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

Start cleaning up stack analysis

db4
Slava Pestov 2009-05-30 13:22:30 -05:00
parent e04df76f60
commit 3e00dc8c8d
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
basis/compiler/cfg/stack-analysis/stack-analysis.factor
View File

@ -88,21 +88,19 @@ GENERIC: visit ( insn -- )
UNION: neutral-insn UNION: neutral-insn
##flushable ##flushable
##effect ##effect
##branch ##loop-entry ;
##loop-entry
##conditional-branch
##compare-imm-branch
##dispatch ;
M: neutral-insn visit , ; M: neutral-insn visit , ;
UNION: sync-if-back-edge UNION: sync-if-back-edge
##branch ##branch
##conditional-branch ##conditional-branch
##compare-imm-branch ; ##compare-imm-branch
##dispatch ;
M: sync-if-back-edge visit M: sync-if-back-edge visit
basic-block get [ successors>> ] [ number>> ] bi '[ number>> _ < ] any? basic-block get [ successors>> ] [ number>> ] bi
'[ number>> _ < ] any?
[ sync-state ] when [ sync-state ] when
, ; , ;
@ -173,8 +171,9 @@ M: ##alien-callback visit , ;
! Maps basic-blocks to states ! Maps basic-blocks to states
SYMBOLS: state-in state-out ; SYMBOLS: state-in state-out ;
: with-state ( state quot -- ) : initial-state ( bb states -- state ) 2drop <state> ;
[ state ] dip with-variable ; inline
: single-predecessor ( bb states -- state ) nip first clone ;
ERROR: must-equal-failed seq ; ERROR: must-equal-failed seq ;
@ -225,32 +224,32 @@ ERROR: must-equal-failed seq ;
ERROR: cannot-merge-poisoned states ; ERROR: cannot-merge-poisoned states ;
: multiple-predecessors ( bb states -- state )
dup [ not ] any? [
[ <state> ] 2dip
sift merge-heights
] [
dup [ poisoned?>> ] any? [
cannot-merge-poisoned
] [
[ state new ] 2dip
[ predecessors>> ] dip
{
[ merge-locs ]
[ merge-actual-locs ]
[ merge-heights ]
[ merge-changed-locs ]
} 2cleave
] if
] if ;
: merge-states ( bb states -- state ) : merge-states ( bb states -- state )
! If any states are poisoned, save all registers ! If any states are poisoned, save all registers
! to the stack in each branch ! to the stack in each branch
dup length { dup length {
{ 0 [ 2drop <state> ] } { 0 [ initial-state ] }
{ 1 [ nip first clone ] } { 1 [ single-predecessor ] }
[ [ drop multiple-predecessors ]
drop
dup [ not ] any? [
[ <state> ] 2dip
sift merge-heights
] [
dup [ poisoned?>> ] any? [
cannot-merge-poisoned
] [
[ state new ] 2dip
[ predecessors>> ] dip
{
[ merge-locs ]
[ merge-actual-locs ]
[ merge-heights ]
[ merge-changed-locs ]
} 2cleave
] if
] if
]
} case ; } case ;
: block-in-state ( bb -- states ) : block-in-state ( bb -- states )
@ -269,12 +268,12 @@ ERROR: cannot-merge-poisoned states ;
dup basic-block set dup basic-block set
dup block-in-state dup block-in-state
[ swap set-block-in-state ] [ [ swap set-block-in-state ] [
[ state [
[ instructions>> [ visit ] each ] [ instructions>> [ visit ] each ]
[ [ state get ] dip set-block-out-state ] [ [ state get ] dip set-block-out-state ]
[ ] [ ]
tri tri
] with-state ] with-variable
] 2bi ] 2bi
] V{ } make >>instructions drop ; ] V{ } make >>instructions drop ;