From 96831028131a521c9c82e5a3beec428ba4818f78 Mon Sep 17 00:00:00 2001 From: Jeppe Johansen Date: Fri, 26 Dec 2014 23:10:34 +0000 Subject: [PATCH] BL/BLX in thumb mode is a long composed instruction in Thumb as well as Thumb2 git-svn-id: branches/laksen/armiw@29333 - --- compiler/arm/armins.dat | 6 +++--- compiler/arm/armtab.inc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/arm/armins.dat b/compiler/arm/armins.dat index 67fbce55a1..c9a35ddb88 100644 --- a/compiler/arm/armins.dat +++ b/compiler/arm/armins.dat @@ -168,9 +168,9 @@ reg32,reg32,reg32,shifterop \x6\x1\xC0 ARM32,ARMv4 reg32,reg32,immshifter \x7\x3\xC0 ARM32,ARMv4 [BLcc] -imm24 \x8D\xF0\xD0 THUMB32,ARMv6T2 -immshifter \x8D\xF0\xD0 THUMB32,ARMv6T2 -mem32 \x8D\xF0\xD0 THUMB32,ARMv6T2 +imm24 \x8D\xF0\xD0 THUMB,THUMB32,ARMv4T +immshifter \x8D\xF0\xD0 THUMB,THUMB32,ARMv4T +mem32 \x8D\xF0\xD0 THUMB,THUMB32,ARMv4T imm24 \x1\x0B ARM32,ARMv4 mem32 \x1\x0B ARM32,ARMv4 diff --git a/compiler/arm/armtab.inc b/compiler/arm/armtab.inc index fa80ff0138..b24b4752af 100644 --- a/compiler/arm/armtab.inc +++ b/compiler/arm/armtab.inc @@ -362,21 +362,21 @@ ops : 1; optypes : (ot_immediate24,ot_none,ot_none,ot_none,ot_none,ot_none); code : #141#240#208; - flags : if_thumb32 or if_armv6t2 + flags : if_thumb or if_thumb32 or if_armv4t ), ( opcode : A_BL; ops : 1; optypes : (ot_immediateshifter,ot_none,ot_none,ot_none,ot_none,ot_none); code : #141#240#208; - flags : if_thumb32 or if_armv6t2 + flags : if_thumb or if_thumb32 or if_armv4t ), ( opcode : A_BL; ops : 1; optypes : (ot_memory or ot_bits32,ot_none,ot_none,ot_none,ot_none,ot_none); code : #141#240#208; - flags : if_thumb32 or if_armv6t2 + flags : if_thumb or if_thumb32 or if_armv4t ), ( opcode : A_BL;