diff options
| author | Michal Strehovsky <michals@microsoft.com> | 2017-08-15 19:36:29 +0300 |
|---|---|---|
| committer | Michal Strehovsky <michals@microsoft.com> | 2017-08-15 19:36:29 +0300 |
| commit | d477247f499160c94f6ab1b97079255dacc508da (patch) | |
| tree | aaf066c2afb21a32f145b9f3c51fe785c4d79f0f /src/Native | |
| parent | bad094358360e5cb616e99584c1a3ed796d71bff (diff) | |
Fix typos in ARM helpers
[tfs-changeset: 1670378]
Diffstat (limited to 'src/Native')
| -rw-r--r-- | src/Native/Runtime/arm/AllocFast.S | 10 | ||||
| -rw-r--r-- | src/Native/Runtime/arm/AllocFast.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Native/Runtime/arm/AllocFast.S b/src/Native/Runtime/arm/AllocFast.S index 3f76d4dc8..c6dda8177 100644 --- a/src/Native/Runtime/arm/AllocFast.S +++ b/src/Native/Runtime/arm/AllocFast.S @@ -116,7 +116,7 @@ NESTED_END RhpNewObject, _TEXT // Allocate a string. // r0 == EEType // r1 == element/character count -LEAF_ENTRY RhpNewString, _TEXT +LEAF_ENTRY RhNewString, _TEXT PROLOG_PUSH "{r4-r6,lr}" // Make sure computing the overall allocation size won't overflow MOV32 r12, ((0xFFFFFFFF - STRING_BASE_SIZE - 3) / STRING_COMPONENT_SIZE) @@ -148,11 +148,11 @@ LEAF_ENTRY RhpNewString, _TEXT // Determine whether the end of the object would lie outside of the current allocation context. If so, // we abandon the attempt to allocate the object directly and fall back to the slow helper. adds r6, r12 - bcs LOCAL_LABEL(RhpNewString_RarePath) // if we get a carry here, the string is too large to fit below 4 GB + bcs LOCAL_LABEL(RhNewString_RarePath) // if we get a carry here, the string is too large to fit below 4 GB ldr r12, [r0, #OFFSETOF__Thread__m_alloc_context__alloc_limit] cmp r6, r12 - bhi LOCAL_LABEL(RhpNewString_RarePath) + bhi LOCAL_LABEL(RhNewString_RarePath) // Reload new object address into r12. ldr r12, [r0, #OFFSETOF__Thread__m_alloc_context__alloc_ptr] @@ -178,7 +178,7 @@ LOCAL_LABEL(StringSizeOverflow): EPILOG_POP "{r4-r6,lr}" b C_FUNC(RhExceptionHandling_FailedAllocation) -LOCAL_LABEL(RhpNewString_RarePath): +LOCAL_LABEL(RhNewString_RarePath): mov r3, r0 mov r0, r4 mov r1, r5 @@ -190,7 +190,7 @@ LOCAL_LABEL(RhpNewString_RarePath): EPILOG_POP "{r4-r6,lr}" b C_FUNC(RhpNewArrayRare) -LEAF_END RhpNewString, _TEXT +LEAF_END RhNewString, _TEXT // Allocate one dimensional, zero based array (SZARRAY). diff --git a/src/Native/Runtime/arm/AllocFast.asm b/src/Native/Runtime/arm/AllocFast.asm index 82a3187d0..8ed77d3f4 100644 --- a/src/Native/Runtime/arm/AllocFast.asm +++ b/src/Native/Runtime/arm/AllocFast.asm @@ -173,7 +173,7 @@ StringSizeOverflow mov r1, #0 ; Indicate that we should throw OOM. b RhExceptionHandling_FailedAllocation - LEAF_END RhpNewString + LEAF_END RhNewString INLINE_GETTHREAD_CONSTANT_POOL |