Determine desciptor for pointer-sized fields based on target not host pointer size.

Author: jkoritzinsky

src/vm/fieldmarshaler.cpp

@@ -106,7 +106,11 @@ VOID ParseNativeType(Module* pModule,
  *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_BLITTABLE_INTEGER, sizeof(INT32), alignof(INT32));
  break;
  case MarshalInfo::MARSHAL_TYPE_GENERIC_8:
- *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_BLITTABLE_INTEGER, sizeof(INT64), alignof(INT64));
+#if defined(_TARGET_X86_) && defined(UNIX_X86_ABI)
+ *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_BLITTABLE_INTEGER, sizeof(INT64), 4);
+#else
+ *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_BLITTABLE_INTEGER, sizeof(INT64), sizeof(INT64));
+#endif
  break;
  case MarshalInfo::MARSHAL_TYPE_ANSICHAR:
  *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_INTEGER_LIKE, sizeof(CHAR), sizeof(CHAR));
@@ -126,7 +130,11 @@ VOID ParseNativeType(Module* pModule,
  *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_R4, sizeof(float), sizeof(float));
  break;
  case MarshalInfo::MARSHAL_TYPE_DOUBLE:
+#if defined(_TARGET_X86_) && defined(UNIX_X86_ABI)
+ *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_R8, sizeof(double), 4);
+#else
  *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_R8, sizeof(double), sizeof(double));
+#endif
  break;
  case MarshalInfo::MARSHAL_TYPE_CURRENCY:
  *pNFD = NativeFieldDescriptor(NATIVE_FIELD_CATEGORY_COM_STRUCT, sizeof(CY), sizeof(CY));

src/vm/mlinfo.cpp

@@ -1920,7 +1920,11 @@ MarshalInfo::MarshalInfo(Module* pModule,
  m_resID = IDS_EE_BADMARSHAL_I;
  IfFailGoto(E_FAIL, lFail);
  }
- m_type = (sizeof(LPVOID) == 4 ? MARSHAL_TYPE_GENERIC_4 : MARSHAL_TYPE_GENERIC_8);
+#ifdef _TARGET_64BIT_
+ m_type = MARSHAL_TYPE_GENERIC_8;
+#else
+ m_type = MARSHAL_TYPE_GENERIC_4;
+#endif
  break;
 
  case ELEMENT_TYPE_U:
@@ -1930,7 +1934,11 @@ MarshalInfo::MarshalInfo(Module* pModule,
  m_resID = IDS_EE_BADMARSHAL_I;
  IfFailGoto(E_FAIL, lFail);
  }
- m_type = (sizeof(LPVOID) == 4 ? MARSHAL_TYPE_GENERIC_U4 : MARSHAL_TYPE_GENERIC_8);
+#ifdef _TARGET_64BIT_
+ m_type = MARSHAL_TYPE_GENERIC_8;
+#else
+ m_type = MARSHAL_TYPE_GENERIC_4;
+#endif
  break;
 
 
@@ -1962,7 +1970,11 @@ MarshalInfo::MarshalInfo(Module* pModule,
  m_resID = IDS_EE_BADMARSHAL_PTR;
  IfFailGoto(E_FAIL, lFail);
  }
- m_type = ( (sizeof(void*)==4) ? MARSHAL_TYPE_GENERIC_4 : MARSHAL_TYPE_GENERIC_8 );
+#ifdef _TARGET_64BIT_
+ m_type = MARSHAL_TYPE_GENERIC_8;
+#else
+ m_type = MARSHAL_TYPE_GENERIC_4;
+#endif
  break;
 
  case ELEMENT_TYPE_FNPTR:
@@ -1979,7 +1991,11 @@ MarshalInfo::MarshalInfo(Module* pModule,
  m_resID = IDS_EE_BADMARSHAL_FNPTR;
  IfFailGoto(E_FAIL, lFail);
  }
- m_type = ( (sizeof(void*)==4) ? MARSHAL_TYPE_GENERIC_4 : MARSHAL_TYPE_GENERIC_8 );
+#ifdef _TARGET_64BIT_
+ m_type = MARSHAL_TYPE_GENERIC_8;
+#else
+ m_type = MARSHAL_TYPE_GENERIC_4;
+#endif
  break;
 
  case ELEMENT_TYPE_OBJECT:

src/vm/mlinfo.h

@@ -899,7 +899,11 @@ class ArrayMarshalInfo
  else if (IsAMIExport64Bit(m_flags))
  return 8;
  else 
- return sizeof(LPVOID);
+#ifdef _TARGET_64BIT_
+ return 8;
+#else
+ return 4;
+#endif
  }
 
 protected: