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

2010-01-09 01:09:47 -06:00 · 2010-01-09 01:09:47 -06:00 · fcc4b3d98a
parent a40beb4901 5b58117be1
commit fcc4b3d98a
2 changed files with 2 additions and 0 deletions
--- a/basis/cpu/x86/32/bootstrap.factor
+++ b/basis/cpu/x86/32/bootstrap.factor
@ -76,6 +76,7 @@ IN: bootstrap.x86
    ! call the quotation
    EAX quot-xt-offset [+] CALL
    ! save ds, rs registers
+    jit-load-vm
    jit-save-context
 ] \ c-to-factor define-sub-primitive

--- a/basis/cpu/x86/64/bootstrap.factor
+++ b/basis/cpu/x86/64/bootstrap.factor
@ -74,6 +74,7 @@ IN: bootstrap.x86
    ctx-reg context-callstack-bottom-offset [+] safe-reg MOV
    ! call the quotation
    arg1 quot-xt-offset [+] CALL
+    jit-load-vm
    jit-save-context
 ] \ c-to-factor define-sub-primitive