--- gforth/see.fs 2000/09/23 15:46:59 1.31 +++ gforth/see.fs 2004/06/19 15:32:31 1.54 @@ -1,6 +1,6 @@ \ SEE.FS highend SEE for ANSforth 16may93jaw -\ Copyright (C) 1995,2000 Free Software Foundation, Inc. +\ Copyright (C) 1995,2000,2003 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -28,7 +28,6 @@ require look.fs require termsize.fs require wordinfo.fs -[IFUNDEF] .name : .name name>string type space ; [THEN] decimal @@ -87,7 +86,7 @@ DEFER nlcount ' noop IS nlcount IF 2drop ELSE XPos +! C-Output @ IF emit ELSE drop THEN THEN ; -DEFER .string +DEFER .string ( c-addr u n -- ) [IFDEF] Green VARIABLE Colors Colors on @@ -108,6 +107,32 @@ VARIABLE Colors Colors on ' (.string) IS .string +: c-\type ( c-addr u -- ) + \ type string in \-escaped form + begin + dup while + 2dup newline string-prefix? if + '\ cemit 'n cemit + newline nip /string + else + over c@ + dup '" = over '\ = or if + '\ cemit cemit + else + dup bl 127 within if + cemit + else + base @ >r try + 8 base ! 0 <<# # # # '\ hold #> ctype #>> 0 + recover + endtry + r> base ! throw + endif + endif + 1 /string + endif + repeat + 2drop ; : .struc uppercase on Str# .string ; @@ -176,12 +201,12 @@ ACONSTANT MaxTable : MyBranch ( a-addr -- a-addr a-addr2 ) \ finds branch table entry for branch at a-addr - dup @ over + + dup @ BranchAddr? BEGIN WHILE 1 cells - @ over <> - WHILE dup @ over + + WHILE dup @ MoreBranchAddr? REPEAT SearchPointer @ 3 cells - @@ -219,7 +244,8 @@ ACONSTANT MaxTable BranchPointer @ 1 cells - ! ; : Branch! ( a-addr rel -- a-addr ) - over + over ,Branch ,Branch 0 ,Branch ; + over ,Branch ,Branch 0 ,Branch ; +\ over + over ,Branch ,Branch 0 ,Branch ; \ DEFER CheckUntil VARIABLE NoOutput @@ -233,22 +259,78 @@ VARIABLE C-Pass : Display? ( -- flag ) C-Pass @ 1 = ; : Debug? ( -- flag ) C-Pass @ 2 = ; -: back? ( n -- flag ) 0< ; -: ahead? ( n -- flag ) 0> ; +: back? ( addr target -- addr flag ) + over u< ; + +: .word ( addr x -- addr ) + \ print x as a word if possible + dup look 0= IF + drop dup threaded>name dup 0= if + 2drop dup 1 cells - @ dup body> look + IF + nip dup ." <" name>string rot wordinfo .string ." > " + ELSE + drop ." <" 0 .r ." > " + THEN + EXIT + then + THEN + nip dup cell+ @ immediate-mask and + IF + bl cemit ." POSTPONE " + THEN + dup name>string rot wordinfo .string + ; -: c-lit +: c-call ( addr1 -- addr2 ) Display? IF - dup @ dup abs 0 <# #S rot sign #> 0 .string bl cemit + dup @ body> .word bl cemit THEN cell+ ; +: c-callxt ( addr1 -- addr2 ) + Display? IF + dup @ .word bl cemit + THEN + cell+ ; + +\ here docon: , docol: , dovar: , douser: , dodefer: , dofield: , +\ here over - 2constant doers + +: c-lit ( addr1 -- addr2 ) + Display? IF + dup @ dup body> dup cfaligned over = swap in-dictionary? and if + ( addr1 addr1@ ) + dup body> @ dovar: = if + drop c-call EXIT + endif + endif + \ !! test for cfa here, and print "['] ..." + dup abs 0 <# #S rot sign #> 0 .string bl cemit + endif + cell+ ; + +: c-lit+ ( addr1 -- addr2 ) + Display? if + dup @ dup abs 0 <# #S rot sign #> 0 .string bl cemit + s" + " 0 .string + endif + cell+ ; + : .name-without ( addr -- addr ) -\ prints a name without () e.g. (+LOOP) or (s") - dup 1 cells - @ look - IF name>string over c@ '( = IF 1 /string THEN - 2dup + 1- c@ ') = IF 1- THEN .struc ELSE drop - THEN ; + \ !! 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 + over c@ '( = IF + 1 /string + THEN + 2dup + 1- c@ ') = IF 1- THEN .struc ELSE drop + THEN ; +[ifdef] (s") : c-c" Display? IF nl .name-without THEN count 2dup + aligned -rot @@ -257,19 +339,70 @@ VARIABLE C-Pass [char] " cemit bl cemit ELSE 2drop THEN ; +[endif] +: c-string? ( addr1 -- addr2 f ) + \ f is true if a string was found and decompiled. + \ if f is false, addr2=addr1 + \ recognizes the following patterns: + \ c": ahead X: len string then lit X + \ 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 + dup @ >r + 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 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 + 6 s\" .\\\" " + else + 4 s\" s\\\" " + endif + \ !! make newline if string too long? + display? if + 0 .string r@ cell+ @ r@ 3 cells + @ c-\type '" cemit bl cemit + else + 2drop + endif + 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 + endif + drop r> 2 cells + true ; : Forward? ( a-addr true | false -- a-addr true | false ) -\ a-addr1 is pointer into branch table -\ returns true when jump is a forward jump - IF dup dup @ swap 1 cells - @ - - Ahead? IF true ELSE drop false THEN - \ only if forward jump - ELSE false THEN ; + \ a-addr is pointer into branch table + \ returns true when jump is a forward jump + IF + dup dup @ swap 1 cells - @ u> IF + true + ELSE + drop false + THEN + \ only if forward jump + ELSE + false + THEN ; : RepeatCheck ( a-addr1 a-addr2 true | false -- false ) IF BEGIN 2dup - 1 cells - @ swap dup @ + + 1 cells - @ swap @ u<= WHILE drop dup cell+ MoreBranchAddr? 0= @@ -279,7 +412,8 @@ VARIABLE C-Pass ELSE false THEN ; -: c-branch +: c-branch ( addr1 -- addr2 ) + c-string? ?exit Scan? IF dup @ Branch! dup @ back? @@ -320,13 +454,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? @@ -360,7 +494,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? @@ -373,17 +507,22 @@ VARIABLE C-Pass : c-do Display? IF nl .name-without level+ THEN ; -: c-?do - Display? IF nl S" ?DO" .struc level+ 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-?do ( addr1 -- addr2 ) + Display? IF + nl .name-without level+ + THEN + DebugBranch cell+ ; + +: 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 @@ -413,26 +552,32 @@ VARIABLE C-Pass CREATE C-Table ' lit A, ' c-lit A, - ' (s") A, ' c-c" A, - ' (.") A, ' c-c" A, - ' "lit A, ' c-c" A, + ' does-exec A, ' c-callxt A, + ' lit@ A, ' c-call A, +[IFDEF] call ' call A, ' c-call A, [THEN] +\ ' useraddr A, .... + ' lit-perform A, ' c-call A, + ' lit+ A, ' c-lit+ A, +[IFDEF] (s") ' (s") A, ' c-c" A, [THEN] +[IFDEF] (.") ' (.") A, ' c-c" A, [THEN] +[IFDEF] "lit ' "lit A, ' c-c" A, [THEN] [IFDEF] (c") ' (c") A, ' c-c" A, [THEN] ' (do) A, ' c-do A, -[IFDEF] (+do) ' (+do) A, ' c-do A, [THEN] -[IFDEF] (u+do) ' (u+do) A, ' c-do A, [THEN] -[IFDEF] (-do) ' (-do) A, ' c-do A, [THEN] -[IFDEF] (u-do) ' (u-do) A, ' c-do A, [THEN] +[IFDEF] (+do) ' (+do) A, ' c-?do A, [THEN] +[IFDEF] (u+do) ' (u+do) A, ' c-?do A, [THEN] +[IFDEF] (-do) ' (-do) A, ' c-?do A, [THEN] +[IFDEF] (u-do) ' (u-do) A, ' c-?do A, [THEN] ' (?do) A, ' c-?do A, ' (for) A, ' c-for A, ' ?branch A, ' c-?branch A, ' branch A, ' c-branch A, ' (loop) A, ' c-loop A, ' (+loop) A, ' c-loop A, -[IFDEF] (s+loop) ' (s+loop) A, ' c-loop A, [THEN] +[IFDEF] (s+loop) ' (s+loop) A, ' c-loop A, [THEN] [IFDEF] (-loop) ' (-loop) A, ' c-loop A, [THEN] ' (next) A, ' c-loop A, ' ;s A, ' c-exit A, - ' (abort") A, ' c-abort" A, +[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] @@ -443,20 +588,23 @@ c-extender ! \ DOTABLE 15may93jaw -: DoTable ( cfa -- flag ) - C-Table - BEGIN dup @ dup 0= - IF drop cell+ @ dup - IF ( next table!) dup @ ELSE - ( end!) 2drop false EXIT THEN - THEN - \ jump over to extender, if any 26jan97jaw - 2 pick <> - WHILE 2 cells + - REPEAT - nip cell+ perform - true - ; +: DoTable ( ca/cfa -- flag ) + decompile-prim C-Table BEGIN ( cfa table-entry ) + dup @ dup 0= IF + drop cell+ @ dup IF ( next table!) + dup @ + ELSE ( end!) + 2drop false EXIT + THEN + THEN + \ jump over to extender, if any 26jan97jaw + xt>threaded 2 pick <> + WHILE + 2 cells + + REPEAT + nip cell+ perform + true +; : BranchTo? ( a-addr -- a-addr ) Display? IF dup BranchAddr? @@ -476,17 +624,15 @@ c-extender ! THEN ; : analyse ( a-addr1 -- a-addr2 ) - Branches @ IF BranchTo? THEN - dup cell+ swap @ - dup >r DoTable r> swap IF drop EXIT THEN - Display? - IF look 0= IF drop dup 1 cells - @ . \ ABORT" SEE: Bua!" - ELSE - dup cell+ count dup immediate-mask and - IF bl cemit ." POSTPONE " THEN - 31 and rot wordinfo .string THEN bl cemit - ELSE drop - THEN ; + Branches @ IF BranchTo? THEN + dup cell+ swap @ + dup >r DoTable r> swap IF drop EXIT THEN + Display? + IF + .word bl cemit + ELSE + drop + THEN ; : c-init 0 YPos ! 0 XPos ! @@ -521,8 +667,7 @@ Defer discode ( addr u -- ) \ gforth : next-head ( addr1 -- addr2 ) \ gforth \G find the next header starting after addr1, up to here (unreliable). here swap u+do - i head? - if + i head? -2 and if i unloop exit then cell +loop @@ -554,10 +699,7 @@ Defer discode ( addr u -- ) \ gforth : seecode ( xt -- ) dup s" Code" .defname - threading-method - if - >code-address - then + >code-address dup in-dictionary? \ user-defined code word? if dup next-head @@ -582,7 +724,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 @@ -634,7 +776,7 @@ Defer discode ( addr u -- ) \ gforth ENDCASE ; : (xt-see-xt) ( xt -- ) - xt-see cr ." lastxt" ; + xt-see cr ." latestxt" ; ' (xt-see-xt) is xt-see-xt : (.immediate) ( xt -- ) @@ -649,13 +791,13 @@ Defer discode ( addr u -- ) \ gforth if \ normal or immediate word swap xt-see (.immediate) else - r@ ['] compile-only-error = + r@ ['] ticking-compile-only-error = if \ compile-only word swap xt-see (.immediate) ." compile-only" 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 ;