aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-20 14:18:35 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-20 14:18:35 +0000
commit278ed7c329b7e5a8dbef8da7efd42a5b73ca785d (patch)
tree729127e9988c7824c633b129d04a6f01e6c1597c /target-i386
parentcaa88be0f59c4b518a29b9e2706b537e675a5e5c (diff)
downloadqemu-278ed7c329b7e5a8dbef8da7efd42a5b73ca785d.zip
qemu-278ed7c329b7e5a8dbef8da7efd42a5b73ca785d.tar.gz
qemu-278ed7c329b7e5a8dbef8da7efd42a5b73ca785d.tar.bz2
cmpxchg fixes
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4755 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/op_helper.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index beb5687..0b5fdc0 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -1837,6 +1837,8 @@ void helper_cmpxchg8b(target_ulong a0)
stq(a0, ((uint64_t)ECX << 32) | (uint32_t)EBX);
eflags |= CC_Z;
} else {
+ /* always do the store */
+ stq(a0, d);
EDX = (uint32_t)(d >> 32);
EAX = (uint32_t)d;
eflags &= ~CC_Z;
@@ -1850,6 +1852,8 @@ void helper_cmpxchg16b(target_ulong a0)
uint64_t d0, d1;
int eflags;
+ if ((a0 & 0xf) != 0)
+ raise_exception(EXCP0D_GPF);
eflags = cc_table[CC_OP].compute_all();
d0 = ldq(a0);
d1 = ldq(a0 + 8);
@@ -1858,6 +1862,9 @@ void helper_cmpxchg16b(target_ulong a0)
stq(a0 + 8, ECX);
eflags |= CC_Z;
} else {
+ /* always do the store */
+ stq(a0, d0);
+ stq(a0 + 8, d1);
EDX = d1;
EAX = d0;
eflags &= ~CC_Z;