Revert "Alternative approach to fixing the EH issue that may fix OSX as well. If it does... I'll likely do this logic for all architectures"

This reverts commit a882fbf.

Author: davidwrighton

src/coreclr/runtime/arm/WriteBarriers.S

@@ -179,10 +179,6 @@ GLOBAL_LABEL RhpCheckedAssignRefAVLocation
 LEAF_END RhpCheckedAssignRef\EXPORT_REG_NAME, _TEXT
 .endm
 
-LEAF_ENTRY RhpWriteBarriers, _TEXT
-          bx            lr
-LEAF_END RhpWriteBarriers, _TEXT
-
 // One day we might have write barriers for all the possible argument registers but for now we have
 // just one write barrier that assumes the input register is RSI.
 DEFINE_CHECKED_WRITE_BARRIER r1, r1
@@ -306,7 +302,3 @@ LOCAL_LABEL(RhpByRefAssignRef_NotInHeap):
           add           r1, #4
           bx            lr
 LEAF_END RhpByRefAssignRef, _TEXT
-
-LEAF_ENTRY RhpWriteBarriers_End, _TEXT
-          bx            lr
-LEAF_END RhpWriteBarriers_End, _TEXT

src/coreclr/runtime/arm64/WriteBarriers.S

@@ -179,10 +179,6 @@
         // Exit label
     .endm
 
-LEAF_ENTRY RhpWriteBarriers, _TEXT
-    ret
-LEAF_END RhpWriteBarriers, _TEXT
-
 // void JIT_ByRefWriteBarrier
 // On entry:
 //   x13  : the source address (points to object reference to write)
@@ -401,8 +397,3 @@ LOCAL_LABEL(NoBarrierXchg):
 .arch_extension nolse
 #endif
 #endif // FEATURE_NATIVEAOT
-
-LEAF_ENTRY RhpWriteBarriers_End, _TEXT
-    ret
-LEAF_END RhpWriteBarriers_End, _TEXT
-

src/coreclr/runtime/arm64/WriteBarriers.asm

@@ -189,10 +189,6 @@ INVALIDGCVALUE  EQU 0xCCCCCCCD
         ;; Exit label
     MEND
 
-    LEAF_ENTRY RhpWriteBarriers
-        ret
-    LEAF_END RhpWriteBarriers
-
 ;; void JIT_ByRefWriteBarrier
 ;; On entry:
 ;;   x13 : the source address (points to object reference to write)
@@ -395,8 +391,4 @@ NoBarrierXchg
     LEAF_END RhpCheckedXchg
 #endif // FEATURE_NATIVEAOT
 
-    LEAF_ENTRY RhpWriteBarriers_End
-        ret
-    LEAF_END RhpWriteBarriers_End
-
     end

src/coreclr/runtime/i386/WriteBarriers.S

@@ -1,5 +1,4 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#include "AsmMacros_Shared.h"
-
+// TODO: Implement

src/coreclr/vm/excep.cpp

@@ -5895,14 +5895,9 @@ BOOL IsIPinVirtualStub(PCODE f_IP)
 #endif // FEATURE_VIRTUAL_STUB_DISPATCH
 }
 
-#if defined(TARGET_ARM64) || defined(TARGET_ARM)
-EXTERN_C void RhpWriteBarriers();
-EXTERN_C void RhpWriteBarriers_End();
-#endif
-
 typedef uint8_t CODE_LOCATION;
 EXTERN_C CODE_LOCATION RhpAssignRefAVLocation;
-#if defined(TARGET_X86)
+#if defined(HOST_X86)
 EXTERN_C CODE_LOCATION RhpAssignRefEAXAVLocation;
 EXTERN_C CODE_LOCATION RhpAssignRefECXAVLocation;
 EXTERN_C CODE_LOCATION RhpAssignRefEBXAVLocation;
@@ -5911,7 +5906,7 @@ EXTERN_C CODE_LOCATION RhpAssignRefEDIAVLocation;
 EXTERN_C CODE_LOCATION RhpAssignRefEBPAVLocation;
 #endif
 EXTERN_C CODE_LOCATION RhpCheckedAssignRefAVLocation;
-#if defined(TARGET_X86)
+#if defined(HOST_X86)
 EXTERN_C CODE_LOCATION RhpCheckedAssignRefEAXAVLocation;
 EXTERN_C CODE_LOCATION RhpCheckedAssignRefECXAVLocation;
 EXTERN_C CODE_LOCATION RhpCheckedAssignRefEBXAVLocation;
@@ -5921,14 +5916,14 @@ EXTERN_C CODE_LOCATION RhpCheckedAssignRefEBPAVLocation;
 #endif
 EXTERN_C CODE_LOCATION RhpByRefAssignRefAVLocation1;
 
-#if !defined(TARGET_ARM64) && !defined(TARGET_LOONGARCH64) && !defined(TARGET_RISCV64)
+#if !defined(HOST_ARM64) && !defined(HOST_LOONGARCH64) && !defined(HOST_RISCV64)
 EXTERN_C CODE_LOCATION RhpByRefAssignRefAVLocation2;
 #endif
 
 static uintptr_t writeBarrierAVLocations[] =
 {
     (uintptr_t)&RhpAssignRefAVLocation,
-#if defined(TARGET_X86)
+#if defined(HOST_X86)
     (uintptr_t)&RhpAssignRefEAXAVLocation,
     (uintptr_t)&RhpAssignRefECXAVLocation,
     (uintptr_t)&RhpAssignRefEBXAVLocation,
@@ -5946,7 +5941,7 @@ static uintptr_t writeBarrierAVLocations[] =
     (uintptr_t)&RhpCheckedAssignRefEBPAVLocation,
 #endif
     (uintptr_t)&RhpByRefAssignRefAVLocation1,
-#if !defined(TARGET_ARM64) && !defined(TARGET_LOONGARCH64) && !defined(TARGET_RISCV64)
+#if !defined(HOST_ARM64) && !defined(HOST_LOONGARCH64) && !defined(HOST_RISCV64)
     (uintptr_t)&RhpByRefAssignRefAVLocation2,
 #endif
 };
@@ -5966,17 +5961,17 @@ bool IsIPInMarkedJitHelper(UINT_PTR uControlPc)
         ASSERT(*(uint8_t*)writeBarrierAVLocations[i] != 0xE9); // jmp XXXXXXXX
 #endif
 
+#ifdef TARGET_ARM
+        if ((writeBarrierAVLocations[i] | THUMB_CODE) == (uControlPc | THUMB_CODE))
+#else
         if (writeBarrierAVLocations[i] == uControlPc)
+#endif
             return true;
     }
 
 #define CHECK_RANGE(name) \
     if (GetEEFuncEntryPoint(name) <= uControlPc && uControlPc < GetEEFuncEntryPoint(name##_End)) return true;
 
-#if defined(TARGET_ARM64) || defined(TARGET_ARM)
-    CHECK_RANGE(RhpWriteBarriers)
-#endif
-
 #ifndef TARGET_X86
     CHECK_RANGE(JIT_WriteBarrier)
     CHECK_RANGE(JIT_CheckedWriteBarrier)