60c7dd22e1
When ADCX is followed by ADOX or vice versa, the second instruction's
carry comes from EFLAGS and the condition codes use the CC_OP_ADCOX
operation. Retrieving the carry from EFLAGS is handled by this bit
of gen_ADCOX:
tcg_gen_extract_tl(carry_in, cpu_cc_src,
ctz32(cc_op == CC_OP_ADCX ? CC_C : CC_O), 1);
Unfortunately, in this case cc_op has been overwritten by the previous
"if" statement to CC_OP_ADCOX. This works by chance when the first
instruction is ADCX; however, if the first instruction is ADOX,
ADCX will incorrectly take its carry from OF instead of CF.
Fix by moving the computation of the new cc_op at the end of the function.
The included exhaustive test case fails without this patch and passes
afterwards.
Because ADCX/ADOX need not be invoked through the VEX prefix, this
regression bisects to commit 16fc5726a6 ("target/i386: reimplement
0x0f 0x38, add AVX", 2022-10-18). However, the mistake happened a
little earlier, when BMI instructions were rewritten using the new
decoder framework.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1471
Reported-by: Paul Jolly <https://gitlab.com/myitcv>
Fixes: 1d0b926150 ("target/i386: move scalar 0F 38 and 0F 3A instruction to new decoder", 2022-10-18)
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
118 lines
3.7 KiB
Makefile
118 lines
3.7 KiB
Makefile
# i386 cross compile notes
|
|
|
|
I386_SRC=$(SRC_PATH)/tests/tcg/i386
|
|
|
|
# Set search path for all sources
|
|
VPATH += $(I386_SRC)
|
|
|
|
config-cc.mak: Makefile
|
|
$(quiet-@)( \
|
|
$(call cc-option,-fno-pie, CROSS_CC_HAS_I386_NOPIE)) 3> config-cc.mak
|
|
|
|
-include config-cc.mak
|
|
|
|
I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c))
|
|
ALL_X86_TESTS=$(I386_SRCS:.c=)
|
|
SKIP_I386_TESTS=test-i386-ssse3 test-avx test-3dnow test-mmx
|
|
X86_64_TESTS:=$(filter test-i386-adcox test-i386-bmi2 $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
|
|
|
|
test-i386-sse-exceptions: CFLAGS += -msse4.1 -mfpmath=sse
|
|
run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max
|
|
run-plugin-test-i386-sse-exceptions-%: QEMU_OPTS += -cpu max
|
|
|
|
test-i386-pcmpistri: CFLAGS += -msse4.2
|
|
run-test-i386-pcmpistri: QEMU_OPTS += -cpu max
|
|
run-plugin-test-i386-pcmpistri-%: QEMU_OPTS += -cpu max
|
|
|
|
test-i386-bmi2: CFLAGS=-O2
|
|
run-test-i386-bmi2: QEMU_OPTS += -cpu max
|
|
run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
|
|
|
|
test-i386-adcox: CFLAGS=-O2
|
|
run-test-i386-adcox: QEMU_OPTS += -cpu max
|
|
run-plugin-test-i386-adcox-%: QEMU_OPTS += -cpu max
|
|
|
|
#
|
|
# hello-i386 is a barebones app
|
|
#
|
|
hello-i386: CFLAGS+=-ffreestanding
|
|
hello-i386: LDFLAGS+=-nostdlib
|
|
|
|
# test-386 includes a couple of additional objects that need to be
|
|
# linked together, we also need a no-pie capable compiler due to the
|
|
# non-pic calls into 16-bit mode
|
|
ifneq ($(CROSS_CC_HAS_I386_NOPIE),)
|
|
test-i386: CFLAGS += -fno-pie
|
|
|
|
test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h
|
|
$(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ \
|
|
$(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm
|
|
else
|
|
test-i386:
|
|
$(call skip-test, "BUILD of $@", "missing -no-pie compiler support")
|
|
run-test-i386:
|
|
$(call skip-test, "RUN of test-i386", "not built")
|
|
run-plugin-test-i386-with-%:
|
|
$(call skip-test, "RUN of test-i386 ($*)", "not built")
|
|
endif
|
|
|
|
ifeq ($(SPEED), slow)
|
|
|
|
test-i386-fprem.ref: test-i386-fprem
|
|
$(call quiet-command, ./$< > $@,"GENREF","generating $@")
|
|
|
|
run-test-i386-fprem: TIMEOUT=60
|
|
run-test-i386-fprem: test-i386-fprem test-i386-fprem.ref
|
|
$(call run-test,test-i386-fprem, $(QEMU) $<)
|
|
$(call diff-out,test-i386-fprem, test-i386-fprem.ref)
|
|
else
|
|
SKIP_I386_TESTS+=test-i386-fprem
|
|
endif
|
|
|
|
# non-inline runs will trigger the duplicate instruction heuristics in libinsn.so
|
|
run-plugin-%-with-libinsn.so:
|
|
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
|
|
-plugin ../../plugin/libinsn.so$(COMMA)inline=on \
|
|
-d plugin -D $*-with-libinsn.so.pout $*)
|
|
|
|
# Update TESTS
|
|
I386_TESTS:=$(filter-out $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
|
|
TESTS=$(MULTIARCH_TESTS) $(I386_TESTS)
|
|
|
|
# On i386 and x86_64 Linux only supports 4k pages (large pages are a different hack)
|
|
EXTRA_RUNS+=run-test-mmap-4096
|
|
|
|
sha512-sse: CFLAGS=-msse4.1 -O3
|
|
sha512-sse: sha512.c
|
|
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
|
|
|
|
run-sha512-sse: QEMU_OPTS+=-cpu max
|
|
run-plugin-sha512-sse-with-%: QEMU_OPTS+=-cpu max
|
|
|
|
TESTS+=sha512-sse
|
|
|
|
CLEANFILES += test-avx.h test-mmx.h test-3dnow.h
|
|
test-3dnow.h: test-mmx.py x86.csv
|
|
$(PYTHON) $(I386_SRC)/test-mmx.py $(I386_SRC)/x86.csv $@ 3DNOW
|
|
|
|
test-mmx.h: test-mmx.py x86.csv
|
|
$(PYTHON) $(I386_SRC)/test-mmx.py $(I386_SRC)/x86.csv $@ MMX SSE SSE2 SSE3 SSSE3
|
|
|
|
test-avx.h: test-avx.py x86.csv
|
|
$(PYTHON) $(I386_SRC)/test-avx.py $(I386_SRC)/x86.csv $@
|
|
|
|
test-3dnow: CFLAGS += -masm=intel -O -I.
|
|
run-test-3dnow: QEMU_OPTS += -cpu max
|
|
run-plugin-test-3dnow: QEMU_OPTS += -cpu max
|
|
test-3dnow: test-3dnow.h
|
|
|
|
test-mmx: CFLAGS += -masm=intel -O -I.
|
|
run-test-mmx: QEMU_OPTS += -cpu max
|
|
run-plugin-test-mmx: QEMU_OPTS += -cpu max
|
|
test-mmx: test-mmx.h
|
|
|
|
test-avx: CFLAGS += -mavx -masm=intel -O -I.
|
|
run-test-avx: QEMU_OPTS += -cpu max
|
|
run-plugin-test-avx: QEMU_OPTS += -cpu max
|
|
test-avx: test-avx.h
|