6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-23 14:25:07 +00:00
Code Issues Projects Releases Wiki Activity

McARM: Use accessors where appropriate.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123746 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2011-01-18 05:55:27 +00:00
parent 6ec56204f3
commit 4b462672d2
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@@ -266,11 +266,11 @@ public:
bool isToken() const { return Kind == Token; } bool isToken() const { return Kind == Token; }
bool isMemory() const { return Kind == Memory; } bool isMemory() const { return Kind == Memory; }
bool isMemMode5() const { bool isMemMode5() const {
if (!isMemory() || Mem.OffsetIsReg || Mem.OffsetRegShifted || if (!isMemory() || getMemOffsetIsReg() || getMemWriteback() ||
Mem.Writeback || Mem.Negative) getMemNegative())
return false; return false;
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getMemOffset());
if (!CE) return false; if (!CE) return false;
// The offset must be a multiple of 4 in the range 0-1020. // The offset must be a multiple of 4 in the range 0-1020.
@@ -278,15 +278,15 @@ public:
return ((Value & 0x3) == 0 && Value <= 1020 && Value >= -1020); return ((Value & 0x3) == 0 && Value <= 1020 && Value >= -1020);
} }
bool isMemModeRegThumb() const { bool isMemModeRegThumb() const {
if (!isMemory() || !Mem.OffsetIsReg || Mem.Writeback) if (!isMemory() || !getMemOffsetIsReg() || getMemWriteback())
return false; return false;
return true; return true;
} }
bool isMemModeImmThumb() const { bool isMemModeImmThumb() const {
if (!isMemory() || Mem.OffsetIsReg || Mem.Writeback) if (!isMemory() || getMemOffsetIsReg() || getMemWriteback())
return false; return false;
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getMemOffset());
if (!CE) return false; if (!CE) return false;
// The offset must be a multiple of 4 in the range 0-124. // The offset must be a multiple of 4 in the range 0-124.
@@ -345,12 +345,12 @@ public:
void addMemMode5Operands(MCInst &Inst, unsigned N) const { void addMemMode5Operands(MCInst &Inst, unsigned N) const {
assert(N == 2 && isMemMode5() && "Invalid number of operands!"); assert(N == 2 && isMemMode5() && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(Mem.BaseRegNum)); Inst.addOperand(MCOperand::CreateReg(getMemBaseRegNum()));
assert(!Mem.OffsetIsReg && "Invalid mode 5 operand"); assert(!getMemOffsetIsReg() && "Invalid mode 5 operand");
// FIXME: #-0 is encoded differently than #0. Does the parser preserve // FIXME: #-0 is encoded differently than #0. Does the parser preserve
// the difference? // the difference?
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getMemOffset());
assert(CE && "Non-constant mode 5 offset operand!"); assert(CE && "Non-constant mode 5 offset operand!");
// The MCInst offset operand doesn't include the low two bits (like // The MCInst offset operand doesn't include the low two bits (like
@@ -366,14 +366,14 @@ public:
void addMemModeRegThumbOperands(MCInst &Inst, unsigned N) const { void addMemModeRegThumbOperands(MCInst &Inst, unsigned N) const {
assert(N == 2 && isMemModeRegThumb() && "Invalid number of operands!"); assert(N == 2 && isMemModeRegThumb() && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(Mem.BaseRegNum)); Inst.addOperand(MCOperand::CreateReg(getMemBaseRegNum()));
Inst.addOperand(MCOperand::CreateReg(Mem.Offset.RegNum)); Inst.addOperand(MCOperand::CreateReg(getMemOffsetRegNum()));
} }
void addMemModeImmThumbOperands(MCInst &Inst, unsigned N) const { void addMemModeImmThumbOperands(MCInst &Inst, unsigned N) const {
assert(N == 2 && isMemModeImmThumb() && "Invalid number of operands!"); assert(N == 2 && isMemModeImmThumb() && "Invalid number of operands!");
Inst.addOperand(MCOperand::CreateReg(Mem.BaseRegNum)); Inst.addOperand(MCOperand::CreateReg(getMemBaseRegNum()));
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getMemOffset());
assert(CE && "Non-constant mode offset operand!"); assert(CE && "Non-constant mode offset operand!");
Inst.addOperand(MCOperand::CreateImm(CE->getValue())); Inst.addOperand(MCOperand::CreateImm(CE->getValue()));
} }