--- gforth/backtrac.fs	2000/09/23 15:46:51	1.4
+++ gforth/backtrac.fs	2006/05/26 21:18:45	1.13
@@ -1,6 +1,6 @@
 \ backtrace handling
 
-\ Copyright (C) 1999,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1999,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -43,7 +43,8 @@ end-struct buffer%
 
 \ backtrace stuff
 
-create backtrace-rs-buffer buffer% %allot \ copy of the return stack at throw
+create backtrace-rs-buffer buffer% %allot drop
+\ copy of the return stack at throw
 
 : init-backtrace ( -- )
     backtrace-rs-buffer init-buffer ;
@@ -68,14 +69,31 @@ IS 'cold
     backtrace-rp0 @ [ 2 cells ]L - over - 0 max ;
 
 :noname ( -- )
-    backtrace-empty @
+    backtrace-return-stack
+    dup backtrace-rs-buffer adjust-buffer
+    backtrace-rs-buffer buffer-address @ swap move ;
+IS store-backtrace
+
+: print-bt-entry ( return-stack-item -- )
+    cell - dup in-dictionary? over dup aligned = and
     if
-	backtrace-return-stack
-	dup backtrace-rs-buffer adjust-buffer
-	backtrace-rs-buffer buffer-address @ swap move
-	backtrace-empty off
+	@ 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 ;
-IS store-backtrace
 
 : print-backtrace ( addr1 addr2 -- )
     \G print a backtrace for the return stack addr1..addr2
@@ -83,19 +101,15 @@ IS store-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
+
+[ifdef] defer-default
+:noname
+    r@ >stderr cr ." deferred word " print-bt-entry ." is uninitialized" ;
+is defer-default
+[then]
\ No newline at end of file