RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

ARM ISB instruction assembly parsing.

Browse Source 
The ISB instruction takes an optional operand, just like DMB/DSB. Typically
only 'sy' is meaningful.

llvm-svn: 135156
This commit is contained in:
Jim Grosbach 2011-07-14 18:00:31 +00:00
parent a6129829fa
commit 9bbc2007df
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/ARM/ARMInstrInfo.td
View File

@ -3317,12 +3317,16 @@ def DSB : AInoP<(outs), (ins memb_opt:$opt), MiscFrm, NoItinerary,
def : InstAlias<"dsb", (DSB 0xf)>, Requires<[IsARM, HasDB]>; def : InstAlias<"dsb", (DSB 0xf)>, Requires<[IsARM, HasDB]>;
// ISB has only full system option // ISB has only full system option
def ISB : AInoP<(outs), (ins), MiscFrm, NoItinerary, "isb", "", []>, def ISB : AInoP<(outs), (ins memb_opt:$opt), MiscFrm, NoItinerary,
"isb", "\t$opt", []>,
Requires<[IsARM, HasDB]> { Requires<[IsARM, HasDB]> {
bits<4> opt;
let Inst{31-4} = 0xf57ff06; let Inst{31-4} = 0xf57ff06;
let Inst{3-0} = 0b1111; let Inst{3-0} = opt;
} }
def : InstAlias<"isb", (ISB 0xf)>, Requires<[IsARM, HasDB]>;
let usesCustomInserter = 1 in { let usesCustomInserter = 1 in {
let Uses = [CPSR] in { let Uses = [CPSR] in {
def ATOMIC_LOAD_ADD_I8 : PseudoInst< def ATOMIC_LOAD_ADD_I8 : PseudoInst<

2
lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp
View File

@ -3380,7 +3380,7 @@ static bool DisassemblePreLoadFrm(MCInst &MI, unsigned Opcode, uint32_t insn,
static bool DisassembleMiscFrm(MCInst &MI, unsigned Opcode, uint32_t insn, static bool DisassembleMiscFrm(MCInst &MI, unsigned Opcode, uint32_t insn,
unsigned short NumOps, unsigned &NumOpsAdded, BO B) { unsigned short NumOps, unsigned &NumOpsAdded, BO B) {
if (Opcode == ARM::DMB || Opcode == ARM::DSB) { if (Opcode == ARM::DMB || Opcode == ARM::DSB || Opcode == ARM::ISB) {
// Inst{3-0} encodes the memory barrier option for the variants. // Inst{3-0} encodes the memory barrier option for the variants.
unsigned opt = slice(insn, 3, 0); unsigned opt = slice(insn, 3, 0);
switch (opt) { switch (opt) {

2
test/MC/ARM/arm_instructions.s
View File

@ -139,7 +139,7 @@
@ CHECK: bkpt #10 @ encoding: [0x7a,0x00,0x20,0xe1] @ CHECK: bkpt #10 @ encoding: [0x7a,0x00,0x20,0xe1]
bkpt #10 bkpt #10
@ CHECK: isb @ encoding: [0x6f,0xf0,0x7f,0xf5] @ CHECK: isb sy @ encoding: [0x6f,0xf0,0x7f,0xf5]
isb isb
@ CHECK: mrs r8, cpsr @ encoding: [0x00,0x80,0x0f,0xe1] @ CHECK: mrs r8, cpsr @ encoding: [0x00,0x80,0x0f,0xe1]
mrs r8, cpsr mrs r8, cpsr