--- gforth/backtrac.fs	2000/09/23 15:05:58	1.3
+++ gforth/backtrac.fs	2007/12/31 19:02:24	1.17
@@ -1,12 +1,12 @@
 \ backtrace handling
 
-\ Copyright (C) 1999,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1999,2000,2003,2004,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ 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.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 
 \ growing buffers that need not be full
@@ -43,7 +42,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 ;
@@ -65,17 +65,34 @@ IS 'cold
     else \ throw by signal handler with insufficient information
 	handler @ cell - \ beyond that we know nothing
     then
-    backtrace-rp0 @ [ 2 cells ]L - over - 0 max ;
+    backtrace-rp0 @ [ 1 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 +100,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