x86.64: change the register order so that RBX is allocated before RCX

diff --git a/basis/compiler/cfg/linear-scan/allocation/allocation-tests.factor b/basis/compiler/cfg/linear-scan/allocation/allocation-tests.factor
index 938c1de56aa1fa095fa61e869eead21cb17ac253..08aaad1de66d1274081fe21904be3a3acd6f194d 100644 (file)
--- a/basis/compiler/cfg/linear-scan/allocation/allocation-tests.factor
+++ b/basis/compiler/cfg/linear-scan/allocation/allocation-tests.factor
@@ -39,7 +39,7 @@ cpu x86.64? [
         interval-[30,46] machine-registers register-status
     ] unit-test
 
-    { { RCX 1/0. } } [
+    { { RBX 1/0. } } [
         f machine-registers init-allocator
         interval-[30,60] add-active
         interval-[30,46] machine-registers register-status
@@ -49,9 +49,9 @@ cpu x86.64? [
     {
         {
             { RAX 1/0. }
+            { RBX 1/0. }
             { RCX 1/0. }
             { RDX 1/0. }
-            { RBX 1/0. }
             { RBP 1/0. }
             { RSI 1/0. }
             { RDI 1/0. }

diff --git a/basis/cpu/x86/64/64.factor b/basis/cpu/x86/64/64.factor
index 178cd4bfd761a6c9162ba68fcf2fe9ff88fb1df1..eb50168eaa969e045b3f2c262c3a921415b78a95 100644 (file)
--- a/basis/cpu/x86/64/64.factor
+++ b/basis/cpu/x86/64/64.factor
@@ -32,7 +32,7 @@ M: x86.64 frame-reg RBP ;
 
 M: x86.64 machine-registers
     {
-        { int-regs { RAX RCX RDX RBX RBP RSI RDI R8 R9 R10 R11 R12 } }
+        { int-regs { RAX RBX RCX RDX RBP RSI RDI R8 R9 R10 R11 R12 } }
         { float-regs {
             XMM0 XMM1 XMM2 XMM3 XMM4 XMM5 XMM6 XMM7
             XMM8 XMM9 XMM10 XMM11 XMM12 XMM13 XMM14 XMM15