summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/docker/Makefile.include2
-rw-r--r--tests/tcg/arm/Makefile.softmmu-target2
-rw-r--r--tests/tcg/i386/test-i386-fp-exceptions.c24
-rw-r--r--tests/tcg/i386/test-i386.c2
4 files changed, 15 insertions, 15 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e68f91b853..ef4518d9eb 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -171,7 +171,7 @@ DOCKER_TESTS := $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS))
$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \
$(foreach t,$(DOCKER_TESTS), \
$(eval .PHONY: docker-$t@$i) \
- $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=$i) \
+ $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run TEST=$t IMAGE=qemu/$i) \
) \
$(foreach t,$(DOCKER_TESTS), \
$(eval docker-all-tests: docker-$t@$i) \
diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target
index 3fe237ba39..7df88ddea8 100644
--- a/tests/tcg/arm/Makefile.softmmu-target
+++ b/tests/tcg/arm/Makefile.softmmu-target
@@ -20,7 +20,7 @@ LDFLAGS+=-nostdlib -N -static
# Specific Test Rules
-test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0
+test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 -mfloat-abi=soft
run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel
run-plugin-test-armv6m-undef-%: QEMU_OPTS+=-semihosting -M microbit -kernel
diff --git a/tests/tcg/i386/test-i386-fp-exceptions.c b/tests/tcg/i386/test-i386-fp-exceptions.c
index dfb7117c17..d445f13c33 100644
--- a/tests/tcg/i386/test-i386-fp-exceptions.c
+++ b/tests/tcg/i386/test-i386-fp-exceptions.c
@@ -423,35 +423,35 @@ int main(void)
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (1.5L) : "st");
+ __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (1.5L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != PE) {
printf("FAIL: fistp inexact\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (32767.5L) : "st");
+ __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (32767.5L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fistp 32767.5\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (-32768.51L) : "st");
+ __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (-32768.51L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fistp -32768.51\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_nan) : "st");
+ __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_nan) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fistp nan\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fistp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
+ __asm__ volatile ("fistps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
"st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
@@ -538,49 +538,49 @@ int main(void)
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (1.5L) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (1.5L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != PE) {
printf("FAIL: fisttp inexact\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.0L) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.0L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fisttp 32768\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (32768.5L) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (32768.5L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fisttp 32768.5\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.0L) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.0L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fisttp -32769\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (-32769.5L) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (-32769.5L) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fisttp -32769.5\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_nan) : "st");
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_nan) : "st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
printf("FAIL: fisttp nan\n");
ret = 1;
}
__asm__ volatile ("fnclex");
- __asm__ volatile ("fisttp %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
+ __asm__ volatile ("fisttps %0" : "=m" (res_16) : "t" (ld_invalid_1.ld) :
"st");
__asm__ volatile ("fnstsw" : "=a" (sw));
if ((sw & EXC) != IE) {
diff --git a/tests/tcg/i386/test-i386.c b/tests/tcg/i386/test-i386.c
index 18d5609665..ac8d5a3c1f 100644
--- a/tests/tcg/i386/test-i386.c
+++ b/tests/tcg/i386/test-i386.c
@@ -866,7 +866,7 @@ void test_fcvt(double a)
uint16_t val16;
val16 = (fpuc & ~0x0c00) | (i << 10);
asm volatile ("fldcw %0" : : "m" (val16));
- asm volatile ("fist %0" : "=m" (wa) : "t" (a));
+ asm volatile ("fists %0" : "=m" (wa) : "t" (a));
asm volatile ("fistl %0" : "=m" (ia) : "t" (a));
asm volatile ("fistpll %0" : "=m" (lla) : "t" (a) : "st");
asm volatile ("frndint ; fstl %0" : "=m" (ra) : "t" (a));
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2025-04-27 01:13:07 +0200