--- gforth/cross.fs	1999/02/19 18:25:28	1.67
+++ gforth/cross.fs	1999/02/22 19:05:45	1.72
@@ -1,7 +1,7 @@
 \ CROSS.FS     The Cross-Compiler                      06oct92py
 \ Idea and implementation: Bernd Paysan (py)
 
-\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -52,9 +52,14 @@ Warnings off
 \G Same behaviour as "Value" if the <name> is not defined
 \G Same behaviour as "to" if <name> is defined
 \G SetValue searches in the current vocabulary
- save-input bl word >r restore-input throw r> count
- get-current search-wordlist
- IF ['] to execute ELSE Value THEN ;
+  save-input bl word >r restore-input throw r> count
+  get-current search-wordlist
+  IF	drop >r
+	\ we have to set current to be topmost context wordlist
+	get-order get-order get-current swap 1+ set-order
+	r> ['] to execute
+	set-order order
+  ELSE Value THEN ;
 
 : DefaultValue ( n -- <name> )
 \G Same behaviour as "Value" if the <name> is not defined
@@ -321,19 +326,43 @@ s" relocate" T environment? H
 
 \ \ Create additional parameters                         19jan95py
 
-1 8 lshift Constant maxbyte 
+\ currently cross only works for host machines with address-unit-bits
+\ eual to 8 because of s! and sc!
+\ but I start to query the environment just to modularize a little bit
+
+: check-address-unit-bits ( -- )	
+\	s" ADDRESS-UNIT-BITS" environment?
+\	IF 8 <> ELSE true THEN
+\	ABORT" ADDRESS-UNIT-BITS unknown or not equal to 8!"
+
+\	shit, this doesn't work because environment? is only defined for 
+\	gforth.fi and not kernl???.fi
+	;
+
+check-address-unit-bits
+8 Constant bits/byte	\ we define: byte is address-unit
+
+1 bits/byte lshift Constant maxbyte 
 \ this sets byte size for the target machine, an (probably right guess) jaw
 
 T
-NIL		   Constant TNIL
-cell               Constant tcell
-cell<<             Constant tcell<<
-cell>bit           Constant tcell>bit
-bits/byte          Constant tbits/byte
-bits/byte 8 /      Constant tchar
-float              Constant tfloat
-1 bits/byte lshift Constant tmaxbyte
+NIL		   	Constant TNIL
+cell               	Constant tcell
+cell<<             	Constant tcell<<
+cell>bit           	Constant tcell>bit
+bits/char          	Constant tbits/char
+bits/char H bits/byte T /      
+			Constant tchar
+float             	Constant tfloat
+1 bits/char lshift 	Constant tmaxchar
+[IFUNDEF] bits/byte
+8			Constant tbits/byte
+[ELSE]
+bits/byte		Constant tbits/byte
+[THEN]
 H
+tbits/byte bits/byte /	Constant tbyte
+
 
 \ Variables                                            06oct92py
 
@@ -348,30 +377,6 @@ Variable bit$
 Variable headers-named 0 headers-named !
 Variable user-vars 0 user-vars !
 
-\ Memory initialisation                                05dec92py
-
-[IFDEF] Memory \ Memory is a bigFORTH feature
-   also Memory
-   : initmem ( var len -- )
-     2dup swap handle! >r @ r> erase ;
-   toss
-[ELSE]
-   : initmem ( var len -- )
-     tuck allocate abort" CROSS: No memory for target"
-     ( len var adr ) dup rot !
-     ( len adr ) swap erase ;
-[THEN]
-
-\ MakeKernal                                           12dec92py
-
-: makekernel ( targetsize -- targetsize )
-  bit$  over 1- tcell>bit rshift 1+ initmem
-  image over initmem ;
-
->MINIMAL
-: makekernel makekernel ;
->CROSS
-
 : target>bitmask-size ( u1 -- u2 )
   1- tcell>bit rshift 1+ ;
 
@@ -379,8 +384,6 @@ Variable user-vars 0 user-vars !
   dup allocate ABORT" CROSS: No memory for target"
   swap over swap erase ;
 
-
-
 \ \ memregion.fs
 
 
@@ -425,7 +428,7 @@ Variable mirrored-link          \ linked
 
 : mirrored                              \G mark a region as mirrored
   mirrored-link
-  linked last-defined-region @ , ;
+  align linked last-defined-region @ , ;
 
 : .addr ( u -- )
 \G prints a 16 or 32 Bit nice hex value
@@ -486,10 +489,10 @@ T has? rom H
 : setup-target ( -- )   \G initialize targets memory space
   s" rom" T $has? H
   IF  \ check for ram and rom...
-      address-space area nip 0<>
+      \ address-space area nip 0<>
       ram-dictionary area nip 0<>
       rom-dictionary area nip 0<>
-      and and 0=
+      and 0=
       ABORT" CROSS: define address-space, rom- , ram-dictionary, with rom-support!"
   THEN
   address-space area nip
@@ -514,12 +517,20 @@ T has? rom H
                 r@ >rmem !
 
                 target>bitmask-size allocatetarget
-                dup
-                bit$ !
+                dup bit$ !
                 r> >rbm !
 
         ELSE    r> drop THEN
-   REPEAT ;
+   REPEAT drop ;
+
+\ MakeKernal                                           		22feb99jaw
+
+: makekernel ( targetsize -- targetsize )
+  dup dictionary >rlen ! setup-target ;
+
+>MINIMAL
+: makekernel makekernel ;
+>CROSS
 
 \ \ switched tdp for rom support				03jun97jaw
 
@@ -598,8 +609,8 @@ variable constflag constflag off
 
 : cell+         tcell + ;
 : cells         tcell<< lshift ;
-: chars         ;
-: char+		1 + ;
+: chars         tchar * ;
+: char+		tchar + ;
 : floats	tfloat * ;
     
 >CROSS
@@ -684,7 +695,7 @@ T has? relocate H
 [ELSE]
 ' drop IS relon
 ' drop IS reloff
-' (correcter) IS >image
+' (>regionimage) IS >image
 [THEN]
 
 \ Target memory access                                 06oct92py
@@ -721,7 +732,7 @@ T has? relocate H
 : cfalign ( -- )
     T here H cfalign+ 0 ?DO  bl T c, tchar H +LOOP ;
 
-: >address		dup 0>= IF tchar / THEN ; \ ?? jaw 
+: >address		dup 0>= IF tbyte / THEN ; \ ?? jaw 
 : A!                    swap >address swap dup relon T ! H ;
 : A,    ( w -- )        >address T here H relon T , H ;