From ac2bfaa14ccfd633350de293e7377c911362babf Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 4 Jan 2021 01:45:15 +0700 Subject: [PATCH] dbgtool: Fix warning from incorrect LispPTR* usage. (#161) `fnobj_lisp` was being treated as a `LispPTR*` when it was just a `LispPTR`. This requires fixing up the printfs as well since it is no longer a void* to treat it as `%p`. --- src/dbgtool.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/dbgtool.c b/src/dbgtool.c index dcb4f40..7d93d19 100644 --- a/src/dbgtool.c +++ b/src/dbgtool.c @@ -735,19 +735,19 @@ void nt(LispPTR index) void ntheader(struct fnhead *fnobj) { LispPTR *localnt1; int localntsize; - LispPTR *fnobj_lisp; + LispPTR fnobj_lisp; - fnobj_lisp = (LispPTR *)LADDR_from_68k((DLword *)fnobj); - printf("%8p: 0x%08x stkmin\n", fnobj_lisp, fnobj->stkmin); - printf("%8p: 0x%08x na\n", fnobj_lisp + 1, fnobj->na); - printf("%8p: 0x%08x pv\n", fnobj_lisp + 2, fnobj->pv); - printf("%8p: 0x%08x startpc\n", fnobj_lisp + 3, fnobj->startpc); - printf("%8p: 0x%08x argtype\n", fnobj_lisp + 4, fnobj->argtype); - printf("%8p: 0x%08x framename ", fnobj_lisp + 5, fnobj->framename); + fnobj_lisp = LADDR_from_68k((DLword *)fnobj); + printf("0x%08x: 0x%08x stkmin\n", fnobj_lisp, fnobj->stkmin); + printf("0x%08x: 0x%08x na\n", fnobj_lisp + 1, fnobj->na); + printf("0x%08x: 0x%08x pv\n", fnobj_lisp + 2, fnobj->pv); + printf("0x%08x: 0x%08x startpc\n", fnobj_lisp + 3, fnobj->startpc); + printf("0x%08x: 0x%08x argtype\n", fnobj_lisp + 4, fnobj->argtype); + printf("0x%08x: 0x%08x framename ", fnobj_lisp + 5, fnobj->framename); print(fnobj->framename); putchar('\n'); - printf("%8p: 0x%08x ntsize\n", fnobj_lisp + 6, fnobj->ntsize); - printf("%8p: 0x%08x nlocals", fnobj_lisp + 7, fnobj->nlocals); + printf("0x%08x: 0x%08x ntsize\n", fnobj_lisp + 6, fnobj->ntsize); + printf("0x%08x: 0x%08x nlocals", fnobj_lisp + 7, fnobj->nlocals); printf(" 0x%08x fvaroffset\n", fnobj->fvaroffset); nt1((LispPTR *)((DLword *)fnobj + FNOVERHEADWORDS), fnobj->ntsize, "Name Table");