Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 5747c073 编写于 作者: P pbrook
浏览文件
操作

Fix int/float inconsistencies. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3672 c046a42c-6fe2-441c-8c8c-71466251a162
上级 02ce600c
隐藏空白更改
内联 并排
Showing with 34 addition and 36 deletion
target-mips/fop_template.c
浏览文件 @ 5747c073
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
#define OP_WLOAD_FREG(treg, tregname, FREG) \ #define OP_WLOAD_FREG(treg, tregname, FREG) \
void glue(glue(op_load_fpr_,tregname), FREG) (void) \ void glue(glue(op_load_fpr_,tregname), FREG) (void) \
{ \ { \
treg = env->fpu->fpr[FREG].fs[FP_ENDIAN_IDX]; \ treg = env->fpu->fpr[FREG].w[FP_ENDIAN_IDX]; \
FORCE_RET(); \ FORCE_RET(); \
} }
#define OP_WSTORE_FREG(treg, tregname, FREG) \ #define OP_WSTORE_FREG(treg, tregname, FREG) \
void glue(glue(op_store_fpr_,tregname), FREG) (void) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \
{ \ { \
env->fpu->fpr[FREG].fs[FP_ENDIAN_IDX] = treg; \ env->fpu->fpr[FREG].w[FP_ENDIAN_IDX] = treg; \
FORCE_RET(); \ FORCE_RET(); \
} }
...@@ -50,10 +50,10 @@ OP_WSTORE_FREG(WT2, WT2_fpr, FREG) ...@@ -50,10 +50,10 @@ OP_WSTORE_FREG(WT2, WT2_fpr, FREG)
void glue(glue(op_load_fpr_,tregname), FREG) (void) \ void glue(glue(op_load_fpr_,tregname), FREG) (void) \
{ \ { \
if (env->hflags & MIPS_HFLAG_F64) \ if (env->hflags & MIPS_HFLAG_F64) \
treg = env->fpu->fpr[FREG].fd; \ treg = env->fpu->fpr[FREG].d; \
else \ else \
treg = (uint64_t)(env->fpu->fpr[FREG | 1].fs[FP_ENDIAN_IDX]) << 32 | \ treg = (uint64_t)(env->fpu->fpr[FREG | 1].w[FP_ENDIAN_IDX]) << 32 | \
env->fpu->fpr[FREG & ~1].fs[FP_ENDIAN_IDX]; \ env->fpu->fpr[FREG & ~1].w[FP_ENDIAN_IDX]; \
FORCE_RET(); \ FORCE_RET(); \
} }
...@@ -61,10 +61,10 @@ OP_WSTORE_FREG(WT2, WT2_fpr, FREG) ...@@ -61,10 +61,10 @@ OP_WSTORE_FREG(WT2, WT2_fpr, FREG)
void glue(glue(op_store_fpr_,tregname), FREG) (void) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \
{ \ { \
if (env->hflags & MIPS_HFLAG_F64) \ if (env->hflags & MIPS_HFLAG_F64) \
env->fpu->fpr[FREG].fd = treg; \ env->fpu->fpr[FREG].d = treg; \
else { \ else { \
env->fpu->fpr[FREG | 1].fs[FP_ENDIAN_IDX] = treg >> 32; \ env->fpu->fpr[FREG | 1].w[FP_ENDIAN_IDX] = treg >> 32; \
env->fpu->fpr[FREG & ~1].fs[FP_ENDIAN_IDX] = treg; \ env->fpu->fpr[FREG & ~1].w[FP_ENDIAN_IDX] = treg; \
} \ } \
FORCE_RET(); \ FORCE_RET(); \
} }
...@@ -81,14 +81,14 @@ OP_DSTORE_FREG(DT2, DT2_fpr, FREG) ...@@ -81,14 +81,14 @@ OP_DSTORE_FREG(DT2, DT2_fpr, FREG)
#define OP_PSLOAD_FREG(treg, tregname, FREG) \ #define OP_PSLOAD_FREG(treg, tregname, FREG) \
void glue(glue(op_load_fpr_,tregname), FREG) (void) \ void glue(glue(op_load_fpr_,tregname), FREG) (void) \
{ \ { \
treg = env->fpu->fpr[FREG].fs[!FP_ENDIAN_IDX]; \ treg = env->fpu->fpr[FREG].w[!FP_ENDIAN_IDX]; \
FORCE_RET(); \ FORCE_RET(); \
} }
#define OP_PSSTORE_FREG(treg, tregname, FREG) \ #define OP_PSSTORE_FREG(treg, tregname, FREG) \
void glue(glue(op_store_fpr_,tregname), FREG) (void) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \
{ \ { \
env->fpu->fpr[FREG].fs[!FP_ENDIAN_IDX] = treg; \ env->fpu->fpr[FREG].w[!FP_ENDIAN_IDX] = treg; \
FORCE_RET(); \ FORCE_RET(); \
} }
......
target-mips/op.c
浏览文件 @ 5747c073
...@@ -2682,7 +2682,7 @@ FLOAT_OP(n ## name1 ## name2, d) \ ...@@ -2682,7 +2682,7 @@ FLOAT_OP(n ## name1 ## name2, d) \
{ \ { \
FDT0 = float64_ ## name1 (FDT0, FDT1, &env->fpu->fp_status); \ FDT0 = float64_ ## name1 (FDT0, FDT1, &env->fpu->fp_status); \
FDT2 = float64_ ## name2 (FDT0, FDT2, &env->fpu->fp_status); \ FDT2 = float64_ ## name2 (FDT0, FDT2, &env->fpu->fp_status); \
FDT2 ^= 1ULL << 63; \ FDT2 = float64_chs(FDT2); \
DEBUG_FPU_STATE(); \ DEBUG_FPU_STATE(); \
FORCE_RET(); \ FORCE_RET(); \
} \ } \
...@@ -2690,7 +2690,7 @@ FLOAT_OP(n ## name1 ## name2, s) \ ...@@ -2690,7 +2690,7 @@ FLOAT_OP(n ## name1 ## name2, s) \
{ \ { \
FST0 = float32_ ## name1 (FST0, FST1, &env->fpu->fp_status); \ FST0 = float32_ ## name1 (FST0, FST1, &env->fpu->fp_status); \
FST2 = float32_ ## name2 (FST0, FST2, &env->fpu->fp_status); \ FST2 = float32_ ## name2 (FST0, FST2, &env->fpu->fp_status); \
FST2 ^= 1 << 31; \ FST2 = float32_chs(FST2); \
DEBUG_FPU_STATE(); \ DEBUG_FPU_STATE(); \
FORCE_RET(); \ FORCE_RET(); \
} \ } \
...@@ -2700,8 +2700,8 @@ FLOAT_OP(n ## name1 ## name2, ps) \ ...@@ -2700,8 +2700,8 @@ FLOAT_OP(n ## name1 ## name2, ps) \
FSTH0 = float32_ ## name1 (FSTH0, FSTH1, &env->fpu->fp_status); \ FSTH0 = float32_ ## name1 (FSTH0, FSTH1, &env->fpu->fp_status); \
FST2 = float32_ ## name2 (FST0, FST2, &env->fpu->fp_status); \ FST2 = float32_ ## name2 (FST0, FST2, &env->fpu->fp_status); \
FSTH2 = float32_ ## name2 (FSTH0, FSTH2, &env->fpu->fp_status); \ FSTH2 = float32_ ## name2 (FSTH0, FSTH2, &env->fpu->fp_status); \
FST2 ^= 1 << 31; \ FST2 = float32_chs(FST2); \
FSTH2 ^= 1 << 31; \ FSTH2 = float32_chs(FSTH2); \
DEBUG_FPU_STATE(); \ DEBUG_FPU_STATE(); \
FORCE_RET(); \ FORCE_RET(); \
} }
......
target-mips/op_helper.c
浏览文件 @ 5747c073
...@@ -626,8 +626,6 @@ void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec, ...@@ -626,8 +626,6 @@ void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
/* Complex FPU operations which may need stack space. */ /* Complex FPU operations which may need stack space. */
#define FLOAT_SIGN32 (1 << 31)
#define FLOAT_SIGN64 (1ULL << 63)
#define FLOAT_ONE32 (0x3f8 << 20) #define FLOAT_ONE32 (0x3f8 << 20)
#define FLOAT_ONE64 (0x3ffULL << 52) #define FLOAT_ONE64 (0x3ffULL << 52)
#define FLOAT_TWO32 (1 << 30) #define FLOAT_TWO32 (1 << 30)
...@@ -1054,7 +1052,7 @@ FLOAT_OP(name, d) \ ...@@ -1054,7 +1052,7 @@ FLOAT_OP(name, d) \
FDT2 = float64_ ## name (FDT0, FDT1, &env->fpu->fp_status); \ FDT2 = float64_ ## name (FDT0, FDT1, &env->fpu->fp_status); \
update_fcr31(); \ update_fcr31(); \
if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) \ if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) \
FDT2 = FLOAT_QNAN64; \ DT2 = FLOAT_QNAN64; \
} \ } \
FLOAT_OP(name, s) \ FLOAT_OP(name, s) \
{ \ { \
...@@ -1062,7 +1060,7 @@ FLOAT_OP(name, s) \ ...@@ -1062,7 +1060,7 @@ FLOAT_OP(name, s) \
FST2 = float32_ ## name (FST0, FST1, &env->fpu->fp_status); \ FST2 = float32_ ## name (FST0, FST1, &env->fpu->fp_status); \
update_fcr31(); \ update_fcr31(); \
if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) \ if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) \
FST2 = FLOAT_QNAN32; \ WT2 = FLOAT_QNAN32; \
} \ } \
FLOAT_OP(name, ps) \ FLOAT_OP(name, ps) \
{ \ { \
...@@ -1071,8 +1069,8 @@ FLOAT_OP(name, ps) \ ...@@ -1071,8 +1069,8 @@ FLOAT_OP(name, ps) \
FSTH2 = float32_ ## name (FSTH0, FSTH1, &env->fpu->fp_status); \ FSTH2 = float32_ ## name (FSTH0, FSTH1, &env->fpu->fp_status); \
update_fcr31(); \ update_fcr31(); \
if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) { \ if (GET_FP_CAUSE(env->fpu->fcr31) & FP_INVALID) { \
FST2 = FLOAT_QNAN32; \ WT2 = FLOAT_QNAN32; \
FSTH2 = FLOAT_QNAN32; \ WTH2 = FLOAT_QNAN32; \
} \ } \
} }
FLOAT_BINOP(add) FLOAT_BINOP(add)
...@@ -1086,14 +1084,14 @@ FLOAT_OP(recip2, d) ...@@ -1086,14 +1084,14 @@ FLOAT_OP(recip2, d)
{ {
set_float_exception_flags(0, &env->fpu->fp_status); set_float_exception_flags(0, &env->fpu->fp_status);
FDT2 = float64_mul(FDT0, FDT2, &env->fpu->fp_status); FDT2 = float64_mul(FDT0, FDT2, &env->fpu->fp_status);
FDT2 = float64_sub(FDT2, FLOAT_ONE64, &env->fpu->fp_status) ^ FLOAT_SIGN64; FDT2 = float64_chs(float64_sub(FDT2, FLOAT_ONE64, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
FLOAT_OP(recip2, s) FLOAT_OP(recip2, s)
{ {
set_float_exception_flags(0, &env->fpu->fp_status); set_float_exception_flags(0, &env->fpu->fp_status);
FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status); FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status);
FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FST2 = float32_chs(float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
FLOAT_OP(recip2, ps) FLOAT_OP(recip2, ps)
...@@ -1101,8 +1099,8 @@ FLOAT_OP(recip2, ps) ...@@ -1101,8 +1099,8 @@ FLOAT_OP(recip2, ps)
set_float_exception_flags(0, &env->fpu->fp_status); set_float_exception_flags(0, &env->fpu->fp_status);
FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status); FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status);
FSTH2 = float32_mul(FSTH0, FSTH2, &env->fpu->fp_status); FSTH2 = float32_mul(FSTH0, FSTH2, &env->fpu->fp_status);
FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FST2 = float32_chs(float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status));
FSTH2 = float32_sub(FSTH2, FLOAT_ONE32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FSTH2 = float32_chs(float32_sub(FSTH2, FLOAT_ONE32, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
...@@ -1111,7 +1109,7 @@ FLOAT_OP(rsqrt2, d) ...@@ -1111,7 +1109,7 @@ FLOAT_OP(rsqrt2, d)
set_float_exception_flags(0, &env->fpu->fp_status); set_float_exception_flags(0, &env->fpu->fp_status);
FDT2 = float64_mul(FDT0, FDT2, &env->fpu->fp_status); FDT2 = float64_mul(FDT0, FDT2, &env->fpu->fp_status);
FDT2 = float64_sub(FDT2, FLOAT_ONE64, &env->fpu->fp_status); FDT2 = float64_sub(FDT2, FLOAT_ONE64, &env->fpu->fp_status);
FDT2 = float64_div(FDT2, FLOAT_TWO64, &env->fpu->fp_status) ^ FLOAT_SIGN64; FDT2 = float64_chs(float64_div(FDT2, FLOAT_TWO64, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
FLOAT_OP(rsqrt2, s) FLOAT_OP(rsqrt2, s)
...@@ -1119,7 +1117,7 @@ FLOAT_OP(rsqrt2, s) ...@@ -1119,7 +1117,7 @@ FLOAT_OP(rsqrt2, s)
set_float_exception_flags(0, &env->fpu->fp_status); set_float_exception_flags(0, &env->fpu->fp_status);
FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status); FST2 = float32_mul(FST0, FST2, &env->fpu->fp_status);
FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status); FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status);
FST2 = float32_div(FST2, FLOAT_TWO32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FST2 = float32_chs(float32_div(FST2, FLOAT_TWO32, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
FLOAT_OP(rsqrt2, ps) FLOAT_OP(rsqrt2, ps)
...@@ -1129,8 +1127,8 @@ FLOAT_OP(rsqrt2, ps) ...@@ -1129,8 +1127,8 @@ FLOAT_OP(rsqrt2, ps)
FSTH2 = float32_mul(FSTH0, FSTH2, &env->fpu->fp_status); FSTH2 = float32_mul(FSTH0, FSTH2, &env->fpu->fp_status);
FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status); FST2 = float32_sub(FST2, FLOAT_ONE32, &env->fpu->fp_status);
FSTH2 = float32_sub(FSTH2, FLOAT_ONE32, &env->fpu->fp_status); FSTH2 = float32_sub(FSTH2, FLOAT_ONE32, &env->fpu->fp_status);
FST2 = float32_div(FST2, FLOAT_TWO32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FST2 = float32_chs(float32_div(FST2, FLOAT_TWO32, &env->fpu->fp_status));
FSTH2 = float32_div(FSTH2, FLOAT_TWO32, &env->fpu->fp_status) ^ FLOAT_SIGN32; FSTH2 = float32_chs(float32_div(FSTH2, FLOAT_TWO32, &env->fpu->fp_status));
update_fcr31(); update_fcr31();
} }
...@@ -1164,8 +1162,8 @@ void do_cmp_d_ ## op (long cc) \ ...@@ -1164,8 +1162,8 @@ void do_cmp_d_ ## op (long cc) \
void do_cmpabs_d_ ## op (long cc) \ void do_cmpabs_d_ ## op (long cc) \
{ \ { \
int c; \ int c; \
FDT0 &= ~FLOAT_SIGN64; \ FDT0 = float64_chs(FDT0); \
FDT1 &= ~FLOAT_SIGN64; \ FDT1 = float64_chs(FDT1); \
c = cond; \ c = cond; \
update_fcr31(); \ update_fcr31(); \
if (c) \ if (c) \
...@@ -1222,8 +1220,8 @@ void do_cmp_s_ ## op (long cc) \ ...@@ -1222,8 +1220,8 @@ void do_cmp_s_ ## op (long cc) \
void do_cmpabs_s_ ## op (long cc) \ void do_cmpabs_s_ ## op (long cc) \
{ \ { \
int c; \ int c; \
FST0 &= ~FLOAT_SIGN32; \ FST0 = float32_abs(FST0); \
FST1 &= ~FLOAT_SIGN32; \ FST1 = float32_abs(FST1); \
c = cond; \ c = cond; \
update_fcr31(); \ update_fcr31(); \
if (c) \ if (c) \
...@@ -1285,10 +1283,10 @@ void do_cmp_ps_ ## op (long cc) \ ...@@ -1285,10 +1283,10 @@ void do_cmp_ps_ ## op (long cc) \
void do_cmpabs_ps_ ## op (long cc) \ void do_cmpabs_ps_ ## op (long cc) \
{ \ { \
int cl, ch; \ int cl, ch; \
FST0 &= ~FLOAT_SIGN32; \ FST0 = float32_abs(FST0); \
FSTH0 &= ~FLOAT_SIGN32; \ FSTH0 = float32_abs(FSTH0); \
FST1 &= ~FLOAT_SIGN32; \ FST1 = float32_abs(FST1); \
FSTH1 &= ~FLOAT_SIGN32; \ FSTH1 = float32_abs(FSTH1); \
cl = condl; \ cl = condl; \
ch = condh; \ ch = condh; \
update_fcr31(); \ update_fcr31(); \
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或