diff options
author | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-09 03:23:46 +0300 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-09 03:23:46 +0300 |
commit | 7f209e8c88359a4e8e756aa385ed71e950569154 (patch) | |
tree | 6a5dba65d1cf1f0212f3ed4076a49340097037d0 /src/Native/Runtime/arm | |
parent | 010e0512512b2111e57e34c691cd225550d39b6e (diff) |
Rolling back the fix, I have a plan for a better one
[tfs-changeset: 1640866]
Diffstat (limited to 'src/Native/Runtime/arm')
-rw-r--r-- | src/Native/Runtime/arm/StubDispatch.asm | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/Native/Runtime/arm/StubDispatch.asm b/src/Native/Runtime/arm/StubDispatch.asm index 6df1e69f1..c1f766a4a 100644 --- a/src/Native/Runtime/arm/StubDispatch.asm +++ b/src/Native/Runtime/arm/StubDispatch.asm @@ -50,12 +50,12 @@ ;; Check a single entry in the cache. ;; R1 : Instance EEType* ;; R12: Cache data structure - ;; R2 : Trashed. On succesful check, set to the target address to jump + ;; R2 : Trashed ldr r2, [r12, #(OFFSETOF__InterfaceDispatchCache__m_rgEntries + ($entry * 8))] cmp r1, r2 bne %ft0 - ldr r2, [r12, #(OFFSETOF__InterfaceDispatchCache__m_rgEntries + ($entry * 8) + 4)] + ldr r12, [r12, #(OFFSETOF__InterfaceDispatchCache__m_rgEntries + ($entry * 8) + 4)] b %fa99 0 MEND @@ -118,7 +118,7 @@ StubName SETS "RhpInterfaceDispatch$entries" NESTED_ENTRY $StubName ;; On input we have the indirection cell data structure in r12. But we need more scratch registers and ;; we may A/V on a null this. Both of these suggest we need a real prolog and epilog. - PROLOG_PUSH {r1-r2, r12} + PROLOG_PUSH {r1-r2} ;; r12 currently holds the indirection cell address. We need to update it to point to the cache ;; structure instead. @@ -134,23 +134,18 @@ CurrentEntry SETA 0 CurrentEntry SETA CurrentEntry + 1 WEND - EPILOG_POP {r1-r2, r12} + ;; r12 currently contains the cache block. We need to point it back to the + ;; indirection cell using the back pointer in the cache block + ldr r12, [r12, #OFFSETOF__InterfaceDispatchCache__m_pCell] + + EPILOG_POP {r1-r2} EPILOG_BRANCH RhpInterfaceDispatchSlow ;; Common epilog for cache hits. Have to out of line it here due to limitation on the number of ;; epilogs imposed by the unwind code macros. 99 - - ;; Restore the indirection cell address - ldr r12, [sp, #8] - ;; r2 contains the target address. Store it to the location where r12 was pushed - ;; at the entry. The EPILOG_LDRPC_POSTINC will load it into the pc, which will results - ;; in jump to the target with all registers in the same state as when the current function - ;; was entered. - str r2, [sp, #8] - EPILOG_POP {r1-r2} - EPILOG_LDRPC_POSTINC 4 + EPILOG_BRANCH_REG r12 NESTED_END $StubName |