o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Russ Cox 2012-03-05 16:36:31 -05:00
commit 4a000a28d3
12 changed files with 134 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libmach/elfcorefreebsdamd64.c
View file

@ -113,7 +113,8 @@ elfcorefreebsdamd64(Fhdr *fp, Elf *elf, ElfNote *note)
u->flags = l->rflags;
u->sp = l->rsp;
u->ss = l->ss;
print("core PC=%#llux SP=%#llux\n", u->ip, u->sp);
if((fp->thread = realloc(fp->thread, (1+fp->nthread)*sizeof(fp->thread[0]))) == nil){
fprint(2, "warning: out of memory saving thread info\n");
return;

5
src/libmach/regs.c
View file

@ -27,7 +27,7 @@ int
rget(Regs *regs, char *name, u64int *u)
{
if(regs == nil){
*u = ~(ulong)0;
*u = ~(u64int)0;
werrstr("registers not mapped");
return -1;
}
@ -54,6 +54,9 @@ _uregrw(Regs *regs, char *name, u64int *u, int isr)
case 'X':
*u = mach->swap4(*(u32int*)ureg);
return 0;
case 'Y':
*u = mach->swap8(*(u64int*)ureg);
return 0;
}
}