--- gforth/cross.fs	2001/09/05 11:01:27	1.107
+++ gforth/cross.fs	2001/09/12 14:45:38	1.113
@@ -986,7 +986,6 @@ Exists-Warnings on
 
 Variable reuse-ghosts reuse-ghosts off
 
-1 [IF] \ FIXME: define when vocs are ready
 : HeaderGhost ( "name" -- ghost )
   >in @ 
   bl word count 
@@ -1003,8 +1002,6 @@ Variable reuse-ghosts reuse-ghosts off
   \ defined words, this is a workaround
   \ for the redefined \ until vocs work
   Make-Ghost ;
-[THEN] 
-
  
 : .ghost ( ghost -- ) >ghostname type ;
 
@@ -1145,8 +1142,11 @@ true DefaultValue standardthreading
 s" relocate" T environment? H 
 \ JAW why set NIL to this?!
 [IF]	drop \ SetValue NIL
-[ELSE]	>ENVIRON T NIL H SetValue relocate
+[ELSE]	>ENVIRON X NIL SetValue relocate
 [THEN]
+>TARGET
+
+0 Constant NIL
 
 >CROSS
 
@@ -1227,6 +1227,10 @@ Variable mirrored-link          \ linked
 : >rlen cell+ ;
 : >rstart ;
 
+: (region) ( addr len region -- )
+\G change startaddress and length of an existing region
+  >r r@ last-defined-region !
+  r@ >rlen ! dup r@ >rstart ! r> >rdp ! ;
 
 : region ( addr len -- )                
 \G create a new region
@@ -1240,8 +1244,7 @@ Variable mirrored-link          \ linked
 	region-link linked 0 , 0 , 0 , bl word count string,
   ELSE	\ store new parameters in region
         bl word drop
-	>body >r r@ last-defined-region !
-	r@ >rlen ! dup r@ >rstart ! r> >rdp !
+	>body (region)
   THEN ;
 
 : borders ( region -- startaddr endaddr ) 
@@ -1359,8 +1362,11 @@ T has? rom H
 
 \ MakeKernel                                           		22feb99jaw
 
-: makekernel ( targetsize -- targetsize )
-  dup dictionary >rlen ! setup-target ;
+: makekernel ( targetsize -- )
+\G convenience word to setup the memory of the target
+\G used by main.fs of the c-engine based systems
+  100 swap dictionary (region)
+  setup-target ;
 
 >MINIMAL
 : makekernel makekernel ;
@@ -1640,8 +1646,8 @@ T has? relocate H
 >TARGET
 
 : count dup X c@ swap X char+ swap ;
-\ FIXME -1 on 64 bit machines?!?!
-: on		T -1 swap ! H ; 
+
+: on		-1 -1 rot TD!  ; 
 : off   	T 0 swap ! H ;
 
 : tcmove ( source dest len -- )
@@ -1684,7 +1690,7 @@ previous
 
 : (cm) ( -- addr )
     T here align H
-    -1 colon, ;					' (cm) plugin-of colonmark,
+    -1 prim, ;					' (cm) plugin-of colonmark,
 
 >TARGET
 : compile, ( xt -- )
@@ -1774,7 +1780,7 @@ Defer resolve-warning
 : prim-resolved  ( ghost -- )
     >link @ prim, ;
 
-\ FIXME: not activated
+\ FIXME: not used currently
 : does-resolved ( ghost -- )
     dup g>body alit, >do:ghost @ g>body colon, ;
 
@@ -1814,10 +1820,6 @@ Defer resolve-warning
 
 \ gexecute ghost,                                      01nov92py
 
-\ FIXME cleanup
-\ : is-resolved   ( ghost -- )
-\  >link @ colon, ; \ compile-call
-
 : (gexecute)   ( ghost -- )
   dup >comp @ EXECUTE ;
 
@@ -1828,8 +1830,6 @@ Defer resolve-warning
 : addr,  ( ghost -- )
   dup forward? IF  1 refered 0 T a, H ELSE >link @ T a, H THEN ;
 
-\ !! : ghost,     ghost  gexecute ;
-
 \ .unresolved                                          11may93jaw
 
 variable ResolveFlag
@@ -2111,12 +2111,12 @@ Variable last-prim-ghost
 
 Defer setup-prim-semantics
 
-: aprim   ( -- ) 
+: mapprim   ( "forthname" "asmlabel" -- ) 
   THeader -1 aprim-nr +! aprim-nr @ T A, H
   asmprimname, 
   setup-prim-semantics ;
 
-: aprim:   ( -- ) 
+: mapprim:   ( "forthname" "asmlabel" -- ) 
   -1 aprim-nr +! aprim-nr @
   Ghost tuck swap resolve <do:> swap tuck >magic !
   asmprimname, ;
@@ -2376,22 +2376,23 @@ Cond: MAXI
 \ by the way: defining a second interpreter (a compiler-)loop
 \             is not allowed if a system should be ans conform
 
+: (:) ( ghost -- ) 
+\ common factor of : and :noname. Prepare ;Resolve and start definition
+   ;Resolve ! there ;Resolve cell+ !
+   docol, ]comp  colon-start depth T ] H ;
+
 : : ( -- colon-sys ) \ Name
   defempty?
   constflag off \ don't let this flag work over colon defs
 		\ just to go sure nothing unwanted happens
   >in @ skip? IF  drop skip-defs  EXIT  THEN  >in !
-  (THeader ;Resolve ! there ;Resolve cell+ !
-   docol, ]comp  colon-start depth T ] H ;
+  (THeader (:) ;
 
 : :noname ( -- colon-sys )
-  X cfalign
-  \ FIXME: cleanup!!!!!!!!
-  \ idtentical to : with dummy ghost?!
-  here ghostheader dup ;Resolve ! dup last-header-ghost ! to lastghost
-  there ;Resolve cell+ !
-  there docol, ]comp 
-  colon-start depth T ] H ;
+  X cfalign there 
+  \ define a nameless ghost
+  here ghostheader dup last-header-ghost ! dup to lastghost
+  (:) ;  
 
 Cond: EXIT ( -- )   compile ;S  ;Cond
 
@@ -2456,23 +2457,23 @@ Cond: DOES>
   depth T ] H ;
 
 >CROSS
-\ Creation                                             01nov92py
+\ Creation                                              01nov92py
 
 \ Builder                                               11may93jaw
 
+0 Value built
+
 : Builder    ( Create-xt do-ghost "name" -- )
 \ builds up a builder in current vocabulary
 \ create-xt is executed when word is interpreted
 \ do:-xt is executed when the created word from builder is executed
 \ for do:-xt an additional entry after the normal ghost-entrys is used
 
-  Make-Ghost 		( Create-xt do-ghost ghost )
-  dup >created on
-  rot swap		( do-ghost Create-xt ghost )
-  tuck >exec ! 
-  tuck >do:ghost ! 
-  ['] prim-resolved over >comp !
-  drop ;
+  ghost to built 
+  built >created @ 0= IF
+    built >created on
+    ['] prim-resolved built >comp ! 
+  THEN ;
 
 : gdoes,  ( ghost -- )
 \ makes the codefield for a word that is built
@@ -2492,17 +2493,13 @@ Cond: DOES>
 
 : takeover-x-semantics ( S constructor-ghost new-ghost -- )
 \g stores execution semantic and compilation semantic in the built word
-\g if the word already has a semantic (concerns S", IS, .", DOES>)
-\g then keep it
    swap >do:ghost @ 
-   \ we use the >exec2 field for the semantic of a crated word,
-   \ so predefined semantics e.g. for ....
-   \ FIXME: find an example in the normal kernel!!!
+   \ we use the >exec2 field for the semantic of a created word,
+   \ using exec or exec2 makes no difference for normal cross-compilation
+   \ but is usefull for instant where the exec field is already
+   \ defined (e.g. Vocabularies)
    2dup >exec @ swap >exec2 ! 
    >comp @ swap >comp ! ;
-\ old version of this:
-\  >exec dup @ ['] NoExec = 
-\  IF swap >do:ghost @ >exec @ swap ! ELSE 2drop THEN ;
 
 : TCreate ( <name> -- )
   create-forward-warn
@@ -2537,98 +2534,90 @@ Cond: DOES>
   postpone TCreate 
   [ [THEN] ] ;
 
+: ;Build
+  postpone ; built >exec ! ; immediate
+
 : gdoes>  ( ghost -- addr flag )
-  executed-ghost @
-\ FIXME: cleanup
-\  compiling? ABORT" CROSS: Executing gdoes> while compiling"
-\ ?! compiling? IF  gexecute true EXIT  THEN
-  g>body ( false ) ;
+  executed-ghost @ g>body ;
 
 \ DO: ;DO                                               11may93jaw
-\ changed to ?EXIT                                      10may93jaw
 
-: DO:     ( -- do-ghost [xt] [colon-sys] )
-  here ghostheader
-  :noname postpone gdoes> ( postpone ?EXIT ) ;
+: do:ghost! ( ghost -- ) built >do:ghost ! ;
+: doexec! ( xt -- ) built >do:ghost @ >exec ! ;
 
-: by:     ( -- do-ghost [xt] [colon-sys] ) \ name
-  Ghost
-  :noname postpone gdoes> ( postpone ?EXIT ) ;
+: DO:     ( -- [xt] [colon-sys] )
+  here ghostheader do:ghost!
+  :noname postpone gdoes> ;
 
-: ;DO ( do-ghost [xt] [colon-sys] -- do-ghost )
-  postpone ;    ( S addr xt )
-  over >exec ! ; immediate
+: by:     ( -- [xt] [colon-sys] ) \ name
+  Ghost do:ghost!
+  :noname postpone gdoes> ;
 
-: by      ( -- do-ghost ) \ Name
-  Ghost >do:ghost @ ;
+: ;DO ( [xt] [colon-sys] -- )
+  postpone ; doexec! ; immediate
 
-: compile: ( do-ghost -- do-ghost [xt] [colon-sys] )
+: by      ( -- ) \ Name
+  Ghost >do:ghost @ do:ghost! ;
+
+: compile: ( --[xt] [colon-sys] )
 \G defines a compile time action for created words
 \G by this builder
   :noname ;
 
-: ;compile ( do-ghost [xt] [colon-sys] -- do-ghost )
-  postpone ;  over >comp ! ; immediate
-
-
+: ;compile ( [xt] [colon-sys] -- )
+  postpone ; built >do:ghost @ >comp ! ; immediate
 
->TARGET
 \ Variables and Constants                              05dec92py
 
-Build:  ( n -- ) ;
-by: :docon ( target-body-addr -- n ) T @ H ;DO
 Builder (Constant)
+Build:  ( n -- ) ;Build
+by: :docon ( target-body-addr -- n ) T @ H ;DO
 
-Build:  ( n -- ) T , H ;
-by (Constant)
 Builder Constant
-
-Build:  ( n -- ) T A, H ;
+Build:  ( n -- ) T , H ;Build
 by (Constant)
+
 Builder AConstant
+Build:  ( n -- ) T A, H ;Build
+by (Constant)
 
-Build:  ( d -- ) T , , H ;
-DO: ( ghost -- d ) T dup cell+ @ swap @ H ;DO
 Builder 2Constant
+Build:  ( d -- ) T , , H ;Build
+DO: ( ghost -- d ) T dup cell+ @ swap @ H ;DO
 
-BuildSmart: ;
-by: :dovar ( target-body-addr -- addr ) ;DO
 Builder Create
+BuildSmart: ;Build
+by: :dovar ( target-body-addr -- addr ) ;DO
 
+Builder Variable
 T has? rom H [IF]
-Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , H ( switchrom ) ;
+Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , H ( switchrom ) ;Build
 by (Constant)
-Builder Variable
 [ELSE]
-Build: T 0 , H ;
+Build: T 0 , H ;Build
 by Create
-Builder Variable
 [THEN]
 
+Builder 2Variable
 T has? rom H [IF]
-Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , 0 , H ( switchrom ) ;
+Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 , 0 , H ( switchrom ) ;Build
 by (Constant)
-Builder 2Variable
 [ELSE]
-Build: T 0 , 0 , H ;
+Build: T 0 , 0 , H ;Build
 by Create
-Builder 2Variable
 [THEN]
 
+Builder AVariable
 T has? rom H [IF]
-Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 A, H ( switchrom ) ;
+Build: ( -- ) T here 0 A, H switchram T align here swap ! 0 A, H ( switchrom ) ;Build
 by (Constant)
-Builder AVariable
 [ELSE]
-Build: T 0 A, H ;
+Build: T 0 A, H ;Build
 by Create
-Builder AVariable
 [THEN]
 
 \ User variables                                       04may94py
 
->CROSS
-
 Variable tup  0 tup !
 Variable tudp 0 tudp !
 
@@ -2640,75 +2629,118 @@ Variable tudp 0 tudp !
   tup @ tudp @ + T A! H
   tudp @ dup T cell+ H tudp ! ;
 
->TARGET
-
-Build: 0 u, X , ;
-by: :douser ( ghost -- up-addr )  X @ tup @ + ;DO
 Builder User
+Build: 0 u, X , ;Build
+by: :douser ( ghost -- up-addr )  X @ tup @ + ;DO
 
-Build: 0 u, X , 0 u, drop ;
-by User
 Builder 2User
-
-Build: 0 au, X , ;
+Build: 0 u, X , 0 u, drop ;Build
 by User
+
 Builder AUser
+Build: 0 au, X , ;Build
+by User
+
+Builder (Value)
+Build:  ( n -- ) ;Build
+by: :docon ( target-body-addr -- n ) T @ H ;DO
 
-BuildSmart: T , H ;
-by (Constant)
 Builder Value
+BuildSmart: T , H ;Build
+by (Value)
 
-BuildSmart: T A, H ;
-by (Constant)
 Builder AValue
+BuildSmart: T A, H ;Build
+by (Value)
 
 Defer texecute
 
-BuildSmart:  ( -- ) [T'] noop T A, H ;
-by: :dodefer ( ghost -- ) X @ texecute ;DO
 Builder Defer
+BuildSmart:  ( -- ) [T'] noop T A, H ;Build
+by: :dodefer ( ghost -- ) X @ texecute ;DO
 
-Build: ( inter comp -- ) swap T immediate A, A, H ;
-DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO
 Builder interpret/compile:
+Build: ( inter comp -- ) swap T immediate A, A, H ;Build
+DO: ( ghost -- ) ABORT" CROSS: Don't execute" ;DO
 
 \ Sturctures                                           23feb95py
 
->CROSS
 : nalign ( addr1 n -- addr2 )
 \ addr2 is the aligned version of addr1 wrt the alignment size n
  1- tuck +  swap invert and ;
->TARGET
 
-Build: ;
-by: :dofield T @ H + ;DO
+
 Builder (Field)
+Build: ;Build
+by: :dofield T @ H + ;DO
 
+Builder Field
 Build: ( align1 offset1 align size "name" --  align2 offset2 )
     rot dup T , H ( align1 align size offset1 )
-    + >r nalign r> ;
+    + >r nalign r> ;Build
 by (Field)
-Builder Field
 
+>TARGET
 : struct  T 1 chars 0 H ;
 : end-struct  T 2Constant H ;
 
 : cell% ( n -- size align )
     T 1 cells H dup ;
+>CROSS
 
 \ Input-Methods                                            01py
 
-Build: ( m v -- m' v )  dup T , cell+ H ;
-DO:  abort" Not in cross mode" ;DO
 Builder input-method
-
-Build: ( m v size -- m v' )  over T , H + ;
+Build: ( m v -- m' v )  dup T , cell+ H ;Build
 DO:  abort" Not in cross mode" ;DO
+
 Builder input-var
+Build: ( m v size -- m v' )  over T , H + ;Build
+DO:  abort" Not in cross mode" ;DO
 
+\ Peephole optimization					05sep01jaw
 
+\ this section defines different compilation
+\ actions for created words
+\ this will help the peephole optimizer
+\ I (jaw) took this from bernds lates cross-compiler
+\ changes but seperated it from the original
+\ Builder words. The final plan is to put this
+\ into a seperate file, together with the peephole
+\ optimizer for cross
 
 
+T has? peephole H [IF]
+
+>CROSS
+: (callc) compile call T >body a, H ;		' (callc) plugin-of colon,
+
+\ if we want this, we have to spilt aconstant
+\ and constant!!
+\ Builder (Constant)
+\ compile: g>body X @ lit, ;compile
+
+Builder (Constant)
+compile: g>body alit, compile @ ;compile
+
+Builder (Value)
+compile: g>body alit, compile @ ;compile
+
+\ this changes also Variable, AVariable and 2Variable
+Builder Create
+\ compile: g>body alit, ;compile
+
+Builder User
+compile: g>body compile useraddr T @ , H ;compile
+
+Builder Defer
+compile: g>body alit, compile @ compile execute ;compile
+
+Builder (Field)
+compile: g>body T @ H lit, compile + ;compile
+
+[THEN]
+
 \ structural conditionals                              17dec92py
 
 >CROSS
@@ -2981,7 +3013,7 @@ magic 7 + c!
 : save-cross ( "image-name" "binary-name" -- )
   bl parse ." Saving to " 2dup type cr
   w/o bin create-file throw >r
-  TNIL IF
+  s" header" X $has? IF
       s" #! "           r@ write-file throw
       bl parse          r@ write-file throw
       s"  --image-file" r@ write-file throw
@@ -2997,7 +3029,7 @@ magic 7 + c!
   THEN
   image @ there 
   r@ write-file throw \ write image
-  TNIL IF
+  s" relocate" X $has? IF
       bit$  @ there 1- tcell>bit rshift 1+
                 r@ write-file throw \ write tags
   THEN
@@ -3008,7 +3040,7 @@ magic 7 + c!
   swap >image swap r@ write-file throw
   r> close-file throw ;
 
-1 [IF]
+\ save-asm-region                         		29aug01jaw
 
 Variable name-ptr
 Create name-buf 200 chars allot
@@ -3062,6 +3094,7 @@ Create name-buf 200 chars allot
   THEN
   @nb ;
 
+\ FIXME why disabled?!
 : label-from-ghostnameXX ( ghost -- addr len )
 \ same as (label-from-ghostname) but caches generated names
   dup >asm-name @ ?dup IF nip count EXIT THEN
@@ -3215,8 +3248,6 @@ Variable outfile-fd
 : save-asm-region ( region adr len -- )
   create-outfile (save-asm-region) close-outfile ;
 
-[THEN]
-
 \ \ minimal definitions
 	   
 >MINIMAL also minimal
@@ -3228,8 +3259,8 @@ Variable outfile-fd
 \ \ [IF] [ELSE] [THEN] ...				14sep97jaw
 
 \ it is useful to define our own structures and not to rely
-\ on the words in the compiler
-\ The words in the compiler might be defined with vocabularies
+\ on the words in the host system
+\ The words in the host system might be defined with vocabularies
 \ this doesn't work with our self-made compile-loop
 
 Create parsed 20 chars allot	\ store word we parsed
@@ -3485,6 +3516,3 @@ UNLOCK >CROSS
 [IFDEF] extend-cross extend-cross [THEN]
 
 LOCK
-
-
-