From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 24 Aug 2022 15:44:45 +0000 (+0200)
Subject: target/i386: REPZ and REPNZ are mutually exclusive
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5c2f60bd1b6fc7164118a6270eefbf0b6dafc4ae;p=qemu.git

target/i386: REPZ and REPNZ are mutually exclusive

The later prefix wins if both are present, make it show in s->prefix too.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index 5f31a59fb8..eaa56b0f48 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -4733,9 +4733,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu)
     switch (b) {
     case 0xf3:
         prefixes |= PREFIX_REPZ;
+        prefixes &= ~PREFIX_REPNZ;
         goto next_byte;
     case 0xf2:
         prefixes |= PREFIX_REPNZ;
+        prefixes &= ~PREFIX_REPZ;
         goto next_byte;
     case 0xf0:
         prefixes |= PREFIX_LOCK;