ARM: Fix ARMSubtarget for WOA

[martell]

Summary

Building on http://reviews.llvm.org/rL273682
This will enable lli for WOA64 and WOA hosts

[rengolin]

Hi,

Have you run all the tests on Windows (check-all)?

cheers,
--renato

lib/Support/Windows/Signals.inc

535 ↗

(On Diff #62135)

Shouldn't this be Fp?

[martell]

In D21813#469255, @rengolin wrote:

Have you run all the tests on Windows (check-all)?

No but I will do.
More changes need to go into Signals.inc to properly print everything out as was intended on ARM.
I just submitted the patch initially to get feedback to see if the change was accurate

lib/Support/Windows/Signals.inc

535 ↗

(On Diff #62135)

Yes it should

[rengolin]

Right, @compnerd knows better about WoA, though.

Also, when you do a diff for Phab, please use "diff -U999" so that we can see the context around the changes. Don't worry, Phab won't show a huge file. :)

cheers,
--renato

[compnerd]

lib/Target/ARM/ARMSubtarget.cpp

216 ↗

(On Diff #62145)

Windows ARM NT is a pure thumb-2 environment. We really should not be generating ARM code. I dont think that this should be changed.

[• my123]

It should be changed, as Thumb-2 code is generated after this. With NoARM=true, no JIT code is generated at all

if you didn't see my NoARM comment.

Thumb-2 code is generated anyway, or at least code that fully runs on both 8.0 and 8.1, Fibonnaci is stable even with high test values, which even means that __chkstk works fine.

lib/Target/ARM/ARMSubtarget.cpp

216 ↗

(On Diff #62145)

It should be changed, as Thumb-2 code is generated after this. With NoARM=true, no JIT code is generated at all

[• my123]

Note that I'm defining the target as arm-pc-win32

[martell]

updated to support woa64 and falback to unknown instead of x86 when unknown

[martell]

leaving the arm subtarget code out until I actually get a device to test this on.
Should be good to merge.

[martell]

@rnk can you review this if you get a chance during the week.
I think compnerd is tied down and I don't want this to rot again :)

[martell]

ping

[rnk]

lgtm, sorry I declared email bankruptcy at some point.

[martell]

Thanks Reid :)

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

 static CRITICAL_SECTION CriticalSection;
 static bool CriticalSectionInitialized = false;
 
 static StringRef Argv0;
 
 enum {
 #if defined(_M_X64)
   NativeMachineType = IMAGE_FILE_MACHINE_AMD64
-#else
+#elif defined(_M_ARM64)
+  NativeMachineType = IMAGE_FILE_MACHINE_ARM64
+#elif defined(_M_IX86)
   NativeMachineType = IMAGE_FILE_MACHINE_I386
+#elif defined(_M_ARM)
+  NativeMachineType = IMAGE_FILE_MACHINE_ARMNT
+#else
+  NativeMachineType = IMAGE_FILE_MACHINE_UNKNOWN
 #endif
 };
 
 static bool printStackTraceWithLLVMSymbolizer(llvm::raw_ostream &OS,
                                               HANDLE hProcess, HANDLE hThread,
                                               STACKFRAME64 &StackFrameOrig,
                                               CONTEXT *ContextOrig) {
   // StackWalk64 modifies the incoming stack frame and context, so copy them.
while (true) {
     }
 
     if (StackFrame.AddrFrame.Offset == 0)
       break;
 
     using namespace llvm;
     // Print the PC in hexadecimal.
     DWORD64 PC = StackFrame.AddrPC.Offset;
-#if defined(_M_X64)
+#if defined(_M_X64) || defined(_M_ARM64)
     OS << format("0x%016llX", PC);
-#elif defined(_M_IX86)
+#elif defined(_M_IX86) || defined(_M_ARM)
     OS << format("0x%08lX", static_cast<DWORD>(PC));
 #endif
 
 // Print the parameters.  Assume there are four.
-#if defined(_M_X64)
+#if defined(_M_X64) || defined(_M_ARM64)
     OS << format(" (0x%016llX 0x%016llX 0x%016llX 0x%016llX)",
             StackFrame.Params[0], StackFrame.Params[1], StackFrame.Params[2],
             StackFrame.Params[3]);
-#elif defined(_M_IX86)
+#elif defined(_M_IX86) || defined(_M_ARM)
     OS << format(" (0x%08lX 0x%08lX 0x%08lX 0x%08lX)",
             static_cast<DWORD>(StackFrame.Params[0]),
             static_cast<DWORD>(StackFrame.Params[1]),
             static_cast<DWORD>(StackFrame.Params[2]),
             static_cast<DWORD>(StackFrame.Params[3]));
 #endif
     // Verify the PC belongs to a module in this process.
     if (!fSymGetModuleBase64(hProcess, PC)) {

 void llvm::sys::PrintStackTrace(raw_ostream &OS) {
   STACKFRAME64 StackFrame = {};
   CONTEXT Context = {};
   ::RtlCaptureContext(&Context);
 #if defined(_M_X64)
   StackFrame.AddrPC.Offset = Context.Rip;
   StackFrame.AddrStack.Offset = Context.Rsp;
   StackFrame.AddrFrame.Offset = Context.Rbp;
-#else
+#elif defined(_M_IX86)
   StackFrame.AddrPC.Offset = Context.Eip;
   StackFrame.AddrStack.Offset = Context.Esp;
   StackFrame.AddrFrame.Offset = Context.Ebp;
+#elif defined(_M_ARM64) || defined(_M_ARM)
+  StackFrame.AddrPC.Offset = Context.Pc;
+  StackFrame.AddrStack.Offset = Context.Sp;
+  StackFrame.AddrFrame.Offset = Context.Fp;
 #endif
   StackFrame.AddrPC.Mode = AddrModeFlat;
   StackFrame.AddrStack.Mode = AddrModeFlat;
   StackFrame.AddrFrame.Mode = AddrModeFlat;
   PrintStackTraceForThread(OS, GetCurrentProcess(), GetCurrentThread(),
                            StackFrame, &Context);
 }
 
#if defined(_M_X64)
   StackFrame.AddrFrame.Mode = AddrModeFlat;
 #elif defined(_M_IX86)
   StackFrame.AddrPC.Offset = ep->ContextRecord->Eip;
   StackFrame.AddrPC.Mode = AddrModeFlat;
   StackFrame.AddrStack.Offset = ep->ContextRecord->Esp;
   StackFrame.AddrStack.Mode = AddrModeFlat;
   StackFrame.AddrFrame.Offset = ep->ContextRecord->Ebp;
   StackFrame.AddrFrame.Mode = AddrModeFlat;
+#elif defined(_M_ARM64) || defined(_M_ARM)
+  StackFrame.AddrPC.Offset = ep->ContextRecord->Pc;
+  StackFrame.AddrPC.Mode = AddrModeFlat;
+  StackFrame.AddrStack.Offset = ep->ContextRecord->Sp;
+  StackFrame.AddrStack.Mode = AddrModeFlat;
+  StackFrame.AddrFrame.Offset = ep->ContextRecord->Fp;
+  StackFrame.AddrFrame.Mode = AddrModeFlat;
 #endif
 
   HANDLE hProcess = GetCurrentProcess();
   HANDLE hThread = GetCurrentThread();
   PrintStackTraceForThread(llvm::errs(), hProcess, hThread, StackFrame,
                            ep->ContextRecord);
 
   _exit(ep->ExceptionRecord->ExceptionCode);