Merge branch 'master' of git://factorcode.org/git/factor

basis/alarms/alarms-tests.factor

@@ -37,3 +37,10 @@ IN: alarms.tests
     [ stop-alarm ] [ start-alarm ] bi
     4 seconds sleep
 ] unit-test
+
+[ { 0 } ] [
+    { 0 }
+    dup '[ 3 seconds sleep 1 _ set-first ] 1 seconds later
+    2 seconds sleep stop-alarm
+    1/2 seconds sleep
+] unit-test

basis/cpu/x86/x86.factor

@@ -583,7 +583,7 @@ M:: x86 %store-stack-param ( src n rep -- )
     #! input values to callbacks; the callback has its own
     #! stack frame set up, and we want to read the frame
     #! set up by the caller.
-    frame-reg swap 2 cells + [+] ;
+    [ frame-reg ] dip 2 cells + reserved-stack-space + [+] ;
 
 M:: x86 %load-stack-param ( dst n rep -- )
     dst n next-stack@ rep %copy ;