From: Patrick von Reth Date: Sat, 6 Feb 2010 12:20:24 +0000 (+0100) Subject: fixed enabled inline assembler for backtrace on windows X-Git-Tag: 0.6-beta1~13 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7efb623a14099449d514df99a0b9b6de69acbb0f;hp=8ee681e8d04043b095ae430fb7581fd6e1f5ea4c fixed enabled inline assembler for backtrace on windows --- diff --git a/src/common/logbacktrace_win.cpp b/src/common/logbacktrace_win.cpp index ed11ea44..b12c15dc 100644 --- a/src/common/logbacktrace_win.cpp +++ b/src/common/logbacktrace_win.cpp @@ -89,16 +89,16 @@ void Quassel::logBacktrace(const QString &filename) { ZeroMemory(&Context, sizeof(CONTEXT)); Context.ContextFlags = CONTEXT_CONTROL; -// TODO: port asssembler to mingw32 + #ifdef __MINGW32__ -// asm("Label:\n\t" -// "movl %%ebp,%0;\n\t" -// "movl %%esp,%1;\n\t" -// "movl $Label,%%eax;\n\t" -// "movl %%eax,;\n\t" -// :"=r"(Content.Epb),"=r"(Context.Esp),"=r"(Context.Eip) -// ://no input -// :"ebp","esp","eax"); + asm("Label:\n\t" + "movl %%ebp,%0;\n\t" + "movl %%esp,%1;\n\t" + "movl $Label,%%eax;\n\t" + "movl %%eax,%2;\n\t" + :"=r"(Context.Ebp),"=r"(Context.Esp),"=r"(Context.Eip) + ://no input + :"eax"); #else _asm { Label: