--- gforth/cross.fs	1995/07/06 15:57:25	1.25
+++ gforth/cross.fs	1995/11/30 18:01:47	1.32
@@ -1,7 +1,23 @@
 \ CROSS.FS     The Cross-Compiler                      06oct92py
-\ $Id: cross.fs,v 1.25 1995/07/06 15:57:25 pazsan Exp $
 \ Idea and implementation: Bernd Paysan (py)
-\ Copyright 1992-94 by the GNU Forth Development Group
+
+\ Copyright (C) 1995 Free Software Foundation, Inc.
+
+\ This file is part of Gforth.
+
+\ Gforth is free software; you can redistribute it and/or
+\ modify it under the terms of the GNU General Public License
+\ as published by the Free Software Foundation; either version 2
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ GNU General Public License for more details.
+
+\ You should have received a copy of the GNU General Public License
+\ along with this program; if not, write to the Free Software
+\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 \ Log:
 \       changed in ; [ to state off           12may93jaw
@@ -120,7 +136,7 @@ H
 -4 Constant :dovar
 -5 Constant :douser
 -6 Constant :dodefer
--7 Constant :dostruc
+-7 Constant :dofield
 -8 Constant :dodoes
 -9 Constant :doesjump
 
@@ -357,7 +373,7 @@ VARIABLE ^imm
 \ Target Header Creation                               01nov92py
 
 : string,  ( addr count -- )
-  dup T c, H bounds  DO  I c@ T c, H  LOOP ; 
+  dup T c, H bounds  ?DO  I c@ T c, H  LOOP ; 
 : name,  ( "name" -- )  bl word count string, T cfalign H ;
 : view,   ( -- ) ( dummy ) ;
 
@@ -387,6 +403,43 @@ Variable to-doc
 	>in !
     THEN  to-doc on ;
 
+\ Target TAGS creation
+
+s" TAGS" r/w create-file throw value tag-file-id
+\ contains the file-id of the tags file
+
+Create tag-beg 2 c,  7F c, bl c,
+Create tag-end 2 c,  bl c, 01 c,
+Create tag-bof 1 c,  0C c,
+
+2variable last-loadfilename 0 0 last-loadfilename 2!
+	    
+: put-load-file-name ( -- )
+    loadfilename 2@ last-loadfilename 2@ d<>
+    IF
+	tag-bof count tag-file-id write-line throw
+	sourcefilename 2dup
+	tag-file-id write-file throw
+	last-loadfilename 2!
+	s" ,0" tag-file-id write-line throw
+    THEN ;
+
+: cross-tag-entry  ( -- )
+    tlast @ 0<>	\ not an anonymous (i.e. noname) header
+    IF
+	put-load-file-name
+	source >in @ min tag-file-id write-file throw
+	tag-beg count tag-file-id write-file throw
+	tlast @ >image count $1F and tag-file-id write-file throw
+	tag-end count tag-file-id write-file throw
+	base @ decimal sourceline# 0 <# #s #> tag-file-id write-file throw
+\	>in @ 0 <# #s [char] , hold #> tag-file-id write-line throw
+	s" ,0" tag-file-id write-line throw
+	base !
+    THEN ;
+
+\ Target header creation
+
 VARIABLE CreateFlag CreateFlag off
 
 : (Theader ( "name" -- ghost ) T align H view,
@@ -402,7 +455,7 @@ VARIABLE CreateFlag CreateFlag off
   Already @ IF  dup >end tdoes !
   ELSE 0 tdoes ! THEN
   80 flag!
-  cross-doc-entry ;
+  cross-doc-entry cross-tag-entry ;
 
 VARIABLE ;Resolve 1 cells allot
 
@@ -446,7 +499,7 @@ ghost (loop)    ghost (+loop)
 ghost (next)                                    drop
 ghost unloop    ghost ;S                        2drop
 ghost lit       ghost (compile) ghost !         2drop drop
-ghost (;code)   ghost noop                      2drop
+ghost (does>)   ghost noop                      2drop
 ghost (.")      ghost (S")      ghost (ABORT")  2drop drop
 ghost '
 
@@ -534,7 +587,7 @@ Cond: [  restrict? state off ;Cond
 
 >TARGET
 Cond: DOES> restrict?
-        compile (;code) dodoes, tdoes @ ?dup IF  @ T here H resolve THEN
+        compile (does>) dodoes, tdoes @ ?dup IF  @ T here H resolve THEN
         ;Cond
 : DOES> dodoes, T here H !does depth T ] H ;
 
@@ -641,6 +694,10 @@ Build: T 0 , H ;
 by Constant
 Builder Value
 
+Build: T 0 A, H ;
+by Constant
+Builder AValue
+
 Build:  ( -- ) compile noop ;
 DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO
 Builder Defer
@@ -658,7 +715,7 @@ Build: 	>r rot r@ nalign  dup T , H  ( a
 	+ swap r> nalign ;
 DO: T @ H + ;DO
 Builder Field
-by Field :dostruc resolve
+by Field :dofield resolve
 
 : struct  T 0 1 chars H ;
 : end-struct  T 2Constant H ;
@@ -820,10 +877,14 @@ Cond: [ELSE]    [ELSE] ;Cond
 
 bigendian Constant bigendian
 
+Create magic  s" gforth00" here over allot swap move
+
+[char] 1 bigendian + cell + magic 7 + c!
+
 : save-cross ( "name" -- )
   bl parse ." Saving to " 2dup type
   w/o bin create-file throw >r
-  s" gforth00"  r@ write-file throw \ write magic
+  magic 8       r@ write-file throw \ write magic
   image @ there r@ write-file throw \ write image
   bit$  @ there 1- cell>bit rshift 1+
                 r@ write-file throw \ write tags