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

Fix generator regression

release
Slava Pestov 2007-10-08 22:56:15 -04:00
parent 97fa31baf6
commit 7bbd169b2a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/generator/generator.factor
View File

@ -130,7 +130,7 @@ UNION: #terminal
M: node generate-node drop iterate-next ; M: node generate-node drop iterate-next ;
: %call ( word -- ) : %call ( word -- )
dup primitive? [ %call-primitive ] [ %call-label ] if ; dup primitive? [ "Call prim: " write dup . %call-primitive ] [ %call-label ] if ;
: %jump ( word -- ) : %jump ( word -- )
{ {
@ -138,6 +138,7 @@ M: node generate-node drop iterate-next ;
drop current-label-start get %jump-label drop current-label-start get %jump-label
] } ] }
{ [ dup primitive? ] [ { [ dup primitive? ] [
"Jump prim: " write dup .
%epilogue-later %jump-primitive %epilogue-later %jump-primitive
] } ] }
{ [ t ] [ { [ t ] [

6
core/generator/registers/registers.factor
View File

@ -458,6 +458,12 @@ M: loc lazy-store
dup loc? over cached? or [ 2drop ] [ %move ] if dup loc? over cached? or [ 2drop ] [ %move ] if
] each-loc ; ] each-loc ;
: reset-phantom ( phantom -- )
dup phantom-locs* over delete-all swap push-all ;
: reset-phantoms ( -- )
[ reset-phantom ] each-phantom ;
: finalize-contents ( -- ) : finalize-contents ( -- )
finalize-locs finalize-vregs [ delete-all ] each-phantom ; finalize-locs finalize-vregs [ delete-all ] each-phantom ;