--- gforth/see.fs 2003/01/01 17:28:29 1.46 +++ gforth/see.fs 2010/04/18 06:18:36 1.67 @@ -1,12 +1,12 @@ \ SEE.FS highend SEE for ANSforth 16may93jaw -\ Copyright (C) 1995,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003,2004,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/. \ May be cross-compiled @@ -28,19 +27,6 @@ require look.fs require termsize.fs require wordinfo.fs -[IFUNDEF] .name -: id. ( nt -- ) \ gforth - \G Print the name of the word represented by @var{nt}. - \ this name comes from fig-Forth - name>string type space ; - -' id. alias .id ( nt -- ) -\G F83 name for @code{id.}. - -' id. alias .name ( nt -- ) -\G Gforth <=0.5.0 name for @code{id.}. - -[THEN] decimal @@ -84,13 +70,9 @@ DEFER nlcount ' noop IS nlcount nlflag @ IF (nl) nlflag off THEN XPos @ over + cols u>= IF (nl) THEN ; -: c-to-upper ( c1 -- c2 ) \ gforth - \ nac05feb1999 there is a primitive, toupper, with this function - dup [char] a >= over [char] z <= and if bl - then ; - : ctype ( adr len -- ) warp? dup XPos +! C-Output @ - IF uppercase @ IF bounds ?DO i c@ c-to-upper emit LOOP + IF uppercase @ IF bounds ?DO i c@ toupper emit LOOP uppercase off ELSE type THEN ELSE 2drop THEN ; @@ -137,9 +119,10 @@ VARIABLE Colors Colors on else base @ >r try 8 base ! 0 <<# # # # '\ hold #> ctype #>> 0 - recover + restore + r@ base ! endtry - r> base ! throw + rdrop throw endif endif 1 /string @@ -275,21 +258,25 @@ VARIABLE C-Pass : back? ( addr target -- addr flag ) over u< ; -: .word ( addr xt -- addr ) - look 0= IF - drop dup 1 cells - @ dup body> look - IF - nip dup ." <" name>string rot wordinfo .string ." >" - ELSE - drop ." <" 0 .r ." >" - THEN - ELSE - dup cell+ @ immediate-mask and - IF - bl cemit ." POSTPONE " - THEN - dup name>string rot wordinfo .string - THEN ; +: .word ( addr x -- addr ) + \ print x as a word if possible + dup look 0= IF + drop dup threaded>name dup 0= if + drop over 1 cells - @ dup body> look + IF + nip nip dup ." <" name>string rot wordinfo .string ." > " + ELSE + 2drop ." <" 0 .r ." > " + THEN + EXIT + then + THEN + nip dup cell+ @ immediate-mask and + IF + bl cemit ." POSTPONE " + THEN + dup name>string rot wordinfo .string + ; : c-call ( addr1 -- addr2 ) Display? IF @@ -327,8 +314,9 @@ VARIABLE C-Pass cell+ ; : .name-without ( addr -- addr ) -\ prints a name without a() e.g. a(+LOOP) or (s") - dup 1 cells - @ look IF + \ !! the stack effect cannot be correct + \ prints a name without a() e.g. a(+LOOP) or (s") + dup 1 cells - @ threaded>name dup IF name>string over c@ 'a = IF 1 /string THEN @@ -354,8 +342,9 @@ VARIABLE C-Pass \ if f is false, addr2=addr1 \ recognizes the following patterns: \ c": ahead X: len string then lit X - \ s\": ahead X: string then lit X lit len - \ .\": ahead X: string then lit X lit len type + \ flit: ahead X: float then lit X f@ + \ s\": ahead X: string then lit X lit len + \ .\": ahead X: string then lit X lit len type \ !! not recognized anywhere: \ abort": if ahead X: len string then lit X c(abort") then dup @ back? if false exit endif @@ -363,8 +352,8 @@ VARIABLE C-Pass r@ @ decompile-prim ['] lit xt>threaded <> if rdrop false exit endif r@ cell+ @ over cell+ <> if rdrop false exit endif \ we have at least C" - r@ 2 cells + @ decompile-prim ['] lit xt>threaded = if - r@ 3 cells + @ over cell+ + aligned r@ = if + r@ 2 cells + @ decompile-prim dup ['] lit xt>threaded = if + drop r@ 3 cells + @ over cell+ + aligned r@ = if \ we have at least s" r@ 4 cells + @ decompile-prim ['] lit-perform xt>threaded = r@ 5 cells + @ ['] type >body = and if @@ -381,6 +370,12 @@ VARIABLE C-Pass nip cells r> + true exit endif endif + ['] f@ xt>threaded = if + display? if + r@ cell+ @ f@ 10 8 16 f>str-rdp 0 .string bl cemit + endif + drop r> 3 cells + true exit + endif \ !! check if count matches space? display? if s\" c\" " 0 .string r@ cell+ @ count 0 .string '" cemit bl cemit @@ -455,13 +450,13 @@ VARIABLE C-Pass THEN THEN Debug? - IF dup @ + + IF @ \ !!! cross-interacts with debugger !!! ELSE cell+ THEN ; : DebugBranch Debug? - IF dup @ over + swap THEN ; \ return 2 different addresses + IF dup @ swap THEN ; \ return 2 different addresses : c-?branch Scan? @@ -495,7 +490,7 @@ VARIABLE C-Pass Display? IF nl S" FOR" .struc level+ THEN ; : c-loop - Display? IF level- nl .name-without bl cemit nl THEN + Display? IF level- nl .name-without nl bl cemit THEN DebugBranch cell+ Scan? IF dup BranchAddr? @@ -514,13 +509,16 @@ VARIABLE C-Pass THEN DebugBranch cell+ ; -: c-exit dup 1 cells - - CheckEnd - IF Display? IF nlflag off S" ;" Com# .string THEN - C-Stop on - ELSE Display? IF S" EXIT " .struc THEN - THEN - Debug? IF drop THEN ; +: c-exit ( addr1 -- addr2 ) + dup 1 cells - + CheckEnd + IF + Display? IF nlflag off S" ;" Com# .string THEN + C-Stop on + ELSE + Display? IF S" EXIT " .struc THEN + THEN + Debug? IF drop THEN ; \ !!! cross-interacts with debugger !!! : c-abort" count 2dup + aligned -rot @@ -531,10 +529,10 @@ VARIABLE C-Pass ELSE 2drop THEN ; -[IFDEF] (does>) +[IFDEF] !does : c-does> \ end of create part - Display? IF S" DOES> " Com# .string THEN - maxaligned /does-handler + ; + Display? IF S" DOES> " Com# .string THEN ; +\ maxaligned /does-handler + ; \ !! no longer needed for non-cross stuff [THEN] [IFDEF] (compile) @@ -578,7 +576,7 @@ CREATE C-Table [IFDEF] (abort") ' (abort") A, ' c-abort" A, [THEN] \ only defined if compiler is loaded [IFDEF] (compile) ' (compile) A, ' c-(compile) A, [THEN] -[IFDEF] (does>) ' (does>) A, ' c-does> A, [THEN] +[IFDEF] !does ' !does A, ' c-does> A, [THEN] 0 , here 0 , avariable c-extender @@ -671,13 +669,15 @@ Defer discode ( addr u -- ) \ gforth cell +loop here ; +[ifundef] umin \ !! bootstrapping help : umin ( u1 u2 -- u ) 2dup u> if swap then drop ; - +[then] + : next-prim ( addr1 -- addr2 ) \ gforth \G find the next primitive after addr1 (unreliable) 1+ >r -1 primstart @@ -722,7 +722,7 @@ Defer discode ( addr u -- ) \ gforth >name ?dup-if ." IS " .name cr else - ." lastxt >body !" + ." latestxt >body !" then ; : see-threaded ( addr -- ) C-Pass @ DebugMode = IF @@ -757,24 +757,27 @@ Defer discode ( addr u -- ) \ gforth dup >code-address CASE docon: of seecon endof +[IFDEF] dovalue: + dovalue: of seevalue endof +[THEN] docol: of seecol endof dovar: of seevar endof -[ [IFDEF] douser: ] +[IFDEF] douser: douser: of seeuser endof -[ [THEN] ] -[ [IFDEF] dodefer: ] +[THEN] +[IFDEF] dodefer: dodefer: of seedefer endof -[ [THEN] ] -[ [IFDEF] dofield: ] +[THEN] +[IFDEF] dofield: dofield: of seefield endof -[ [THEN] ] +[THEN] over of seecode endof \ direct threaded code words over >body of seecode endof \ indirect threaded code words 2drop abort" unknown word type" ENDCASE ; : (xt-see-xt) ( xt -- ) - xt-see cr ." lastxt" ; + xt-see cr ." latestxt" ; ' (xt-see-xt) is xt-see-xt : (.immediate) ( xt -- ) @@ -795,7 +798,7 @@ Defer discode ( addr u -- ) \ gforth else \ interpret/compile word r@ xt-see-xt cr swap xt-see-xt cr - ." interpret/compile " over .name (.immediate) + ." interpret/compile: " over .name drop then then rdrop drop ;