mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-22 10:29:35 +00:00
@l and friends adjust their value depending the context used in.
For ori, they are unsigned, for addi, signed. Create a new target expression type to handle this and evaluate Fixups accordingly. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215315 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
901a1b8885
commit
4417c25b03
@ -297,6 +297,7 @@ struct PPCOperand : public MCParsedAsmOperand {
|
|||||||
enum KindTy {
|
enum KindTy {
|
||||||
Token,
|
Token,
|
||||||
Immediate,
|
Immediate,
|
||||||
|
ContextImmediate,
|
||||||
Expression,
|
Expression,
|
||||||
TLSRegister
|
TLSRegister
|
||||||
} Kind;
|
} Kind;
|
||||||
@ -341,6 +342,7 @@ public:
|
|||||||
Tok = o.Tok;
|
Tok = o.Tok;
|
||||||
break;
|
break;
|
||||||
case Immediate:
|
case Immediate:
|
||||||
|
case ContextImmediate:
|
||||||
Imm = o.Imm;
|
Imm = o.Imm;
|
||||||
break;
|
break;
|
||||||
case Expression:
|
case Expression:
|
||||||
@ -365,6 +367,16 @@ public:
|
|||||||
assert(Kind == Immediate && "Invalid access!");
|
assert(Kind == Immediate && "Invalid access!");
|
||||||
return Imm.Val;
|
return Imm.Val;
|
||||||
}
|
}
|
||||||
|
int64_t getImmS16Context() const {
|
||||||
|
assert((Kind == Immediate || Kind == ContextImmediate) && "Invalid access!");
|
||||||
|
if (Kind == Immediate)
|
||||||
|
return Imm.Val;
|
||||||
|
return static_cast<int16_t>(Imm.Val);
|
||||||
|
}
|
||||||
|
int64_t getImmU16Context() const {
|
||||||
|
assert((Kind == Immediate || Kind == ContextImmediate) && "Invalid access!");
|
||||||
|
return Imm.Val;
|
||||||
|
}
|
||||||
|
|
||||||
const MCExpr *getExpr() const {
|
const MCExpr *getExpr() const {
|
||||||
assert(Kind == Expression && "Invalid access!");
|
assert(Kind == Expression && "Invalid access!");
|
||||||
@ -422,15 +434,42 @@ public:
|
|||||||
bool isU8ImmX8() const { return Kind == Immediate &&
|
bool isU8ImmX8() const { return Kind == Immediate &&
|
||||||
isUInt<8>(getImm()) &&
|
isUInt<8>(getImm()) &&
|
||||||
(getImm() & 7) == 0; }
|
(getImm() & 7) == 0; }
|
||||||
bool isU16Imm() const { return Kind == Expression ||
|
bool isU16Imm() const {
|
||||||
(Kind == Immediate && isUInt<16>(getImm())); }
|
switch (Kind) {
|
||||||
bool isS16Imm() const { return Kind == Expression ||
|
case Expression:
|
||||||
(Kind == Immediate && isInt<16>(getImm())); }
|
return true;
|
||||||
|
case Immediate:
|
||||||
|
case ContextImmediate:
|
||||||
|
return isUInt<16>(getImmU16Context());
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
bool isS16Imm() const {
|
||||||
|
switch (Kind) {
|
||||||
|
case Expression:
|
||||||
|
return true;
|
||||||
|
case Immediate:
|
||||||
|
case ContextImmediate:
|
||||||
|
return isInt<16>(getImmS16Context());
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
bool isS16ImmX4() const { return Kind == Expression ||
|
bool isS16ImmX4() const { return Kind == Expression ||
|
||||||
(Kind == Immediate && isInt<16>(getImm()) &&
|
(Kind == Immediate && isInt<16>(getImm()) &&
|
||||||
(getImm() & 3) == 0); }
|
(getImm() & 3) == 0); }
|
||||||
bool isS17Imm() const { return Kind == Expression ||
|
bool isS17Imm() const {
|
||||||
(Kind == Immediate && isInt<17>(getImm())); }
|
switch (Kind) {
|
||||||
|
case Expression:
|
||||||
|
return true;
|
||||||
|
case Immediate:
|
||||||
|
case ContextImmediate:
|
||||||
|
return isInt<17>(getImmS16Context());
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
bool isTLSReg() const { return Kind == TLSRegister; }
|
bool isTLSReg() const { return Kind == TLSRegister; }
|
||||||
bool isDirectBr() const {
|
bool isDirectBr() const {
|
||||||
if (Kind == Expression)
|
if (Kind == Expression)
|
||||||
@ -553,6 +592,36 @@ public:
|
|||||||
Inst.addOperand(MCOperand::CreateExpr(getExpr()));
|
Inst.addOperand(MCOperand::CreateExpr(getExpr()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void addS16ImmOperands(MCInst &Inst, unsigned N) const {
|
||||||
|
assert(N == 1 && "Invalid number of operands!");
|
||||||
|
switch (Kind) {
|
||||||
|
case Immediate:
|
||||||
|
Inst.addOperand(MCOperand::CreateImm(getImm()));
|
||||||
|
break;
|
||||||
|
case ContextImmediate:
|
||||||
|
Inst.addOperand(MCOperand::CreateImm(getImmS16Context()));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Inst.addOperand(MCOperand::CreateExpr(getExpr()));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void addU16ImmOperands(MCInst &Inst, unsigned N) const {
|
||||||
|
assert(N == 1 && "Invalid number of operands!");
|
||||||
|
switch (Kind) {
|
||||||
|
case Immediate:
|
||||||
|
Inst.addOperand(MCOperand::CreateImm(getImm()));
|
||||||
|
break;
|
||||||
|
case ContextImmediate:
|
||||||
|
Inst.addOperand(MCOperand::CreateImm(getImmU16Context()));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Inst.addOperand(MCOperand::CreateExpr(getExpr()));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void addBranchTargetOperands(MCInst &Inst, unsigned N) const {
|
void addBranchTargetOperands(MCInst &Inst, unsigned N) const {
|
||||||
assert(N == 1 && "Invalid number of operands!");
|
assert(N == 1 && "Invalid number of operands!");
|
||||||
if (Kind == Immediate)
|
if (Kind == Immediate)
|
||||||
@ -633,6 +702,16 @@ public:
|
|||||||
return Op;
|
return Op;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static std::unique_ptr<PPCOperand>
|
||||||
|
CreateContextImm(int64_t Val, SMLoc S, SMLoc E, bool IsPPC64) {
|
||||||
|
auto Op = make_unique<PPCOperand>(ContextImmediate);
|
||||||
|
Op->Imm.Val = Val;
|
||||||
|
Op->StartLoc = S;
|
||||||
|
Op->EndLoc = E;
|
||||||
|
Op->IsPPC64 = IsPPC64;
|
||||||
|
return Op;
|
||||||
|
}
|
||||||
|
|
||||||
static std::unique_ptr<PPCOperand>
|
static std::unique_ptr<PPCOperand>
|
||||||
CreateFromMCExpr(const MCExpr *Val, SMLoc S, SMLoc E, bool IsPPC64) {
|
CreateFromMCExpr(const MCExpr *Val, SMLoc S, SMLoc E, bool IsPPC64) {
|
||||||
if (const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Val))
|
if (const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Val))
|
||||||
@ -642,6 +721,12 @@ public:
|
|||||||
if (SRE->getKind() == MCSymbolRefExpr::VK_PPC_TLS)
|
if (SRE->getKind() == MCSymbolRefExpr::VK_PPC_TLS)
|
||||||
return CreateTLSReg(SRE, S, E, IsPPC64);
|
return CreateTLSReg(SRE, S, E, IsPPC64);
|
||||||
|
|
||||||
|
if (const PPCMCExpr *TE = dyn_cast<PPCMCExpr>(Val)) {
|
||||||
|
int64_t Res;
|
||||||
|
if (TE->EvaluateAsConstant(Res))
|
||||||
|
return CreateContextImm(Res, S, E, IsPPC64);
|
||||||
|
}
|
||||||
|
|
||||||
return CreateExpr(Val, S, E, IsPPC64);
|
return CreateExpr(Val, S, E, IsPPC64);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -654,6 +739,7 @@ void PPCOperand::print(raw_ostream &OS) const {
|
|||||||
OS << "'" << getToken() << "'";
|
OS << "'" << getToken() << "'";
|
||||||
break;
|
break;
|
||||||
case Immediate:
|
case Immediate:
|
||||||
|
case ContextImmediate:
|
||||||
OS << getImm();
|
OS << getImm();
|
||||||
break;
|
break;
|
||||||
case Expression:
|
case Expression:
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
//
|
//
|
||||||
//===----------------------------------------------------------------------===//
|
//===----------------------------------------------------------------------===//
|
||||||
|
|
||||||
|
#include "PPCFixupKinds.h"
|
||||||
#include "PPCMCExpr.h"
|
#include "PPCMCExpr.h"
|
||||||
#include "llvm/MC/MCAsmInfo.h"
|
#include "llvm/MC/MCAsmInfo.h"
|
||||||
#include "llvm/MC/MCAssembler.h"
|
#include "llvm/MC/MCAssembler.h"
|
||||||
@ -51,6 +52,43 @@ void PPCMCExpr::PrintImpl(raw_ostream &OS) const {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool
|
||||||
|
PPCMCExpr::EvaluateAsConstant(int64_t &Res) const {
|
||||||
|
MCValue Value;
|
||||||
|
|
||||||
|
if (!getSubExpr()->EvaluateAsRelocatable(Value, nullptr, nullptr))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!Value.isAbsolute())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
Res = EvaluateAsInt64(Value.getConstant());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int64_t
|
||||||
|
PPCMCExpr::EvaluateAsInt64(int64_t Value) const {
|
||||||
|
switch (Kind) {
|
||||||
|
case VK_PPC_LO:
|
||||||
|
return Value & 0xffff;
|
||||||
|
case VK_PPC_HI:
|
||||||
|
return (Value >> 16) & 0xffff;
|
||||||
|
case VK_PPC_HA:
|
||||||
|
return ((Value + 0x8000) >> 16) & 0xffff;
|
||||||
|
case VK_PPC_HIGHER:
|
||||||
|
return (Value >> 32) & 0xffff;
|
||||||
|
case VK_PPC_HIGHERA:
|
||||||
|
return ((Value + 0x8000) >> 32) & 0xffff;
|
||||||
|
case VK_PPC_HIGHEST:
|
||||||
|
return (Value >> 48) & 0xffff;
|
||||||
|
case VK_PPC_HIGHESTA:
|
||||||
|
return ((Value + 0x8000) >> 48) & 0xffff;
|
||||||
|
case VK_PPC_None:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
llvm_unreachable("Invalid kind!");
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
PPCMCExpr::EvaluateAsRelocatableImpl(MCValue &Res,
|
PPCMCExpr::EvaluateAsRelocatableImpl(MCValue &Res,
|
||||||
const MCAsmLayout *Layout,
|
const MCAsmLayout *Layout,
|
||||||
@ -61,32 +99,10 @@ PPCMCExpr::EvaluateAsRelocatableImpl(MCValue &Res,
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (Value.isAbsolute()) {
|
if (Value.isAbsolute()) {
|
||||||
int64_t Result = Value.getConstant();
|
int64_t Result = EvaluateAsInt64(Value.getConstant());
|
||||||
switch (Kind) {
|
if ((Fixup == nullptr || (unsigned)Fixup->getKind() != PPC::fixup_ppc_half16) &&
|
||||||
default:
|
(Result >= 0x8000))
|
||||||
llvm_unreachable("Invalid kind!");
|
return false;
|
||||||
case VK_PPC_LO:
|
|
||||||
Result = Result & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HI:
|
|
||||||
Result = (Result >> 16) & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HA:
|
|
||||||
Result = ((Result + 0x8000) >> 16) & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HIGHER:
|
|
||||||
Result = (Result >> 32) & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HIGHERA:
|
|
||||||
Result = ((Result + 0x8000) >> 32) & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HIGHEST:
|
|
||||||
Result = (Result >> 48) & 0xffff;
|
|
||||||
break;
|
|
||||||
case VK_PPC_HIGHESTA:
|
|
||||||
Result = ((Result + 0x8000) >> 48) & 0xffff;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Res = MCValue::get(Result);
|
Res = MCValue::get(Result);
|
||||||
} else {
|
} else {
|
||||||
if (!Layout)
|
if (!Layout)
|
||||||
|
@ -34,6 +34,8 @@ private:
|
|||||||
const MCExpr *Expr;
|
const MCExpr *Expr;
|
||||||
bool IsDarwin;
|
bool IsDarwin;
|
||||||
|
|
||||||
|
int64_t EvaluateAsInt64(int64_t Value) const;
|
||||||
|
|
||||||
explicit PPCMCExpr(VariantKind _Kind, const MCExpr *_Expr,
|
explicit PPCMCExpr(VariantKind _Kind, const MCExpr *_Expr,
|
||||||
bool _IsDarwin)
|
bool _IsDarwin)
|
||||||
: Kind(_Kind), Expr(_Expr), IsDarwin(_IsDarwin) {}
|
: Kind(_Kind), Expr(_Expr), IsDarwin(_IsDarwin) {}
|
||||||
@ -88,6 +90,8 @@ public:
|
|||||||
// There are no TLS PPCMCExprs at the moment.
|
// There are no TLS PPCMCExprs at the moment.
|
||||||
void fixELFSymbolsInTLSFixups(MCAssembler &Asm) const override {}
|
void fixELFSymbolsInTLSFixups(MCAssembler &Asm) const override {}
|
||||||
|
|
||||||
|
bool EvaluateAsConstant(int64_t &Res) const;
|
||||||
|
|
||||||
static bool classof(const MCExpr *E) {
|
static bool classof(const MCExpr *E) {
|
||||||
return E->getKind() == MCExpr::Target;
|
return E->getKind() == MCExpr::Target;
|
||||||
}
|
}
|
||||||
|
@ -458,7 +458,7 @@ def u6imm : Operand<i32> {
|
|||||||
}
|
}
|
||||||
def PPCS16ImmAsmOperand : AsmOperandClass {
|
def PPCS16ImmAsmOperand : AsmOperandClass {
|
||||||
let Name = "S16Imm"; let PredicateMethod = "isS16Imm";
|
let Name = "S16Imm"; let PredicateMethod = "isS16Imm";
|
||||||
let RenderMethod = "addImmOperands";
|
let RenderMethod = "addS16ImmOperands";
|
||||||
}
|
}
|
||||||
def s16imm : Operand<i32> {
|
def s16imm : Operand<i32> {
|
||||||
let PrintMethod = "printS16ImmOperand";
|
let PrintMethod = "printS16ImmOperand";
|
||||||
@ -468,7 +468,7 @@ def s16imm : Operand<i32> {
|
|||||||
}
|
}
|
||||||
def PPCU16ImmAsmOperand : AsmOperandClass {
|
def PPCU16ImmAsmOperand : AsmOperandClass {
|
||||||
let Name = "U16Imm"; let PredicateMethod = "isU16Imm";
|
let Name = "U16Imm"; let PredicateMethod = "isU16Imm";
|
||||||
let RenderMethod = "addImmOperands";
|
let RenderMethod = "addU16ImmOperands";
|
||||||
}
|
}
|
||||||
def u16imm : Operand<i32> {
|
def u16imm : Operand<i32> {
|
||||||
let PrintMethod = "printU16ImmOperand";
|
let PrintMethod = "printU16ImmOperand";
|
||||||
@ -478,7 +478,7 @@ def u16imm : Operand<i32> {
|
|||||||
}
|
}
|
||||||
def PPCS17ImmAsmOperand : AsmOperandClass {
|
def PPCS17ImmAsmOperand : AsmOperandClass {
|
||||||
let Name = "S17Imm"; let PredicateMethod = "isS17Imm";
|
let Name = "S17Imm"; let PredicateMethod = "isS17Imm";
|
||||||
let RenderMethod = "addImmOperands";
|
let RenderMethod = "addS16ImmOperands";
|
||||||
}
|
}
|
||||||
def s17imm : Operand<i32> {
|
def s17imm : Operand<i32> {
|
||||||
// This operand type is used for addis/lis to allow the assembler parser
|
// This operand type is used for addis/lis to allow the assembler parser
|
||||||
@ -554,7 +554,7 @@ def ptr_rc_idx : Operand<iPTR>, PointerLikeRegClass<0> {
|
|||||||
|
|
||||||
def PPCDispRIOperand : AsmOperandClass {
|
def PPCDispRIOperand : AsmOperandClass {
|
||||||
let Name = "DispRI"; let PredicateMethod = "isS16Imm";
|
let Name = "DispRI"; let PredicateMethod = "isS16Imm";
|
||||||
let RenderMethod = "addImmOperands";
|
let RenderMethod = "addS16ImmOperands";
|
||||||
}
|
}
|
||||||
def dispRI : Operand<iPTR> {
|
def dispRI : Operand<iPTR> {
|
||||||
let ParserMatchClass = PPCDispRIOperand;
|
let ParserMatchClass = PPCDispRIOperand;
|
||||||
|
@ -27,6 +27,8 @@ subis 1, 1, target4-target3@ha
|
|||||||
|
|
||||||
addi 1, 1, target5+0x8000@l
|
addi 1, 1, target5+0x8000@l
|
||||||
addis 1, 1, target5+0x8000@ha
|
addis 1, 1, target5+0x8000@ha
|
||||||
|
ori 1, 1, target5+0x8000@l
|
||||||
|
oris 1, 1, target5+0x8000@ha
|
||||||
|
|
||||||
.set target5, 0x10000001
|
.set target5, 0x10000001
|
||||||
|
|
||||||
@ -68,7 +70,7 @@ addis 1, 1, target7@highesta
|
|||||||
# CHECK-NEXT: ]
|
# CHECK-NEXT: ]
|
||||||
# CHECK-NEXT: Address: 0x0
|
# CHECK-NEXT: Address: 0x0
|
||||||
# CHECK-NEXT: Offset:
|
# CHECK-NEXT: Offset:
|
||||||
# CHECK-NEXT: Size: 64
|
# CHECK-NEXT: Size: 72
|
||||||
# CHECK-NEXT: Link: 0
|
# CHECK-NEXT: Link: 0
|
||||||
# CHECK-NEXT: Info: 0
|
# CHECK-NEXT: Info: 0
|
||||||
# CHECK-NEXT: AddressAlignment: 4
|
# CHECK-NEXT: AddressAlignment: 4
|
||||||
@ -78,10 +80,12 @@ addis 1, 1, target7@highesta
|
|||||||
# CHECK-LE-NEXT: 0000: 34122138 3412213C 78562138 3412213C
|
# CHECK-LE-NEXT: 0000: 34122138 3412213C 78562138 3412213C
|
||||||
# CHECK-BE-NEXT: 0010: 38214444 3C211111 38218001 3C211001
|
# CHECK-BE-NEXT: 0010: 38214444 3C211111 38218001 3C211001
|
||||||
# CHECK-LE-NEXT: 0010: 44442138 1111213C 01802138 0110213C
|
# CHECK-LE-NEXT: 0010: 44442138 1111213C 01802138 0110213C
|
||||||
# CHECK-BE-NEXT: 0020: 38210008 3C210000 38214321 3C214321
|
# CHECK-BE-NEXT: 0020: 60218001 64211001 38210008 3C210000
|
||||||
# CHECK-LE-NEXT: 0020: 08002138 0000213C 21432138 2143213C
|
# CHECK-LE-NEXT: 0020: 01802160 01102164 08002138 0000213C
|
||||||
# CHECK-BE-NEXT: 0030: 3821FFFF 3C211234 38210000 3C211235
|
# CHECK-BE-NEXT: 0030: 38214321 3C214321 3821FFFF 3C211234
|
||||||
# CHECK-LE-NEXT: 0030: FFFF2138 3412213C 00002138 3512213C
|
# CHECK-LE-NEXT: 0030: 21432138 2143213C FFFF2138 3412213C
|
||||||
|
# CHECK-BE-NEXT: 0040: 38210000 3C211235
|
||||||
|
# CHECK-LE-NEXT: 0040: 00002138 3512213C
|
||||||
# CHECK-NEXT: )
|
# CHECK-NEXT: )
|
||||||
# CHECK-NEXT: }
|
# CHECK-NEXT: }
|
||||||
|
|
||||||
|
@ -687,6 +687,18 @@ base:
|
|||||||
# CHECK-BE: ori 1, 2, 2 # encoding: [0x60,0x41,0x00,0x02]
|
# CHECK-BE: ori 1, 2, 2 # encoding: [0x60,0x41,0x00,0x02]
|
||||||
# CHECK-LE: ori 1, 2, 2 # encoding: [0x02,0x00,0x41,0x60]
|
# CHECK-LE: ori 1, 2, 2 # encoding: [0x02,0x00,0x41,0x60]
|
||||||
ori 1, 2, 131071@ha
|
ori 1, 2, 131071@ha
|
||||||
|
# CHECK-BE: addi 1, 2, -1 # encoding: [0x38,0x22,0xff,0xff]
|
||||||
|
# CHECK-LE: addi 1, 2, -1 # encoding: [0xff,0xff,0x22,0x38]
|
||||||
|
addi 1, 2, 131071@l
|
||||||
|
# CHECK-BE: addi 1, 2, 1 # encoding: [0x38,0x22,0x00,0x01]
|
||||||
|
# CHECK-LE: addi 1, 2, 1 # encoding: [0x01,0x00,0x22,0x38]
|
||||||
|
addi 1, 2, 131071@h
|
||||||
|
# CHECK-BE: addi 1, 2, 2 # encoding: [0x38,0x22,0x00,0x02]
|
||||||
|
# CHECK-LE: addi 1, 2, 2 # encoding: [0x02,0x00,0x22,0x38]
|
||||||
|
addi 1, 2, 131071@ha
|
||||||
|
# CHECK-BE: addis 1, 2, -4096 # encoding: [0x3c,0x22,0xf0,0x00]
|
||||||
|
# CHECK-LE: addis 1, 2, -4096 # encoding: [0x00,0xf0,0x22,0x3c]
|
||||||
|
addis 1, 2, 0xf0000000@h
|
||||||
|
|
||||||
# Data relocs
|
# Data relocs
|
||||||
# llvm-mc does not show any "encoding" string for data, so we just check the relocs
|
# llvm-mc does not show any "encoding" string for data, so we just check the relocs
|
||||||
|
Loading…
Reference in New Issue
Block a user