ref: dc4a648a71627db05ba1c24557c0ab7f80d348ed
parent: 8879856616972ab0b4f74463594a8d342a5a4798
author: spew <spew@cbza.org>
date: Thu Mar 20 21:40:53 EDT 2025
lsd: break up asm into das and instsize, cleanup various things
--- a/src/plan9/lsd.c
+++ b/src/plan9/lsd.c
@@ -122,26 +122,7 @@
return locals;
}
-static sl_v tracelist;
-
static void
-trlist(Map *map, uvlong retpc, uvlong sp, Symbol *fn)
-{- sl_v v;
-
- USED(map);
- v = alloc_vec(5, 0);
- sl_gc_handle(&v);
- vec_elt(v, 0) = lsd_framesym;
- vec_elt(v, 1) = mk_symbol(fn);
- vec_elt(v, 2) = mk_u64(retpc);
- vec_elt(v, 3) = mk_u64(sp);
- vec_elt(v, 4) = localslist(fn, sp);
- sl_free_gc_handles(1);
- tracelist = mk_cons(v, tracelist);
-}
-
-static void
load(void)
{int fd;
@@ -237,6 +218,48 @@
return pid;
}
+static sl_v tracelist;
+
+static void
+trlist(Map *map, uvlong retpc, uvlong sp, Symbol *fn)
+{+ sl_v v;
+
+ USED(map);
+ v = alloc_vec(5, 0);
+ sl_gc_handle(&v);
+ vec_elt(v, 0) = lsd_framesym;
+ vec_elt(v, 1) = mk_symbol(fn);
+ vec_elt(v, 2) = mk_u64(retpc);
+ vec_elt(v, 3) = mk_u64(sp);
+ vec_elt(v, 4) = localslist(fn, sp);
+ sl_free_gc_handles(1);
+ tracelist = mk_cons(v, tracelist);
+}
+
+BUILTIN("lsd-ctrace", lsd_ctrace)+{+ sl_v *a;
+ uvlong pc, sp, res;
+
+ argcount(nargs, 3);
+ for(a = args; a < args+3; a++)
+ if(sl_unlikely(!sl_isnum(*a)))
+ type_error("num", *a);+
+ pc = tosize(args[0]);
+ sp = tosize(args[1]);
+ res = tosize(args[2]);
+ tracelist = sl_nil;
+ sl_gc_handle(&tracelist);
+ if(machdata->ctrace(coremap, pc, sp, res, trlist) <= 0){+ sl_free_gc_handles(1);
+ lerrorf(sl_errio, "could not retrieve stack frame: %r");
+ }
+ sl_free_gc_handles(1);
+ return tracelist;
+}
+
BUILTIN("lsd-cleanup", lsd_cleanup) {USED(args);
@@ -352,7 +375,7 @@
return foll;
}
-BUILTIN("lsd-asm", lsd_asm)+BUILTIN("lsd-das", lsd_das) {static char buf[512];
int size;
@@ -366,15 +389,23 @@
addr = tosize(args[0]);
if(machdata->das(coremap, addr, 'i', buf, sizeof(buf)) < 0)
lerrorf(sl_errio, "could not disassemble at %ud", addr);
- size = machdata->instsize(coremap, addr);
- if(size < 0)
- lerrorf(sl_errio, "could not get instruction size at %ud", addr);
+ return str_from_cstr(buf);
+}
- r = str_from_cstr(buf);
- sl_gc_handle(&r);
- r = mk_cons(size_wrap(size), r);
- sl_free_gc_handles(1);
- return r;
+BUILTIN("lsd-instsize", lsd_instsize)+{+ uvlong addr;
+ int sz;
+
+ argcount(nargs, 1);
+ if(sl_unlikely(!sl_isnum(args[0])))
+ type_error("num", args[0]);+
+ addr = tosize(args[0]);
+ sz = machdata->instsize(coremap, addr);
+ if(sz < 0)
+ lerrorf(sl_errio, "could not get instruction size at %ud", addr);
+ return size_wrap(sz);
}
BUILTIN("lsd-fileline", lsd_fileline)@@ -414,27 +445,4 @@
if(addr == ~0)
lerrorf(sl_errio, "could not find address of %s:%d", buf, line);
return size_wrap(addr);
-}
-
-BUILTIN("lsd-ctrace", lsd_ctrace)-{- sl_v *a;
- uvlong pc, sp, res;
-
- argcount(nargs, 3);
- for(a = args; a < args+3; a++)
- if(sl_unlikely(!sl_isnum(*a)))
- type_error("num", *a);-
- pc = tosize(args[0]);
- sp = tosize(args[1]);
- res = tosize(args[2]);
- tracelist = sl_nil;
- sl_gc_handle(&tracelist);
- if(machdata->ctrace(coremap, pc, sp, res, trlist) <= 0){- sl_free_gc_handles(1);
- lerrorf(sl_errio, "no stack frame: %r");
- }
- sl_free_gc_handles(1);
- return tracelist;
}
--- a/src/plan9/lsd.lsp
+++ b/src/plan9/lsd.lsp
@@ -2,7 +2,9 @@
(defstruct reg name type addr size)
(defstruct symbol name type addr)
-(defstruct global text data)
+(defstruct global
+ "All the global symbols, separated into text and data symbols."
+ text data)
(defstruct frame loc retpc sp locals)
(def coref NIL)
@@ -82,6 +84,10 @@
(unless coref (error "not attached to proc"))
(apply readcore (cons (symbol-addr symbol) rest)))
+(def (hex n) (str "0x" (num->str n 16)))
+
+(def (oct n) (str "0" (num->str n 8)))
+
(let ((bp_init (λ (loc)
(when (< pid 0) (error "no running process"))
(unless (eq? (status) 'Stopped)
@@ -121,7 +127,7 @@
Examples:
`(bpset 'strcpy)` ; breakpoint on strcpy function.
- `(bpset (readreg PC))` ; breakpoint on current instruction.
+ `(bpset (curPC))` ; breakpoint on current instruction.
`(bpset \"/sys/src/cmd/cat.c:26\")` ; breakpoint on line 26.")
(doc-for (bpdel loc)
@@ -139,7 +145,7 @@
Examples:
`(bpdel 'strcpy)` ; remove breakpoint on strcpy function.
- `(bpdel (readreg PC))` ; remove breakpoint on current instruction.
+ `(bpdel (curPC))` ; remove breakpoint on current instruction.
`(bpdel \"/sys/src/cmd/cat.c:26\")` ; remove breakpoint on line 26.")
(def (detach)
@@ -187,12 +193,14 @@
(caddr stats)))
(def tracers (table
- "386" (λ () (lsd-ctrace (readreg PC) (readreg SP) (u64 0)))
- "amd64" (λ () (lsd-ctrace (readreg PC) (readreg SP) (u64 0)))
- "arm64" (λ () (lsd-ctrace (readreg PC) (readreg SP) (readreg R30)))))
+ "386" (λ () (lsd-ctrace (curPC) (readreg SP) (u64 0)))
+ "amd64" (λ () (lsd-ctrace (curPC) (readreg SP) (u64 0)))
+ "arm64" (λ () (lsd-ctrace (curPC) (readreg SP) (readreg R30)))))
-(def _stk (get tracers (os-getenv "objtype")))
+(def ctrace (get tracers (os-getenv "objtype")))
+(def (_stk) (reverse (ctrace)))
+
(def (curPC) (and (>= pid 0) (readreg PC)))
(def (step (n 1))
@@ -200,7 +208,7 @@
address to be executed or `NIL` if the program has exited."
(if (= n 0)
(curPC)
- (let* ((addr (readreg PC))
+ (let* ((addr (curPC))
(on-bp (has? bptbl addr)))
(when on-bp (writecore addr (get bptbl addr)))
(let* ((f (follow addr))
@@ -214,12 +222,12 @@
(def (cont)
"Continue program execution. Return the next instruction
address to be executed or `NIL` if the program has exited."
- (let ((addr (readreg PC)))
+ (let ((addr (curPC)))
(when (has? bptbl addr) (step))
(startstop)
(curPC)))
-(def (asmlist (n 5) (addr (readreg PC)))
+(def (asmlist (n 5) (addr (curPC)))
"Return a list of the next `n` disassembled instructions starting at `addr`.
Each element in the list has the form `(address . instr)` where `instr`
@@ -230,13 +238,12 @@
()
(let ((on-bp (has? bptbl addr)))
(when on-bp (writecore addr (get bptbl addr)))
- (let* ((a (lsd-asm addr))
- (next (car a))
- (instr (cdr a)))
+ (let ((instr (lsd-das addr))
+ (isize (lsd-instsize addr)))
(when on-bp (writecore addr bpinst))
- (cons (cons addr instr) (asmlist (1- n) (+ addr next)))))))
+ (cons (cons addr instr) (asmlist (1- n) (+ addr isize)))))))
-(def (asm (n 5) (addr (readreg PC)))
+(def (asm (n 5) (addr (curPC)))
"Print the next `n` disassembled instructions at addr.
Examples:
@@ -244,15 +251,15 @@
`(asm)` ; print out 5 from current program instruction.
`(asm 10)` ; print out 10 from current program instruction.
`(asm 3 (sym-addr 'strecpy))` ; 3 instructions from strecpy"
- (for-each (λ (i) (princ (car i) "\t" (cdr i) "\n"))
+ (for-each (λ (i) (princ (hex (car i)) "\t" (cdr i) "\n"))
(asmlist n addr)))
-(def (src (addr (readreg PC)))
+(def (src (addr (curPC)))
"Return a string of the filename and line number corresponding
to the instruction address."
(lsd-fileline addr))
-(def (Bsrc (addr (readreg PC)))
+(def (Bsrc (addr (curPC)))
"Send a plumb message of the filename and line number
corresponding to the instruction address so that the
source code can be viewed in your text editor."