mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Revert 165057, per Jim's request. This requires further discussion.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165069 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
8e71e617c9
commit
f9e008bf67
@ -34,13 +34,6 @@ public:
|
||||
/// isMem - Is this a memory operand?
|
||||
virtual bool isMem() const = 0;
|
||||
|
||||
/// isMSAsmWildcard - Is this a wildcard operand? This is specific to
|
||||
/// MS-style inline assembly and should never happen in normal assembly.
|
||||
virtual bool isMSAsmWildcard() const { return false; }
|
||||
|
||||
/// setMSAsmWildcard - Convert the operand into a wildcard.
|
||||
virtual void setMSAsmWildcard(unsigned Size) { }
|
||||
|
||||
/// getStartLoc - Get the location of the first token of this operand.
|
||||
virtual SMLoc getStartLoc() const = 0;
|
||||
/// getEndLoc - Get the location of the last token of this operand.
|
||||
|
@ -158,8 +158,7 @@ struct X86Operand : public MCParsedAsmOperand {
|
||||
Token,
|
||||
Register,
|
||||
Immediate,
|
||||
Memory,
|
||||
MSAsmWildcard
|
||||
Memory
|
||||
} Kind;
|
||||
|
||||
SMLoc StartLoc, EndLoc;
|
||||
@ -186,10 +185,6 @@ struct X86Operand : public MCParsedAsmOperand {
|
||||
unsigned Scale;
|
||||
unsigned Size;
|
||||
} Mem;
|
||||
|
||||
struct {
|
||||
unsigned Size;
|
||||
} MSAsm;
|
||||
};
|
||||
|
||||
X86Operand(KindTy K, SMLoc Start, SMLoc End)
|
||||
@ -323,32 +318,25 @@ struct X86Operand : public MCParsedAsmOperand {
|
||||
|
||||
bool isMem() const { return Kind == Memory; }
|
||||
bool isMem8() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 8)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 8);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 8);
|
||||
}
|
||||
bool isMem16() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 16)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 16);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 16);
|
||||
}
|
||||
bool isMem32() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 32)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 32);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 32);
|
||||
}
|
||||
bool isMem64() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 64)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 64);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 64);
|
||||
}
|
||||
bool isMem80() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 80)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 80);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 80);
|
||||
}
|
||||
bool isMem128() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 128)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 128);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 128);
|
||||
}
|
||||
bool isMem256() const {
|
||||
return (Kind == Memory && (!Mem.Size || Mem.Size == 256)) ||
|
||||
(Kind == MSAsmWildcard && MSAsm.Size == 256);
|
||||
return Kind == Memory && (!Mem.Size || Mem.Size == 256);
|
||||
}
|
||||
|
||||
bool isMemVX32() const {
|
||||
@ -375,12 +363,6 @@ struct X86Operand : public MCParsedAsmOperand {
|
||||
|
||||
bool isReg() const { return Kind == Register; }
|
||||
|
||||
bool isMSAsmWildcard() const { return Kind == MSAsmWildcard; }
|
||||
void setMSAsmWildcard(unsigned Size) {
|
||||
Kind = MSAsmWildcard;
|
||||
this->MSAsm.Size = Size;
|
||||
}
|
||||
|
||||
void addExpr(MCInst &Inst, const MCExpr *Expr) const {
|
||||
// Add as immediates when possible.
|
||||
if (const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Expr))
|
||||
|
Loading…
Reference in New Issue
Block a user