diff options
| author | gson <gson> | 2010-04-25 12:55:41 +0000 |
|---|---|---|
| committer | gson <gson> | 2010-04-25 12:55:41 +0000 |
| commit | 770edc60411add374f50e32dce906b2a9f8724ad (patch) | |
| tree | f2ed69d26dae90e5695a55866032051858b52320 /emulators | |
| parent | f2433565997908317b129b43f2b085166f9edb34 (diff) | |
| download | pkgsrc-770edc60411add374f50e32dce906b2a9f8724ad.tar.gz | |
Correct emulation of i386 cmpxchg instruction in the case where the
comparison outcome is unequal and the memory write causes a page
fault. Fixes PR pkg/42158.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/Makefile | 4 | ||||
| -rw-r--r-- | emulators/qemu/distinfo | 3 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-ed | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 0e3cd9dc863..9dcf88e0279 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.65 2010/04/10 05:57:40 sbd Exp $ +# $NetBSD: Makefile,v 1.66 2010/04/25 12:55:41 gson Exp $ # DISTNAME= qemu-0.12.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/ diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 6054141fcd7..d1b708e8fb9 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.53 2010/02/27 23:21:13 tnn Exp $ +$NetBSD: distinfo,v 1.54 2010/04/25 12:55:41 gson Exp $ SHA1 (qemu-0.12.3.tar.gz) = 03ec307be094bb216bb5be17297e9f33e1a01b56 RMD160 (qemu-0.12.3.tar.gz) = 10dd16ee970a19a6706491fa4425ddbea1da2ba3 @@ -9,3 +9,4 @@ SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc SHA1 (patch-dd) = 32661203ba023bea67cd7cde1f4088f4d0e5c582 SHA1 (patch-de) = 225eaa996fccc02b17be0099d943c75302600ada SHA1 (patch-dk) = 5538bebc08b0047e501469f9cb306cb798d0eb00 +SHA1 (patch-ed) = ef1871b82dac9c89dc3c3d28c97805fabeea43ab diff --git a/emulators/qemu/patches/patch-ed b/emulators/qemu/patches/patch-ed new file mode 100644 index 00000000000..5fb2c680501 --- /dev/null +++ b/emulators/qemu/patches/patch-ed @@ -0,0 +1,34 @@ +$NetBSD: patch-ed,v 1.1 2010/04/25 12:55:41 gson 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 + 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_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; |