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 2009-06-30 18:48:10 -05:00
parent 97cd0d584e bc2a6c0ecc
commit 357408df3e
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
basis/compiler/cfg/linear-scan/assignment/assignment.factor
View File

@ -108,11 +108,14 @@ SYMBOL: check-assignment?
ERROR: overlapping-registers intervals ; ERROR: overlapping-registers intervals ;
: check-assignment ( intervals -- )
dup [ copy-from>> ] map sift '[ vreg>> _ member? not ] filter
dup [ reg>> ] map all-unique? [ drop ] [ overlapping-registers ] if ;
: active-intervals ( insn -- intervals ) : active-intervals ( insn -- intervals )
insn#>> pending-intervals get [ covers? ] with filter insn#>> pending-intervals get [ covers? ] with filter
check-assignment? get [ check-assignment? get [
dup [ reg>> ] map all-unique? dup check-assignment
[ overlapping-registers ] unless
] when ; ] when ;
M: vreg-insn assign-registers-in-insn M: vreg-insn assign-registers-in-insn

2
basis/compiler/cfg/stack-analysis/stack-analysis-tests.factor
View File

@ -17,8 +17,6 @@ IN: compiler.cfg.stack-analysis.tests
: linearize ( cfg -- mr ) : linearize ( cfg -- mr )
flatten-cfg instructions>> ; flatten-cfg instructions>> ;
local-only? off
[ ] [ [ ] test-stack-analysis drop ] unit-test [ ] [ [ ] test-stack-analysis drop ] unit-test
! Only peek once ! Only peek once

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

@ -59,17 +59,12 @@ UNION: sync-if-back-edge
##dispatch ##dispatch
##loop-entry ; ##loop-entry ;
SYMBOL: local-only?
t local-only? set-global
: back-edge? ( from to -- ? ) : back-edge? ( from to -- ? )
[ number>> ] bi@ > ; [ number>> ] bi@ > ;
: sync-state? ( -- ? ) : sync-state? ( -- ? )
basic-block get successors>> basic-block get successors>>
[ [ predecessors>> ] keep '[ _ back-edge? ] any? ] any? [ [ predecessors>> ] keep '[ _ back-edge? ] any? ] any? ;
local-only? get or ;
M: sync-if-back-edge visit M: sync-if-back-edge visit
sync-state? [ sync-state ] when , ; sync-state? [ sync-state ] when , ;

8
basis/cpu/x86/32/32.factor
View File

@ -29,13 +29,15 @@ M: x86.32 temp-reg-2 EDX ;
M:: x86.32 %dispatch ( src temp -- ) M:: x86.32 %dispatch ( src temp -- )
! Load jump table base. ! Load jump table base.
src HEX: ffffffff ADD temp src HEX: ffffffff [+] LEA
building get length cell - :> start
0 rc-absolute-cell rel-here 0 rc-absolute-cell rel-here
! Go ! Go
src HEX: 7f [+] JMP temp HEX: 7f [+] JMP
building get length :> end
! Fix up the displacement above ! Fix up the displacement above
cell code-alignment cell code-alignment
[ 7 + building get dup pop* push ] [ end start - + building get dup pop* push ]
[ align-code ] [ align-code ]
bi ; bi ;

8
basis/cpu/x86/64/64.factor
View File

@ -23,15 +23,17 @@ M: x86.64 rs-reg R15 ;
M: x86.64 stack-reg RSP ; M: x86.64 stack-reg RSP ;
M:: x86.64 %dispatch ( src temp -- ) M:: x86.64 %dispatch ( src temp -- )
building get length :> start
! Load jump table base. ! Load jump table base.
temp HEX: ffffffff MOV temp HEX: ffffffff MOV
0 rc-absolute-cell rel-here 0 rc-absolute-cell rel-here
! Add jump table base ! Add jump table base
src temp ADD temp src ADD
src HEX: 7f [+] JMP temp HEX: 7f [+] JMP
building get length :> end
! Fix up the displacement above ! Fix up the displacement above
cell code-alignment cell code-alignment
[ 15 + building get dup pop* push ] [ end start - 2 - + building get dup pop* push ]
[ align-code ] [ align-code ]
bi ; bi ;