From 2129b0816f369ee6bf172e7065b0de137ac9c7f7 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Thu, 14 May 1998 13:00:18 +0000 Subject: [PATCH] Patch from Gary McGary to fix i960 problem with out-of-range shifts. * i960.h (hard_regno_mode_ok): Changed to function from array of unsigned. (HARD_REGNO_MODE_OK): Call function instead of testing bit. * i960.c (hard_regno_mode_ok): Changed to function from array of unsigned. From-SVN: r19745 --- gcc/ChangeLog | 8 +++++ gcc/config/i960/i960.c | 71 ++++++++++++++++++++++++++---------------- gcc/config/i960/i960.h | 5 ++- 3 files changed, 54 insertions(+), 30 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b8964b385bd..c99ab5ea9b3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +Thu May 14 12:58:21 1998 Jim Wilson + + * i960.h (hard_regno_mode_ok): Changed to function from array of + unsigned. + (HARD_REGNO_MODE_OK): Call function instead of testing bit. + * i960.c (hard_regno_mode_ok): Changed to function from array of + unsigned. + Thu May 14 08:41:46 1998 J"orn Rennecke * reload.c (remove_replacements): New function. diff --git a/gcc/config/i960/i960.c b/gcc/config/i960/i960.c index 11b2a21f9be..f87b02c8a1b 100644 --- a/gcc/config/i960/i960.c +++ b/gcc/config/i960/i960.c @@ -2067,40 +2067,57 @@ i960_alignment (size, align) } #endif -/* Modes for condition codes. */ -#define C_MODES \ - ((1 << (int) CCmode) | (1 << (int) CC_UNSmode) | (1<< (int) CC_CHKmode)) -/* Modes for single-word (and smaller) quantities. */ -#define S_MODES \ - (~C_MODES \ - & ~ ((1 << (int) DImode) | (1 << (int) TImode) \ - | (1 << (int) DFmode) | (1 << (int) XFmode))) - -/* Modes for double-word (and smaller) quantities. */ -#define D_MODES \ - (~C_MODES \ - & ~ ((1 << (int) TImode) | (1 << (int) XFmode))) +int +hard_regno_mode_ok (regno, mode) + int regno; + enum machine_mode mode; +{ + if (regno < 32) + { + switch (mode) + { + case CCmode: case CC_UNSmode: case CC_CHKmode: + return 0; -/* Modes for quad-word quantities. */ -#define T_MODES (~C_MODES) + case DImode: case DFmode: + return (regno & 1) == 0; -/* Modes for single-float quantities. */ -#define SF_MODES ((1 << (int) SFmode)) + case TImode: case XFmode: + return (regno & 3) == 0; -/* Modes for double-float quantities. */ -#define DF_MODES (SF_MODES | (1 << (int) DFmode) | (1 << (int) SCmode)) + default: + return 1; + } + } + else if (regno >= 32 && regno < 36) + { + switch (mode) + { + case SFmode: case DFmode: case XFmode: + case SCmode: case DCmode: + return 1; -/* Modes for quad-float quantities. */ -#define XF_MODES (DF_MODES | (1 << (int) XFmode) | (1 << (int) DCmode)) + default: + return 0; + } + } + else if (regno == 36) + { + switch (mode) + { + case CCmode: case CC_UNSmode: case CC_CHKmode: + return 1; -unsigned int hard_regno_mode_ok[FIRST_PSEUDO_REGISTER] = { - T_MODES, S_MODES, D_MODES, S_MODES, T_MODES, S_MODES, D_MODES, S_MODES, - T_MODES, S_MODES, D_MODES, S_MODES, T_MODES, S_MODES, D_MODES, S_MODES, - T_MODES, S_MODES, D_MODES, S_MODES, T_MODES, S_MODES, D_MODES, S_MODES, - T_MODES, S_MODES, D_MODES, S_MODES, T_MODES, S_MODES, D_MODES, S_MODES, + default: + return 0; + } + } + else if (regno == 37) + return 0; - XF_MODES, XF_MODES, XF_MODES, XF_MODES, C_MODES}; + abort (); +} /* Return the minimum alignment of an expression rtx X in bytes. This takes diff --git a/gcc/config/i960/i960.h b/gcc/config/i960/i960.h index 27967f09a65..1ba3dcc79f0 100644 --- a/gcc/config/i960/i960.h +++ b/gcc/config/i960/i960.h @@ -506,9 +506,8 @@ extern int target_flags; /* Value is 1 if hard register REGNO can hold a value of machine-mode MODE. On 80960, the cpu registers can hold any mode but the float registers can only hold SFmode, DFmode, or XFmode. */ -extern unsigned int hard_regno_mode_ok[FIRST_PSEUDO_REGISTER]; -#define HARD_REGNO_MODE_OK(REGNO, MODE) \ - ((hard_regno_mode_ok[REGNO] & (1 << (int) (MODE))) != 0) +extern int hard_regno_mode_ok (); +#define HARD_REGNO_MODE_OK(REGNO, MODE) hard_regno_mode_ok ((REGNO), (MODE)) /* Value is 1 if it is a good idea to tie two pseudo registers when one has mode MODE1 and one has mode MODE2. -- 2.30.2