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

McARM: Make ARMOperand use a union where appropriate.

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

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

@@ -145,8 +145,10 @@ class ARMOperand : public MCParsedAsmOperand {
/// Combined record for all forms of ARM address expressions. /// Combined record for all forms of ARM address expressions.
struct { struct {
unsigned BaseRegNum; unsigned BaseRegNum;
unsigned OffsetRegNum; // used when OffsetIsReg is true union {
const MCExpr *Offset; // used when OffsetIsReg is false unsigned RegNum; ///< Offset register num, when OffsetIsReg.
const MCExpr *Value; ///< Offset value, when !OffsetIsReg.
} Offset;
const MCExpr *ShiftAmount; // used when OffsetRegShifted is true const MCExpr *ShiftAmount; // used when OffsetRegShifted is true
enum ShiftType ShiftType; // used when OffsetRegShifted is true enum ShiftType ShiftType; // used when OffsetRegShifted is true
unsigned OffsetRegShifted : 1; // only used when OffsetIsReg is true unsigned OffsetRegShifted : 1; // only used when OffsetIsReg is true
@@ -234,7 +236,7 @@ public:
Mem.Writeback || Mem.Negative) Mem.Writeback || Mem.Negative)
return false; return false;
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value);
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.
@@ -250,7 +252,7 @@ public:
if (!isMemory() || Mem.OffsetIsReg || Mem.Writeback) if (!isMemory() || Mem.OffsetIsReg || Mem.Writeback)
return false; return false;
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value);
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.
@@ -314,7 +316,7 @@ public:
// 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); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value);
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
@@ -331,13 +333,13 @@ 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(Mem.BaseRegNum));
Inst.addOperand(MCOperand::CreateReg(Mem.OffsetRegNum)); Inst.addOperand(MCOperand::CreateReg(Mem.Offset.RegNum));
} }
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(Mem.BaseRegNum));
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset); const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Mem.Offset.Value);
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()));
} }
@@ -425,8 +427,10 @@ public:
ARMOperand *Op = new ARMOperand(Memory); ARMOperand *Op = new ARMOperand(Memory);
Op->Mem.BaseRegNum = BaseRegNum; Op->Mem.BaseRegNum = BaseRegNum;
Op->Mem.OffsetIsReg = OffsetIsReg; Op->Mem.OffsetIsReg = OffsetIsReg;
Op->Mem.Offset = Offset; if (OffsetIsReg)
Op->Mem.OffsetRegNum = OffsetRegNum; Op->Mem.Offset.RegNum = OffsetRegNum;
else
Op->Mem.Offset.Value = Offset;
Op->Mem.OffsetRegShifted = OffsetRegShifted; Op->Mem.OffsetRegShifted = OffsetRegShifted;
Op->Mem.ShiftType = ShiftType; Op->Mem.ShiftType = ShiftType;
Op->Mem.ShiftAmount = ShiftAmount; Op->Mem.ShiftAmount = ShiftAmount;