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

compiler.cfg.alias-analysis: storing a reference into an object now merges the reference's alias class with the heap alias class

db4
Slava Pestov 2010-05-03 18:20:28 -04:00
parent 58e4381eb1
commit ca4f442eaa
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basis/compiler/cfg/alias-analysis/alias-analysis.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel math namespaces assocs hashtables sequences arrays USING: kernel math namespaces assocs hashtables sequences arrays
accessors words vectors combinators combinators.short-circuit accessors words vectors combinators combinators.short-circuit
sets classes layouts cpu.architecture sets classes layouts fry cpu.architecture
compiler.cfg compiler.cfg
compiler.cfg.rpo compiler.cfg.rpo
compiler.cfg.def-use compiler.cfg.def-use
@ -100,6 +100,15 @@ SYMBOL: acs>vregs
: each-alias ( vreg quot -- ) : each-alias ( vreg quot -- )
[ aliases ] dip each ; inline [ aliases ] dip each ; inline
: merge-acs ( vreg into -- )
[ vreg>ac ] dip
2dup eq? [ 2drop ] [
[ ac>vregs ] dip
[ vregs>acs get '[ [ _ ] dip _ set-at ] each ]
[ acs>vregs get at push-all ]
2bi
] if ;
! Map vregs -> slot# -> vreg ! Map vregs -> slot# -> vreg
SYMBOL: live-slots SYMBOL: live-slots
@ -187,7 +196,8 @@ SYMBOL: heap-ac
: remember-set-slot ( slot#/f vreg -- ) : remember-set-slot ( slot#/f vreg -- )
over [ over [
[ record-constant-set-slot ] [ record-constant-set-slot ]
[ kill-constant-set-slot ] 2bi [ kill-constant-set-slot ]
2bi
] [ nip kill-computed-set-slot ] if ; ] [ nip kill-computed-set-slot ] if ;
GENERIC: insn-slot# ( insn -- slot#/f ) GENERIC: insn-slot# ( insn -- slot#/f )
@ -262,7 +272,10 @@ M: ##write analyze-aliases*
dup dup
[ src>> resolve ] [ insn-slot# ] [ insn-object ] tri [ src>> resolve ] [ insn-slot# ] [ insn-object ] tri
3dup idempotent? [ 3drop ] [ 3dup idempotent? [ 3drop ] [
[ remember-set-slot drop ] [ load-slot ] 3bi [ 2drop heap-ac get merge-acs ]
[ remember-set-slot drop ]
[ load-slot ]
3tri
] if ; ] if ;
M: ##copy analyze-aliases* M: ##copy analyze-aliases*