Improved signal handling and x87 flags (with tests backported from box86)

6 files changed, 400 insertions, 0 deletions

diff --git a/tests/ref21.txt b/tests/ref21.txt
new file mode 100644
index 00000000..38e983ce
--- /dev/null
+++ b/tests/ref21.txt
@@ -0,0 +1,2 @@
+sig = 11
+got bad_ptr
diff --git a/tests/ref22.txt b/tests/ref22.txt
new file mode 100644
index 00000000..0b90c207
--- /dev/null
+++ b/tests/ref22.txt
@@ -0,0 +1,222 @@
+FUCOMI 0x0 0x4082c00000000000 --C
+FUCOMPP 0x0 0x4082c00000000000 --C
+FRNDINT 0x0 => 0x0
+FRNDINT 0x4082c00000000000 => 0x4082c00000000000
+FISTP 0x0 => word: 0
+FISTP 0x4082c00000000000 => word: 258
+FISTP 0x0 => long: 0
+FISTP 0x4082c00000000000 => long: 258
+FISTP 0x0 => quad: 0
+FISTP 0x4082c00000000000 => quad: 258
+FUCOMI 0x4082c00000000000 0x0 ---
+FUCOMPP 0x4082c00000000000 0x0 ---
+FRNDINT 0x4082c00000000000 => 0x4082c00000000000
+FRNDINT 0x0 => 0x0
+FISTP 0x4082c00000000000 => word: 258
+FISTP 0x0 => word: 0
+FISTP 0x4082c00000000000 => long: 258
+FISTP 0x0 => long: 0
+FISTP 0x4082c00000000000 => quad: 258
+FISTP 0x0 => quad: 0
+FUCOMI 0x8000000000000000 0x4082c00000000000 --C
+FUCOMPP 0x8000000000000000 0x4082c00000000000 --C
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FRNDINT 0x4082c00000000000 => 0x4082c00000000000
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x4082c00000000000 => word: 258
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x4082c00000000000 => long: 258
+FISTP 0x8000000000000000 => quad: 0
+FISTP 0x4082c00000000000 => quad: 258
+FUCOMI 0x4082c00000000000 0x8000000000000000 ---
+FUCOMPP 0x4082c00000000000 0x8000000000000000 ---
+FRNDINT 0x4082c00000000000 => 0x4082c00000000000
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FISTP 0x4082c00000000000 => word: 258
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x4082c00000000000 => long: 258
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x4082c00000000000 => quad: 258
+FISTP 0x8000000000000000 => quad: 0
+FUCOMI 0x8000000000000000 0x0 Z--
+FUCOMPP 0x8000000000000000 0x0 Z--
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FRNDINT 0x0 => 0x0
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x0 => word: 0
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x0 => long: 0
+FISTP 0x8000000000000000 => quad: 0
+FISTP 0x0 => quad: 0
+FUCOMI 0x0 0x8000000000000000 Z--
+FUCOMPP 0x0 0x8000000000000000 Z--
+FRNDINT 0x0 => 0x0
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FISTP 0x0 => word: 0
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x0 => long: 0
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x0 => quad: 0
+FISTP 0x8000000000000000 => quad: 0
+FUCOMI 0x8000000000000000 0x3ff0000000000000 --C
+FUCOMPP 0x8000000000000000 0x3ff0000000000000 --C
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x8000000000000000 => quad: 0
+FISTP 0x3ff0000000000000 => quad: 1
+FUCOMI 0x3ff0000000000000 0x8000000000000000 ---
+FUCOMPP 0x3ff0000000000000 0x8000000000000000 ---
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FRNDINT 0x8000000000000000 => 0x8000000000000000
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x8000000000000000 => word: 0
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x8000000000000000 => long: 0
+FISTP 0x3ff0000000000000 => quad: 1
+FISTP 0x8000000000000000 => quad: 0
+FUCOMI 0x3ff0000000000000 0x3fe89d9000000000 ---
+FUCOMPP 0x3ff0000000000000 0x3fe89d9000000000 ---
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FRNDINT 0x3fe89d9000000000 => 0x0
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x3fe89d9000000000 => word: 0
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x3fe89d9000000000 => long: 0
+FISTP 0x3ff0000000000000 => quad: 1
+FISTP 0x3fe89d9000000000 => quad: 0
+FUCOMI 0x3fe89d9000000000 0x3ff0000000000000 --C
+FUCOMPP 0x3fe89d9000000000 0x3ff0000000000000 --C
+FRNDINT 0x3fe89d9000000000 => 0x0
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FISTP 0x3fe89d9000000000 => word: 0
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x3fe89d9000000000 => long: 0
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x3fe89d9000000000 => quad: 0
+FISTP 0x3ff0000000000000 => quad: 1
+FUCOMI 0x3ff0000000000000 0x7ff0000000000000 --C
+FUCOMPP 0x3ff0000000000000 0x7ff0000000000000 --C
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FRNDINT 0x7ff0000000000000 => 0x7ff0000000000000
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x7ff0000000000000 => word: 8000
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x7ff0000000000000 => long: 80000000
+FISTP 0x3ff0000000000000 => quad: 1
+FISTP 0x7ff0000000000000 => quad: 8000000000000000
+FUCOMI 0x7ff0000000000000 0x3ff0000000000000 ---
+FUCOMPP 0x7ff0000000000000 0x3ff0000000000000 ---
+FRNDINT 0x7ff0000000000000 => 0x7ff0000000000000
+FRNDINT 0x3ff0000000000000 => 0x3ff0000000000000
+FISTP 0x7ff0000000000000 => word: 8000
+FISTP 0x3ff0000000000000 => word: 1
+FISTP 0x7ff0000000000000 => long: 80000000
+FISTP 0x3ff0000000000000 => long: 1
+FISTP 0x7ff0000000000000 => quad: 8000000000000000
+FISTP 0x3ff0000000000000 => quad: 1
+FUCOMI 0xfff0000000000000 0x7ff0000000000000 --C
+FUCOMPP 0xfff0000000000000 0x7ff0000000000000 --C
+FRNDINT 0xfff0000000000000 => 0xfff0000000000000
+FRNDINT 0x7ff0000000000000 => 0x7ff0000000000000
+FISTP 0xfff0000000000000 => word: 8000
+FISTP 0x7ff0000000000000 => word: 8000
+FISTP 0xfff0000000000000 => long: 80000000
+FISTP 0x7ff0000000000000 => long: 80000000
+FISTP 0xfff0000000000000 => quad: 8000000000000000
+FISTP 0x7ff0000000000000 => quad: 8000000000000000
+FUCOMI 0x7ff0000000000000 0xfff0000000000000 ---
+FUCOMPP 0x7ff0000000000000 0xfff0000000000000 ---
+FRNDINT 0x7ff0000000000000 => 0x7ff0000000000000
+FRNDINT 0xfff0000000000000 => 0xfff0000000000000
+FISTP 0x7ff0000000000000 => word: 8000
+FISTP 0xfff0000000000000 => word: 8000
+FISTP 0x7ff0000000000000 => long: 80000000
+FISTP 0xfff0000000000000 => long: 80000000
+FISTP 0x7ff0000000000000 => quad: 8000000000000000
+FISTP 0xfff0000000000000 => quad: 8000000000000000
+FUCOMI 0x3ff0002ca0000000 0xaeff000025000000 ---
+FUCOMPP 0x3ff0002ca0000000 0xaeff000025000000 ---
+FRNDINT 0x3ff0002ca0000000 => 0x3ff0000000000000
+FRNDINT 0xaeff000025000000 => 0x8000000000000000
+FISTP 0x3ff0002ca0000000 => word: 1
+FISTP 0xaeff000025000000 => word: 0
+FISTP 0x3ff0002ca0000000 => long: 1
+FISTP 0xaeff000025000000 => long: 0
+FISTP 0x3ff0002ca0000000 => quad: 1
+FISTP 0xaeff000025000000 => quad: 0
+FUCOMI 0xaeff000025000000 0x3ff0002ca0000000 --C
+FUCOMPP 0xaeff000025000000 0x3ff0002ca0000000 --C
+FRNDINT 0xaeff000025000000 => 0x8000000000000000
+FRNDINT 0x3ff0002ca0000000 => 0x3ff0000000000000
+FISTP 0xaeff000025000000 => word: 0
+FISTP 0x3ff0002ca0000000 => word: 1
+FISTP 0xaeff000025000000 => long: 0
+FISTP 0x3ff0002ca0000000 => long: 1
+FISTP 0xaeff000025000000 => quad: 0
+FISTP 0x3ff0002ca0000000 => quad: 1
+FUCOMI 0x3ff0000050000000 0xc082c00000000000 ---
+FUCOMPP 0x3ff0000050000000 0xc082c00000000000 ---
+FRNDINT 0x3ff0000050000000 => 0x3ff0000000000000
+FRNDINT 0xc082c00000000000 => 0xc082c00000000000
+FISTP 0x3ff0000050000000 => word: 1
+FISTP 0xc082c00000000000 => word: fda8
+FISTP 0x3ff0000050000000 => long: 1
+FISTP 0xc082c00000000000 => long: fffffda8
+FISTP 0x3ff0000050000000 => quad: 1
+FISTP 0xc082c00000000000 => quad: fffffffffffffda8
+FUCOMI 0xc082c00000000000 0x3ff0000050000000 --C
+FUCOMPP 0xc082c00000000000 0x3ff0000050000000 --C
+FRNDINT 0xc082c00000000000 => 0xc082c00000000000
+FRNDINT 0x3ff0000050000000 => 0x3ff0000000000000
+FISTP 0xc082c00000000000 => word: fda8
+FISTP 0x3ff0000050000000 => word: 1
+FISTP 0xc082c00000000000 => long: fffffda8
+FISTP 0x3ff0000050000000 => long: 1
+FISTP 0xc082c00000000000 => quad: fffffffffffffda8
+FISTP 0x3ff0000050000000 => quad: 1
+FUCOMI 0x0 0x7ff8000000000001 ZPC
+FUCOMPP 0x0 0x7ff8000000000001 ZPC
+FRNDINT 0x0 => 0x0
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FISTP 0x0 => word: 0
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x0 => long: 0
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x0 => quad: 0
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+FUCOMI 0x7ff8000000000001 0x0 ZPC
+FUCOMPP 0x7ff8000000000001 0x0 ZPC
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FRNDINT 0x0 => 0x0
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x0 => word: 0
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x0 => long: 0
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+FISTP 0x0 => quad: 0
+FUCOMI 0x7ff8000000000001 0x7ff8000000000001 ZPC
+FUCOMPP 0x7ff8000000000001 0x7ff8000000000001 ZPC
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+FUCOMI 0x7ff8000000000001 0x7ff8000000000001 ZPC
+FUCOMPP 0x7ff8000000000001 0x7ff8000000000001 ZPC
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FRNDINT 0x7ff8000000000001 => 0x7ff8000000000001
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x7ff8000000000001 => word: 8000
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x7ff8000000000001 => long: 80000000
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+FISTP 0x7ff8000000000001 => quad: 8000000000000000
+
+Done
diff --git a/tests/test21 b/tests/test21
new file mode 100755
index 00000000..71760a7d
--- /dev/null
+++ b/tests/test21
Binary files differdiff --git a/tests/test21.c b/tests/test21.c
new file mode 100644
index 00000000..803f0142
--- /dev/null
+++ b/tests/test21.c
@@ -0,0 +1,30 @@
+#include <signal.h>
+#include <setjmp.h>
+#include <stdio.h>
+
+static jmp_buf context_buf;
+
+static void segv_handler(int sig)
+{
+	printf("sig = %d\n", sig);
+	longjmp(context_buf, 1);
+}
+
+void test()
+{
+	if(!setjmp(context_buf)) {
+		int *bad_ptr = (int*)0xffffffffdeadbeef;
+		printf("*bad_ptr = %d\n", *bad_ptr);
+	} else {
+		printf("got bad_ptr\n");
+	}
+}
+
+int main()
+{
+	if(signal(SIGSEGV, segv_handler) == SIG_ERR)
+		printf("Err = %m\n");
+	//printf("handler = %p\n", segv_handler);
+	test();
+	return 0;
+}
diff --git a/tests/test22 b/tests/test22
new file mode 100755
index 00000000..4e84cb56
--- /dev/null
+++ b/tests/test22
Binary files differdiff --git a/tests/test22.c b/tests/test22.c
new file mode 100644
index 00000000..68bd41c6
--- /dev/null
+++ b/tests/test22.c
@@ -0,0 +1,146 @@
+#include <string.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <math.h>
+
+#if defined(__x86_64__)
+uint64_t _fucomip_(double a, double b)
+{
+    uint32_t ret;
+    asm volatile (
+    "fldl %2\n"
+    "fldl %1\n"
+    "fucomip %%st(1)\n"
+    "fstp %%st(0)\n"
+    "pushf\n"
+    "pop %%rax\n"
+    :"=a" (ret):"m"(a), "m"(b):"cc");
+    return ret;
+}
+uint64_t _fucompp_(double a, double b)
+{
+    uint32_t ret;
+    asm volatile (
+    "fldl %2\n"
+    "fldl %1\n"
+    "fucompp\n"
+    "fstsw %%ax\n"
+    :"=a" (ret):"m"(a), "m"(b):"cc");
+    return ret;
+}
+uint64_t _fistpw_(double a)
+{
+    uint16_t ret;
+    uint16_t t1, t2;
+    asm volatile (
+    "fldl %1\n"
+    "fstcw %2\n"
+    "mov %2, %%ax\n"
+    "mov $0x0c, %%ah\n"
+    "mov %%ax, %3\n"
+    "fldcw %3\n"
+    "fistp %0\n"
+    "fldcw %2\n"
+    :"=m" (ret):"m"(a), "m"(t1), "m"(t2):"cc");
+    return ret;
+}
+uint64_t _fistpl_(double a)
+{
+    uint32_t ret;
+    uint16_t t1, t2;
+    asm volatile (
+    "fldl %1\n"
+    "fstcw %2\n"
+    "mov %2, %%ax\n"
+    "mov $0x0c, %%ah\n"
+    "mov %%ax, %3\n"
+    "fldcw %3\n"
+    "fistpl %0\n"
+    "fldcw %2\n"
+    :"=m" (ret):"m"(a), "m"(t1), "m"(t2):"cc");
+    return ret;
+}
+uint64_t _fistpq_(double a)
+{
+    uint64_t ret;
+    uint16_t t1, t2;
+    asm volatile (
+    "fldl %1\n"
+    "fstcw %2\n"
+    "mov %2, %%ax\n"
+    "mov $0x0c, %%ah\n"
+    "mov %%ax, %3\n"
+    "fldcw %3\n"
+    "fistpq %0\n"
+    "fldcw %2\n"
+    :"=m" (ret):"m"(a), "m"(t1), "m"(t2):"cc");
+    return ret;
+}
+uint64_t _frndint_(double a)
+{
+    uint64_t ret;
+    uint16_t t1, t2;
+    asm volatile (
+    "fldl %1\n"
+    "fstcw %2\n"
+    "mov %2, %%ax\n"
+    "mov $0x0c, %%ah\n"
+    "mov %%ax, %3\n"
+    "fldcw %3\n"
+    "frndint\n"
+    "fstpl %0\n"
+    "fldcw %2\n"
+    :"=m" (ret):"m"(a), "m"(t1), "m"(t2):"cc");
+    return ret;
+}
+#endif
+
+int main(int argc, const char** argv)
+{
+ double a, b;
+ char pf, cf, zf;
+ char pa, ca, za;
+ uint64_t flags;
+ uint64_t tests[][2] = {
+  {0x0, 0x4082c00000000000LL},
+  {0x8000000000000000LL, 0x4082c00000000000LL},
+  {0x8000000000000000LL, 0x0},
+  {0x8000000000000000LL, 0x3ff0000000000000LL},
+  {0x3ff0000000000000LL, 0x3fe89d9000000000LL},
+  {0x3ff0000000000000LL, 0x7ff0000000000000LL},
+  {0xfff0000000000000LL, 0x7ff0000000000000LL},
+  {0x3ff0002ca0000000LL, 0xaeff000025000000LL},
+  {0x3ff0000050000000LL, 0xc082c00000000000LL},
+  {0x0, 0x7ff8000000000001LL},
+  {0x7ff8000000000001LL, 0x7ff8000000000001LL},
+ };
+ int n = sizeof(tests)/sizeof(tests[0]); 
+ for(int i=0; i<n; ++i)
+  for(int j=0; j<2; ++j) {
+   *(uint64_t*)&a = tests[i][0+j];
+   *(uint64_t*)&b = tests[i][1-j];
+   printf("FUCOMI 0x%llx 0x%llx ", *(uint64_t*)&a, *(uint64_t*)&b);
+   flags = _fucomip_(a, b);
+   ca = (flags>>0)&1?'C':'-';
+   za = (flags>>(0+6))&1?'Z':'-';
+   pa = (flags>>(0+2))&1?'P':'-';
+   printf("%c%c%c\n", za, pa, ca);
+   printf("FUCOMPP 0x%llx 0x%llx ", *(uint64_t*)&a, *(uint64_t*)&b);
+   flags = _fucompp_(a, b);
+   ca = (flags>>8)&1?'C':'-';
+   za = (flags>>(8+6))&1?'Z':'-';
+   pa = (flags>>(8+2))&1?'P':'-';
+   printf("%c%c%c\n", za, pa, ca);
+   printf("FRNDINT 0x%llx => 0x%llx\n", *(uint64_t*)&a, _frndint_(a));
+   printf("FRNDINT 0x%llx => 0x%llx\n", *(uint64_t*)&b, _frndint_(b));
+   printf("FISTP 0x%llx => word: %x\n", *(uint64_t*)&a, _fistpw_(a));
+   printf("FISTP 0x%llx => word: %x\n", *(uint64_t*)&b, _fistpw_(b));
+   printf("FISTP 0x%llx => long: %x\n", *(uint64_t*)&a, _fistpl_(a));
+   printf("FISTP 0x%llx => long: %x\n", *(uint64_t*)&b, _fistpl_(b));
+   printf("FISTP 0x%llx => quad: %llx\n", *(uint64_t*)&a, _fistpq_(a));
+   printf("FISTP 0x%llx => quad: %llx\n", *(uint64_t*)&b, _fistpq_(b));
+ }
+ printf("\nDone\n");
+}