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

compiler.cfg.builder.blocks: some cleanup

locals-and-roots
Björn Lindqvist 2016-03-16 11:48:31 +01:00
parent 3a9b297b3b
commit 5ca571e304
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/compiler/cfg/builder/blocks/blocks-docs.factor
View File

@ -53,7 +53,7 @@ HELP: emit-conditional
{ $values { $values
{ "block" basic-block } { "block" basic-block }
{ "branches" "sequence of pairs" } { "branches" "sequence of pairs" }
{ "block'" basic-block } { "block'/f" { $maybe basic-block } }
} }
{ $description "Emits a sequence of conditional branches to the current " { $link cfg } ". Each branch is a pair where the first item is the entry basic block and the second the branches " { $link height-state } ". 'block' is the block in which the control flow is branched and \"block'\" the block in which it converges again." } ; { $description "Emits a sequence of conditional branches to the current " { $link cfg } ". Each branch is a pair where the first item is the entry basic block and the second the branches " { $link height-state } ". 'block' is the block in which the control flow is branched and \"block'\" the block in which it converges again." } ;

8
basis/compiler/cfg/builder/blocks/blocks.factor
View File

@ -3,12 +3,10 @@
USING: accessors arrays compiler.cfg compiler.cfg.instructions USING: accessors arrays compiler.cfg compiler.cfg.instructions
compiler.cfg.stacks compiler.cfg.stacks.local compiler.cfg.utilities compiler.cfg.stacks compiler.cfg.stacks.local compiler.cfg.utilities
kernel make math namespaces sequences ; kernel make math namespaces sequences ;
SLOT: in-d
SLOT: out-d
IN: compiler.cfg.builder.blocks IN: compiler.cfg.builder.blocks
: set-basic-block ( basic-block -- ) : set-basic-block ( basic-block -- )
[ instructions>> building set ] [ begin-local-analysis ] bi ; dup begin-local-analysis instructions>> building set ;
: end-basic-block ( block -- ) : end-basic-block ( block -- )
[ end-local-analysis ] when* building off ; [ end-local-analysis ] when* building off ;
@ -17,7 +15,7 @@ IN: compiler.cfg.builder.blocks
<basic-block> swap [ over connect-bbs ] when* dup set-basic-block ; <basic-block> swap [ over connect-bbs ] when* dup set-basic-block ;
: begin-basic-block ( block -- block' ) : begin-basic-block ( block -- block' )
dup [ end-local-analysis ] when* (begin-basic-block) ; dup end-basic-block (begin-basic-block) ;
: emit-trivial-block ( block quot: ( ..a block' -- ..b ) -- block' ) : emit-trivial-block ( block quot: ( ..a block' -- ..b ) -- block' )
##branch, swap begin-basic-block ##branch, swap begin-basic-block
@ -52,7 +50,7 @@ IN: compiler.cfg.builder.blocks
: with-branch ( block quot: ( ..a block -- ..b block' ) -- pair/f ) : with-branch ( block quot: ( ..a block -- ..b block' ) -- pair/f )
[ [ begin-branch ] dip call end-branch ] with-scope ; inline [ [ begin-branch ] dip call end-branch ] with-scope ; inline
: emit-conditional ( block branches -- block' ) : emit-conditional ( block branches -- block'/f )
swap end-basic-block swap end-basic-block
sift [ f ] [ sift [ f ] [
dup first second height-state set dup first second height-state set