factor: trim using lists

[factor.git] / basis / compiler / cfg / build-stack-frame / build-stack-frame.factor

diff --git a/basis/compiler/cfg/build-stack-frame/build-stack-frame.factor b/basis/compiler/cfg/build-stack-frame/build-stack-frame.factor
index e2ce7d26e035de1ca12a1e85badfa1f7ff248861..96d4f881a8cb05b40f591169eba0028129fb3773 100644 (file)
--- a/basis/compiler/cfg/build-stack-frame/build-stack-frame.factor
+++ b/basis/compiler/cfg/build-stack-frame/build-stack-frame.factor
@@ -1,33 +1,25 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces accessors math math.order assocs kernel
-sequences combinators classes words system fry locals
-cpu.architecture layouts compiler.cfg compiler.cfg.rpo
-compiler.cfg.instructions compiler.cfg.registers
-compiler.cfg.stack-frame ;
+USING: accessors compiler.cfg.instructions
+compiler.cfg.linearization cpu.architecture kernel layouts math
+math.order namespaces sequences ;
 IN: compiler.cfg.build-stack-frame
 
-SYMBOLS: param-area-size allot-area-size allot-area-align
-frame-required? ;
+SYMBOLS: param-area-size allot-area-size allot-area-align ;
 
-: frame-required ( -- ) frame-required? on ;
+GENERIC: compute-stack-frame* ( insn -- ? )
 
-GENERIC: compute-stack-frame* ( insn -- )
-
-M:: ##local-allot compute-stack-frame* ( insn -- )
-    frame-required
+M:: ##local-allot compute-stack-frame* ( insn -- ? )
     insn size>> :> s
     insn align>> :> a
     allot-area-align [ a max ] change
-    allot-area-size [ a align [ insn offset<< ] [ s + ] bi ] change ;
+    allot-area-size [ a align [ insn offset<< ] [ s + ] bi ] change t ;
 
 M: alien-call-insn compute-stack-frame*
-    frame-required
-    stack-size>> param-area-size [ max ] change ;
+    stack-size>> param-area-size [ max ] change t ;
 
-: vm-frame-required ( -- )
-    frame-required
-    vm-stack-space param-area-size [ max ] change ;
+: vm-frame-required ( -- ? )
+    vm-stack-space param-area-size [ max ] change t ;
 
 M: ##call-gc compute-stack-frame* drop vm-frame-required ;
 M: ##box compute-stack-frame* drop vm-frame-required ;
@@ -35,42 +27,43 @@ M: ##unbox compute-stack-frame* drop vm-frame-required ;
 M: ##box-long-long compute-stack-frame* drop vm-frame-required ;
 M: ##callback-inputs compute-stack-frame* drop vm-frame-required ;
 M: ##callback-outputs compute-stack-frame* drop vm-frame-required ;
-M: ##unary-float-function compute-stack-frame* drop vm-frame-required ;
-M: ##binary-float-function compute-stack-frame* drop vm-frame-required ;
 
-M: ##call compute-stack-frame* drop frame-required ;
-M: ##spill compute-stack-frame* drop frame-required ;
-M: ##reload compute-stack-frame* drop frame-required ;
+M: ##call compute-stack-frame* drop t ;
+M: ##spill compute-stack-frame* drop t ;
+M: ##reload compute-stack-frame* drop t ;
 
 M: ##float>integer compute-stack-frame*
-    drop integer-float-needs-stack-frame? [ frame-required ] when ;
+    drop integer-float-needs-stack-frame? ;
 
 M: ##integer>float compute-stack-frame*
-    drop integer-float-needs-stack-frame? [ frame-required ] when ;
+    drop integer-float-needs-stack-frame? ;
+
+M: insn compute-stack-frame* drop f ;
 
-M: insn compute-stack-frame* drop ;
+: calculate-allot-area-base ( stack-frame -- n )
+    [ params>> ] [ allot-area-align>> ] bi align ;
 
-: finalize-stack-frame ( stack-frame -- )
-    dup [ params>> ] [ allot-area-align>> ] bi align >>allot-area-base
-    dup [ [ allot-area-base>> ] [ allot-area-size>> ] bi + ] [ spill-area-align>> ] bi align >>spill-area-base
-    dup stack-frame-size >>total-size drop ;
+: calculate-spill-area-base ( stack-frame -- n )
+    [ allot-area-base>> ]
+    [ allot-area-size>> + ]
+    [ spill-area-align>> ] tri align ;
 
-: <stack-frame> ( cfg -- stack-frame )
-    [ stack-frame new ] dip
-    [ spill-area-size>> >>spill-area-size ]
-    [ spill-area-align>> >>spill-area-align ] bi
-    allot-area-size get >>allot-area-size
-    allot-area-align get >>allot-area-align
-    param-area-size get >>params
-    dup finalize-stack-frame ;
+: finalize-stack-frame ( stack-frame -- stack-frame )
+    dup calculate-allot-area-base >>allot-area-base
+    dup calculate-spill-area-base >>spill-area-base
+    dup stack-frame-size >>total-size ;
 
 : compute-stack-frame ( cfg -- stack-frame/f )
-    [ [ instructions>> [ compute-stack-frame* ] each ] each-basic-block ]
-    [ frame-required? get [ <stack-frame> ] [ drop f ] if ]
-    bi ;
+    dup cfg>insns f [ compute-stack-frame* or ] reduce [
+        stack-frame>>
+        allot-area-size get >>allot-area-size
+        allot-area-align get >>allot-area-align
+        param-area-size get >>params
+        finalize-stack-frame
+    ] [ drop f ] if ;
 
-: build-stack-frame ( cfg -- cfg )
+: build-stack-frame ( cfg -- )
     0 param-area-size set
     0 allot-area-size set
     cell allot-area-align set
-    dup compute-stack-frame >>stack-frame ;
+    [ compute-stack-frame ] keep stack-frame<< ;