Use some helpers from portable version for ARM (#3989)

Signed-off-by: Petr Bred <bredpetr@gmail.com>
This commit is contained in:
Petr Bred 2017-06-27 13:31:39 +03:00 коммит произвёл Jan Kotas
Родитель c2e0c9b007
Коммит bead80c60b
2 изменённых файлов: 26 добавлений и 16 удалений

Просмотреть файл

@ -32,19 +32,23 @@ RhpNewArrayAlign8Name: .asciz "RhpNewArrayAlign8"
// 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.
// r0 == EEType
LEAF_ENTRY RhpNewFast, _TEXT
#ifdef _DEBUG
GEN_ASSERT_FUNC RhpNewFastName
#endif
LEAF_END RhpNewFast, _TEXT
//
// LEAF_ENTRY RhpNewFast, _TEXT
//#ifdef _DEBUG
// GEN_ASSERT_FUNC RhpNewFastName
//#endif
// LEAF_END RhpNewFast, _TEXT
//
// Allocate non-array object with finalizer.
// r0 == EEType
LEAF_ENTRY RhpNewFinalizable, _TEXT
#ifdef _DEBUG
GEN_ASSERT_FUNC RhpNewFinalizableName
#endif
LEAF_END RhpNewFinalizable, _TEXT
//
// LEAF_ENTRY RhpNewFinalizable, _TEXT
//#ifdef _DEBUG
// GEN_ASSERT_FUNC RhpNewFinalizableName
//#endif
// LEAF_END RhpNewFinalizable, _TEXT
//
// Allocate non-array object.
// r0 == EEType
@ -58,11 +62,13 @@ RhpNewArrayAlign8Name: .asciz "RhpNewArrayAlign8"
// Allocate one dimensional, zero based array (SZARRAY).
// r0 == EEType
// r1 == element count
LEAF_ENTRY RhpNewArray, _TEXT
#ifdef _DEBUG
GEN_ASSERT_FUNC RhpNewArrayName
#endif
LEAF_END RhpNewArray, _TEXT
//
// LEAF_ENTRY RhpNewArray, _TEXT
//#ifdef _DEBUG
// GEN_ASSERT_FUNC RhpNewArrayName
//#endif
// LEAF_END RhpNewArray, _TEXT
//
// Allocate one dimensional, zero based array (SZARRAY) using the slow path that calls a runtime helper.
// r0 == EEType

Просмотреть файл

@ -35,7 +35,7 @@
#include "GCMemoryHelpers.h"
#include "GCMemoryHelpers.inl"
#ifdef USE_PORTABLE_HELPERS
#if defined(USE_PORTABLE_HELPERS) || defined(_ARM_)
EXTERN_C REDHAWK_API void* REDHAWK_CALLCONV RhpGcAlloc(EEType *pEEType, UInt32 uFlags, UIntNative cbSize, void * pTransitionFrame);
EXTERN_C REDHAWK_API void* REDHAWK_CALLCONV RhpPublishObject(void* pObject, UIntNative cbSize);
@ -171,6 +171,10 @@ COOP_PINVOKE_HELPER(Array *, RhpNewArray, (EEType * pArrayEEType, int numElement
return pObject;
}
#endif // defined(USE_PORTABLE_HELPERS) || defined(_ARM_)
#ifdef USE_PORTABLE_HELPERS
#ifdef _ARM_
COOP_PINVOKE_HELPER(Object *, RhpNewFinalizableAlign8, (EEType* pEEType))
{