Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 04:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DBGHELP] Sync with Wine Staging 2.16. CORE-13762

Browse source 
00e27186 dbghelp: Silence a noisy FIXME.

svn path=/trunk/; revision=75868
This commit is contained in:
Amine Khaldi 2017-09-17 12:33:49 +00:00
parent 10e905a8e0
commit bcd314bf3f
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/dbghelp/cpu_arm.c
View file

@ -33,7 +33,11 @@ static BOOL arm_get_addr(HANDLE hThread, const CONTEXT* ctx,
#ifdef __arm__
case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE;
case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE;
#ifdef __REACTOS__
case cpu_addr_frame: addr->Offset = ctx->R11; return TRUE;
#else
case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE;
#endif
#endif
default: addr->Mode = -1;
return FALSE;
@ -116,7 +120,11 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON
/* set frame information */
frame->AddrStack.Offset = context->Sp;
frame->AddrReturn.Offset = context->Lr;
#ifdef __REACTOS__
frame->AddrFrame.Offset = context->R11;
#else
frame->AddrFrame.Offset = context->Fp;
#endif
frame->AddrPC.Offset = context->Pc;
frame->Far = TRUE;
@ -169,8 +177,13 @@ static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size)
case CV_ARM_R0 + 8: *size = sizeof(ctx->R8); return &ctx->R8;
case CV_ARM_R0 + 9: *size = sizeof(ctx->R9); return &ctx->R9;
case CV_ARM_R0 + 10: *size = sizeof(ctx->R10); return &ctx->R10;
#ifdef __REACTOS__
case CV_ARM_R0 + 11: *size = sizeof(ctx->R11); return &ctx->R11;
case CV_ARM_R0 + 12: *size = sizeof(ctx->R12); return &ctx->R12;
#else
case CV_ARM_R0 + 11: *size = sizeof(ctx->Fp); return &ctx->Fp;
case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip;
#endif
case CV_ARM_SP: *size = sizeof(ctx->Sp); return &ctx->Sp;
case CV_ARM_LR: *size = sizeof(ctx->Lr); return &ctx->Lr;

2
reactos/dll/win32/dbghelp/dwarf.c
View file

@ -1790,7 +1790,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm,
if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc))
{
FIXME("no range\n");
WARN("no range\n");
return;
}

2
reactos/media/doc/README.WINE
View file

@ -63,7 +63,7 @@ reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9
reactos/dll/win32/cryptdll # Synced to WineStaging-2.9
reactos/dll/win32/cryptnet # Synced to WineStaging-2.9
reactos/dll/win32/cryptui # Synced to WineStaging-2.16
reactos/dll/win32/dbghelp # Synced to WineStaging-2.9
reactos/dll/win32/dbghelp # Synced to WineStaging-2.16
reactos/dll/win32/dciman32 # Synced to WineStaging-2.9
reactos/dll/win32/faultrep # Synced to WineStaging-2.9
reactos/dll/win32/fontsub # Synced to WineStaging-2.9