Module: wine Branch: master Commit: 57c58be77dd7ee70a5854cea9d22d38644dd8a47 URL: https://gitlab.winehq.org/wine/wine/-/commit/57c58be77dd7ee70a5854cea9d22d38...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 8 15:09:03 2022 +0100
winedbg: Fix printf format warnings on ARM platforms.
---
programs/winedbg/be_arm.c | 8 ++++---- programs/winedbg/be_arm64.c | 2 +- programs/winedbg/memory.c | 2 +- programs/winedbg/stack.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index a505697c9bb..02b56de4408 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1704,13 +1704,13 @@ static void be_arm_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all_r if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-';
- dbg_printf(" Pc:%08x Sp:%08x Lr:%08x Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%08lx Sp:%08lx Lr:%08lx Cpsr:%08lx(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.Lr, ctx->ctx.Cpsr, buf); - dbg_printf(" r0:%08x r1:%08x r2:%08x r3:%08x\n", + dbg_printf(" r0:%08lx r1:%08lx r2:%08lx r3:%08lx\n", ctx->ctx.R0, ctx->ctx.R1, ctx->ctx.R2, ctx->ctx.R3); - dbg_printf(" r4:%08x r5:%08x r6:%08x r7:%08x\n", + dbg_printf(" r4:%08lx r5:%08lx r6:%08lx r7:%08lx\n", ctx->ctx.R4, ctx->ctx.R5, ctx->ctx.R6, ctx->ctx.R7); - dbg_printf(" r8:%08x r9:%08x r10:%08x r11:%08x r12:%08x\n", + dbg_printf(" r8:%08lx r9:%08lx r10:%08lx r11:%08lx r12:%08lx\n", ctx->ctx.R8, ctx->ctx.R9, ctx->ctx.R10, ctx->ctx.R11, ctx->ctx.R12);
if (all_regs) dbg_printf( "Floating point ARM dump not implemented\n" ); diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d9e0a97bce5..ce7be7ca734 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -80,7 +80,7 @@ static void be_arm64_print_context(HANDLE hThread, const dbg_ctx_t *ctx, int all if (!((ctx->ctx.Cpsr >> 26) & (1 << (sizeof(condflags) - i)))) buf[i] = '-';
- dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08x(%s)\n", + dbg_printf(" Pc:%016I64x Sp:%016I64x Lr:%016I64x Cpsr:%08lx(%s)\n", ctx->ctx.Pc, ctx->ctx.Sp, ctx->ctx.u.s.Lr, ctx->ctx.Cpsr, buf); dbg_printf(" x0: %016I64x x1: %016I64x x2: %016I64x x3: %016I64x x4: %016I64x\n", ctx->ctx.u.s.X0, ctx->ctx.u.s.X1, ctx->ctx.u.s.X2, ctx->ctx.u.s.X3, ctx->ctx.u.s.X4); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index a8318675ff6..c1a714626b2 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -726,7 +726,7 @@ void print_address(const ADDRESS64* addr, BOOLEAN with_line) if (!SymGetModuleInfo(dbg_curr_process->handle, lin, &im)) return; dbg_printf(" %s", im.ModuleName); if (lin > im.BaseOfImage) - dbg_printf("+0x%Ix", lin - im.BaseOfImage); + dbg_printf("+0x%Ix", lin - (DWORD_PTR)im.BaseOfImage); } if (with_line) { diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 59ec7f6c45f..4acb5666079 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -296,7 +296,7 @@ static void stack_print_addr_and_args(void) dbg_printf(" [%s:%lu]", il.FileName, il.LineNumber); dbg_printf(" in %s", im.ModuleName); } - else dbg_printf(" in %s (+0x%Ix)", im.ModuleName, frm->linear_pc - im.BaseOfImage); + else dbg_printf(" in %s (+0x%Ix)", im.ModuleName, frm->linear_pc - (DWORD_PTR)im.BaseOfImage); }
/******************************************************************
-
Alexandre Julliard