add registers to stack trace

This commit is contained in:
rsc 2004-04-21 20:04:34 +00:00
parent 4a64a77bd3
commit f21f37f219

View file

@ -14,6 +14,7 @@ static struct {
Loc l; Loc l;
char *fn; char *fn;
char *var; char *var;
char *reg;
} rock; } rock;
static int static int
@ -28,6 +29,13 @@ ltrace(Map *map, Regs *regs, ulong pc, ulong nextpc, Symbol *sym, int depth)
if(sym==nil || strcmp(sym->name, rock.fn) != 0) if(sym==nil || strcmp(sym->name, rock.fn) != 0)
return ++rock.nframe < 40; return ++rock.nframe < 40;
if(rock.reg){
if(rget(regs, rock.reg, &v) < 0)
return 0;
rock.l = locconst(v);
rock.found = 1;
return 0;
}
if(lookuplsym(sym, rock.var, &s1) < 0) if(lookuplsym(sym, rock.var, &s1) < 0)
return 0; return 0;
if(locsimplify(map, regs, s1.loc, &rock.l) < 0) if(locsimplify(map, regs, s1.loc, &rock.l) < 0)
@ -43,9 +51,17 @@ ltrace(Map *map, Regs *regs, ulong pc, ulong nextpc, Symbol *sym, int depth)
int int
localaddr(Map *map, Regs *regs, char *fn, char *var, ulong *val) localaddr(Map *map, Regs *regs, char *fn, char *var, ulong *val)
{ {
Regdesc *rp;
rock.found = 0; rock.found = 0;
rock.nframe = 0; rock.nframe = 0;
rock.fn = fn; rock.fn = fn;
rock.reg = nil;
rock.var = nil;
for(rp=mach->reglist; rp->name; rp++)
if(strcmp(rp->name, var) == 0)
rock.reg = rp->name;
if(!rock.reg)
rock.var = var; rock.var = var;
stacktrace(map, regs, ltrace); stacktrace(map, regs, ltrace);
if(rock.found){ if(rock.found){