--- gforth/see.fs	2000/03/11 20:35:05	1.25
+++ gforth/see.fs	2001/03/28 09:06:57	1.36
@@ -1,6 +1,6 @@
 \ SEE.FS       highend SEE for ANSforth                16may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,2000 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
 \ May be cross-compiled
@@ -28,7 +28,19 @@
 require look.fs
 require termsize.fs
 require wordinfo.fs
-[IFUNDEF] .name : .name name>string type space ; [THEN]
+[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
 
@@ -87,7 +99,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
@@ -242,6 +254,25 @@ VARIABLE C-Pass
     THEN
     cell+ ;
 
+: .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 ;
+
+: c-call
+    Display? IF  dup @ body> .word bl cemit  THEN  cell+ ;
+
 : .name-without ( addr -- addr )
 \ prints a name without () e.g. (+LOOP) or (s")
   dup 1 cells - @ look 
@@ -413,6 +444,7 @@ VARIABLE C-Pass
 
 CREATE C-Table
 	        ' lit A,            ' c-lit A,
+		' call A,           ' c-call A,
 		' (s") A,	    ' c-c" A,
        		 ' (.") A,	    ' c-c" A,
         	' "lit A,           ' c-c" A,
@@ -476,17 +508,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 !
@@ -514,12 +544,43 @@ Defer xt-see-xt ( xt -- )
     then
     space ;
 
-Defer discode ( addr -- )
-\  hook for the disassembler: disassemble code at addr (as far as the
-\  disassembler thinks is sensible)
-:noname ( addr -- )
-    drop ." ..." ;
-IS discode
+Defer discode ( addr u -- ) \ gforth
+\G hook for the disassembler: disassemble code at addr of length u
+' dump IS discode
+
+: 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 unloop exit
+	then
+    cell +loop
+    here ;
+
+: umin ( u1 u2 -- u )
+    2dup u>
+    if
+	swap
+    then
+    drop ;
+	
+: next-prim ( addr1 -- addr2 ) \ gforth
+    \G find the next primitive after addr1 (unreliable)
+    1+ >r -1 primstart
+    begin ( umin head R: boundary )
+	@ dup
+    while
+	tuck name>int >code-address ( head1 umin ca R: boundary )
+	r@ - umin
+	swap
+    repeat
+    drop dup r@ negate u>=
+    \ "umin+boundary within [0,boundary)" = "umin within [-boundary,0)"
+    if ( umin R: boundary ) \ no primitive found behind -> use a default length
+	drop 31
+    then
+    r> + ;
 
 : seecode ( xt -- )
     dup s" Code" .defname
@@ -527,8 +588,14 @@ IS discode
     if
 	>code-address
     then
-    discode
-    ."  end-code" cr ;
+    dup in-dictionary? \ user-defined code word?
+    if
+	dup next-head
+    else
+	dup next-prim
+    then
+    over - discode
+    ." end-code" cr ;
 : seevar ( xt -- )
     s" Variable" .defname cr ;
 : seeuser ( xt -- )
@@ -542,10 +609,10 @@ IS discode
 : seedefer ( xt -- )
     dup >body @ xt-see-xt cr
     dup s" Defer" .defname cr
-    >name dup ??? = if
-	drop ." lastxt >body !"
-    else
+    >name ?dup-if
 	." IS " .name cr
+    else
+	." lastxt >body !"
     then ;
 : see-threaded ( addr -- )
     C-Pass @ DebugMode = IF
@@ -566,7 +633,8 @@ IS discode
     dup >body ." 0 " ? ." 0 0 "
     s" Field" .defname cr ;
 
-: xt-see ( xt -- )
+: xt-see ( xt -- ) \ gforth
+    \G Decompile the definition represented by @i{xt}.
     cr c-init
     dup >does-code
     if
@@ -590,7 +658,8 @@ IS discode
 [ [IFDEF] dofield: ]
 	dofield: of seefield endof
 [ [THEN] ]
-	over >body of seecode endof
+	over       of seecode endof \ direct threaded code words
+	over >body of seecode endof \ indirect threaded code words
 	2drop abort" unknown word type"
     ENDCASE ;