This is an archive of the discontinued LLVM Phabricator instance.

Differential D45590

[Support] Fix building for Windows on ARM
ClosedPublic

Authored by mstorsjo on Apr 12 2018, 1:31 PM.

Details

Reviewers
martell
compnerd
rnk
Commits
rG8293161712e6: [Support] Fix building for Windows on ARM
rL329991: [Support] Fix building for Windows on ARM
Summary

The commit in SVN r310001 that added support for this actually didn't use the right struct field for the frame pointer - for ARM, there is no register named Fp in the CONTEXT struct. On Windows, the R11 register is used as frame pointer.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Apr 12 2018, 1:31 PM
Herald added a subscriber: kristof.beyls. · View Herald TranscriptApr 12 2018, 1:31 PM
compnerd accepted this revision.Apr 12 2018, 7:41 PM
This revision is now accepted and ready to land.Apr 12 2018, 7:41 PM
Closed by commit rL329991: [Support] Fix building for Windows on ARM (authored by mstorsjo). · Explain WhyApr 12 2018, 11:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Support/
Windows/
10 lines

Diff 142337

llvm/trunk/lib/Support/Windows/Signals.inc

Show First 20 Lines • Show All 527 Lines • ▼ Show 20 Lines
#if defined(_M_X64) #if defined(_M_X64)
StackFrame.AddrPC.Offset = Context.Rip; StackFrame.AddrPC.Offset = Context.Rip;
StackFrame.AddrStack.Offset = Context.Rsp; StackFrame.AddrStack.Offset = Context.Rsp;
StackFrame.AddrFrame.Offset = Context.Rbp; StackFrame.AddrFrame.Offset = Context.Rbp;
#elif defined(_M_IX86) #elif defined(_M_IX86)
StackFrame.AddrPC.Offset = Context.Eip; StackFrame.AddrPC.Offset = Context.Eip;
StackFrame.AddrStack.Offset = Context.Esp; StackFrame.AddrStack.Offset = Context.Esp;
StackFrame.AddrFrame.Offset = Context.Ebp; StackFrame.AddrFrame.Offset = Context.Ebp;
#elif defined(_M_ARM64) || defined(_M_ARM) #elif defined(_M_ARM64)
StackFrame.AddrPC.Offset = Context.Pc; StackFrame.AddrPC.Offset = Context.Pc;
StackFrame.AddrStack.Offset = Context.Sp; StackFrame.AddrStack.Offset = Context.Sp;
StackFrame.AddrFrame.Offset = Context.Fp; StackFrame.AddrFrame.Offset = Context.Fp;
#elif defined(_M_ARM)
StackFrame.AddrPC.Offset = Context.Pc;
StackFrame.AddrStack.Offset = Context.Sp;
StackFrame.AddrFrame.Offset = Context.R11;
#endif #endif
StackFrame.AddrPC.Mode = AddrModeFlat; StackFrame.AddrPC.Mode = AddrModeFlat;
StackFrame.AddrStack.Mode = AddrModeFlat; StackFrame.AddrStack.Mode = AddrModeFlat;
StackFrame.AddrFrame.Mode = AddrModeFlat; StackFrame.AddrFrame.Mode = AddrModeFlat;
PrintStackTraceForThread(OS, GetCurrentProcess(), GetCurrentThread(), PrintStackTraceForThread(OS, GetCurrentProcess(), GetCurrentThread(),
StackFrame, &Context); StackFrame, &Context);
} }
▲ Show 20 Lines • Show All 263 Lines • ▼ Show 20 Lines#elif defined(_M_IX86)
StackFrame.AddrStack.Mode = AddrModeFlat; StackFrame.AddrStack.Mode = AddrModeFlat;
StackFrame.AddrFrame.Offset = ep->ContextRecord->Ebp; StackFrame.AddrFrame.Offset = ep->ContextRecord->Ebp;
StackFrame.AddrFrame.Mode = AddrModeFlat; StackFrame.AddrFrame.Mode = AddrModeFlat;
#elif defined(_M_ARM64) || defined(_M_ARM) #elif defined(_M_ARM64) || defined(_M_ARM)
StackFrame.AddrPC.Offset = ep->ContextRecord->Pc; StackFrame.AddrPC.Offset = ep->ContextRecord->Pc;
StackFrame.AddrPC.Mode = AddrModeFlat; StackFrame.AddrPC.Mode = AddrModeFlat;
StackFrame.AddrStack.Offset = ep->ContextRecord->Sp; StackFrame.AddrStack.Offset = ep->ContextRecord->Sp;
StackFrame.AddrStack.Mode = AddrModeFlat; StackFrame.AddrStack.Mode = AddrModeFlat;
#if defined(_M_ARM64)
StackFrame.AddrFrame.Offset = ep->ContextRecord->Fp; StackFrame.AddrFrame.Offset = ep->ContextRecord->Fp;
#else
StackFrame.AddrFrame.Offset = ep->ContextRecord->R11;
#endif
StackFrame.AddrFrame.Mode = AddrModeFlat; StackFrame.AddrFrame.Mode = AddrModeFlat;
#endif #endif
HANDLE hProcess = GetCurrentProcess(); HANDLE hProcess = GetCurrentProcess();
HANDLE hThread = GetCurrentThread(); HANDLE hThread = GetCurrentThread();
PrintStackTraceForThread(llvm::errs(), hProcess, hThread, StackFrame, PrintStackTraceForThread(llvm::errs(), hProcess, hThread, StackFrame,
ep->ContextRecord); ep->ContextRecord);
Show All 34 Lines