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

Merge branch 'master' of git://factorcode.org/git/factor

release
Alex Chapman 2007-09-30 16:20:42 +10:00
parent 342399df29 592886c783
commit 334300a5f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/alien.c
View File

@ -38,7 +38,7 @@ void *pinned_alien_offset(CELL object)
alien = untag_object(object); alien = untag_object(object);
if(alien->expired != F) if(alien->expired != F)
general_error(ERROR_EXPIRED,object,F,NULL); general_error(ERROR_EXPIRED,object,F,NULL);
return alien_offset(alien->alien) + alien->displacement; return pinned_alien_offset(alien->alien) + alien->displacement;
case F_TYPE: case F_TYPE:
return NULL; return NULL;
default: default:

2
vm/cpu-x86.S
View File

@ -29,7 +29,7 @@ DEF(F_FASTCALL void,dosym,(CELL word)):
/* Here we have two entry points. The first one is taken when profiling is /* Here we have two entry points. The first one is taken when profiling is
enabled */ enabled */
DEF(F_FASTCALL void,docol_profiling,(CELL word)): DEF(F_FASTCALL void,docol_profiling,(CELL word)):
add $CELL_SIZE,PROFILING_OFFSET(ARG0) /* Increment profile-count slot */ add $8,PROFILING_OFFSET(ARG0) /* Increment profile-count slot */
DEF(F_FASTCALL void,docol,(CELL word)): DEF(F_FASTCALL void,docol,(CELL word)):
mov WORD_DEF_OFFSET(ARG0),ARG0 /* Load word-def slot */ mov WORD_DEF_OFFSET(ARG0),ARG0 /* Load word-def slot */
JUMP_QUOT JUMP_QUOT