Fix code review nit picks

dotnet · Jul 24, 2015 · 442b786 · 442b786
1 parent a751050
commit 442b786
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt
@@ -57,6 +57,8 @@ set( JIT_SOURCES
   assertionprop.cpp
   rangecheck.cpp
   loopcloning.cpp
+  lower.cpp
+  lsra.cpp
 )
 
 if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
@@ -67,8 +69,6 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64)
     lowerxarch.cpp
     codegenxarch.cpp
     simdcodegenxarch.cpp
-    lower.cpp
-    lsra.cpp
     simd.cpp
   )
 elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
@@ -78,8 +78,6 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM)
     lowerarm.cpp
     codegenarm.cpp
     unwindarm.cpp
-    lower.cpp
-    lsra.cpp
   )
 else()
   message(FATAL_ERROR "Only ARM and AMD64 is supported")

diff --git a/src/pal/inc/unixasmmacrosarm.inc b/src/pal/inc/unixasmmacrosarm.inc
@@ -113,6 +113,32 @@ C_FUNC(\Name\()_End):
         .cfi_adjust_cfa_offset -(4*4)
 .endm
 
+// Stack layout:
+//
+// (stack parameters)
+// ...
+// ArgumentRegisters::r3
+// ArgumentRegisters::r2
+// ArgumentRegisters::r1
+// ArgumentRegisters::r0
+// CalleeSavedRegisters::lr
+// CalleeSavedRegisters::r11
+// CalleeSavedRegisters::r10
+// CalleeSavedRegisters::r9
+// CalleeSavedRegisters::r8
+// CalleeSavedRegisters::r7
+// CalleeSavedRegisters::r6
+// CalleeSavedRegisters::r5
+// CalleeSavedRegisters::r4    <- __PWTB_StackAlloc, __PWTB_TransitionBlock
+// padding to align float save area
+// d7
+// d6
+// d5
+// d4
+// d3
+// d2
+// d1
+// d0                          <- __PWTB_FloatArgumentRegisters
 .macro PROLOG_WITH_TRANSITION_BLOCK extraLocals = 0, saveFpArgs = 0, pushArgRegs = 0
 
         __PWTB_FloatArgumentRegisters = \extraLocals

diff --git a/src/pal/src/thread/context.cpp b/src/pal/src/thread/context.cpp
@@ -413,7 +413,7 @@ void CONTEXTToNativeContext(CONST CONTEXT *lpContext, native_context_t *native)
 
     if ((lpContext->ContextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT)
     {
-#ifndef _ARM_
+#ifdef _AMD64_
         FPREG_ControlWord(native) = lpContext->FltSave.ControlWord;
         FPREG_StatusWord(native) = lpContext->FltSave.StatusWord;
         FPREG_TagWord(native) = lpContext->FltSave.TagWord;
@@ -472,7 +472,7 @@ void CONTEXTFromNativeContext(const native_context_t *native, LPCONTEXT lpContex
 
     if ((contextFlags & CONTEXT_FLOATING_POINT) == CONTEXT_FLOATING_POINT)
     {
-#ifndef _ARM_
+#ifdef _AMD64_
         lpContext->FltSave.ControlWord = FPREG_ControlWord(native);
         lpContext->FltSave.StatusWord = FPREG_StatusWord(native);
         lpContext->FltSave.TagWord = FPREG_TagWord(native);

diff --git a/src/unwinder/arm/unwinder_arm.cpp b/src/unwinder/arm/unwinder_arm.cpp
@@ -1484,4 +1484,4 @@ PEXCEPTION_ROUTINE RtlVirtualUnwind(
 
     return NULL;
 }
-#endif
+#endif
diff --git a/src/vm/arm/asmhelpers.S b/src/vm/arm/asmhelpers.S
@@ -1358,4 +1358,4 @@ DelayLoad_Helper\suffix:
 LEAF_ENTRY StartUnwindingNativeFrames, _TEXT
        // TODO: Implement
        bx lr
-LEAF_END StartUnwindingNativeFrames, _TEXT
+LEAF_END StartUnwindingNativeFrames, _TEXT
diff --git a/src/vm/arm/memcpy.S b/src/vm/arm/memcpy.S
@@ -34,4 +34,4 @@ LOCAL_LABEL(GC_POLL):
         it ne
         bne C_FUNC(FCallMemCpy_GCPoll)
         bx lr
-    LEAF_END FCallMemcpy, _TEXT
+    LEAF_END FCallMemcpy, _TEXT