@@ -289,7 +289,7 @@ LOCAL_LABEL(LNullThis):
289
289
290
290
PROLOG_PUSH "{r0-r4,r7,r8,lr}" // add r8 to make stack aligned by 8B
291
291
PROLOG_STACK_SAVE_OFFSET r7 , # 20
292
- vpush {d0 - d7}
292
+ PROLOG_VPUSH {d0 - d7}
293
293
294
294
CHECK_STACK_ALIGNMENT
295
295
@@ -300,8 +300,8 @@ LOCAL_LABEL(LNullThis):
300
300
mov r12 , r0
301
301
302
302
// Epilog
303
- vpop {d0 - d7}
304
- pop {r0- r4 , r7 , r8 , lr}
303
+ EPILOG_VPOP {d0 - d7}
304
+ EPILOG_POP " {r0-r4,r7,r8,lr}"
305
305
bx r12
306
306
307
307
NESTED_END TheUMEntryPrestub , _TEXT
@@ -542,16 +542,16 @@ ThePreStubPatchLabel:
542
542
PROLOG_PUSH "{r0-r4,r7,r8,lr}" // Spill general argument registers , return address and
543
543
PROLOG_STACK_SAVE_OFFSET r7 , # 20
544
544
// arbitrary register to keep stack aligned
545
- vpush {d0 - d7} // Spill floating point argument registers
545
+ PROLOG_VPUSH {d0 - d7} // Spill floating point argument registers
546
546
547
547
CHECK_STACK_ALIGNMENT
548
548
549
549
mov r0 , r12
550
550
bl C_FUNC(NDirectImportWorker)
551
551
mov r12 , r0
552
552
553
- vpop {d0 - d7}
554
- pop {r0- r4 , r7 , r8 , lr}
553
+ EPILOG_VPOP {d0 - d7}
554
+ EPILOG_POP " {r0-r4,r7,r8,lr}"
555
555
556
556
// If we got back from NDirectImportWorker , the MD has been successfully
557
557
// linked. Proceed to execute the original DLL call .
@@ -972,7 +972,7 @@ LOCAL_LABEL(stackProbe_loop):
972
972
// pop the stack and restore original register state
973
973
vldm sp , {d0 - d7}
974
974
free_stack SIZEOF__FloatArgumentRegisters + 4
975
- pop {r0- r3 , r7 , r8 , lr}
975
+ EPILOG_POP " {r0-r3, r7,r8, lr}"
976
976
977
977
PATCH_LABEL VirtualMethodFixupPatchLabel
978
978
@@ -1060,13 +1060,13 @@ LOCAL_LABEL(stackProbe_loop):
1060
1060
1061
1061
PROLOG_PUSH "{r0-r1, r7,r8, r11, lr}" // save integer return value
1062
1062
PROLOG_STACK_SAVE_OFFSET r7 , # 8
1063
- vpush {d0 - d3} // floating point return value
1063
+ PROLOG_VPUSH {d0 - d3} // floating point return value
1064
1064
1065
1065
CHECK_STACK_ALIGNMENT
1066
1066
1067
1067
bl C_FUNC(JIT_RareDisableHelperWorker)
1068
1068
1069
- vpop {d0 - d3}
1069
+ EPILOG_VPOP {d0 - d3}
1070
1070
EPILOG_POP "{r0-r1, r7,r8, r11, pc}"
1071
1071
1072
1072
NESTED_END JIT_RareDisableHelper , _TEXT
@@ -1193,8 +1193,8 @@ LOCAL_LABEL(ThrowIndexOutOfRangeException):
1193
1193
// r12 = array - >GetArrayElementTypeHandle()
1194
1194
//
1195
1195
NESTED_ENTRY JIT_Stelem_Ref_NotExactMatch , _TEXT , NoHandler
1196
- push {lr}
1197
- push {r0- r2}
1196
+ PROLOG_PUSH {lr}
1197
+ PROLOG_PUSH {r0 - r2}
1198
1198
1199
1199
CHECK_STACK_ALIGNMENT
1200
1200
@@ -1213,8 +1213,8 @@ LOCAL_LABEL(NeedFrame):
1213
1213
bl C_FUNC(ArrayStoreCheck) // ArrayStoreCheck(&val , &array)
1214
1214
1215
1215
LOCAL_LABEL(DoWrite):
1216
- pop {r0- r2}
1217
- pop {lr}
1216
+ EPILOG_POP {r0 - r2}
1217
+ EPILOG_POP {lr}
1218
1218
b C_FUNC(JIT_Stelem_DoWrite)
1219
1219
1220
1220
NESTED_END JIT_Stelem_Ref_NotExactMatch , _TEXT
@@ -1410,13 +1410,13 @@ g_rgWriteBarrierDescriptors:
1410
1410
NESTED_ENTRY DelayLoad_MethodCall_FakeProlog , _TEXT , NoHandler
1411
1411
1412
1412
// Match wh at the lazy thunk has pushed. The actual method arguments will be spilled later.
1413
- push {r1- r3}
1413
+ PROLOG_PUSH {r1 - r3}
1414
1414
1415
1415
// This is where execution really starts.
1416
1416
DelayLoad_MethodCall:
1417
1417
. global DelayLoad_MethodCall
1418
1418
1419
- push {r0}
1419
+ PROLOG_PUSH {r0}
1420
1420
1421
1421
PROLOG_WITH_TRANSITION_BLOCK 0x0 , 1 , DoNotPushArgRegs
1422
1422
@@ -1454,13 +1454,13 @@ DelayLoad_MethodCall:
1454
1454
NESTED_ENTRY DelayLoad_Helper\suffix\()_FakeProlog , _TEXT , NoHandler
1455
1455
1456
1456
// Match wh at the lazy thunk has pushed. The actual method arguments will be spilled later.
1457
- push {r1- r3}
1457
+ PROLOG_PUSH {r1 - r3}
1458
1458
1459
1459
// This is where execution really starts.
1460
1460
DelayLoad_Helper\suffix:
1461
1461
. global DelayLoad_Helper\suffix
1462
1462
1463
- push {r0}
1463
+ PROLOG_PUSH {r0}
1464
1464
1465
1465
PROLOG_WITH_TRANSITION_BLOCK 0x4 , 0 , DoNotPushArgRegs
1466
1466
0 commit comments