--- gforth/kernel/basics.fs 2002/12/26 19:16:17 1.34 +++ gforth/kernel/basics.fs 2003/01/03 17:28:13 1.35 @@ -67,8 +67,14 @@ has? ec unlock ram-dictionary borders nip lock AConstant dictionary-end [ELSE] -: dictionary-end ( -- addr ) - forthstart [ 3 cells image-header + ] Aliteral @ + ; + has? header [IF] + : dictionary-end ( -- addr ) + forthstart [ 3 cells image-header + ] Aliteral @ + ; + [ELSE] + : forthstart 0 ; + : dictionary-end ( -- addr ) + forthstart [ has? kernel-size ] Literal + ; + [THEN] [THEN] : usable-dictionary-end ( -- addr ) @@ -225,7 +231,7 @@ defer throw ( y1 .. ym nerror -- y1 .. y :noname ( y1 .. ym error -- y1 .. ym / z1 .. zn error ) ?dup if - [ has? ec 0= [IF] here image-header 9 cells + ! [THEN] ] + [ has? header [IF] here image-header 9 cells + ! [THEN] ] cr .error cr [ has? file [IF] ] script? IF 1 (bye) ELSE quit THEN [ [ELSE] ] quit [ [THEN] ]