jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

More DPRINTF debugging

Browse Source 
modified:   stub/src/amd64-darwin.macho-main.c
This commit is contained in:
John Reiser 2020-06-06 17:10:53 -07:00 committed by Markus F.X.J. Oberhumer
parent 3ace7a0468
commit d7c416f243
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stub/src/amd64-darwin.macho-main.c
View File

@ -136,6 +136,7 @@ xread(Extent *x, void *buf, size_t count)
static void static void
xpeek(Extent *x, void *buf, size_t count) xpeek(Extent *x, void *buf, size_t count)
{ {
DPRINTF("xpeek buf=%%p count=%%x ", buf, count);
xread(x, buf, count); xread(x, buf, count);
x->size += count; x->size += count;
x->buf -= count; x->buf -= count;
@ -493,8 +494,8 @@ xfind_pages(
for (j=0; j < ncmds; ++j, for (j=0; j < ncmds; ++j,
(sc = (Mach_segment_command const *)((sc->cmdsize>>2) + (unsigned const *)sc)) (sc = (Mach_segment_command const *)((sc->cmdsize>>2) + (unsigned const *)sc))
) if (LC_SEGMENT==sc->cmd) { ) if (LC_SEGMENT==sc->cmd) {
DPRINTF(" #%%d cmd=%%x cmdsize=%%x vmaddr=%%p vmsize==%%p lo=%%p mflags=%%x\\n", DPRINTF(" #%%d cmd=%%x cmdsize=%%x vmaddr=%%p vmsize==%%p filesize=%%p lo=%%p mflags=%%x\\n",
j, sc->cmd, sc->cmdsize, sc->vmaddr, sc->vmsize, lo, mflags); j, sc->cmd, sc->cmdsize, sc->vmaddr, sc->vmsize, sc->filesize, lo, mflags);
if (sc->vmsize // theoretically occupies address space if (sc->vmsize // theoretically occupies address space
&& !(sc->vmaddr==0 && (MAP_FIXED & mflags)) // but ignore PAGEZERO when MAP_FIXED && !(sc->vmaddr==0 && (MAP_FIXED & mflags)) // but ignore PAGEZERO when MAP_FIXED
) { ) {
@ -563,6 +564,7 @@ do_xmap(
struct b_info h; struct b_info h;
if (xi && sc->filesize) { // Find the correct compressed block. if (xi && sc->filesize) { // Find the correct compressed block.
xpeek(xi, (unsigned char *)&h, sizeof(h)); xpeek(xi, (unsigned char *)&h, sizeof(h));
DPRINTF(" h.b_extra=%%d j=%%d\n", h.b_extra, j);
if (h.b_extra != j) { // not the next one if (h.b_extra != j) { // not the next one
*xi = xi_orig; // rewind *xi = xi_orig; // rewind
for (;;) { for (;;) {