Fix compiler errors

db4
Slava Pestov 2009-06-01 03:00:10 -05:00
parent f09b36424c
commit 3a9922d161
5 changed files with 6 additions and 7 deletions

View File

@ -7,4 +7,4 @@ IN: compiler.cfg.local
[ '[ live-in keys @ ] ] [ '[ _ change-instructions drop ] ] bi* bi ; inline [ '[ live-in keys @ ] ] [ '[ _ change-instructions drop ] ] bi* bi ; inline
: local-optimization ( cfg init-quot: ( live-in -- ) insn-quot: ( insns -- insns' ) -- cfg' ) : local-optimization ( cfg init-quot: ( live-in -- ) insn-quot: ( insns -- insns' ) -- cfg' )
[ dup ] 2dip '[ _ _ optimize-basic-block ] each-basic-block ; [ dup ] 2dip '[ _ _ optimize-basic-block ] each-basic-block ; inline

View File

@ -1,8 +1,7 @@
! Copyright (C) 2008, 2009 Slava Pestov. ! Copyright (C) 2008, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel accessors namespaces make math sequences sets USING: kernel accessors namespaces make math sequences sets
assocs fry compiler.cfg compiler.cfg.instructions assocs fry compiler.cfg compiler.cfg.instructions ;
compiler.cfg.liveness ;
IN: compiler.cfg.rpo IN: compiler.cfg.rpo
SYMBOL: visited SYMBOL: visited

View File

@ -15,12 +15,12 @@ IN: compiler.cfg.two-operand
: make-copy/float ( dst src -- insn ) \ ##copy-float new-insn ; inline : make-copy/float ( dst src -- insn ) \ ##copy-float new-insn ; inline
: convert-two-operand/integer ( insn -- insns ) : convert-two-operand/integer ( insn -- )
[ [ dst>> ] [ src1>> ] bi ##copy ] [ [ dst>> ] [ src1>> ] bi ##copy ]
[ dup dst>> >>src1 , ] [ dup dst>> >>src1 , ]
bi ; inline bi ; inline
: convert-two-operand/float ( insn -- insns ) : convert-two-operand/float ( insn -- )
[ [ dst>> ] [ src1>> ] bi ##copy-float ] [ [ dst>> ] [ src1>> ] bi ##copy-float ]
[ dup dst>> >>src1 , ] [ dup dst>> >>src1 , ]
bi ; inline bi ; inline

View File

@ -79,7 +79,7 @@ M: ##compare-imm-branch rewrite
[ dst>> ] [ dst>> ]
[ src2>> ] [ src2>> ]
[ src1>> vreg>vn vn>constant ] tri [ src1>> vreg>vn vn>constant ] tri
cc= f i \ ##compare-imm boa ; cc= i \ ##compare-imm new-insn ;
M: ##compare rewrite M: ##compare rewrite
dup flip-comparison? [ dup flip-comparison? [

View File

@ -82,7 +82,7 @@ SYMBOL: relocation-table
dup resolve-offset neg add-literal dup resolve-offset neg add-literal
[ rt-here ] dip [ class>> ] [ offset>> ] bi add-relocation-entry ; [ rt-here ] dip [ class>> ] [ offset>> ] bi add-relocation-entry ;
: resolve-relative-label ( label-fixup -- ) : resolve-relative-label ( label-fixup -- label )
[ class>> ] [ offset>> ] [ resolve-offset ] tri 3array ; [ class>> ] [ offset>> ] [ resolve-offset ] tri 3array ;
: resolve-labels ( label-fixups -- labels' ) : resolve-labels ( label-fixups -- labels' )