diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-17 17:33:32 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-17 17:33:32 -0800 |
| commit | 89396ee16657a2884babe8ac5d0e688743d4cd83 (patch) | |
| tree | 7ec7a850db4a8c1954fb87b0c885664d33817455 /src/vm | |
| parent | 357662351bc2ef57c032143ebf6bbfab6dcb593e (diff) | |
| parent | 6b576b9c032b06b082304638da5642da63b646ed (diff) | |
| download | coreclr-89396ee16657a2884babe8ac5d0e688743d4cd83.tar.gz coreclr-89396ee16657a2884babe8ac5d0e688743d4cd83.tar.bz2 coreclr-89396ee16657a2884babe8ac5d0e688743d4cd83.zip | |
Merge pull request #3215 from jkotas/arm-floatargs
Save/restore floating point arguments in asm macros on Linux arm and arm64
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/arm/asmhelpers.S | 2 | ||||
| -rw-r--r-- | src/vm/arm/asmhelpers.asm | 2 | ||||
| -rw-r--r-- | src/vm/arm64/asmhelpers.S | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/vm/arm/asmhelpers.S b/src/vm/arm/asmhelpers.S index 2dcc817d6f..442fb3f25a 100644 --- a/src/vm/arm/asmhelpers.S +++ b/src/vm/arm/asmhelpers.S @@ -1311,7 +1311,7 @@ DelayLoad_Helper\suffix: push {r0} - PROLOG_WITH_TRANSITION_BLOCK 0x4, 1, DoNotPushArgRegs + PROLOG_WITH_TRANSITION_BLOCK 0x4, 0, DoNotPushArgRegs // Load the helper arguments ldr r5, [sp,#(__PWTB_TransitionBlock+10*4)] // pModule diff --git a/src/vm/arm/asmhelpers.asm b/src/vm/arm/asmhelpers.asm index 5a1a0b87a8..283d8379b3 100644 --- a/src/vm/arm/asmhelpers.asm +++ b/src/vm/arm/asmhelpers.asm @@ -2708,7 +2708,7 @@ $__RealName PROLOG_PUSH {r0} - PROLOG_WITH_TRANSITION_BLOCK 0x4, {true}, DoNotPushArgRegs + PROLOG_WITH_TRANSITION_BLOCK 0x4, {false}, DoNotPushArgRegs ; Load the helper arguments ldr r5, [sp,#(__PWTB_TransitionBlock+10*4)] ; pModule diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S index 5fe638dac8..8cc6150fe3 100644 --- a/src/vm/arm64/asmhelpers.S +++ b/src/vm/arm64/asmhelpers.S @@ -149,7 +149,7 @@ NESTED_END PrecodeFixupThunk, _TEXT NESTED_ENTRY ThePreStub, _TEXT, NoHandler - PROLOG_WITH_TRANSITION_BLOCK 0, 0 + PROLOG_WITH_TRANSITION_BLOCK add x0, sp, #__PWTB_TransitionBlock // pTransitionBlock mov x1, METHODDESC_REGISTER // pMethodDesc @@ -158,7 +158,7 @@ NESTED_ENTRY ThePreStub, _TEXT, NoHandler mov x9, x0 - EPILOG_WITH_TRANSITION_BLOCK_TAILCALL 0, 0 + EPILOG_WITH_TRANSITION_BLOCK_TAILCALL EPILOG_BRANCH_REG x9 NESTED_END ThePreStub, _TEXT @@ -180,7 +180,7 @@ LEAF_END ThePreStubPatch, _TEXT // The stub dispatch thunk which transfers control to VSD_ResolveWorker. NESTED_ENTRY ResolveWorkerAsmStub, _TEXT, NoHandler - PROLOG_WITH_TRANSITION_BLOCK 0, 0 + PROLOG_WITH_TRANSITION_BLOCK add x0, sp, #__PWTB_TransitionBlock // pTransitionBlock and x1, x11, #-4 // Indirection cell @@ -189,7 +189,7 @@ NESTED_ENTRY ResolveWorkerAsmStub, _TEXT, NoHandler bl C_FUNC(VSD_ResolveWorker) mov x9, x0 - EPILOG_WITH_TRANSITION_BLOCK_TAILCALL 0, 0 + EPILOG_WITH_TRANSITION_BLOCK_TAILCALL EPILOG_BRANCH_REG x9 @@ -390,7 +390,7 @@ NESTED_END VirtualMEthodFixupStub, _TEXT NESTED_ENTRY ExternalMethodFixupStub, _TEXT, NoHandler - PROLOG_WITH_TRANSITION_BLOCK 0, 0 + PROLOG_WITH_TRANSITION_BLOCK add x0, sp, #__PWTB_TransitionBlock // pTransitionBlock mov x1, x12 // pThunk @@ -400,7 +400,7 @@ NESTED_ENTRY ExternalMethodFixupStub, _TEXT, NoHandler // mov the address we patched to in x12 so that we can tail call to it mov x12, x0 - EPILOG_WITH_TRANSITION_BLOCK_TAILCALL 0, 0 + EPILOG_WITH_TRANSITION_BLOCK_TAILCALL PATCH_LABEL ExternalMethodFixupPatchLabel EPILOG_BRANCH_REG x12 |