lsd: add (lstk), add a target to install lsd

spew committed 1 year ago

Commit 415ef9f1 parent 3d331f32 files · +29 −10Browse files

Unified · Split

2 files

mkfile +3 −0
src/plan9/lsd.sl +26 −10

@@ -121,3 +121,6 @@ clean:V: · 120 unmodified lines
121		121
122	nuke:V:	122	nuke:V:
123	mk clean	123	mk clean
		124
		125	lsd:V:
		126	cp src/plan9/lsd.sl /rc/bin/lsd

src/plan9/lsd.sl+26−10

   :doc-see symbol
   text data)
 (defstruct frame
-  "A stack frame.  Loc is the enclosing function symbol and instruction
+  "A stack frame.  Sym is the enclosing function symbol and instruction
    address of the frame.  Retpc is the return instruction address.  Sp is
    the stack pointer value.  Locals are all the local symbols."
   :doc-group lsd
   :doc-see symbol
-  loc retpc sp locals)
+  sym retpc sp locals)
 (def coref NIL)
 (def textf NIL)
   :doc-see frame
   (reverse! (ctrace)))
-(def (stk)
+(def (stk (:locals NIL))
-  "Print the stack trace without showing local auto values.
+  "Print the stack trace optionally showing local auto values.
    Bugs:
-       Prints the values of parameters as unsigned 64 bit
+       Prints the values of parameters and autos as unsigned
-       integers, not as their actual types."
+       64 bit integers, not as their actual types."
   :doc-group lsd
   :doc-see _stk
+  :doc-see lstk
   (def (go pc fs)
     (if (not fs) pc
       (let* {[f (car fs)]
-             [floc (frame-loc f)]}
+             [fsym (frame-sym f)]}
         (receive (params autos)
                  (partition (λ (x) (equal? #\p (symbol-type x)))
                             (frame-locals f))
           (set! params (sort params #.< :key symbol-addr))
           (set! autos (sort autos #.> :key symbol-addr))
-          (princ (symbol-name floc) "(")
+          (princ (symbol-name fsym) "(")
           (princ
             (str-join
               (map (λ (p)
                      (str (symbol-name p) "=" (hex (symbol-read p 'u64))))
                    params)
               ", "))
-          (princ ")+" (hex (- pc (symbol-addr floc))) " ")
+          (princ ")+" (hex (- pc (symbol-addr fsym))) " ")
           (princ (src pc) "\n")
+          (when locals
+            (for-each (λ (l) (princ "	"
+                                    (symbol-name l)
+                                    "="
+                                    (hex (symbol-read l 'u64))
+                                    "\n"))
+                      autos))
           (go (frame-retpc f) (cdr fs))))))
   (let* {[tos (go (curPC) (_stk))]
          [topsym (lsd-findsym tos)]}
            (src tos)
            "\n")))
+(def (lstk)
+  "Print the stack trace showing local auto values."
+  :doc-group lsd
+  :doc-see _stk
+  :doc-see stk
+  (stk :locals T))
 (def (curPC) (and (>= pid 0) (readreg PC)))
 (def (step (n 1))
                    (path-cwd)
                    "\ntext\n\n"
                    (length s)
-                   "\n" s))
+                   "\n"
+                   s))
     (io-close plumbf)))
 (def (B stepper)

lsd: add (lstk), add a target to install lsd

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code