diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:40:46 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:40:46 -0300 |
| commit | b08e9748ff26914b5a29032923e03f2670822de8 (patch) | |
| tree | 869dfb199647436d40ec8b616acb5cfc2da4a7a6 /target-i386 | |
| parent | Merge commit '0f457d91c41047f0f22c2e6965fbd154c5cd07d9' into upstream-merge (diff) | |
| parent | Move generation of config-host.h to Makefile from configure (diff) | |
| download | qemu-kvm-b08e9748ff26914b5a29032923e03f2670822de8.tar.gz qemu-kvm-b08e9748ff26914b5a29032923e03f2670822de8.tar.bz2 qemu-kvm-b08e9748ff26914b5a29032923e03f2670822de8.zip | |
Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge
* commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f':
Move generation of config-host.h to Makefile from configure
Don't include config-host.mak from inside config.mak
CRIS: Update PR_EDA on TLB faults.
Clean up test for qdev_init() failure
Warn if value of qdev_init() isn't checked
Make isa_create() terminate program on failure
New qdev_init_nofail()
Check return value of qdev_init()
Make qdev_init() destroy the device on failure
Unbreak USB autoconnect filters
tcg: improve output log
target-i386: fix ARPL
configure and Makefile are not generated in qemu
Don't use implicit rules for Makefile
optionrom: create .PHONY variable
add build-all to .PHONY rules
optionrom: remove use of implicit RM variable
AIOLIBS is not used anywhere
qdev: move comment
Conflicts:
Makefile
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/translate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target-i386/translate.c b/target-i386/translate.c index e3cb49f33..251194394 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7305,7 +7305,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) #endif { int label1; - TCGv t0, t1, t2; + TCGv t0, t1, t2, a0; if (!s->pe || s->vm86) goto illegal_op; @@ -7320,8 +7320,11 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) if (mod != 3) { gen_lea_modrm(s, modrm, ®_addr, &offset_addr); gen_op_ld_v(ot + s->mem_index, t0, cpu_A0); + a0 = tcg_temp_local_new(); + tcg_gen_mov_tl(a0, cpu_A0); } else { gen_op_mov_v_reg(ot, t0, rm); + TCGV_UNUSED(a0); } gen_op_mov_v_reg(ot, t1, reg); tcg_gen_andi_tl(cpu_tmp0, t0, 3); @@ -7334,8 +7337,9 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) tcg_gen_movi_tl(t2, CC_Z); gen_set_label(label1); if (mod != 3) { - gen_op_st_v(ot + s->mem_index, t0, cpu_A0); - } else { + gen_op_st_v(ot + s->mem_index, t0, a0); + tcg_temp_free(a0); + } else { gen_op_mov_reg_v(ot, rm, t0); } if (s->cc_op != CC_OP_DYNAMIC) |