--- gforth/kernel/vars.fs	2002/02/04 21:25:18	1.29
+++ gforth/kernel/vars.fs	2006/05/26 21:18:45	1.43
@@ -1,6 +1,6 @@
 \ VARS.FS      Kernal variables
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -46,17 +46,22 @@ has? floating [IF]
 \G @i{c-char} is the character value for a space.
 \ used by docon:, must be constant
 
-FF Constant /line
+has? EC [IF] 40 [ELSE] FF [THEN] Constant /line
 
+has? file [IF]
 40 Constant c/l
 10 Constant l/s
 400 Constant chars/block
+[THEN]
 
 20 8 2* cells + 2 + cell+ constant word-pno-size ( -- u )
+
+has? EC 0= [IF]
 create holdbuf word-pno-size chars allot
 holdbuf word-pno-size chars + aconstant holdbuf-end
 avariable holdptr holdbuf-end holdptr a!
 avariable holdend holdbuf-end holdend a!
+[THEN]
 
 84 constant pad-minsize ( -- u )
 
@@ -69,11 +74,12 @@ $400 Value def#tib
 
 \ initialized by COLD
 
-Create main-task  has? OS [IF] 100 [ELSE] 40 [THEN] cells allot
+has? no-userspace 0= [IF]
+Create main-task  has? OS [IF] 100 [ELSE] 40 [THEN] cells dup allot
 
 \ set user-pointer from cross-compiler right
 main-task 
-UNLOCK tup ! LOCK
+UNLOCK swap region user-region user-region setup-region LOCK
 
 Variable udp ( -- a-addr ) \ gforth
 \G user area size
@@ -81,15 +87,16 @@ Variable udp ( -- a-addr ) \ gforth
 AUser next-task        main-task next-task !
 AUser prev-task        main-task prev-task !
 AUser save-task        0 save-task !
+[THEN]
 AUser sp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the data stack pointer.
 \ sp0 is used by douser:, must be user
-    ' sp0 Alias s0 ( -- a-addr ) \ gforth
+\    ' sp0 Alias s0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{sp0}
 
 AUser rp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the return stack pointer.
-    ' rp0 Alias r0 ( -- a-addr ) \ gforth
+\    ' rp0 Alias r0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{rp0}
 
 has? floating [IF]
@@ -101,13 +108,12 @@ AUser fp0 ( -- a-addr ) \ gforth
 has? glocals [IF]
 AUser lp0 ( -- a-addr ) \ gforth
 \G @code{User} variable -- initial value of the locals stack pointer.
-    ' lp0 Alias l0 ( -- a-addr ) \ gforth
+\    ' lp0 Alias l0 ( -- a-addr ) \ gforth
 \G OBSOLETE alias of @code{lp0}
 [THEN]
 
 AUser handler	\ pointer to last throw frame
 has? backtrace [IF]
-User backtrace-empty \ true if the next THROW should store a backtrace
 AUser backtrace-rp0 \ rp at last call of interpret
 [THEN]
 \ AUser output
@@ -145,8 +151,8 @@ has? file [IF]
 
  User loadfile          0 loadfile !
 
- User loadfilename#	0 loadfilename# !
-
+ 2user loadfilename	0 0 loadfilename 2! \ addr u for sourcefilename
+     
  User loadline          \ number of the currently interpreted
                         \ (in TIB) line if the interpretation
                         \ is in a textfile
@@ -157,6 +163,9 @@ has? file [IF]
 [THEN]
 [THEN]
 
+ 2user includefilename  0 0 includefilename 2! \ innermost included file
+
+
 User base ( -- a-addr ) \ core
 \G @code{User} variable -- @i{a-addr} is the address of a cell that stores the
 \G number base used by default for number conversion during input and output.
@@ -165,7 +174,7 @@ User dpl ( -- a-addr ) \ gforth
 \G @code{User} variable -- @i{a-addr} is the address of a cell that stores the 		
 \G position of the decimal point in the most recent numeric conversion.
 \G Initialised to -1. After the conversion of a number containing no
-\G decimal point, @code{@ dpl} is -1. After the conversion of @code{2.} it holds
+\G decimal point, @code{dpl} is -1. After the conversion of @code{2.} it holds
 \G 0. After the conversion of 234123.9 it contains 1, and so forth.
 -1 dpl !
 
@@ -192,15 +201,19 @@ AUser dpp		normal-dp dpp !
 AUser LastCFA
 AUser Last
 
-AUser last-compiled \ last compile,d xt
-                    \ 0 if last xt was dyn-compiled already (basic-block-end)
-0 last-compiled !
-AUser last-compiled-here \ where LAST-COMPILED should be stored
-
-has? peephole  [IF]
-0 value peeptable \ initialized in boot
+has? flash [IF]
+    AUser flash-dp
+    : rom  flash-dp dpp ! ;
+    : ram  normal-dp dpp ! ;
 [THEN]
 
+User max-name-length \ maximum length of all names defined yet
+32 max-name-length !
+    
+\  has? peephole  [IF]
+\  0 value peeptable \ initialized in boot
+\  [THEN]
+
 has? glocals [IF]
 User locals-size \ this is the current size of the locals stack
 		 \ frame of the current word