david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-sh4: define FPSCR constants

Browse Source 
Define FPSCR constants for all field and use them instead of hardcoded
values.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2011-01-14 20:39:18 +01:00
parent 442599a340
commit 26ac1ea559
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
target-sh4/cpu.h
View File

@ -61,10 +61,37 @@
#define SR_S (1 << 1) #define SR_S (1 << 1)
#define SR_T (1 << 0) #define SR_T (1 << 0)
#define FPSCR_FR (1 << 21) #define FPSCR_MASK (0x003fffff)
#define FPSCR_SZ (1 << 20) #define FPSCR_FR (1 << 21)
#define FPSCR_PR (1 << 19) #define FPSCR_SZ (1 << 20)
#define FPSCR_DN (1 << 18) #define FPSCR_PR (1 << 19)
#define FPSCR_DN (1 << 18)
#define FPSCR_CAUSE_MASK (0x3f << 12)
#define FPSCR_CAUSE_SHIFT (12)
#define FPSCR_CAUSE_E (1 << 17)
#define FPSCR_CAUSE_V (1 << 16)
#define FPSCR_CAUSE_Z (1 << 15)
#define FPSCR_CAUSE_O (1 << 14)
#define FPSCR_CAUSE_U (1 << 13)
#define FPSCR_CAUSE_I (1 << 12)
#define FPSCR_ENABLE_MASK (0x1f << 7)
#define FPSCR_ENABLE_SHIFT (7)
#define FPSCR_ENABLE_V (1 << 11)
#define FPSCR_ENABLE_Z (1 << 10)
#define FPSCR_ENABLE_O (1 << 9)
#define FPSCR_ENABLE_U (1 << 8)
#define FPSCR_ENABLE_I (1 << 7)
#define FPSCR_FLAG_MASK (0x1f << 2)
#define FPSCR_FLAG_SHIFT (2)
#define FPSCR_FLAG_V (1 << 6)
#define FPSCR_FLAG_Z (1 << 5)
#define FPSCR_FLAG_O (1 << 4)
#define FPSCR_FLAG_U (1 << 3)
#define FPSCR_FLAG_I (1 << 2)
#define FPSCR_RM_MASK (0x03 << 0)
#define FPSCR_RM_NEAREST (0 << 0)
#define FPSCR_RM_ZERO (1 << 0)
#define DELAY_SLOT (1 << 0) #define DELAY_SLOT (1 << 0)
#define DELAY_SLOT_CONDITIONAL (1 << 1) #define DELAY_SLOT_CONDITIONAL (1 << 1)
#define DELAY_SLOT_TRUE (1 << 2) #define DELAY_SLOT_TRUE (1 << 2)

7
target-sh4/op_helper.c
View File

@ -443,11 +443,12 @@ static inline void clr_t(void)
void helper_ld_fpscr(uint32_t val) void helper_ld_fpscr(uint32_t val)
{ {
env->fpscr = val & 0x003fffff; env->fpscr = val & FPSCR_MASK;
if (val & 0x01) if ((val & FPSCR_RM_MASK) == FPSCR_RM_ZERO) {
set_float_rounding_mode(float_round_to_zero, &env->fp_status); set_float_rounding_mode(float_round_to_zero, &env->fp_status);
else } else {
set_float_rounding_mode(float_round_nearest_even, &env->fp_status); set_float_rounding_mode(float_round_nearest_even, &env->fp_status);
}
} }
uint32_t helper_fabs_FT(uint32_t t0) uint32_t helper_fabs_FT(uint32_t t0)

4
target-sh4/translate.c
View File

@ -203,10 +203,10 @@ static void cpu_sh4_reset(CPUSH4State * env)
env->fpscr = FPSCR_PR; /* value for userspace according to the kernel */ env->fpscr = FPSCR_PR; /* value for userspace according to the kernel */
set_float_rounding_mode(float_round_nearest_even, &env->fp_status); /* ?! */ set_float_rounding_mode(float_round_nearest_even, &env->fp_status); /* ?! */
#else #else
env->fpscr = 0x00040001; /* CPU reset value according to SH4 manual */ env->fpscr = FPSCR_DN | FPSCR_RM_ZERO; /* CPU reset value according to SH4 manual */
set_float_rounding_mode(float_round_to_zero, &env->fp_status); set_float_rounding_mode(float_round_to_zero, &env->fp_status);
#endif #endif
set_default_nan_mode(1, &env->vfp.fp_status); set_default_nan_mode(1, &env->fp_status);
env->mmucr = 0; env->mmucr = 0;
} }