util: Fix interworking for the thumb version of the m5 util.
authorGabe Black <gabeblack@google.com>
Fri, 10 Apr 2020 06:57:45 +0000 (23:57 -0700)
committerGabe Black <gabeblack@google.com>
Tue, 25 Aug 2020 19:46:14 +0000 (19:46 +0000)
Make sure the m5 op call sight is marked as thumb, and also use an
interworking branch to return from it.

Change-Id: I4f6ec6a0e9e7ff76fc8f256fec9ec410a9959189
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27748
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
util/m5/src/abi/thumb/m5op.S

index a8cf7b2424a58733edcfa009da9cf46091c645a7..0a0f864e4a703082266e7c642102f13b8bfe6665 100644 (file)
 .macro m5op_func name, func
         .align 2
         .globl \name
+        .thumb_func
 \name:
         .short 0xEE00 | \func
         .short 0x0110
-        mov pc,lr
+        bx lr
 .endm
 
 .text