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

winedbg: In x86_64 backend, now recognize 'rep ret' as a valid function return instruction.

Browse Source
This commit is contained in:
Eric Pouech 2012-01-02 20:58:23 +01:00 committed by Alexandre Julliard
parent 4d4955f248
commit c047d6ddbd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/winedbg/be_x86_64.c
View File

@ -300,7 +300,15 @@ static unsigned be_x86_64_is_step_over_insn(const void* insn)
static unsigned be_x86_64_is_function_return(const void* insn) static unsigned be_x86_64_is_function_return(const void* insn)
{ {
BYTE c; BYTE c;
return dbg_read_memory(insn, &c, sizeof(c)) && ((c == 0xC2) || (c == 0xC3));
/* sigh... amd64 for prefetch optimization requires 'rep ret' in some cases */
if (!dbg_read_memory(insn, &c, sizeof(c))) return FALSE;
if (c == 0xF3) /* REP */
{
insn = (const char*)insn + 1;
if (!dbg_read_memory(insn, &c, sizeof(c))) return FALSE;
}
return c == 0xC2 /* ret */ || c == 0xC3 /* ret NN */;
} }
static unsigned be_x86_64_is_break_insn(const void* insn) static unsigned be_x86_64_is_break_insn(const void* insn)