Fixing half vm abi #defines.

Author: anthonycanino

src/coreclr/vm/callhelpers.cpp

@@ -416,7 +416,7 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT *
 #ifdef CALLDESCR_REGTYPEMAP
             {
                 CorElementType regMapType = m_argIt.GetArgType();
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
                 // System.Half is passed in floating point registers like a float
                 if (regMapType == ELEMENT_TYPE_VALUETYPE)
                 {
@@ -425,7 +425,7 @@ void MethodDescCallSite::CallTargetWorker(const ARG_SLOT *pArguments, ARG_SLOT *
                     if (!th.IsNull() && th.AsMethodTable()->IsNativeHalfType())
                         regMapType = ELEMENT_TYPE_R4;
                 }
-#endif // TARGET_XARCH
+#endif // TARGET_AMD64 || TARGET_X86
                 FillInRegTypeMap(ofs, regMapType, pMap);
             }
 #endif

src/coreclr/vm/callingconvention.h

@@ -873,7 +873,7 @@ class ArgIteratorTemplate : public ARGITERATOR_BASE
 #if !defined(UNIX_AMD64_ABI)
             // On Windows x64, we re-use the location in the transition block for both the integer and floating point registers
             if ((m_argType == ELEMENT_TYPE_R4) || (m_argType == ELEMENT_TYPE_R8)
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
                 // System.Half is passed in floating point registers like a float
                 || (m_argType == ELEMENT_TYPE_VALUETYPE && !m_argTypeHandle.IsNull() && m_argTypeHandle.AsMethodTable()->IsNativeHalfType())
 #endif // TARGET_XARCH
@@ -2002,7 +2002,7 @@ void ArgIteratorTemplate<ARGITERATOR_BASE>::ComputeReturnFlags()
             }
 #endif
 
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
             // System.Half is returned in xmm0 like a float
             if (thValueType.AsMethodTable()->IsNativeHalfType())
             {

src/coreclr/vm/class.cpp

@@ -1720,7 +1720,7 @@ int MethodTable::GetVectorSize()
     return 0;
 }
 
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
 //*******************************************************************************
 // Returns true if this is the System.Half type and the CPU supports AVX10v1.
 // System.Half is passed and returned in floating point registers on xarch

src/coreclr/vm/invokeutil.cpp

@@ -220,7 +220,7 @@ void InvokeUtil::CopyArg(TypeHandle th, PVOID argRef, ArgDestination *argDest) {
     case ELEMENT_TYPE_VALUETYPE:
     {
         MethodTable* pMT = th.GetMethodTable();
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
         // System.Half is passed in floating point registers. Zero-extend the 2-byte value
         // to 4 bytes so that the movss load in CallDescrWorker reads clean data.
         if (pMT->IsNativeHalfType())

src/coreclr/vm/methodtable.h

@@ -2012,7 +2012,7 @@ class MethodTable
     bool IsNativeHFA();
     CorInfoHFAElemType GetNativeHFAType();
 
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86)
     // Returns true if this is the System.Half type, which is passed and returned
     // in floating point registers on xarch platforms.
     bool IsNativeHalfType();

src/coreclr/vm/reflectioninvocation.cpp

@@ -543,7 +543,7 @@ extern "C" void QCALLTYPE RuntimeMethodHandle_InvokeMethod(
 #ifdef CALLDESCR_REGTYPEMAP
         {
             CorElementType regMapType = argit.GetArgType();
-#ifdef TARGET_XARCH
+#if defined(TARGET_AMD64) || defined(TARGET_X86) 
             // System.Half is passed in floating point registers like a float
             if (regMapType == ELEMENT_TYPE_VALUETYPE && !th.IsNull() && th.AsMethodTable()->IsNativeHalfType())
                 regMapType = ELEMENT_TYPE_R4;