Changeset 3341

Timestamp:

Sep 27, 2012 11:17:26 PM (8 months ago)

Author:

wmb

Message:

Debugger - improve visual debugger redisplay so it's rarely necessary to use the L command. See OLPC trac #12105.

File:

• forth/lib/debug.fth (modified) (9 diffs)

forth/lib/debug.fth

@@ -38 +38 @@
 variable res
 headers
-false value redisplay?
+
+-1 value displayed-xt
+: force-redisplay  ( -- )  -1 to displayed-xt  ;
 
 : (debug)       (s low-adr hi-adr -- )
@@ -47 +49 @@
    then
    step? on
-   true is redisplay?
-;
+   force-redisplay
+;
+
 headerless
 : 'unnest   (s pfa -- pfa' )
@@ -189 +192 @@
 0 value the-ip
 0 value the-rp
+: redisplay?  ( -- flag )  displayed-xt  the-ip find-cfa <>  ;
+
 : (.rs  ( -- )
    show-rstack @ 0=  if  exit  then
@@ -211 +216 @@
    ." Stack: " #out @ #line @ to full-stack-xy  cr  \ For stack
    the-ip debug-see
+   the-ip find-cfa to displayed-xt
    cr
    \ Display the initial stack on the cursor line
@@ -225 +231 @@
       then
       0 show-rstack !
-      false is redisplay?
    then
 ;
@@ -270 +275 @@
             ascii C  of                                               \ Continue
                step? @ 0= step? !              
-               step? @ 0=  if  true to scrolling-debug?  true to redisplay?  then
+               step? @ 0=  if  true to scrolling-debug?  force-redisplay  then
                true
             endof
@@ -291 +296 @@
             ascii \  of  show-rstack @ 0= show-rstack !  false  endof  \ toggle return stack display
             ascii X  of  hex-stack @ 0= hex-stack !      false  endof  \ toggle heX stack display
-            ascii L  of  true to redisplay?              false  endof  \ Redisplay
+            ascii L  of  force-redisplay                 false  endof  \ Redisplay
             ascii V  of                                         \ toggle Visual (2D) mode
                scrolling-debug? 0= to scrolling-debug?      
-               scrolling-debug? 0=  if  true to redisplay?  then  false
+               scrolling-debug? 0=  if  force-redisplay  then  false
             endof
             ( default )  true swap
@@ -310 +315 @@
 \   scrolling-debug? 0=  if  to-result-loc  then
    the-ip token@  dup ['] unnest =  swap ['] exit =  or  if
-      cr  true is redisplay?
+      cr  force-redisplay
    then
    slow-next? @  if  pnext  then
@@ -326 +331 @@
 ;
 : debugging  ( -- )  ' .debug-short-help  dup (debug  execute  ;
-: resume    (s -- )  true is exit-interact?  pnext  ;
+: resume    (s -- )  true is exit-interact?  force-redisplay  pnext  ;
 : stepping  (s -- )  step? on  ;
 : tracing   (s -- )  step? off ;