diff --git a/basis/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor index e2096987da..0540ccd6d6 100644 --- a/basis/cpu/x86/32/bootstrap.factor +++ b/basis/cpu/x86/32/bootstrap.factor @@ -11,7 +11,7 @@ IN: bootstrap.x86 : shift-arg ( -- reg ) ECX ; : div-arg ( -- reg ) EAX ; : mod-arg ( -- reg ) EDX ; -: arg ( -- reg ) EAX ; +: arg1 ( -- reg ) EAX ; : arg2 ( -- reg ) EDX ; : temp0 ( -- reg ) EAX ; : temp1 ( -- reg ) EDX ; @@ -29,7 +29,7 @@ IN: bootstrap.x86 ! save stack pointer temp0 [] stack-reg MOV ! pass vm ptr to primitive - arg 0 MOV rc-absolute-cell rt-vm jit-rel + arg1 0 MOV rc-absolute-cell rt-vm jit-rel ! call the primitive 0 JMP rc-relative rt-primitive jit-rel ] jit-primitive jit-define diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor index ff6c241970..bffe056656 100644 --- a/basis/cpu/x86/64/bootstrap.factor +++ b/basis/cpu/x86/64/bootstrap.factor @@ -29,7 +29,7 @@ IN: bootstrap.x86 ! load XT temp1 0 MOV rc-absolute-cell rt-primitive jit-rel ! load vm ptr - arg 0 MOV rc-absolute-cell rt-vm jit-rel + arg1 0 MOV rc-absolute-cell rt-vm jit-rel ! go temp1 JMP ] jit-primitive jit-define diff --git a/basis/cpu/x86/64/unix/bootstrap.factor b/basis/cpu/x86/64/unix/bootstrap.factor index 199fe8daf4..2ad3a721af 100644 --- a/basis/cpu/x86/64/unix/bootstrap.factor +++ b/basis/cpu/x86/64/unix/bootstrap.factor @@ -5,7 +5,7 @@ cpu.x86.assembler cpu.x86.assembler.operands layouts vocabs parser ; IN: bootstrap.x86 : stack-frame-size ( -- n ) 4 bootstrap-cells ; -: arg ( -- reg ) RDI ; +: arg1 ( -- reg ) RDI ; : arg2 ( -- reg ) RSI ; << "vocab:cpu/x86/64/bootstrap.factor" parse-file parsed >> diff --git a/basis/cpu/x86/64/winnt/bootstrap.factor b/basis/cpu/x86/64/winnt/bootstrap.factor index 72b9d27ca4..2dd3e889a5 100644 --- a/basis/cpu/x86/64/winnt/bootstrap.factor +++ b/basis/cpu/x86/64/winnt/bootstrap.factor @@ -6,7 +6,7 @@ cpu.x86.assembler.operands ; IN: bootstrap.x86 : stack-frame-size ( -- n ) 8 bootstrap-cells ; -: arg ( -- reg ) RCX ; +: arg1 ( -- reg ) RCX ; : arg2 ( -- reg ) RDX ; << "vocab:cpu/x86/64/bootstrap.factor" parse-file parsed >> diff --git a/basis/cpu/x86/bootstrap.factor b/basis/cpu/x86/bootstrap.factor index 5bc5272ab4..3cc71d22f7 100644 --- a/basis/cpu/x86/bootstrap.factor +++ b/basis/cpu/x86/bootstrap.factor @@ -248,13 +248,13 @@ big-endian off ! Quotations and words [ ! load from stack - arg ds-reg [] MOV + arg1 ds-reg [] MOV ! pop stack ds-reg bootstrap-cell SUB ! pass vm pointer arg2 0 MOV rc-absolute-cell rt-vm jit-rel ! call quotation - arg quot-xt-offset [+] JMP + arg1 quot-xt-offset [+] JMP ] \ (call) define-sub-primitive ! Objects