OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sh.h (TARGET_CACHE32, [...]): Delete macro. 

* config/sh/sh.h (TARGET_CACHE32, TARGET_HARVARD): Delete macro.
	(TARGET_SUPERSCALAR): Add TARGET_SH2A.
	(CACHE_LOG): Use TARGET_HARD_SH4 and TARGET_SH5 instead of
	TARGET_CACHE32.
	(TRAMPOLINE_ALIGNMENT): Use TARGET_HARD_SH4 and TARGET_SH5 instead of
	TARGET_HARVARD.
	* config/sh/sh.c (sh_trampoline_init): Likewise.

From-SVN: r193151
This commit is contained in:
Oleg Endo 2012-11-05 01:06:18 +00:00
parent e091ffb72f
commit ead4af4fb6
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/ChangeLog
View File

@ -1,3 +1,13 @@
2012-11-05 Oleg Endo <olegendo@gcc.gnu.org>
* config/sh/sh.h (TARGET_CACHE32, TARGET_HARVARD): Delete macro.
(TARGET_SUPERSCALAR): Add TARGET_SH2A.
(CACHE_LOG): Use TARGET_HARD_SH4 and TARGET_SH5 instead of
TARGET_CACHE32.
(TRAMPOLINE_ALIGNMENT): Use TARGET_HARD_SH4 and TARGET_SH5 instead of
TARGET_HARVARD.
* config/sh/sh.c (sh_trampoline_init): Likewise.
2012-11-05 David Edelsohn <dje.gcc@gmail.com>
* system.h (loc_t): Poison.

2
gcc/config/sh/sh.c
View File

@ -11545,7 +11545,7 @@ sh_trampoline_init (rtx tramp_mem, tree fndecl, rtx cxt)
SImode));
emit_move_insn (adjust_address (tramp_mem, SImode, 8), cxt);
emit_move_insn (adjust_address (tramp_mem, SImode, 12), fnaddr);
if (TARGET_HARVARD)
if (TARGET_HARD_SH4 || TARGET_SH5)
{
if (!TARGET_INLINE_IC_INVALIDATE
|| (!(TARGET_SH4A_ARCH || TARGET_SH4_300) && TARGET_USERMODE))

15
gcc/config/sh/sh.h
View File

@ -58,14 +58,8 @@ extern int code_for_indirect_jump_scratch;
/* Nonzero if we should generate code using type 3E insns. */
#define TARGET_SH3E (TARGET_SH3 && TARGET_SH_E)
/* Nonzero if the cache line size is 32. */
#define TARGET_CACHE32 (TARGET_HARD_SH4 || TARGET_SH5)
/* Nonzero if we schedule for a superscalar implementation. */
#define TARGET_SUPERSCALAR TARGET_HARD_SH4
/* Nonzero if the target has separate instruction and data caches. */
#define TARGET_HARVARD (TARGET_HARD_SH4 || TARGET_SH5)
#define TARGET_SUPERSCALAR (TARGET_HARD_SH4 || TARGET_SH2A)
/* Nonzero if a double-precision FPU is available. */
#define TARGET_FPU_DOUBLE \
@ -461,7 +455,7 @@ extern enum sh_divide_strategy_e sh_div_strategy;
/* The log (base 2) of the cache line size, in bytes. Processors prior to
SH2 have no actual cache, but they fetch code in chunks of 4 bytes.
The SH2/3 have 16 byte cache lines, and the SH4 has a 32 byte cache line */
#define CACHE_LOG (TARGET_CACHE32 ? 5 : TARGET_SH2 ? 4 : 2)
#define CACHE_LOG ((TARGET_HARD_SH4 || TARGET_SH5) ? 5 : TARGET_SH2 ? 4 : 2)
/* ABI given & required minimum allocation boundary (in *bits*) for the
code of a function. */
@ -1575,9 +1569,10 @@ struct sh_args {
/* Length in units of the trampoline for entering a nested function. */
#define TRAMPOLINE_SIZE (TARGET_SHMEDIA64 ? 40 : TARGET_SH5 ? 24 : 16)
/* Alignment required for a trampoline in bits . */
/* Alignment required for a trampoline in bits. */
#define TRAMPOLINE_ALIGNMENT \
((CACHE_LOG < 3 || (optimize_size && ! TARGET_HARVARD)) ? 32 \
((CACHE_LOG < 3 \
|| (optimize_size && ! (TARGET_HARD_SH4 || TARGET_SH5))) ? 32 \
: TARGET_SHMEDIA ? 256 : 64)
/* A C expression whose value is RTL representing the value of the return