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

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

release
U-C4\Administrator 2007-10-06 19:26:17 -05:00
parent 95ac4fe29b 20d81509df
commit 99fc00dde1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/cpu/x86/32/bootstrap.factor
View File

@ -13,6 +13,5 @@ IN: bootstrap.x86
: scan-reg EBX ; : scan-reg EBX ;
: xt-reg ECX ; : xt-reg ECX ;
: fixnum>slot@ arg0 1 SAR ; : fixnum>slot@ arg0 1 SAR ;
: next-frame@ -44 ;
"resource:core/cpu/x86/bootstrap.factor" run-file "resource:core/cpu/x86/bootstrap.factor" run-file

1
core/cpu/x86/64/bootstrap.factor
View File

@ -13,6 +13,5 @@ IN: bootstrap.x86
: scan-reg RBX ; : scan-reg RBX ;
: xt-reg RCX ; : xt-reg RCX ;
: fixnum>slot@ ; : fixnum>slot@ ;
: next-frame@ -88 ;
"resource:core/cpu/x86/bootstrap.factor" run-file "resource:core/cpu/x86/bootstrap.factor" run-file

8
core/cpu/x86/bootstrap.factor
View File

@ -8,10 +8,10 @@ big-endian off
1 jit-code-format set 1 jit-code-format set
: scan-save stack-reg 3 bootstrap-cells [+] ;
: stack-frame-size 8 bootstrap-cells ; : stack-frame-size 8 bootstrap-cells ;
: scan-save stack-reg 3 bootstrap-cells [+] ;
[ [
arg0 arg0 quot-array@ [+] MOV ! load array arg0 arg0 quot-array@ [+] MOV ! load array
scan-reg arg0 scan@ [+] LEA ! initialize scan pointer scan-reg arg0 scan@ [+] LEA ! initialize scan pointer
@ -79,9 +79,9 @@ big-endian off
[ [
load-branch load-branch
stack-reg [] scan-reg MOV ! save scan pointer scan-save scan-reg MOV ! save scan pointer
xt-reg CALL ! call quotation xt-reg CALL ! call quotation
scan-reg stack-reg [] MOV ! restore scan pointer scan-reg scan-save MOV ! restore scan pointer
] { } make jit-if-call set ] { } make jit-if-call set
[ [

2
vm/debug.c
View File

@ -102,6 +102,8 @@ void print_stack_frame(F_STACK_FRAME *frame)
{ {
print_obj(frame_executing(frame)); print_obj(frame_executing(frame));
printf("\n"); printf("\n");
print_obj(frame_scan(frame));
printf("\n");
} }
void print_callstack(void) void print_callstack(void)