Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ROSSYM_NEW]

Browse source 
- fix some warnings
- fix function prototype. This might fix usermode stack logs

svn path=/trunk/; revision=53568
This commit is contained in:
Jérôme Gardou 2011-09-03 23:56:04 +00:00
parent b0334ceb09
commit a52963082d
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
reactos/lib/rossym_new/dwarfinfo.c
View file

@ -830,7 +830,8 @@ int dwarfgetarg(Dwarf *d, const char *name, DwarfBuf *buf, ulong cfa, PROSSYM_RE
case OpNop: case OpNop:
break; break;
case OpDeref: { case OpDeref: {
ulong val, addr = stackpop(&stack); ulong val;
void* addr = (void*)stackpop(&stack);
if (!RosSymCallbacks.MemGetProc if (!RosSymCallbacks.MemGetProc
(d->pe->fd, (d->pe->fd,
&val, &val,
@ -840,7 +841,8 @@ int dwarfgetarg(Dwarf *d, const char *name, DwarfBuf *buf, ulong cfa, PROSSYM_RE
stackpush(&stack, val); stackpush(&stack, val);
} break; } break;
case OpDerefSize: { case OpDerefSize: {
ulong val, addr = stackpop(&stack), size = dwarfget1(buf); ulong val, size = dwarfget1(buf);
void* addr = (void*)stackpop(&stack);
if (!RosSymCallbacks.MemGetProc if (!RosSymCallbacks.MemGetProc
(d->pe->fd, (d->pe->fd,
&val, &val,
@ -850,12 +852,13 @@ int dwarfgetarg(Dwarf *d, const char *name, DwarfBuf *buf, ulong cfa, PROSSYM_RE
stackpush(&stack, val); stackpush(&stack, val);
} break; } break;
case OpFbreg: { case OpFbreg: {
ulong val, addr = cfa, offset = dwarfget128s(buf); ulong val, offset = dwarfget128s(buf);;
void* addr = (void*)cfa;
werrstr("FBREG cfa %x offset %x", cfa, offset); werrstr("FBREG cfa %x offset %x", cfa, offset);
if (!RosSymCallbacks.MemGetProc if (!RosSymCallbacks.MemGetProc
(d->pe->fd, (d->pe->fd,
&val, &val,
addr+offset, (PVOID)((ULONG_PTR)addr+offset),
d->addrsize)) d->addrsize))
goto fatal; goto fatal;
stackpush(&stack, val); stackpush(&stack, val);
@ -873,13 +876,13 @@ int dwarfgetarg(Dwarf *d, const char *name, DwarfBuf *buf, ulong cfa, PROSSYM_RE
} else if (opcode >= OpBreg0 && opcode < OpRegx) { } else if (opcode >= OpBreg0 && opcode < OpRegx) {
ulong val, ulong val,
reg = opcode - OpBreg0, reg = opcode - OpBreg0,
addr = registers->Registers[reg],
offset = dwarfget128s(buf); offset = dwarfget128s(buf);
void* addr = (void*)(ULONG_PTR)registers->Registers[reg];
werrstr("BREG[%d] reg %x offset %x", reg, addr, offset); werrstr("BREG[%d] reg %x offset %x", reg, addr, offset);
if (!RosSymCallbacks.MemGetProc if (!RosSymCallbacks.MemGetProc
(d->pe->fd, ((PVOID)d->pe->fd,
&val, &val,
addr + offset, (PVOID)((ULONG_PTR)addr + offset),
d->addrsize)) d->addrsize))
goto fatal; goto fatal;
stackpush(&stack, val); stackpush(&stack, val);
@ -964,7 +967,7 @@ int dwarfargvalue(Dwarf *d, DwarfSym *proc, ulong pc, ulong cfa, PROSSYM_REGISTE
void void
dwarfdumpsym(Dwarf *d, DwarfSym *s) dwarfdumpsym(Dwarf *d, DwarfSym *s)
{ {
int i, j; int j;
werrstr("tag %x\n", s->attrs.tag); werrstr("tag %x\n", s->attrs.tag);
for (j = 0; plist[j].name; j++) { for (j = 0; plist[j].name; j++) {
char *have = ((char*)&s->attrs) + plist[j].haveoff; char *have = ((char*)&s->attrs) + plist[j].haveoff;
@ -996,7 +999,7 @@ dwarfgetparams(Dwarf *d, DwarfSym *s, ulong pc, int pnum, DwarfParam *paramblock
paramblocks[ip].type = param.attrs.type; paramblocks[ip].type = param.attrs.type;
paramblocks[ip].loctype = param.attrs.have.location; paramblocks[ip].loctype = param.attrs.have.location;
paramblocks[ip].len = param.attrs.location.b.len; paramblocks[ip].len = param.attrs.location.b.len;
paramblocks[ip].fde = param.attrs.location.b.data; paramblocks[ip].fde = (ulong)param.attrs.location.b.data;
werrstr("param[%d] block %s -> type %x loctype %x fde %x len %x", werrstr("param[%d] block %s -> type %x loctype %x fde %x len %x",
ip, ip,
paramblocks[ip].name, paramblocks[ip].name,

2
reactos/lib/rossym_new/initum.c
View file

@ -22,7 +22,7 @@ RosSymFreeMemUM(PVOID Area)
} }
static BOOLEAN static BOOLEAN
RosSymGetMemUM(ULONG_PTR *Target, PVOID SourceMem, ULONG Size) RosSymGetMemUM(PVOID FileContext, ULONG_PTR *Target, PVOID SourceMem, ULONG Size)
{ {
return FALSE; return FALSE;
} }