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

Fix alien-indirect on ppc

db4
sheeple 2008-10-09 14:04:33 -05:00
parent d89868f377
commit bb6b998686
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/cpu/ppc/architecture/architecture.factor
View File

@ -96,9 +96,9 @@ M: ppc %epilogue ( n -- )
1 1 rot ADDI 1 1 rot ADDI
0 MTLR ; 0 MTLR ;
: (%call) ( -- ) 11 MTLR BLRL ; : (%call) ( reg -- ) MTLR BLRL ;
: (%jump) ( -- ) 11 MTCTR BCTR ; : (%jump) ( reg -- ) MTCTR BCTR ;
: %load-dlsym ( symbol dll register -- ) : %load-dlsym ( symbol dll register -- )
0 swap LOAD32 rc-absolute-ppc-2/2 rel-dlsym ; 0 swap LOAD32 rc-absolute-ppc-2/2 rel-dlsym ;
@ -117,7 +117,7 @@ M: ppc %dispatch ( -- )
"offset" operand "n" operand 1 SRAWI "offset" operand "n" operand 1 SRAWI
11 11 "offset" operand ADD 11 11 "offset" operand ADD
11 dup 6 cells LWZ 11 dup 6 cells LWZ
(%jump) 11 (%jump)
] H{ ] H{
{ +input+ { { f "n" } } } { +input+ { { f "n" } } }
{ +scratch+ { { f "offset" } } } { +scratch+ { { f "offset" } } }
@ -244,17 +244,17 @@ M: ppc %prepare-alien-invoke
rs-reg 11 12 STW ; rs-reg 11 12 STW ;
M: ppc %alien-invoke ( symbol dll -- ) M: ppc %alien-invoke ( symbol dll -- )
11 %load-dlsym (%call) ; 11 %load-dlsym 11 (%call) ;
M: ppc %alien-callback ( quot -- ) M: ppc %alien-callback ( quot -- )
3 load-indirect "c_to_factor" f %alien-invoke ; 3 load-indirect "c_to_factor" f %alien-invoke ;
M: ppc %prepare-alien-indirect ( -- ) M: ppc %prepare-alien-indirect ( -- )
"unbox_alien" f %alien-invoke "unbox_alien" f %alien-invoke
3 11 MR ; 13 3 MR ;
M: ppc %alien-indirect ( -- ) M: ppc %alien-indirect ( -- )
(%call) ; 13 (%call) ;
M: ppc %callback-value ( ctype -- ) M: ppc %callback-value ( ctype -- )
! Save top of data stack ! Save top of data stack