diff options
Diffstat (limited to 'target-mips/fop_template.c')
| -rw-r--r-- | target-mips/fop_template.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/target-mips/fop_template.c b/target-mips/fop_template.c index 25b2ca7a5..c5941d121 100644 --- a/target-mips/fop_template.c +++ b/target-mips/fop_template.c @@ -24,15 +24,15 @@ #define OP_WLOAD_FREG(treg, tregname, FREG) \ void glue(glue(op_load_fpr_,tregname), FREG) (void) \ { \ - treg = env->fpu->fpr[FREG].fs[FP_ENDIAN_IDX]; \ - RETURN(); \ + treg = env->fpu->fpr[FREG].w[FP_ENDIAN_IDX]; \ + FORCE_RET(); \ } #define OP_WSTORE_FREG(treg, tregname, FREG) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \ { \ - env->fpu->fpr[FREG].fs[FP_ENDIAN_IDX] = treg; \ - RETURN(); \ + env->fpu->fpr[FREG].w[FP_ENDIAN_IDX] = treg; \ + FORCE_RET(); \ } /* WT0 = FREG.w: op_load_fpr_WT0_fprFREG */ @@ -50,23 +50,23 @@ OP_WSTORE_FREG(WT2, WT2_fpr, FREG) void glue(glue(op_load_fpr_,tregname), FREG) (void) \ { \ if (env->hflags & MIPS_HFLAG_F64) \ - treg = env->fpu->fpr[FREG].fd; \ + treg = env->fpu->fpr[FREG].d; \ else \ - treg = (uint64_t)(env->fpu->fpr[FREG | 1].fs[FP_ENDIAN_IDX]) << 32 | \ - env->fpu->fpr[FREG & ~1].fs[FP_ENDIAN_IDX]; \ - RETURN(); \ + treg = (uint64_t)(env->fpu->fpr[FREG | 1].w[FP_ENDIAN_IDX]) << 32 | \ + env->fpu->fpr[FREG & ~1].w[FP_ENDIAN_IDX]; \ + FORCE_RET(); \ } #define OP_DSTORE_FREG(treg, tregname, FREG) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \ { \ if (env->hflags & MIPS_HFLAG_F64) \ - env->fpu->fpr[FREG].fd = treg; \ + env->fpu->fpr[FREG].d = treg; \ else { \ - env->fpu->fpr[FREG | 1].fs[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 >> 32; \ + env->fpu->fpr[FREG & ~1].w[FP_ENDIAN_IDX] = treg; \ } \ - RETURN(); \ + FORCE_RET(); \ } OP_DLOAD_FREG(DT0, DT0_fpr, FREG) @@ -81,15 +81,15 @@ OP_DSTORE_FREG(DT2, DT2_fpr, FREG) #define OP_PSLOAD_FREG(treg, tregname, FREG) \ void glue(glue(op_load_fpr_,tregname), FREG) (void) \ { \ - treg = env->fpu->fpr[FREG].fs[!FP_ENDIAN_IDX]; \ - RETURN(); \ + treg = env->fpu->fpr[FREG].w[!FP_ENDIAN_IDX]; \ + FORCE_RET(); \ } #define OP_PSSTORE_FREG(treg, tregname, FREG) \ void glue(glue(op_store_fpr_,tregname), FREG) (void) \ { \ - env->fpu->fpr[FREG].fs[!FP_ENDIAN_IDX] = treg; \ - RETURN(); \ + env->fpu->fpr[FREG].w[!FP_ENDIAN_IDX] = treg; \ + FORCE_RET(); \ } OP_PSLOAD_FREG(WTH0, WTH0_fpr, FREG) @@ -109,12 +109,12 @@ OP_PSSTORE_FREG(WTH2, WTH2_fpr, FREG) void glue(op_set, tregname)(void) \ { \ treg = PARAM1; \ - RETURN(); \ + FORCE_RET(); \ } \ void glue(op_reset, tregname)(void) \ { \ treg = 0; \ - RETURN(); \ + FORCE_RET(); \ } SET_RESET(WT0, _WT0) |