[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] i386/translate: ignore 0x67 (PREFIX_ADR) on TARGET_
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH] i386/translate: ignore 0x67 (PREFIX_ADR) on TARGET_X86_64 && CODE64() |
Date: |
Fri, 24 May 2013 23:37:36 +0200 |
The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR.
Restore the previous behavior:
If TARGET_X86_64 *and* CODE64():
(a) PREFIX_ADR set: no effect, "aflag" should stay at the original
"s->code32" value,
(b) PREFIX_ADR clear: "aflag" should be set to constant 2.
Otherwise:
(c) PREFIX_ADR set: the least significant bit in "aflag" (originally
initialized form "s->code32") should be negated,
(d) PREFIX_ADR clear: no effect, "aflag" should stay at the original
"s->code32" value.
Currently branch (a) is mishandled as branch (c).
Please-review: Richard Henderson <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
---
target-i386/translate.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 0aeccdb..86f2678 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -4813,7 +4813,11 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
/* 0x66 is ignored if rex.w is set */
dflag = 2;
}
- if (!(prefixes & PREFIX_ADR)) {
+ if (prefixes & PREFIX_ADR) {
+ /* flip it back, 0x67 should have no effect */
+ aflag ^= 1;
+ }
+ else {
aflag = 2;
}
}
--
1.7.1
- [Qemu-devel] [PATCH] i386/translate: ignore 0x67 (PREFIX_ADR) on TARGET_X86_64 && CODE64(),
Laszlo Ersek <=