Fix CppCodegen and Unix

5 files changed, 11 insertions, 11 deletions

diff --git a/src/Native/Runtime/amd64/AllocFast.S b/src/Native/Runtime/amd64/AllocFast.S
index 513175fad..a1e5e5fce 100644
--- a/src/Native/Runtime/amd64/AllocFast.S
+++ b/src/Native/Runtime/amd64/AllocFast.S
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 .intel_syntax noprefix
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 // Allocate non-array, non-finalizable object. If the allocation doesn't fit into the current thread's
 // allocation context then automatically fallback to the slow allocation path.
@@ -122,7 +122,7 @@ NESTED_END RhpNewObject, _TEXT
 // Allocate a string.
 //  RDI == EEType
 //  ESI == character/element count
-NESTED_ENTRY RhpNewString, _TEXT, NoHandler
+NESTED_ENTRY RhNewString, _TEXT, NoHandler
         // we want to limit the element count to the non-negative 32-bit int range
         cmp         rsi, 07fffffffh
         ja          LOCAL_LABEL(StringSizeOverflow)
@@ -140,7 +140,7 @@ NESTED_ENTRY RhpNewString, _TEXT, NoHandler
         mov         rcx, rax    // rcx = Thread*
 
         // Compute overall allocation size (align(base size + (element size * elements), 8)).
-        lea         rax, [(r12 * STRING_COMPONENT_SIZE) + (STRING_BASE_SIZE + 7)]
+        lea         rax, [r12 * STRING_COMPONENT_SIZE + STRING_BASE_SIZE + 7]
         and         rax, -8
 
         // rax == string size
@@ -150,7 +150,7 @@ NESTED_ENTRY RhpNewString, _TEXT, NoHandler
 
         mov         rdx, rax
         add         rax, [rcx + OFFSETOF__Thread__m_alloc_context__alloc_ptr]
-        jc          LOCAL_LABEL(RhpNewString_RarePath)
+        jc          LOCAL_LABEL(RhNewString_RarePath)
 
         // rax == new alloc ptr
         // rbx == EEType
@@ -158,7 +158,7 @@ NESTED_ENTRY RhpNewString, _TEXT, NoHandler
         // rdx == string size
         // r12 == element count
         cmp         rax, [rcx + OFFSETOF__Thread__m_alloc_context__alloc_limit]
-        ja          LOCAL_LABEL(RhpNewString_RarePath)
+        ja          LOCAL_LABEL(RhNewString_RarePath)
 
         mov         [rcx + OFFSETOF__Thread__m_alloc_context__alloc_ptr], rax
 
@@ -176,7 +176,7 @@ NESTED_ENTRY RhpNewString, _TEXT, NoHandler
 
         .cfi_restore_state
         .cfi_def_cfa_offset 32  // workaround cfi_restore_state bug
-LOCAL_LABEL(RhpNewString_RarePath):
+LOCAL_LABEL(RhNewString_RarePath):
         mov         rdi, rbx    // restore EEType
         mov         rsi, r12    // restore element count
         // passing string size in rdx
@@ -195,7 +195,7 @@ LOCAL_LABEL(StringSizeOverflow):
         xor         esi, esi            // Indicate that we should throw OOM.
         jmp         C_FUNC(RhExceptionHandling_FailedAllocation)
 
-NESTED_END RhpNewString, _TEXT
+NESTED_END RhNewString, _TEXT
 
 
 // Allocate one dimensional, zero based array (SZARRAY).
diff --git a/src/Native/Runtime/amd64/ExceptionHandling.S b/src/Native/Runtime/amd64/ExceptionHandling.S
index b9478f0a0..fcf4dfbda 100644
--- a/src/Native/Runtime/amd64/ExceptionHandling.S
+++ b/src/Native/Runtime/amd64/ExceptionHandling.S
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 .intel_syntax noprefix
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/Native/Runtime/amd64/InteropThunksHelpers.S b/src/Native/Runtime/amd64/InteropThunksHelpers.S
index 47011c295..6e1e2feba 100644
--- a/src/Native/Runtime/amd64/InteropThunksHelpers.S
+++ b/src/Native/Runtime/amd64/InteropThunksHelpers.S
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 .intel_syntax noprefix
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 #define POINTER_SIZE 8
 
 LEAF_ENTRY RhCommonStub, _TEXT
diff --git a/src/Native/Runtime/amd64/PInvoke.S b/src/Native/Runtime/amd64/PInvoke.S
index e1def2bef..0a8cbbde0 100644
--- a/src/Native/Runtime/amd64/PInvoke.S
+++ b/src/Native/Runtime/amd64/PInvoke.S
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 .intel_syntax noprefix
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 //
 // RhpPInvoke
diff --git a/src/Native/Runtime/amd64/StubDispatch.S b/src/Native/Runtime/amd64/StubDispatch.S
index 096b59d0a..c2fe83c9c 100644
--- a/src/Native/Runtime/amd64/StubDispatch.S
+++ b/src/Native/Runtime/amd64/StubDispatch.S
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 .intel_syntax noprefix
-#include <unixasmmacros.inc>
 #include <AsmOffsets.inc>         // generated by the build from AsmOffsets.cpp
+#include <unixasmmacros.inc>
 
 LEAF_ENTRY RhpCastableObjectDispatch_CommonStub, _TEXT
         // UNIXTODO: Implement this function