--- gforth/kernel/vars.fs	2006/01/31 15:25:44	1.37
+++ gforth/kernel/vars.fs	2007/02/23 22:33:22	1.45
@@ -1,6 +1,6 @@
 \ VARS.FS      Kernal variables
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006 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,6 +74,7 @@ $400 Value def#tib
 
 \ initialized by COLD
 
+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
@@ -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
@@ -161,8 +167,10 @@ has? file [IF]
 
 
 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.
+\G @code{User} variable -- @i{a-addr} is the address of a cell that
+\G stores the number base used by default for number conversion during
+\G input and output.  Don't store to @code{base}, use
+\G @code{base-execute} instead.
                        A base !
 User dpl ( -- a-addr ) \ gforth
 \G @code{User} variable -- @i{a-addr} is the address of a cell that stores the 		
@@ -195,6 +203,12 @@ AUser dpp		normal-dp dpp !
 AUser LastCFA
 AUser Last
 
+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 !