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

Fix PICs for x86-64

db4
Slava Pestov 2009-04-30 18:00:49 -05:00
parent 48dbd4022c
commit f9ec0a07c5
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/bootstrap/image/image.factor
View File

@ -98,7 +98,7 @@ SYMBOL: jit-define-rt
SYMBOL: jit-define-offset SYMBOL: jit-define-offset
: compute-offset ( -- offset ) : compute-offset ( -- offset )
building get length jit-define-rc get rc-absolute-cell = cell 4 ? - ; building get length jit-define-rc get rc-absolute-cell = bootstrap-cell 4 ? - ;
: jit-rel ( rc rt -- ) : jit-rel ( rc rt -- )
jit-define-rt set jit-define-rt set

1
basis/cpu/x86/bootstrap.factor
View File

@ -241,6 +241,7 @@ big-endian off
temp0 0 MOV rc-absolute-cell rt-immediate jit-rel temp0 0 MOV rc-absolute-cell rt-immediate jit-rel
! key = class ! key = class
temp2 temp1 MOV temp2 temp1 MOV
bootstrap-cell 8 = [ temp2 1 SHL ] when
! key &= cache.length - 1 ! key &= cache.length - 1
temp2 mega-cache-size get 1- bootstrap-cell * AND temp2 mega-cache-size get 1- bootstrap-cell * AND
! cache += array-start-offset ! cache += array-start-offset

2
vm/cpu-x86.64.S
View File

@ -78,6 +78,6 @@ DEF(F_FASTCALL void,primitive_inline_cache_miss,(void)):
sub $STACK_PADDING,%rsp sub $STACK_PADDING,%rsp
call MANGLE(inline_cache_miss) call MANGLE(inline_cache_miss)
add $STACK_PADDING,%rsp add $STACK_PADDING,%rsp
jmp *WORD_XT_OFFSET(%rax) jmp *%rax
#include "cpu-x86.S" #include "cpu-x86.S"

4
vm/cpu-x86.h
View File

@ -25,11 +25,11 @@ INLINE void check_call_site(CELL return_address)
INLINE CELL get_call_target(CELL return_address) INLINE CELL get_call_target(CELL return_address)
{ {
check_call_site(return_address); check_call_site(return_address);
return *(F_FIXNUM *)(return_address - 4) + return_address; return *(int *)(return_address - 4) + return_address;
} }
INLINE void set_call_target(CELL return_address, CELL target) INLINE void set_call_target(CELL return_address, CELL target)
{ {
check_call_site(return_address); check_call_site(return_address);
*(F_FIXNUM *)(return_address - 4) = (target - return_address); *(int *)(return_address - 4) = (target - return_address);
} }