--- gforth/look.fs	2000/09/23 15:06:01	1.14
+++ gforth/look.fs	2003/03/09 15:16:50	1.26
@@ -1,6 +1,6 @@
 \ LOOK.FS      xt -> lfa                               22may93jaw
 
-\ Copyright (C) 1995,1996,1997,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,2000,2003 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.
 
 \ Look checks first if the word is a primitive. If yes then the
 \ vocabulary in the primitive area is beeing searched, meaning
@@ -26,21 +26,49 @@
 \ Problems: A compiled xt via compile, might be created with noname:
 \           a noname: leaves now a empty name field
 
+require stuff.fs
+require environ.fs
+
 decimal
 
 \ look                                                  17may93jaw
 
 \ rename to discover!!!
 
-: (look)  ( xt startlfa -- lfa flag )
-        false swap
-        BEGIN @ dup
-        WHILE dup name>int
-              3 pick = IF nip dup THEN
-        REPEAT
-        drop nip
-        dup 0<> ;
-
+: xt>threaded ( xt -- x )
+\G produces the threaded-code cell for the primitive xt
+    threading-method 0= if
+	@
+    then ;
+
+: search-name  ( xt startlfa -- nt|0 )
+    \ look up name of primitive with code at xt
+    swap
+    >r false swap
+    BEGIN
+	@ dup
+    WHILE
+	    dup name>int
+	    r@ = IF
+		nip dup
+	    THEN
+    REPEAT
+    drop rdrop ;
+
+: threaded>xt ( ca -- xt|0 )
+\G For the code address ca of a primitive, find the xt (or 0).
+    [IFDEF] decompile-prim
+	decompile-prim
+    [THEN]
+     \ walk through the array of primitive CAs
+    >r ['] noop begin
+	dup @ while
+	    dup xt>threaded r@ = if
+		rdrop exit
+	    endif
+	    cell+
+    repeat
+    drop rdrop 0 ;
 
 \ !!! nicht optimal!
 [IFUNDEF] look
@@ -48,13 +76,16 @@ has? ec [IF]
 
 has? rom 
 [IF]
-: look
+: prim>name ( xt -- nt|0 )
+    forth-wordlist @ search-name ;
+
+: look ( xt -- lfa flag )
     dup [ unlock rom-dictionary area lock ] 
     literal literal within
     IF
 	>head-noprim dup ?? <>
     ELSE
-	forth-wordlist @ (look)
+	prim>name dup 0<>
     THEN ;
 [ELSE]
 : look ( cfa -- lfa flag )
@@ -65,17 +96,23 @@ has? rom
 
 : PrimStart ['] true >head-noprim ;
 
-: look ( cfa -- lfa flag )
+: prim>name ( xt -- nt|0 )
+    PrimStart search-name ;
+
+: look ( xt -- lfa flag )
     dup in-dictionary?
     IF
 	>head-noprim dup ??? <>
     ELSE
-	PrimStart (look)
+	prim>name dup 0<>
     THEN ;
 
 [THEN]
 [THEN]
 
+: threaded>name ( ca -- nt|0 )
+    threaded>xt prim>name ;
+
 : >head ( cfa -- nt|0 ) \ gforth to-head
     \G tries to find the name token nt of the word represented by cfa;
     \G returns 0 if it fails.  This word is not absolutely reliable,