[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 25/26] target-i386: Fix aflag logic for CODE64 and
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 25/26] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix |
Date: |
Wed, 12 Jun 2013 16:41:37 -0500 |
From: Richard Henderson <address@hidden>
The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR.
While fixing this, tidy and comment the code so that it's more obvious
what's going on in setting both aflag and dflag.
The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the
constant zero when TARGET_X86_64 is undefined.
Cc: Paolo Bonzini <address@hidden>
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>
(cherry picked from commit dec3fc9657e0682637de4d5a29d947284d01985c)
Signed-off-by: Michael Roth <address@hidden>
---
target-i386/translate.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/target-i386/translate.c b/target-i386/translate.c
index 0aeccdb..14b0298 100644
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
}
s->pc = pc_start;
prefixes = 0;
- aflag = s->code32;
- dflag = s->code32;
s->override = -1;
rex_w = -1;
rex_r = 0;
@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env,
DisasContext *s,
}
/* Post-process prefixes. */
- if (prefixes & PREFIX_DATA) {
- dflag ^= 1;
- }
- if (prefixes & PREFIX_ADR) {
- aflag ^= 1;
- }
-#ifdef TARGET_X86_64
if (CODE64(s)) {
- if (rex_w == 1) {
- /* 0x66 is ignored if rex.w is set */
- dflag = 2;
+ /* In 64-bit mode, the default data size is 32-bit. Select 64-bit
+ data with rex_w, and 16-bit data with 0x66; rex_w takes precedence
+ over 0x66 if both are present. */
+ dflag = (rex_w > 0 ? 2 : prefixes & PREFIX_DATA ? 0 : 1);
+ /* In 64-bit mode, 0x67 selects 32-bit addressing. */
+ aflag = (prefixes & PREFIX_ADR ? 1 : 2);
+ } else {
+ /* In 16/32-bit mode, 0x66 selects the opposite data size. */
+ dflag = s->code32;
+ if (prefixes & PREFIX_DATA) {
+ dflag ^= 1;
}
- if (!(prefixes & PREFIX_ADR)) {
- aflag = 2;
+ /* In 16/32-bit mode, 0x67 selects the opposite addressing. */
+ aflag = s->code32;
+ if (prefixes & PREFIX_ADR) {
+ aflag ^= 1;
}
}
-#endif
s->prefix = prefixes;
s->aflag = aflag;
--
1.7.9.5
- [Qemu-stable] [PATCH 14/26] xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional), (continued)
- [Qemu-stable] [PATCH 14/26] xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional), Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 15/26] do not check pointers after dereferencing them, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 16/26] qdev: fix get_fw_dev_path to support to add nothing to fw_dev_path, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 17/26] host-libusb: Correct test for USB packet state, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 18/26] Fix usage of USB_DEV_FLAG_IS_HOST flag., Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 20/26] ui/gtk.c: Fix *BSD build of Gtk+ UI, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 19/26] vmxnet3: fix NICState cleanup, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 22/26] virtio-ccw: Fix unsetting of indicators., Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 21/26] s390x/css: Fix concurrent sense., Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 24/26] qemu-char: don't issue CHR_EVENT_OPEN in a BH, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 25/26] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix,
Michael Roth <=
- [Qemu-stable] [PATCH 26/26] q35: set fw_name, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 23/26] xilinx_axidma: Do not set DMA .notify to NULL after notify, Michael Roth, 2013/06/12
- [Qemu-stable] [PATCH 11/26] update seabios to release 1.7.2.2, Michael Roth, 2013/06/12
- Re: [Qemu-stable] [Qemu-devel] Patch Round-up for stable 1.5.1, freeze on 2013-06-19, Stefan Hajnoczi, 2013/06/13
- Re: [Qemu-stable] Patch Round-up for stable 1.5.1, freeze on 2013-06-19, Paolo Bonzini, 2013/06/13
- Re: [Qemu-stable] [Qemu-devel] Patch Round-up for stable 1.5.1, freeze on 2013-06-19, Frederic Konrad, 2013/06/13
- Re: [Qemu-stable] [Qemu-devel] Patch Round-up for stable 1.5.1, freeze on 2013-06-19, Frederic Konrad, 2013/06/13