From ade5db24059a6877b3bdfacda2e0a604b900f1fa Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Wed, 3 Jun 2009 03:22:46 -0500
Subject: [PATCH] cpu.x86: fix small register intrinsics on x86-64
---
basis/compiler/tests/codegen.factor | 9 +++++-
basis/cpu/x86/x86.factor | 45 +++++++++++++++++++++--------
2 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor
index e0bc917f1c..47c6fa31e7 100644
--- a/basis/compiler/tests/codegen.factor
+++ b/basis/compiler/tests/codegen.factor
@@ -2,7 +2,7 @@ USING: generalizations accessors arrays compiler kernel kernel.private
math hashtables.private math.private namespaces sequences tools.test
namespaces.private slots.private sequences.private byte-arrays alien
alien.accessors layouts words definitions compiler.units io
-combinators vectors grouping make ;
+combinators vectors grouping make alien.c-types ;
QUALIFIED: namespaces.private
IN: compiler.tests.codegen
@@ -282,3 +282,10 @@ TUPLE: cucumber ;
M: cucumber equal? "The cucumber has no equal" throw ;
[ t ] [ [ cucumber ] compile-call cucumber eq? ] unit-test
+
+[ 4294967295 B{ 255 255 255 255 } -1 ]
+[
+ -1 <int> -1 <int>
+ [ [ 0 alien-unsigned-cell swap ] [ 0 alien-signed-2 ] bi ]
+ compile-call
+] unit-test
\ No newline at end of file
diff --git a/basis/cpu/x86/x86.factor b/basis/cpu/x86/x86.factor
index 375ea32940..ef353281e5 100644
--- a/basis/cpu/x86/x86.factor
+++ b/basis/cpu/x86/x86.factor
@@ -327,17 +327,29 @@ M:: x86 %box-alien ( dst src temp -- )
"end" resolve-label
] with-scope ;
-: small-reg-4 ( reg -- reg' )
+: small-reg-8 ( reg -- reg' )
H{
- { EAX EAX }
- { ECX ECX }
- { EDX EDX }
- { EBX EBX }
- { ESP ESP }
- { EBP EBP }
- { ESI ESP }
- { EDI EDI }
+ { EAX RAX }
+ { ECX RCX }
+ { EDX RDX }
+ { EBX RBX }
+ { ESP RSP }
+ { EBP RBP }
+ { ESI RSP }
+ { EDI RDI }
+ { RAX RAX }
+ { RCX RCX }
+ { RDX RDX }
+ { RBX RBX }
+ { RSP RSP }
+ { RBP RBP }
+ { RSI RSP }
+ { RDI RDI }
+ } at ; inline
+
+: small-reg-4 ( reg -- reg' )
+ small-reg-8 H{
{ RAX EAX }
{ RCX ECX }
{ RDX EDX }
@@ -373,12 +385,21 @@ M:: x86 %box-alien ( dst src temp -- )
{ 1 [ small-reg-1 ] }
{ 2 [ small-reg-2 ] }
{ 4 [ small-reg-4 ] }
+ { 8 [ small-reg-8 ] }
} case ;
-: small-regs ( -- regs ) { EAX ECX EDX EBX } ; inline
+HOOK: small-regs cpu ( -- regs )
+
+M: x86.32 small-regs { EAX ECX EDX EBX } ;
+M: x86.64 small-regs { RAX RCX RDX RBX } ;
+
+HOOK: small-reg-native cpu ( reg -- reg' )
+
+M: x86.32 small-reg-native small-reg-4 ;
+M: x86.64 small-reg-native small-reg-8 ;
: small-reg-that-isn't ( exclude -- reg' )
- small-regs swap [ small-reg-4 ] map '[ _ memq? not ] find nip ;
+ small-regs swap [ small-reg-native ] map '[ _ memq? not ] find nip ;
: with-save/restore ( reg quot -- )
[ drop PUSH ] [ call ] [ drop POP ] 2tri ; inline
@@ -388,7 +409,7 @@ M:: x86 %box-alien ( dst src temp -- )
#! call the quot with that. Otherwise, we find a small
#! register that is not in exclude, and call quot, saving
#! and restoring the small register.
- dst small-reg-4 small-regs memq? [ dst quot call ] [
+ dst small-reg-native small-regs memq? [ dst quot call ] [
exclude small-reg-that-isn't
[ quot call ] with-save/restore
] if ; inline