pkgsrc/emulators/qemu0/patches/patch-ed
ryoon 937a6294da Readd qemu-0.15.1nb5 as emularoes/qemu0
This package tracks qemu-0.*.
At least, NetBSD/sparc 5.1.2 and 6.0_BETA2 does not work stably on
qemu-system-sparc from newer qemu-1.1.0.
2012-06-07 21:35:37 +00:00

32 lines
1.4 KiB
Text

$NetBSD: patch-ed,v 1.1 2012/06/07 21:35:37 ryoon Exp $
--- target-i386/translate.c.orig 2011-08-08 18:28:42 +0000
+++ target-i386/translate.c
@@ -4856,20 +4856,23 @@ static target_ulong disas_insn(DisasCont
tcg_gen_sub_tl(t2, cpu_regs[R_EAX], t0);
gen_extu(ot, t2);
tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, label1);
+ label2 = gen_new_label();
if (mod == 3) {
- label2 = gen_new_label();
gen_op_mov_reg_v(ot, R_EAX, t0);
tcg_gen_br(label2);
gen_set_label(label1);
gen_op_mov_reg_v(ot, rm, t1);
- gen_set_label(label2);
} else {
- tcg_gen_mov_tl(t1, t0);
+ /* perform no-op store cycle like physical cpu; must be
+ before changing accumulator to ensure idempotency if
+ the store faults and the instruction is restarted */
+ gen_op_st_v(ot + s->mem_index, t0, a0);
gen_op_mov_reg_v(ot, R_EAX, t0);
+ tcg_gen_br(label2);
gen_set_label(label1);
- /* always store */
gen_op_st_v(ot + s->mem_index, t1, a0);
}
+ gen_set_label(label2);
tcg_gen_mov_tl(cpu_cc_src, t0);
tcg_gen_mov_tl(cpu_cc_dst, t2);
s->cc_op = CC_OP_SUBB + ot;