--- gforth/stuff.fs 2004/12/31 13:23:58 1.41 +++ gforth/stuff.fs 2009/09/05 17:38:37 1.60 @@ -1,12 +1,12 @@ \ miscelleneous words -\ Copyright (C) 1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc. +\ Copyright (C) 1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 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 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. require glocals.fs @@ -123,8 +122,9 @@ AUser CSP 2dup r@ read-file throw over <> abort" could not read whole file" r> close-file throw ; -: slurp-fid { fid -- addr u } \ gforth - \G @var{addr u} is the content of the file @var{fid} +: slurp-fid ( fid -- addr u ) \ gforth +\G @var{addr u} is the content of the file @var{fid} + { fid } 0 0 begin ( awhole uwhole ) dup 1024 + dup >r extend-mem ( anew awhole uwhole R: unew ) rot r@ fid read-file throw ( awhole uwhole uread R: unew ) @@ -139,35 +139,50 @@ AUser CSP : compile-literal ( n -- ) postpone literal ; +: compile-compile-literal ( n -- ) + compile-literal postpone compile-literal ; + +: compile-2literal ( n1 n2 -- ) + postpone 2literal ; + +: compile-compile-2literal ( n1 n2 -- ) + compile-2literal postpone compile-2literal ; + : [[ ( -- ) \G switch from postpone state to compile state \ this is only a marker; it is never really interpreted compile-only-error ; immediate -: postponer ( c-addr u -- ) - 2dup find-name dup if ( c-addr u nt ) +[ifdef] compiler1 +: postponer1 ( c-addr u -- ... xt ) + 2dup + [ifdef] find-name-run-prelude find-name-run-prelude [else] find-name [then] + dup if ( c-addr u nt ) nip nip name>comp 2dup [comp'] [[ d= if - 2drop ['] compiler is parser + 2drop ['] compiler1 is parser1 ['] noop else - postpone, + ['] postpone, endif else drop - 2dup snumber? dup if + 2dup 2>r snumber? dup if 0> IF - swap postpone literal postpone compile-literal + ['] compile-compile-2literal + ELSE + ['] compile-compile-literal THEN - postpone Literal postpone compile-literal - 2drop + 2rdrop ELSE - drop no.extensions + drop 2r> no.extensions THEN then ; : ]] ( -- ) \ switch into postpone state - ['] postponer is parser state on ; immediate restrict + ['] postponer1 is parser1 state on ; immediate restrict + +[then] \ f.rdp @@ -186,6 +201,11 @@ AUser CSP ur nd - 1- dup { beforep } fsign + nexp 0 max >= and if \ fixed-point notation c-addr ur beforep nexp - dup { befored } '0 push-right + befored 1+ ur >= if \ <=1 digit left, will be pushed out by '.' + rf fabs f2* 0.1e nd s>d d>f f** f> if \ round last digit + '1 c-addr befored + 1- c! + endif + endif c-addr beforep 1- befored min dup { beforez } 0 max bl fill fsign if '- c-addr beforez 1- 0 max + c! @@ -282,8 +302,9 @@ AUser CSP [then] : f.s ( -- ) \ gforth f-dot-s - \G Display the number of items on the floating-point stack, - \G followed by a list of the items; TOS is the right-most item. +\G Display the number of items on the floating-point stack, followed +\G by a list of the items (but not more than specified by +\G @code{maxdepth-.s}; TOS is the right-most item. ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 ?DO dup i - 1- floats fp@ + f@ 16 5 11 f.rdp space LOOP drop ; @@ -314,3 +335,61 @@ interpret/compile: what's ( interpretati emit loop ; +\ w and l stuff + +environment-wordlist >order + +16 address-unit-bits / 1 max constant /w ( -- u ) \ gforth slash-w +\G address units for a 16-bit value + +32 address-unit-bits / 1 max constant /l ( -- u ) \ gforth slash-l +\G address units for a 32-bit value + +previous + +[ifdef] uw@ +\ Open firmware names +' uw@ alias w@ ( addr -- u ) +' ul@ alias l@ ( addr -- u ) +\ ' sw@ alias