diff options
| author | Bradley Smith <bradley.smith@arm.com> | 2014-04-09 14:42:56 +0000 |
|---|---|---|
| committer | Bradley Smith <bradley.smith@arm.com> | 2014-04-09 14:42:56 +0000 |
| commit | 4925be9b569d0f58b53aa14464155ac20a2cd7c1 (patch) | |
| tree | 2a8ee176f435e8c02444088d7da065e1397d52b6 | |
| parent | 3339427e2a9bc45cfda236c1dd9dd48e1e40cff9 (diff) | |
| download | bcm5719-llvm-4925be9b569d0f58b53aa14464155ac20a2cd7c1.tar.gz bcm5719-llvm-4925be9b569d0f58b53aa14464155ac20a2cd7c1.zip | |
[ARM64] Use PStateMapper to ensure that MSRcpsr operands are validated during disassembly.
llvm-svn: 205873
| -rw-r--r-- | llvm/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp b/llvm/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp index 3712d2256ec..667603ca0c3 100644 --- a/llvm/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp +++ b/llvm/lib/Target/ARM64/Disassembler/ARM64Disassembler.cpp @@ -1579,10 +1579,15 @@ static DecodeStatus DecodeSystemCPSRInstruction(llvm::MCInst &Inst, uint64_t op2 = fieldFromInstruction(insn, 5, 3); uint64_t crm = fieldFromInstruction(insn, 8, 4); - Inst.addOperand(MCOperand::CreateImm((op1 << 3) | op2)); + uint64_t cpsr_field = (op1 << 3) | op2; + + Inst.addOperand(MCOperand::CreateImm(cpsr_field)); Inst.addOperand(MCOperand::CreateImm(crm)); - return Success; + bool ValidNamed; + (void)ARM64PState::PStateMapper().toString(cpsr_field, ValidNamed); + + return ValidNamed ? Success : Fail; } static DecodeStatus DecodeTestAndBranch(llvm::MCInst &Inst, uint32_t insn, |
