--- gforth/backtrac.fs	2000/07/24 13:48:36	1.1
+++ gforth/backtrac.fs	2004/11/28 20:35:06	1.10
@@ -1,6 +1,6 @@
 \ backtrace handling
 
-\ Copyright (C) 1999 Free Software Foundation, Inc.
+\ Copyright (C) 1999,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.
 
 
 \ growing buffers that need not be full
@@ -43,7 +43,8 @@ end-struct buffer%
 
 \ backtrace stuff
 
-create backtrace-rs-buffer buffer% %allot \ copy of the rturn stack at throw
+create backtrace-rs-buffer buffer% %allot drop
+\ copy of the return stack at throw
 
 : init-backtrace ( -- )
     backtrace-rs-buffer init-buffer ;
@@ -77,25 +78,40 @@ IS 'cold
     then ;
 IS store-backtrace
 
+: print-bt-entry ( return-stack-item -- )
+    cell - dup in-dictionary? over dup aligned = and
+    if
+	@ dup threaded>name dup if
+	    .name drop
+	else
+	    drop dup look if
+		.name drop
+	    else
+		drop body> look \ !! check for "call" in cell before?
+		if
+		    .name
+		else
+		    drop
+		then
+	    then
+	then
+    else
+	drop
+    then ;
+
 : print-backtrace ( addr1 addr2 -- )
     \G print a backtrace for the return stack addr1..addr2
     cr ." Backtrace:"
     swap u+do
 	cr
 	i @ dup hex. ( return-addr? )
-	cell - dup in-dictionary? over dup aligned = and
-	if
-	    @ look
-	    if
-		.name
-	    else
-		drop
-	    then
-	else
-	    drop
-	then
+	print-bt-entry
 	cell +loop ;
 
 :noname ( -- )
     backtrace-rs-buffer 2@ over + print-backtrace ;
 IS dobacktrace
+
+:noname
+    r@ >stderr cr ." deferred word " print-bt-entry ." is uninitialized" ;
+is defer-default