diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 02:19:57 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 02:19:57 +0000 |
| commit | 5b340b51fda6f2bdfde6777aa2c8cf69294e17c9 (patch) | |
| tree | f0942b6a32edcc8a06baec61ad4a84aa948e4cac /target-arm | |
| parent | 35c4d671ebfa9509ba915188836070717088bd13 (diff) | |
| download | hqemu-5b340b51fda6f2bdfde6777aa2c8cf69294e17c9.zip hqemu-5b340b51fda6f2bdfde6777aa2c8cf69294e17c9.tar.gz | |
Fix ARM VFP related segfaults.
The fconst change is partly a guess.
VFP_OP1 is still unused.
An ARMv6 target still won't boot.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4210 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/translate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c index 99b57cc..afa368a 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -1009,7 +1009,7 @@ static inline void gen_vfp_##name(int dp) \ gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, cpu_F1s, cpu_env); \ } -#define VFP_OP1i(name) \ +#define VFP_OP1(name) \ static inline void gen_vfp_##name(int dp, int arg) \ { \ if (dp) \ @@ -1068,9 +1068,9 @@ static inline void gen_vfp_cmpe(int dp) static inline void gen_vfp_F1_ld0(int dp) { if (dp) - tcg_gen_movi_i64(cpu_F0d, 0); + tcg_gen_movi_i64(cpu_F1d, 0); else - tcg_gen_movi_i32(cpu_F0s, 0); + tcg_gen_movi_i32(cpu_F1s, 0); } static inline void gen_vfp_uito(int dp) @@ -3117,7 +3117,7 @@ static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn) else i |= 0x800; n |= i << 19; - tcg_gen_movi_i32(cpu_F0d, ((uint64_t)n) << 32); + tcg_gen_movi_i32(cpu_F0s, n); } break; case 15: /* extension space */ |
