mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-25 12:12:47 +01:00
150d7b2d23
This option, compatible with gas's -mimplicit-it, controls the generation/checking of implicit IT blocks in ARM/Thumb assembly. This option allows two behaviours that were not possible before: - When in ARM mode, emit a warning when assembling a conditional instruction that is not in an IT block. This is enabled with -mimplicit-it=never and -mimplicit-it=thumb. - When in Thumb mode, automatically generate IT instructions when an instruction with a condition code appears outside of an IT block. This is enabled with -mimplicit-it=thumb and -mimplicit-it=always. The default option is -mimplicit-it=arm, which matches the existing behaviour (allow conditional ARM instructions outside IT blocks without warning, and error if a conditional Thumb instruction is outside an IT block). The general strategy for generating IT blocks in Thumb mode is to keep a small list of instructions which should be in the IT block, and only emit them when we encounter something in the input which means we cannot continue the block. This could be caused by: - A non-predicable instruction - An instruction with a condition not compatible with the IT block - The IT block already contains 4 instructions - A branch-like instruction (including ALU instructions with the PC as the destination), which cannot appear in the middle of an IT block - A label (branching into an IT block is not legal) - A change of section, architecture, ISA, etc - The end of the assembly file. Some of these, such as change of section and end of file, are parsed outside of the ARM asm parser, so I've added a new virtual function to AsmParser to ensure any previously-parsed instructions have been emitted. The ARM implementation of this flushes the currently pending IT block. We now have to try instruction matching up to 3 times, because we cannot know if the current IT block is valid before matching, and instruction matching changes depending on the IT block state (due to the 16-bit ALU instructions, which set the flags iff not in an IT block). In the common case of not having an open implicit IT block and the instruction being matched not needing one, we still only have to run the matcher once. I've removed the ITState.FirstCond variable, because it does not store any information that isn't already represented by CurPosition. I've also updated the comment on CurPosition to accurately describe it's meaning (which this patch doesn't change). Differential Revision: https://reviews.llvm.org/D22760 llvm-svn: 276747
74 lines
3.0 KiB
ArmAsm
74 lines
3.0 KiB
ArmAsm
@ RUN: not llvm-mc -triple thumbv7a--none-eabi -arm-implicit-it=never < %s 2>%t | FileCheck %s --check-prefix=CHECK
|
|
@ RUN: FileCheck %s < %t --check-prefix=THUMB-STDERR
|
|
@ RUN: not llvm-mc -triple armv7a--none-eabi -arm-implicit-it=never < %s 2>%t | FileCheck %s --check-prefix=CHECK --check-prefix=ARM
|
|
@ RUN: FileCheck %s < %t --check-prefix=ARM-STDERR
|
|
|
|
@ RUN: not llvm-mc -triple thumbv7a--none-eabi -arm-implicit-it=always < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB
|
|
@ RUN: not llvm-mc -triple armv7a--none-eabi -arm-implicit-it=always < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ARM
|
|
|
|
@ RUN: not llvm-mc -triple thumbv7a--none-eabi -arm-implicit-it=arm < %s 2>%t | FileCheck %s --check-prefix=CHECK
|
|
@ RUN: FileCheck %s < %t --check-prefix=THUMB-STDERR
|
|
@ RUN: not llvm-mc -triple armv7a--none-eabi -arm-implicit-it=arm < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ARM
|
|
|
|
@ RUN: not llvm-mc -triple thumbv7a--none-eabi < %s 2>%t | FileCheck %s --check-prefix=CHECK
|
|
@ RUN: FileCheck %s < %t --check-prefix=THUMB-STDERR
|
|
@ RUN: not llvm-mc -triple armv7a--none-eabi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ARM
|
|
|
|
@ RUN: not llvm-mc -triple thumbv7a--none-eabi -arm-implicit-it=thumb < %s | FileCheck %s --check-prefix=CHECK --check-prefix=THUMB
|
|
@ RUN: not llvm-mc -triple armv7a--none-eabi -arm-implicit-it=thumb < %s 2>%t | FileCheck %s --check-prefix=CHECK --check-prefix=ARM
|
|
@ RUN: FileCheck %s < %t --check-prefix=ARM-STDERR
|
|
|
|
@ A single conditional instruction without IT block
|
|
.section test1
|
|
@ CHECK-LABEL: test1
|
|
addeq r0, r0, #1
|
|
@ THUMB: it eq
|
|
@ THUMB: addeq r0, r0, #1
|
|
@ ARM: addeq r0, r0, #1
|
|
@ THUMB-STDERR: error: predicated instructions must be in IT block
|
|
@ ARM-STDERR: warning: predicated instructions should be in IT block
|
|
|
|
@ A single conditional instruction with IT block
|
|
.section test2
|
|
@ CHECK-LABEL: test2
|
|
it eq
|
|
addeq r0, r0, #1
|
|
@ THUMB: it eq
|
|
@ THUMB: addeq r0, r0, #1
|
|
@ ARM: addeq r0, r0, #1
|
|
@ THUMB-STDERR-NOT: error:
|
|
@ ARM-STDERR-NOT: warning:
|
|
|
|
@ A single conditional instruction with IT block, but incorrect condition
|
|
.section test3
|
|
@ CHECK-LABEL: test3
|
|
it eq
|
|
addgt r0, r0, #1
|
|
@ THUMB-STDERR: error: incorrect condition in IT block
|
|
@ ARM-STDERR: error: incorrect condition in IT block
|
|
|
|
@ Multiple conditional instructions in an IT block, inverted and non-inverted conditions
|
|
.section test4
|
|
@ CHECK-LABEL: test4
|
|
itete gt
|
|
addgt r0, r0, #1
|
|
addle r0, r0, #1
|
|
addgt r0, r0, #1
|
|
addle r0, r0, #1
|
|
@ THUMB: itete gt
|
|
@ CHECK: addgt r0, r0, #1
|
|
@ CHECK: addle r0, r0, #1
|
|
@ CHECK: addgt r0, r0, #1
|
|
@ CHECK: addle r0, r0, #1
|
|
@ THUMB-STDERR-NOT: error:
|
|
@ ARM-STDERR-NOT: warning:
|
|
|
|
@ Incorrectly inverted condition on the second slot of an IT block
|
|
.section test5
|
|
@ CHECK-LABEL: test5
|
|
itt eq
|
|
addeq r0, r0, #1
|
|
addne r0, r0, #1
|
|
@ THUMB-STDERR: error: incorrect condition in IT block
|
|
@ ARM-STDERR: error: incorrect condition in IT block
|