Eliminate compiler.alien

basis/alien/c-types/c-types.factor

@@ -66,15 +66,6 @@ M: word c-type
     dup "c-type" word-prop resolve-typedef
     [ ] [ no-c-type ] ?if ;
 
-GENERIC: c-struct? ( c-type -- ? )
-
-M: object c-struct? drop f ;
-
-M: c-type-name c-struct? dup void? [ drop f ] [ c-type c-struct? ] if ;
-
-! These words being foldable means that words need to be
-! recompiled if a C type is redefined. Even so, folding the
-! size facilitates some optimizations.
 GENERIC: c-type-class ( name -- class )
 
 M: abstract-c-type c-type-class class>> ;

basis/alien/syntax/syntax-docs.factor

@@ -119,10 +119,6 @@ HELP: typedef
 
 { POSTPONE: TYPEDEF: typedef } related-words
 
-HELP: c-struct?
-{ $values { "c-type" "a C type" } { "?" "a boolean" } }
-{ $description "Tests if a C type is a structure defined by " { $link POSTPONE: STRUCT: } "." } ;
-
 HELP: C-GLOBAL:
 { $syntax "C-GLOBAL: type name" }
 { $values { "type" "a C type" } { "name" "a C global variable name" } }

basis/classes/struct/struct.factor

@@ -176,7 +176,12 @@ HOOK: flatten-struct-type cpu ( type -- pairs )
 M: object flatten-struct-type
     stack-size cell /i { int-rep f } <repetition> ;
 
-M: struct-c-type c-struct? drop t ;
+: large-struct? ( type -- ? )
+    {
+        { [ dup void? ] [ drop f ] }
+        { [ dup base-type struct-c-type? not ] [ drop f ] }
+        [ return-struct-in-registers? not ]
+    } cond ;
 
 <PRIVATE
 : struct-slot-values-quot ( class -- quot )

basis/cocoa/messages/messages.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.strings arrays assocs
-classes.struct continuations combinators compiler compiler.alien
+classes.struct continuations combinators compiler
 core-graphics.types stack-checker kernel math namespaces make
 quotations sequences strings words cocoa.runtime cocoa.types io
 macros memoize io.encodings.utf8 effects layouts libc

basis/compiler/alien/alien.factor

@@ -1,13 +0,0 @@
-! Copyright (C) 2008, 2010 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel namespaces make math sequences layouts
-alien.c-types cpu.architecture ;
-IN: compiler.alien
-
-: large-struct? ( type -- ? )
-    dup c-struct? [ return-struct-in-registers? not ] [ drop f ] if ;
-
-: alien-parameters ( params -- seq )
-    dup parameters>>
-    swap return>> large-struct?
-    [ struct-return-on-stack? (stack-value) void* ? prefix ] when ;

basis/compiler/alien/summary.txt

@@ -1 +0,0 @@
-Common code used for analysis and code generation of alien bindings

basis/compiler/cfg/builder/alien/alien.factor

@@ -1,10 +1,10 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays layouts math math.order math.parser
-combinators fry make sequences locals alien alien.private
+combinators combinators.short-circuit fry make sequences locals
-alien.strings alien.c-types alien.libraries classes.struct
+alien alien.private alien.strings alien.c-types alien.libraries
-namespaces kernel strings libc quotations cpu.architecture
+classes.struct namespaces kernel strings libc quotations
-compiler.alien compiler.utilities compiler.tree compiler.cfg
+cpu.architecture compiler.utilities compiler.tree compiler.cfg
 compiler.cfg.builder compiler.cfg.builder.alien.params
 compiler.cfg.builder.blocks compiler.cfg.instructions
 compiler.cfg.stack-frame compiler.cfg.stacks
@@ -65,9 +65,9 @@ M:: struct-c-type unbox-parameter ( src c-type -- )
 
 : (objects>registers) ( vregs -- )
     ! Place instructions in reverse order, so that the
-    ! ##store-stack-param instructions come first. This is
+    ! ##store-stack-param instructions come first. This ensures
-    ! because they are not clobber-insns and so we avoid some
+    ! that no registers are used after the ##store-reg-param
-    ! spills that way.
+    ! instructions.
     [
         first3 [ dup reg-class-of reg-class-full? ] dip or
         [ [ alloc-stack-param ] keep \ ##store-stack-param new-insn ]
@@ -75,15 +75,13 @@ M:: struct-c-type unbox-parameter ( src c-type -- )
         if
     ] map reverse % ;
 
-: objects>registers ( params -- )
+: objects>registers ( params -- stack-size )
-    #! Generate code for unboxing a list of C types, then
-    #! generate code for moving these parameters to registers on
-    #! architectures where parameters are passed in registers.
     [ abi>> ] [ parameters>> ] [ return>> ] tri
     '[ 
         _ unbox-parameters
         _ prepare-struct-area
         (objects>registers)
+        stack-params get
     ] with-param-regs ;
 
 GENERIC: box-return ( c-type -- dst )
@@ -94,11 +92,9 @@ M: c-type box-return
 M: long-long-type box-return
     [ f ] dip boxer>> ^^box-long-long ;
 
-: if-small-struct ( c-type true false -- ? )
-    [ dup return-struct-in-registers? ] 2dip '[ f swap @ ] if ; inline
-
 M: struct-c-type box-return
-    [ ^^box-small-struct ] [ ^^box-large-struct ] if-small-struct ;
+    dup return-struct-in-registers?
+    [ ^^box-small-struct ] [ [ f ] dip ^^box-large-struct ] if ;
 
 : box-return* ( node -- )
     return>> [ ] [ base-type box-return 1 ##inc-d D 0 ##replace ] if-void ;
@@ -130,62 +126,66 @@ M: array dlsym-valid? '[ _ dlsym ] any? ;
     [ library>> load-library ]
     bi 2dup check-dlsym ;
 
-: return-size ( ctype -- n )
+: return-size ( c-type -- n )
     #! Amount of space we reserve for a return value.
     {
-        { [ dup c-struct? not ] [ drop 0 ] }
+        { [ dup void? ] [ drop 0 ] }
+        { [ dup base-type struct-c-type? not ] [ drop 0 ] }
         { [ dup large-struct? not ] [ drop 2 cells ] }
         [ heap-size ]
     } cond ;
 
-: <alien-stack-frame> ( params -- stack-frame )
-    stack-frame new
-        swap
-        [ return>> return-size >>return ]
-        [ alien-parameters [ stack-size ] map-sum >>params ] bi
-        t >>calls-vm? ;
-
 : alien-node-height ( params -- )
     [ out-d>> length ] [ in-d>> length ] bi - adjust-d ;
 
-: emit-alien-node ( node quot -- )
+: emit-alien-block ( node quot: ( params -- ) -- )
     '[
         make-kill-block
         params>>
-        [ <alien-stack-frame> ##stack-frame ]
+        _ [ alien-node-height ] bi
-        _
-        [ alien-node-height ]
-        tri
     ] emit-trivial-block ; inline
 
+: <alien-stack-frame> ( stack-size return -- stack-frame )
+    stack-frame new
+        swap return-size >>return
+        swap >>params
+        t >>calls-vm? ;
+
+: emit-stack-frame ( stack-size params -- )
+    return>>
+    [ stack-cleanup ##cleanup ]
+    [ <alien-stack-frame> ##stack-frame ] bi ;
+
 M: #alien-invoke emit-node
     [
         {
             [ objects>registers ]
             [ alien-invoke-dlsym ##alien-invoke ]
-            [ stack-cleanup ##cleanup ]
+            [ emit-stack-frame ]
             [ box-return* ]
         } cleave
-    ] emit-alien-node ;
+    ] emit-alien-block ;
 
-M: #alien-indirect emit-node
+M:: #alien-indirect emit-node ( node -- )
-    [
+    node [
-        D 0 ^^peek -1 ##inc-d ^^unbox-any-c-ptr
+        D 0 ^^peek -1 ##inc-d ^^unbox-any-c-ptr :> src
         {
-            [ drop objects>registers ]
+            [ objects>registers ]
-            [ nip ##alien-indirect ]
+            [ drop src ##alien-indirect ]
-            [ drop stack-cleanup ##cleanup ]
+            [ emit-stack-frame ]
-            [ drop box-return* ]
+            [ box-return* ]
-        } 2cleave
+        } cleave
-    ] emit-alien-node ;
+    ] emit-alien-block ;
 
 M: #alien-assembly emit-node
     [
+        {
             [ objects>registers ]
             [ quot>> ##alien-assembly ]
+            [ emit-stack-frame ]
             [ box-return* ]
-        tri
+        } cleave
-    ] emit-alien-node ;
+    ] emit-alien-block ;
 
 GENERIC: box-parameter ( n c-type -- dst )
 
@@ -207,6 +207,10 @@ M: struct-c-type box-parameter
 : prepare-parameters ( parameters -- offsets types indices )
     [ length iota <reversed> ] [ parameter-offsets ] [ ] tri ;
 
+: alien-parameters ( params -- seq )
+    [ parameters>> ] [ return>> large-struct? ] bi
+    [ struct-return-on-stack? (stack-value) void* ? prefix ] when ;
+
 : box-parameters ( params -- )
     alien-parameters
     [ length ##inc-d ]
@@ -276,16 +280,22 @@ M: long-long-type unbox-return
 M: struct-c-type unbox-return
     [ ^^unbox-any-c-ptr ] dip ##store-struct-return ;
 
+: emit-callback-stack-frame ( params -- )
+    [ alien-parameters [ stack-size ] map-sum ] [ return>> ] bi
+    <alien-stack-frame> ##stack-frame ;
+
 M: #alien-callback emit-node
     dup params>> xt>> dup
     [
         ##prologue
         [
+            {
                 [ registers>objects ]
+                [ emit-callback-stack-frame ]
                 [ wrap-callback-quot ##alien-callback ]
                 [
                     return>> {
-                    { [ dup void eq? ] [ drop ##end-callback ] }
+                        { [ dup void? ] [ drop ##end-callback ] }
                         { [ dup large-struct? ] [ drop ##end-callback ] }
                         [
                             [ D 0 ^^peek ] dip
@@ -293,8 +303,9 @@ M: #alien-callback emit-node
                             base-type unbox-return
                         ]
                     } cond
-            ] tri
+                ]
-        ] emit-alien-node
+            } cleave
+        ] emit-alien-block
         ##epilogue
         ##return
     ] with-cfg-builder ;

basis/compiler/cfg/builder/builder.factor

@@ -19,8 +19,7 @@ compiler.cfg.instructions
 compiler.cfg.predecessors
 compiler.cfg.builder.blocks
 compiler.cfg.stacks
-compiler.cfg.stacks.local
+compiler.cfg.stacks.local ;
-compiler.alien ;
 IN: compiler.cfg.builder
 
 ! Convert tree SSA IR to CFG IR. The result is not in SSA form; this is