From 9d49cf095bb755ed0a6472619b2f8024cddf05f3 Mon Sep 17 00:00:00 2001 From: Jason Prado Date: Wed, 30 Mar 2016 16:39:26 -0700 Subject: [PATCH] Revert FBReactKit: use indirect jumps to external functions Reviewed By: rnystrom Differential Revision: D3117661 fb-gh-sync-id: 05b7f796b58656aa13e4be78a562e07d18cf9488 fbshipit-source-id: 05b7f796b58656aa13e4be78a562e07d18cf9488 --- React/Profiler/RCTProfileTrampoline-arm.S | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/React/Profiler/RCTProfileTrampoline-arm.S b/React/Profiler/RCTProfileTrampoline-arm.S index 5725a5cb6ab..96f140b25e0 100644 --- a/React/Profiler/RCTProfileTrampoline-arm.S +++ b/React/Profiler/RCTProfileTrampoline-arm.S @@ -35,10 +35,7 @@ SYMBOL_NAME(RCTProfileTrampoline): * profile */ mov r0, #0xc - - ldr ip, LCPI_malloc - blx ip - + bl SYMBOL_NAME(malloc) /** * r4 is the callee saved register we'll use to refer to the allocated memory, * store its initial value, so we can restore it later @@ -90,20 +87,10 @@ SYMBOL_NAME(RCTProfileTrampoline): ldr r1, [r4, #0x8] ldr r4, [r4] push {r1} // save the caller on the stack - - ldr ip, LCPI_free - blx ip + bl SYMBOL_NAME(free) pop {lr} // pop the caller pop {r0} // pop the return value bx lr // jump to the calleer - trap - - .p2align 2 -LCPI_malloc: - .long SYMBOL_NAME(malloc) -LCPI_free: - .long SYMBOL_NAME(free) - #endif