--- gforth/cross.fs	2006/02/18 22:58:04	1.155
+++ gforth/cross.fs	2006/12/31 13:39:11	1.161
@@ -1,7 +1,7 @@
 \ CROSS.FS     The Cross-Compiler                      06oct92py
 \ Idea and implementation: Bernd Paysan (py)
 
-\ Copyright (C) 1995,1996,1997,1998,1999,2000,2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,1999,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -1184,6 +1184,7 @@ true DefaultValue gforthcross
 true DefaultValue interpreter
 true DefaultValue ITC
 false DefaultValue rom
+false DefaultValue flash
 true DefaultValue standardthreading
 
 \ ANSForth environment  stuff
@@ -1751,7 +1752,11 @@ Ghost state drop
   swap -rot bounds ?DO I c@ over X c! X char+ LOOP drop ;
 
 2Variable last-string
+X has? rom [IF] $60 [ELSE] $00 [THEN] Constant header-masks
 
+: ht-header,  ( addr count -- )
+  dup there swap last-string 2!
+    dup header-masks or T c, H bounds  ?DO  I c@ T c, H  LOOP ;
 : ht-string,  ( addr count -- )
   dup there swap last-string 2!
     dup T c, H bounds  ?DO  I c@ T c, H  LOOP ;
@@ -2060,7 +2065,7 @@ $20 constant restrict-mask
 
 >TARGET
 X has? f83headerstring [IF]
-: name,  ( "name" -- )  bl word count ht-string, X cfalign ;
+: name,  ( "name" -- )  bl word count ht-header, X cfalign ;
 [ELSE]
 : name,  ( "name" -- )  bl word count ht-lstring, X cfalign ;
 [THEN]
@@ -2635,7 +2640,8 @@ T has? peephole H [IF]
 
 >TARGET
 Cond: DOES>
-        T here 5 cells H + alit, compile (does>2) compile ;s
+        T here H [ T has? peephole H [IF] ] 5 [ [ELSE] ] 4 [ [THEN] ] T cells
+        H + alit, compile (does>2) compile ;s
         doeshandler, resolve-does>-part
         ;Cond
 
@@ -2881,7 +2887,7 @@ by (Value)
 [ELSE]
 Builder (Value)
 Build:  ( n -- ) ;Build
-by: :docon ( target-body-addr -- n ) T @ H ;DO
+by: :dovalue ( target-body-addr -- n ) T @ H ;DO
 
 Builder Value
 BuildSmart: T , H ;Build
@@ -3239,6 +3245,8 @@ Cond: IS        T ' >body @ H compile AL
 : IS            T >address ' >body @ ! H ;
 Cond: TO        T ' >body @ H compile ALiteral compile ! ;Cond
 : TO            T ' >body @ ! H ;
+Cond: CTO       T ' >body H compile ALiteral compile ! ;Cond
+: CTO           T ' >body ! H ;
 [ELSE]
 Cond: IS        T ' >body H compile ALiteral compile ! ;Cond
 : IS            T >address ' >body ! H ;
@@ -3724,6 +3732,8 @@ previous
 : 2/ 2/ ;
 : hex. base @ $10 base ! swap . base ! ;
 : invert invert ;
+: linkstring ( addr u n addr -- )
+    X here over X @ X , swap X ! X , ht-string, X align ;
 \ : . . ;
 
 : all-words    ['] forced?    IS skip? ;