diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:59:32 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 08:59:32 -0500 |
commit | 9d0baba1104c51f5d95d632ff41406e5aca83216 (patch) | |
tree | 0edd64c45cb6a32f85c11a2116ce603f3cf3d71d /target-i386 | |
parent | a60fce0bcc193c37c92972b8217341d81f7a9860 (diff) | |
parent | 9f4facbce9dc4037b23baa77950381fc2f92e2d3 (diff) | |
download | qemu-9d0baba1104c51f5d95d632ff41406e5aca83216.zip qemu-9d0baba1104c51f5d95d632ff41406e5aca83216.tar.gz qemu-9d0baba1104c51f5d95d632ff41406e5aca83216.tar.bz2 |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'target-i386')
-rw-r--r-- | target-i386/op_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 1bbc3b5..1fc248f 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1970,20 +1970,20 @@ void helper_aas(void) void helper_daa(void) { - int al, af, cf; + int old_al, al, af, cf; int eflags; eflags = helper_cc_compute_all(CC_OP); cf = eflags & CC_C; af = eflags & CC_A; - al = EAX & 0xff; + old_al = al = EAX & 0xff; eflags = 0; if (((al & 0x0f) > 9 ) || af) { al = (al + 6) & 0xff; eflags |= CC_A; } - if ((al > 0x9f) || cf) { + if ((old_al > 0x99) || cf) { al = (al + 0x60) & 0xff; eflags |= CC_C; } |