ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Use DWARF registry mapping quirk only for actual macho modules. 

Fixes handling DWARF in PE on macOS.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-03-29 21:01:02 +02:00 committed by Alexandre Julliard
parent 5d8067c608
commit 3b6c268380
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/dbghelp/cpu_i386.c
View File

@ -520,13 +520,11 @@ static unsigned i386_map_dwarf_register(unsigned regno, const struct module* mod
case 3: reg = CV_REG_EBX; break; case 3: reg = CV_REG_EBX; break;
case 4: case 4:
case 5: case 5:
#ifdef __APPLE__
/* On OS X, DWARF eh_frame uses a different mapping for the registers. It's /* On OS X, DWARF eh_frame uses a different mapping for the registers. It's
apparently the mapping as emitted by GCC, at least at some point in its history. */ apparently the mapping as emitted by GCC, at least at some point in its history. */
if (eh_frame) if (eh_frame && module->type == DMT_MACHO)
reg = (regno == 4) ? CV_REG_EBP : CV_REG_ESP; reg = (regno == 4) ? CV_REG_EBP : CV_REG_ESP;
else else
#endif
reg = (regno == 4) ? CV_REG_ESP : CV_REG_EBP; reg = (regno == 4) ? CV_REG_ESP : CV_REG_EBP;
break; break;
case 6: reg = CV_REG_ESI; break; case 6: reg = CV_REG_ESI; break;