diff options
Diffstat (limited to 'src/vm/arm/asmhelpers.S')
| -rw-r--r-- | src/vm/arm/asmhelpers.S | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/src/vm/arm/asmhelpers.S b/src/vm/arm/asmhelpers.S index d269186ab4..55bdd9fcba 100644 --- a/src/vm/arm/asmhelpers.S +++ b/src/vm/arm/asmhelpers.S @@ -1364,34 +1364,8 @@ DelayLoad_Helper\suffix: #ifdef FEATURE_HIJACK // ------------------------------------------------------------------ -// Hijack function for functions which return a reference type - NESTED_ENTRY OnHijackObjectTripThread, _TEXT, NoHandler - PROLOG_PUSH "{r0,r4-r11,lr}" - - CHECK_STACK_ALIGNMENT - - mov r0, sp - bl OnHijackObjectWorker - - EPILOG_POP "{r0,r4-r11,pc}" - NESTED_END OnHijackObjectTripThread, _TEXT - -// ------------------------------------------------------------------ -// Hijack function for functions which return an interior pointer within an object allocated in managed heap - NESTED_ENTRY OnHijackInteriorPointerTripThread, _TEXT, NoHandler - PROLOG_PUSH "{r0,r4-r11,lr}" - - CHECK_STACK_ALIGNMENT - - mov r0, sp - bl C_FUNC(OnHijackInteriorPointerWorker) - - EPILOG_POP "{r0,r4-r11,pc}" - NESTED_END OnHijackInteriorPointerTripThread, _TEXT - -// ------------------------------------------------------------------ // Hijack function for functions which return a value type - NESTED_ENTRY OnHijackScalarTripThread, _TEXT, NoHandler + NESTED_ENTRY OnHijackTripThread, _TEXT, NoHandler PROLOG_PUSH "{r0,r4-r11,lr}" PROLOG_VPUSH "{d0-d3}" // saving as d0-d3 can have the floating point return value @@ -1401,13 +1375,13 @@ DelayLoad_Helper\suffix: CHECK_STACK_ALIGNMENT add r0, sp, #40 - bl C_FUNC(OnHijackScalarWorker) + bl C_FUNC(OnHijackWorker) free_stack 4 EPILOG_POP "{r1}" EPILOG_VPOP "{d0-d3}" EPILOG_POP "{r0,r4-r11,pc}" - NESTED_END OnHijackScalarTripThread, _TEXT + NESTED_END OnHijackTripThread, _TEXT #endif |