steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

db4
Doug Coleman 2010-05-23 22:19:48 -05:00
parent af2a5eb18d 75de44c2a5
commit 0e32dafb38
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basis/alarms/alarms-tests.factor
View File

@ -37,3 +37,10 @@ IN: alarms.tests
[ stop-alarm ] [ start-alarm ] bi [ stop-alarm ] [ start-alarm ] bi
4 seconds sleep 4 seconds sleep
] unit-test ] 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

2
basis/cpu/x86/x86.factor
View File

@ -583,7 +583,7 @@ M:: x86 %store-stack-param ( src n rep -- )
#! input values to callbacks; the callback has its own #! input values to callbacks; the callback has its own
#! stack frame set up, and we want to read the frame #! stack frame set up, and we want to read the frame
#! set up by the caller. #! 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 -- ) M:: x86 %load-stack-param ( dst n rep -- )
dst n next-stack@ rep %copy ; dst n next-stack@ rep %copy ;