float parameters work

diff --git a/library/compiler/amd64/alien.factor b/library/compiler/amd64/alien.factor
index d6a88f25a4294a8d9851b20af6f967c764462a64..b8c26688aebe26148b6b3adbb56a6083a6404f2b 100644 (file)
--- a/library/compiler/amd64/alien.factor
+++ b/library/compiler/amd64/alien.factor
@@ -24,6 +24,8 @@ M: float-regs store-insn
 M: float-regs load-insn
     [ fastcall-regs nth swap stack@ ] keep MOVSS/LPD ;
 
+M: stack-params load-insn 3drop ;
+
 M: %unbox generate-node ( vop -- )
     drop
     ! Call the unboxer

diff --git a/library/compiler/amd64/architecture.factor b/library/compiler/amd64/architecture.factor
index 41ba6c451aa3ee57bfdc1405b4d7de4d8197b2da..a372801cc3defb7d39f879af1cd66e00285cbbf2 100644 (file)
--- a/library/compiler/amd64/architecture.factor
+++ b/library/compiler/amd64/architecture.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 IN: compiler-backend
 USING: alien arrays assembler compiler compiler-backend kernel
-kernel-internals math sequences ;
+kernel-internals math namespaces sequences ;
 
 ! AMD64 register assignments
 ! RAX RCX RDX RSI RDI R8 R9 R10 R11 vregs
@@ -53,3 +53,8 @@ M: float-regs fastcall-regs
     #! We use RIP-relative addressing. The '3' is a hardcoded
     #! instruction length.
     add-literal from 3 - 1array MOV ; inline
+
+: stack-increment \ stack-reserve get 16 align 8 + ;
+
+: compile-epilogue ( -- )
+    RSP stack-increment ADD ; inline

diff --git a/library/compiler/amd64/assembler.factor b/library/compiler/amd64/assembler.factor
index c51ee8a0633bf9e5b200e2356ec3cd82f5ede4e2..a0eae63d989cdcb924243fca6e1c2e29bc125eda 100644 (file)
--- a/library/compiler/amd64/assembler.factor
+++ b/library/compiler/amd64/assembler.factor
@@ -19,3 +19,12 @@ SYMBOL: R12 \ R12 12 64 define-register
 SYMBOL: R13 \ R13 13 64 define-register
 SYMBOL: R14 \ R14 14 64 define-register
 SYMBOL: R15 \ R15 15 64 define-register
+
+SYMBOL: XMM8 \ XMM8 8 128 define-register
+SYMBOL: XMM9 \ XMM9 9 128 define-register
+SYMBOL: XMM10 \ XMM10 10 128 define-register
+SYMBOL: XMM11 \ XMM11 11 128 define-register
+SYMBOL: XMM12 \ XMM12 12 128 define-register
+SYMBOL: XMM13 \ XMM13 13 128 define-register
+SYMBOL: XMM14 \ XMM14 14 128 define-register
+SYMBOL: XMM15 \ XMM15 15 128 define-register

diff --git a/library/compiler/amd64/generator.factor b/library/compiler/amd64/generator.factor
index 2a7972799f62f0cbec9c8ecc3b0e021deff2eb7c..99106ad88e02ec630ac24d7b2b670ea4c77cddf1 100644 (file)
--- a/library/compiler/amd64/generator.factor
+++ b/library/compiler/amd64/generator.factor
@@ -3,10 +3,5 @@
 IN: compiler-backend
 USING: assembler kernel math namespaces ;
 
-: stack-increment \ stack-reserve get 16 align 8 + ;
-
 M: %prologue generate-node ( vop -- )
     drop RSP stack-increment SUB ;
-
-: compile-epilogue ( -- )
-    RSP stack-increment ADD ; inline

diff --git a/library/compiler/x86/assembler.factor b/library/compiler/x86/assembler.factor
index 64007b3dc48b7289edd200fea50c50b6c7a97a4f..7cf7fd09acee38c83363df66a7bd6c043a76fd65 100644 (file)
--- a/library/compiler/x86/assembler.factor
+++ b/library/compiler/x86/assembler.factor
@@ -50,19 +50,20 @@ SYMBOL: EBP \ EBP 5 32 define-register
 SYMBOL: ESI \ ESI 6 32 define-register
 SYMBOL: EDI \ EDI 7 32 define-register
 
-SYMBOL: XMM0
-SYMBOL: XMM1
-SYMBOL: XMM2
-SYMBOL: XMM3
-SYMBOL: XMM4
-SYMBOL: XMM5
-SYMBOL: XMM6
-SYMBOL: XMM7
+SYMBOL: XMM0 \ XMM0 0 128 define-register
+SYMBOL: XMM1 \ XMM1 1 128 define-register
+SYMBOL: XMM2 \ XMM2 2 128 define-register
+SYMBOL: XMM3 \ XMM3 3 128 define-register
+SYMBOL: XMM4 \ XMM4 4 128 define-register
+SYMBOL: XMM5 \ XMM5 5 128 define-register
+SYMBOL: XMM6 \ XMM6 6 128 define-register
+SYMBOL: XMM7 \ XMM7 7 128 define-register
 
 PREDICATE: word register "register" word-prop ;
 
 PREDICATE: register register-32 "register-size" word-prop 32 = ;
 PREDICATE: register register-64 "register-size" word-prop 64 = ;
+PREDICATE: register register-128 "register-size" word-prop 128 = ;
 
 M: register modifier drop BIN: 11 ;
 M: register register "register" word-prop 7 bitand ;
@@ -279,5 +280,13 @@ M: operand CMP OCT: 071 2-operand ;
 
 ( SSE multimedia instructions )
 
-: MOVLPD ( dest src -- ) 2drop ;
-: MOVSS ( dest src -- ) 2drop ;
+: 2-operand-sse ( dst src op1 op2 -- )
+    pick register-128? [ nip ] [ drop swapd ] if
+    >r 2dup t rex-prefix HEX: 0f assemble-1 r>
+    assemble-1 register mod-r/m ;
+
+: MOVLPD ( dest src -- )
+    HEX: 66 assemble-1 HEX: 12 HEX: 13 2-operand-sse ;
+
+: MOVSS ( dest src -- )
+    HEX: f3 assemble-1 HEX: 10 HEX: 11 2-operand-sse ;

diff --git a/library/test/compiler/alien.factor b/library/test/compiler/alien.factor
index 04febd73bbe980e35f1a947a9039d84d336c8dbb..ba650dd078ed5b668036ef2f23f0893959f9ec21 100644 (file)
--- a/library/test/compiler/alien.factor
+++ b/library/test/compiler/alien.factor
@@ -21,3 +21,9 @@ FUNCTION: double ffi_test_5 ; compiled
 FUNCTION: double ffi_test_6 float x float y ; compiled
 [ 6.0 ] [ 3.0 2.0 ffi_test_6 ] unit-test
 
+FUNCTION: double ffi_test_7 double x double y ; compiled
+[ 6.0 ] [ 3.0 2.0 ffi_test_7 ] unit-test
+
+FUNCTION: double ffi_test_8 double x float y double z float t int w ; compiled
+[ 19.0 ] [ 3.0 2.0 1.0 6.0 7 ffi_test_8 ] unit-test
+

diff --git a/native/ffi_test.c b/native/ffi_test.c
index b9e6ed5c19a6e2bd4bbab6ca388102f46a24e2fa..3ff87c634cfaf1f48d0691faa6082c1ec2bee8e7 100644 (file)
--- a/native/ffi_test.c
+++ b/native/ffi_test.c
@@ -43,7 +43,14 @@ double ffi_test_6(float x, float y)
        return x * y;
 }
 
-double ffi_test_7(void)
+double ffi_test_7(double x, double y)
 {
-       return 1.5;
+       printf("ffi_test_7(%f,%f)\n",x,y);
+       return x * y;
+}
+
+double ffi_test_8(double x, float y, double z, float t, int w)
+{
+       printf("ffi_test_8(%f,%f,%f,%f,%d)\n",x,y,z,t,w);
+       return x * y + z * t + w;
 }