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

Fix 64-bit bootstrap

db4
Slava Pestov 2008-02-10 01:34:16 -06:00
parent 545a49a12e
commit ce1602bc2c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/bootstrap/image/image.factor
View File

@ -135,8 +135,10 @@ SYMBOL: undefined-quot
: here-as ( tag -- pointer ) here swap bitor ; : here-as ( tag -- pointer ) here swap bitor ;
USE: continuations
: align-here ( -- ) : align-here ( -- )
here 8 mod 4 = [ 0 emit ] when ; here 8 mod 4 = [ break heap-size drop 0 emit ] when ;
: emit-fixnum ( n -- ) tag-fixnum emit ; : emit-fixnum ( n -- ) tag-fixnum emit ;
@ -177,6 +179,7 @@ GENERIC: ' ( obj -- ptr )
[ dup bignum-bits neg shift swap bignum-radix bitand ] [ dup bignum-bits neg shift swap bignum-radix bitand ]
[ ] unfold nip ; [ ] unfold nip ;
USE: continuations
: emit-bignum ( n -- ) : emit-bignum ( n -- )
dup 0 < [ 1 swap neg ] [ 0 swap ] if bignum>seq dup 0 < [ 1 swap neg ] [ 0 swap ] if bignum>seq
dup length 1+ emit-fixnum dup length 1+ emit-fixnum
@ -215,8 +218,8 @@ M: f '
: -1, -1 >bignum ' -1-offset fixup ; : -1, -1 >bignum ' -1-offset fixup ;
! Beginning of the image ! Beginning of the image
: begin-image ( -- )
: begin-image ( -- ) emit-header t, 0, 1, -1, ; emit-header t, 0, 1, -1, ;
! Words ! Words
@ -426,8 +429,8 @@ PRIVATE>
: make-image ( arch -- ) : make-image ( arch -- )
architecture [ architecture [
prepare-image prepare-image
begin-image
"resource:/core/bootstrap/stage1.factor" run-file "resource:/core/bootstrap/stage1.factor" run-file
begin-image
end-image end-image
image get image get
architecture get boot-image-name resource-path architecture get boot-image-name resource-path