diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-28 22:22:50 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-03-28 22:22:50 +0000 |
| commit | f364515c836fcc7caa1606a8c27edae25f27a6ce (patch) | |
| tree | 544c9948fa5c44b81f5642b3290c4cf7753ab6b5 | |
| parent | 41e0c701599de298beec6853f9bb055365e51174 (diff) | |
target-mips: fix FPU in 64-bit mode
TCG does not allow the same memory location to be aliased in two
different global registers, fpu_fpr32 and fpu_fpr64.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6915 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-mips/translate.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/target-mips/translate.c b/target-mips/translate.c index 8dc7976518..7a3c719e51 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -432,7 +432,6 @@ static TCGv cpu_HI[MIPS_DSP_ACC], cpu_LO[MIPS_DSP_ACC], cpu_ACX[MIPS_DSP_ACC]; static TCGv cpu_dspctrl, btarget; static TCGv_i32 bcond; static TCGv_i32 fpu_fpr32[32], fpu_fpr32h[32]; -static TCGv_i64 fpu_fpr64[32]; static TCGv_i32 fpu_fcr0, fpu_fcr31; #include "gen-icount.h" @@ -501,12 +500,6 @@ static const char *fregnames[] = "f16", "f17", "f18", "f19", "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", }; -static const char *fregnames_64[] = - { "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", - "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", - "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", - "F24", "F25", "F26", "F27", "F28", "F29", "F30", "F31", }; - static const char *fregnames_h[] = { "h0", "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "h9", "h10", "h11", "h12", "h13", "h14", "h15", @@ -617,18 +610,20 @@ static inline void gen_store_fpr32 (TCGv_i32 t, int reg) static inline void gen_load_fpr64 (DisasContext *ctx, TCGv_i64 t, int reg) { - if (ctx->hflags & MIPS_HFLAG_F64) - tcg_gen_mov_i64(t, fpu_fpr64[reg]); - else { + if (ctx->hflags & MIPS_HFLAG_F64) { + tcg_gen_concat_i32_i64(t, fpu_fpr32[reg], fpu_fpr32h[reg]); + } else { tcg_gen_concat_i32_i64(t, fpu_fpr32[reg & ~1], fpu_fpr32[reg | 1]); } } static inline void gen_store_fpr64 (DisasContext *ctx, TCGv_i64 t, int reg) { - if (ctx->hflags & MIPS_HFLAG_F64) - tcg_gen_mov_i64(fpu_fpr64[reg], t); - else { + if (ctx->hflags & MIPS_HFLAG_F64) { + tcg_gen_trunc_i64_i32(fpu_fpr32[reg], t); + tcg_gen_shri_i64(t, t, 32); + tcg_gen_trunc_i64_i32(fpu_fpr32h[reg], t); + } else { tcg_gen_trunc_i64_i32(fpu_fpr32[reg & ~1], t); tcg_gen_shri_i64(t, t, 32); tcg_gen_trunc_i64_i32(fpu_fpr32[reg | 1], t); @@ -8442,10 +8437,6 @@ static void mips_tcg_init(void) offsetof(CPUState, active_fpu.fpr[i].w[FP_ENDIAN_IDX]), fregnames[i]); for (i = 0; i < 32; i++) - fpu_fpr64[i] = tcg_global_mem_new_i64(TCG_AREG0, - offsetof(CPUState, active_fpu.fpr[i]), - fregnames_64[i]); - for (i = 0; i < 32; i++) fpu_fpr32h[i] = tcg_global_mem_new_i32(TCG_AREG0, offsetof(CPUState, active_fpu.fpr[i].w[!FP_ENDIAN_IDX]), fregnames_h[i]); |