added location-printing for the backtrace (not yet in image)

Author: AntonErtl

backtrac.fs

@@ -37,7 +37,7 @@
 IS store-backtrace
 
 : print-bt-entry ( return-stack-item -- )
-    cell - dup in-dictionary? over dup aligned = and
+    cell- dup in-dictionary? over dup aligned = and
     if
 	@ dup threaded>name dup if
 	    .name drop
@@ -57,13 +57,14 @@ IS store-backtrace
 	drop
     then ;
 
+defer .backtrace-pos ( addr -- )
+' drop is .backtrace-pos
+
 : print-backtrace ( addr1 addr2 -- )
     \G print a backtrace for the return stack addr1..addr2
     2dup u< IF  cr ." Backtrace:"  THEN
     swap u+do
-	cr
-	i @ dup hex. ( return-addr? )
-	print-bt-entry
+	cr i @ dup .backtrace-pos dup hex. print-bt-entry
 	cell +loop ;
 
 : bt ( -- )

except.fs

@@ -183,9 +183,36 @@ is catch
 Defer kill-task ' noop IS kill-task
 Variable located-xpos
 Variable located-len
+variable bn-xpos      \ first contains located-xpos, but is updated by B and N
+variable located-top  \ first line to display with l
+variable located-bottom \ last line to display with l
+2variable located-slurped \ the contents of the file in located-xpos, or 0 0
+
+\ lines to show before and after locate
+3 value before-locate
+12 value after-locate
+
+: xpos>file# ( xpos -- u )
+    23 rshift ;
+
+: xpos>line ( xpos -- u )
+    8 rshift $7fff and ;
+
+: set-located-xpos ( xpos len -- )
+    over xpos>file# located-xpos @ xpos>file# <> if
+	located-slurped 2@ drop ?dup-if
+	    free throw then
+	0 0 located-slurped 2! then
+    located-len ! dup located-xpos ! dup bn-xpos !
+    xpos>line
+    dup before-locate - 0 max located-top !
+    after-locate + located-bottom ! ;
 
 : set-current-xpos ( -- )
-    input-lexeme @ located-len ! current-sourcepos1 located-xpos ! ;
+    current-sourcepos1 input-lexeme @ set-located-xpos ;
+
+\ : set-current-xpos ( -- )
+\    input-lexeme @ located-len ! current-sourcepos1 located-xpos ! ;
 
 :noname ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception
     ?DUP IF

gforth.el

@@ -314,7 +314,7 @@ PARSED-TYPE specifies what kind of text is parsed. It should be on of 'name',
 	  "fconstant" "value" "2value" "field" "user" "vocabulary" "voctable" 
 	  "create-interpret/compile" "interpret/compile:"
 	  "debug:" "field:" "2field:" "ffield:" "sffield:" "dffield:"
-	  "uvar" "uvalue" "cfield:" "wfield:" "lfield:")
+	  "uvar" "uvalue" "cfield:" "wfield:" "lfield:" "+field")
 	 non-immediate (font-lock-type-face . 2)
 	 "[ \t\n]" t name (font-lock-variable-name-face . 3))
 	("\\S-+%" non-immediate (font-lock-type-face . 2))

kernel/comp.fs

@@ -285,12 +285,16 @@ defer basic-block-end ( -- )
     0 compile-prim1 ;
 is basic-block-end
 
+defer xt-location ( addr -- addr )
+\ note that an xt was compiled at addr, for backtrace-locate functionality
+' noop is xt-location
+
 has? primcentric [IF]
     has? peephole [IF]
 	\ dynamic only    
 	: peephole-compile, ( xt -- )
 	    \ compile xt, appending its code to the current dynamic superinstruction
-	    here swap , compile-prim1 ;
+	    here swap , xt-location compile-prim1 ;
     [ELSE]
 	: peephole-compile, ( xt -- addr ) @ , ;
     [THEN]

locate1.fs

@@ -17,29 +17,6 @@
 \ You should have received a copy of the GNU General Public License
 \ along with this program. If not, see http://www.gnu.org/licenses/.
 
-variable located-xpos \ contains xpos of LOCATEd/EDITed word
-variable located-len  \ contains the length of the word
-variable bn-xpos      \ first contains located-xpos, but is updated by B and N
-variable located-top  \ first line to display with l
-variable located-bottom \ last line to display with l
-2variable located-slurped \ the contents of the file in located-xpos, or 0 0
-
-: set-located-xpos ( xpos len -- )
-    over xpos>file# located-xpos @ xpos>file# <> if
-	located-slurped 2@ drop ?dup-if
-	    free throw then
-	0 0 located-slurped 2! then
-    located-len ! dup located-xpos ! dup bn-xpos !
-    xpos>line
-    dup before-locate - 0 max located-top !
-    after-locate + located-bottom ! ;
-
-:noname {: uline c-addr1 u1 -- uline c-addr1 u1 :}
-    c-addr1 u1 str>loadfilename# uline
-    input-lexeme 2@ >r source drop - encode-pos1 r> set-located-xpos
-    uline c-addr1 u1
-; is set-current-xpos
-
 : set-bn-xpos ( -- )
     bn-xpos @ xpos>file# located-top @ 0 encode-pos1 bn-xpos ! ;
 
@@ -120,3 +97,75 @@ variable located-bottom \ last line to display with l
 : edit ( "name" -- )
     \g Enter the editor at the place of "name"
     (') name-set-located-xpos g ;
+
+\ backtrace locate stuff:
+
+256 1024 * constant bl-data-size
+
+0
+2field:  bl-bounds
+field:   bl-next
+bl-data-size cell+ +field bl-data
+constant bl-size
+
+variable code-locations 0 code-locations !
+
+: .bl {: bl -- :}
+    cr bl bl-bounds 2@ swap 16 hex.r 17 hex.r
+    bl bl-data 17 hex.r
+    bl bl-next @ 17 hex.r ;
+
+: .bls ( -- )
+    cr ."       code-start         code-end          bl-data          bl-next"
+    code-locations @ begin
+	dup while
+	    dup .bl
+	    bl-next @ repeat
+    drop ;
+
+: lookup-location ( addr -- pos1|0 )
+    code-locations @ begin ( addr bl )
+	dup while
+	    2dup bl-bounds 2@ within if
+		tuck bl-bounds 2@ drop  - + bl-data @ exit then
+	    bl-next @ repeat
+    2drop 0 ;
+
+[ifdef] .backtrace-pos
+: .backtrace-pos1 ( addr -- )
+    cell- lookup-location dup if
+	.sourcepos1 space then ;
+' .backtrace-pos1 is .backtrace-pos
+[then]
+
+: xt-location2 ( addr bl -- addr )
+    \ knowing that addr is within bl, record the current source
+    \ position for addr
+    2dup bl-bounds 2@ drop - + bl-data ( addr addr' )
+    current-sourcepos1 swap 2dup ! cell+ ! ;
+
+: new-bl ( addr blp -- )
+    bl-size allocate throw >r
+    swap dup bl-data-size + r@ bl-bounds 2!
+    dup @ r@ bl-next !
+    r@ bl-data bl-data-size cell+ erase
+    r> swap ! ;
+    
+: xt-location1 ( addr -- addr )
+    code-locations begin ( addr blp )
+	dup @ 0= if
+	    2dup new-bl then
+	@ 2dup bl-bounds 2@ within 0= while ( addr bl )
+	    bl-next repeat
+    xt-location2 ;
+
+' xt-location1 is xt-location
+
+\ test
+
+: foo 0 @ ;
+
+: foo1 foo ;
+: foo2 foo1 ;
+
+foo2

sections.fs

@@ -48,9 +48,6 @@ constant extra-section-error
 : current-section-addr ( -- addr )
     current-section @ section-addr ;
 
-: hex.r ( u1 u2 -- )
-    ['] .r #16 base-execute ;
-
 : .sections ( -- )
     cr ."             start              end               dp "
     sections hex. 

source.fs

@@ -37,12 +37,6 @@ require string.fs
 : decode-pos1 ( xpos -- nfile nline nchar )
     dup 23 arshift swap $7fffff and decode-pos ;
 
-: xpos>file# ( xpos -- u )
-    23 rshift ;
-
-: xpos>line ( xpos -- u )
-    8 rshift $7fff and ;
-
 : xpos>char ( xpos -- u )
     $ff and ;
 

stuff.fs

@@ -427,6 +427,9 @@ previous
     endtry
     throw ;
 
+: hex.r ( u1 u2 -- )
+    ['] .r #16 base-execute ;
+
 : dump ( addr u -- ) ['] dump $10 base-execute ;
 \ wrap dump into base-execute