This commit is contained in:
fgsch 2010-05-27 23:58:47 +00:00
parent 30c8d05947
commit 5ffde3bd12
2 changed files with 15 additions and 16 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cache-utils_c,v 1.1 2010/05/27 18:50:16 fgsch Exp $
--- cache-utils.c.orig Thu May 27 19:23:46 2010
+++ cache-utils.c Thu May 27 19:34:48 2010
@@ -55,6 +55,12 @@
$OpenBSD: patch-cache-utils_c,v 1.2 2010/05/27 23:58:47 fgsch Exp $
--- cache-utils.c.orig Tue Feb 23 13:54:38 2010
+++ cache-utils.c Thu May 27 16:52:14 2010
@@ -55,6 +55,12 @@ static void ppc_init_cacheline_sizes(void)
qemu_cache_conf.icache_bsize = cacheline;
}
}

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-target-i386_translate_c,v 1.1 2010/05/27 19:03:07 fgsch Exp $
--- target-i386/translate.c.orig 2010-02-23 22:54:38.000000000 +0200
+++ target-i386/translate.c
@@ -4876,20 +4876,24 @@ static target_ulong disas_insn(DisasCont
$OpenBSD: patch-target-i386_translate_c,v 1.2 2010/05/27 23:58:47 fgsch Exp $
--- target-i386/translate.c.orig Tue Feb 23 13:54:38 2010
+++ target-i386/translate.c Thu May 27 16:54:43 2010
@@ -4876,20 +4876,24 @@ static target_ulong disas_insn(DisasContext *s, target
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();
+ label2 = gen_new_label();
if (mod == 3) {
- label2 = gen_new_label();
gen_op_mov_reg_v(ot, R_EAX, t0);
@ -16,18 +16,17 @@ $OpenBSD: patch-target-i386_translate_c,v 1.1 2010/05/27 19:03:07 fgsch Exp $
} 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
+ */
+ 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);
+ tcg_gen_br(label2);
gen_set_label(label1);
- /* always store */
- gen_op_st_v(ot + s->mem_index, t1, a0);
+ gen_op_st_v(ot + s->mem_index, t1, a0);
gen_op_st_v(ot + s->mem_index, t1, a0);
}
+ gen_set_label(label2);
+ 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;