steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

isolated %vm-invoke-blah-arg crap to 64.factor

db4
Phil Dawes 2009-09-25 19:02:41 +01:00
parent 68f85a69b3
commit 28420c587a
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
basis/cpu/architecture/architecture.factor
View File

@ -383,9 +383,6 @@ M: object %prepare-var-args ;
HOOK: %alien-invoke cpu ( function library -- ) HOOK: %alien-invoke cpu ( function library -- )
HOOK: %vm-invoke-1st-arg cpu ( function -- )
HOOK: %vm-invoke-3rd-arg cpu ( function -- )
HOOK: %cleanup cpu ( params -- ) HOOK: %cleanup cpu ( params -- )
M: object %cleanup ( params -- ) drop ; M: object %cleanup ( params -- ) drop ;

3
basis/cpu/ppc/ppc.factor
View File

@ -40,9 +40,6 @@ enable-float-intrinsics
M: ppc %vm-field-ptr ( dst field -- ) %load-vm-field-addr ; M: ppc %vm-field-ptr ( dst field -- ) %load-vm-field-addr ;
M: ppc %vm-invoke-1st-arg ( function -- ) f %alien-invoke ;
M: ppc %vm-invoke-3rd-arg ( function -- ) f %alien-invoke ;
M: ppc machine-registers M: ppc machine-registers
{ {
{ int-regs $[ 2 12 [a,b] 15 29 [a,b] append ] } { int-regs $[ 2 12 [a,b] 15 29 [a,b] append ] }

8
basis/cpu/x86/32/32.factor
View File

@ -51,14 +51,6 @@ M: x86.32 %alien-invoke 0 CALL rc-relative rel-dlsym ;
temp-reg 0 MOV rc-absolute-cell rt-vm rel-fixup ! push the vm ptr as an argument temp-reg 0 MOV rc-absolute-cell rt-vm rel-fixup ! push the vm ptr as an argument
temp-reg PUSH ; temp-reg PUSH ;
M: x86.32 %vm-invoke-1st-arg ( function -- )
push-vm-ptr
f %alien-invoke
temp-reg POP ;
M: x86.32 %vm-invoke-3rd-arg ( function -- )
%vm-invoke-1st-arg ; ! first 2 args are regs, 3rd is stack so vm-invoke-1st-arg works here
M: x86.32 return-struct-in-registers? ( c-type -- ? ) M: x86.32 return-struct-in-registers? ( c-type -- ? )
c-type c-type
[ return-in-registers?>> ] [ return-in-registers?>> ]

4
basis/cpu/x86/64/64.factor
View File

@ -74,7 +74,7 @@ M: x86.64 %prepare-unbox ( -- )
param-reg-1 R14 [] MOV param-reg-1 R14 [] MOV
R14 cell SUB ; R14 cell SUB ;
M: x86.64 %vm-invoke-1st-arg ( function -- ) : %vm-invoke-1st-arg ( function -- )
param-reg-1 0 MOV rc-absolute-cell rt-vm rel-fixup param-reg-1 0 MOV rc-absolute-cell rt-vm rel-fixup
f %alien-invoke ; f %alien-invoke ;
@ -82,7 +82,7 @@ M: x86.64 %vm-invoke-1st-arg ( function -- )
param-reg-2 0 MOV rc-absolute-cell rt-vm rel-fixup param-reg-2 0 MOV rc-absolute-cell rt-vm rel-fixup
f %alien-invoke ; f %alien-invoke ;
M: x86.64 %vm-invoke-3rd-arg ( function -- ) : %vm-invoke-3rd-arg ( function -- )
param-reg-3 0 MOV rc-absolute-cell rt-vm rel-fixup param-reg-3 0 MOV rc-absolute-cell rt-vm rel-fixup
f %alien-invoke ; f %alien-invoke ;