Module: wine Branch: master Commit: ebaa47dcee08cb58d407a8dd15323258e8e5aa79 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebaa47dcee08cb58d407a8dd1532325... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 19:03:14 2024 +0100 winedump: Print the correct register names for exception info on ARM64. --- tools/winedump/pe.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1104072a2c2..d4bf46c5307 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1424,15 +1424,15 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) } else if (ptr[i] < 0x40) /* save_r19r20_x */ { - printf( "stp r19,r20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); + printf( "stp x19,x20,[sp,-#%#x]!\n", 8 * (val & 0x1f) ); } else if (ptr[i] < 0x80) /* save_fplr */ { - printf( "stp r29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); + printf( "stp x29,lr,[sp,#%#x]\n", 8 * (val & 0x3f) ); } else if (ptr[i] < 0xc0) /* save_fplr_x */ { - printf( "stp r29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); + printf( "stp x29,lr,[sp,-#%#x]!\n", 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xc8) /* alloc_m */ { @@ -1441,27 +1441,27 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) else if (ptr[i] < 0xcc) /* save_regp */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); + printf( "stp x%u,x%u,[sp,#%#x]\n", reg, reg + 1, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd0) /* save_regp_x */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "stp r%u,r%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); + printf( "stp x%u,x%u,[sp,-#%#x]!\n", reg, reg + 1, 8 * (val & 0x3f) + 8 ); } else if (ptr[i] < 0xd4) /* save_reg */ { int reg = 19 + ((val >> 6) & 0xf); - printf( "str r%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "str x%u,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xd6) /* save_reg_x */ { int reg = 19 + ((val >> 5) & 0xf); - printf( "str r%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); + printf( "str x%u,[sp,-#%#x]!\n", reg, 8 * (val & 0x1f) + 8 ); } else if (ptr[i] < 0xd8) /* save_lrpair */ { int reg = 19 + 2 * ((val >> 6) & 0x7); - printf( "stp r%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); + printf( "stp x%u,lr,[sp,#%#x]\n", reg, 8 * (val & 0x3f) ); } else if (ptr[i] < 0xda) /* save_fregp */ {