Fix Linux/x86-64 signal handler problem

diff --git a/core/compiler/test/curry.factor b/core/compiler/test/curry.factor
index 307c8adcdb31952d4791923fb4a99a08664e825e..0e840154ca2d57232ed4dbea4809f9c2cba84071 100755 (executable)
--- a/core/compiler/test/curry.factor
+++ b/core/compiler/test/curry.factor
@@ -50,7 +50,7 @@ IN: temporary
     global keys =
 ] unit-test
 
-[ 3 ] [ 1 2 [ curry [ 3 ] [ 4 ] if ] compile-1 ] unit-test
+[ 3 ] [ 1 [ 2 ] [ curry [ 3 ] [ 4 ] if ] compile-1 ] unit-test
 
 [ 3 ] [ t [ 3 [ ] curry 4 [ ] curry if ] compile-1 ] unit-test
 

diff --git a/core/compiler/test/simple.factor b/core/compiler/test/simple.factor
index 594bb844a12a7d013af538298d6c7587595fcbd0..cc446dee23dd46898436ca63e7c3dd053e5bb1ac 100644 (file)
--- a/core/compiler/test/simple.factor
+++ b/core/compiler/test/simple.factor
@@ -56,3 +56,8 @@ IN: temporary
 \ recursive compile
 
 [ ] [ t recursive ] unit-test
+
+! Make sure error reporting works
+
+[ [ dup ] compile-1 ] unit-test-fails
+[ [ drop ] compile-1 ] unit-test-fails

diff --git a/vm/os-linux-x86-64.h b/vm/os-linux-x86-64.h
index 2bbae86f6e110d4ece2cbdc680cc5af048158444..911c2f1749340e008ef448ab38581a60f79e2d96 100644 (file)
--- a/vm/os-linux-x86-64.h
+++ b/vm/os-linux-x86-64.h
@@ -1,2 +1,10 @@
+#include <ucontext.h>
+
+INLINE void *ucontext_stack_pointer(void *uap)
+{
+        ucontext_t *ucontext = (ucontext_t *)uap;
+        return (void *)ucontext->uc_mcontext.gregs[15];
+}
+
 #define UAP_PROGRAM_COUNTER(ucontext) \
        (((ucontext_t *)(ucontext))->uc_mcontext.gregs[16])

diff --git a/vm/platform.h b/vm/platform.h
index f181c93e2c9ba7136a3f8789545c87dcd4090322..75228726a9c3c6816982974df06595235d41648f 100644 (file)
--- a/vm/platform.h
+++ b/vm/platform.h
@@ -70,7 +70,6 @@
                        #elif defined(FACTOR_ARM)
                                #include "os-linux-arm.h"
                        #elif defined(FACTOR_AMD64)
-                               #include "os-unix-ucontext.h"
                                #include "os-linux-x86-64.h"
                        #else
                                #error "Unsupported Linux flavor"