--- gforth/wordinfo.fs	1996/08/26 10:07:22	1.13
+++ gforth/wordinfo.fs	1998/12/08 22:02:53	1.17
@@ -1,6 +1,6 @@
 \ WORDINFO.FS  V1.0                                    17may93jaw
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -22,7 +22,7 @@
 \ If you want check values then exclude comments,
 \ but keep in mind that this can't be cross-compiled
 
-INCLUDE look.fs
+\ INCLUDE look.fs
 
 \ Wordinfo is a tool that checks a nfa
 \ and finds out what wordtype we have
@@ -61,9 +61,16 @@ INCLUDE look.fs
 \ the above words could be factored with create-does>, but this would
 \ probably make this file incompatible with cross.
 
+[IFDEF] forthstart
+: xtprim? ( xt -- flag )
+    dictionary-end forthstart within ; \ !! does not work for CODE words
+[ELSE]
+: xtprim? ( xt -- flag )
+    dup >body swap >code-address = ; \ !! works only for indirect threaded code
+				     \ !! does not work for primitives
+[THEN]
 : prim? ( nfa -- flag )
-        name>int
-        forthstart u< ;
+        name>int xtprim? ;
 
 \ None nestable IDs: