Try dotnet#2

Revert "Try dotnet#2" This reverts commit 479548733c2b215e085eafd519b8f304d63925d5. ldr instead of mov
franksinankaya · Dec 30, 2019 · 0c6e672 · 0c6e672
1 parent ccd4dbd
commit 0c6e672
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/coreclr/src/utilcode/util.cpp b/src/coreclr/src/utilcode/util.cpp
@@ -2602,12 +2602,13 @@ void PutThumb2Mov32(UINT16 * p, UINT32 imm32)
 //*****************************************************************************
 void PutArmMov(UINT16 * p, UINT32 imm32)
 {
-    printf("%s:%d p[0] = 0x%x \n", __func__, __LINE__, p[0]);
-    printf("%s:%d p[1] = 0x%x \n", __func__, __LINE__, p[1]);
-    printf("%s:%d p[2] = 0x%x \n", __func__, __LINE__, p[2]);
-    printf("%s:%d p[3] = 0x%x \n", __func__, __LINE__, p[3]);
-    p[0] = (UINT16)imm32;
-    p[1] = (UINT16)(imm32 >> 16);
+#ifdef __thumb__
+    p[1] = (UINT16)imm32;
+    p[2] = (UINT16)(imm32 >> 16);
+#else
+    p[2] = (UINT16)imm32;
+    p[3] = (UINT16)(imm32 >> 16);
+#endif
 }
 
 //*****************************************************************************

diff --git a/src/coreclr/src/vm/arm/asmhelpers.S b/src/coreclr/src/vm/arm/asmhelpers.S
@@ -1170,10 +1170,10 @@ LOCAL_LABEL(DoWrite):
     .macro LOAD_GC_GLOBAL name, regName, globalName
 \name\()__\globalName\()_offset:
     __\name\()__\globalName\()_offset = (\name\()__\globalName\()_offset - \name)
-
+        b       \name\()__\globalName\()_load
 \name\()__\globalName\()_value:
         .word   0
-
+\name\()__\globalName\()_load:
         ldr \regName, \name\()__\globalName\()_value
     .endm