* patch by Jeppe Johansen to fix thumb2 epilog generation, resolves #18392

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@17252 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 8 insertions, 2 deletions

diff --git a/rtl/arm/thumb2.inc b/rtl/arm/thumb2.inc
index c4948d9ca0..6271c6920d 100644
--- a/rtl/arm/thumb2.inc
+++ b/rtl/arm/thumb2.inc
@@ -77,12 +77,18 @@ asm
 end;
 {$ENDIF not INTERNAL_BACKTRACE}
 
+{
+ Stack frame on Thumb2:
+  LR    <- FP
+  Old FP
+}
+
 {$define FPC_SYSTEM_HAS_GET_CALLER_ADDR}
 function get_caller_addr(framebp:pointer):pointer;assembler;
 asm
   movs r0,r0
   beq .Lg_a_null
-  ldr r0,[r0,#-4]
+  ldr r0,[r0]
 .Lg_a_null:
 end;
 
@@ -92,7 +98,7 @@ function get_caller_frame(framebp:pointer):pointer;assembler;
 asm
   movs r0,r0
   beq .Lgnf_null
-  ldr r0,[r0,#-12]
+  ldr r0,[r0,#-4]
 .Lgnf_null:
 end;