mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-25 05:22:04 +00:00
Split the Add, Sub, and Mul instruction opcodes into separate
integer and floating-point opcodes, introducing FAdd, FSub, and FMul. For now, the AsmParser, BitcodeReader, and IRBuilder all preserve backwards compatability, and the Core LLVM APIs preserve backwards compatibility for IR producers. Most front-ends won't need to change immediately. This implements the first step of the plan outlined here: http://nondot.org/sabre/LLVMNotes/IntegerOverflow.txt git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72897 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -573,8 +573,11 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
|
||||
return GV;
|
||||
}
|
||||
case Instruction::Add:
|
||||
case Instruction::FAdd:
|
||||
case Instruction::Sub:
|
||||
case Instruction::FSub:
|
||||
case Instruction::Mul:
|
||||
case Instruction::FMul:
|
||||
case Instruction::UDiv:
|
||||
case Instruction::SDiv:
|
||||
case Instruction::URem:
|
||||
@@ -605,11 +608,11 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
|
||||
case Type::FloatTyID:
|
||||
switch (CE->getOpcode()) {
|
||||
default: assert(0 && "Invalid float opcode"); abort();
|
||||
case Instruction::Add:
|
||||
case Instruction::FAdd:
|
||||
GV.FloatVal = LHS.FloatVal + RHS.FloatVal; break;
|
||||
case Instruction::Sub:
|
||||
case Instruction::FSub:
|
||||
GV.FloatVal = LHS.FloatVal - RHS.FloatVal; break;
|
||||
case Instruction::Mul:
|
||||
case Instruction::FMul:
|
||||
GV.FloatVal = LHS.FloatVal * RHS.FloatVal; break;
|
||||
case Instruction::FDiv:
|
||||
GV.FloatVal = LHS.FloatVal / RHS.FloatVal; break;
|
||||
@@ -620,11 +623,11 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
|
||||
case Type::DoubleTyID:
|
||||
switch (CE->getOpcode()) {
|
||||
default: assert(0 && "Invalid double opcode"); abort();
|
||||
case Instruction::Add:
|
||||
case Instruction::FAdd:
|
||||
GV.DoubleVal = LHS.DoubleVal + RHS.DoubleVal; break;
|
||||
case Instruction::Sub:
|
||||
case Instruction::FSub:
|
||||
GV.DoubleVal = LHS.DoubleVal - RHS.DoubleVal; break;
|
||||
case Instruction::Mul:
|
||||
case Instruction::FMul:
|
||||
GV.DoubleVal = LHS.DoubleVal * RHS.DoubleVal; break;
|
||||
case Instruction::FDiv:
|
||||
GV.DoubleVal = LHS.DoubleVal / RHS.DoubleVal; break;
|
||||
@@ -638,15 +641,15 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
|
||||
APFloat apfLHS = APFloat(LHS.IntVal);
|
||||
switch (CE->getOpcode()) {
|
||||
default: assert(0 && "Invalid long double opcode"); abort();
|
||||
case Instruction::Add:
|
||||
case Instruction::FAdd:
|
||||
apfLHS.add(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
|
||||
GV.IntVal = apfLHS.bitcastToAPInt();
|
||||
break;
|
||||
case Instruction::Sub:
|
||||
case Instruction::FSub:
|
||||
apfLHS.subtract(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
|
||||
GV.IntVal = apfLHS.bitcastToAPInt();
|
||||
break;
|
||||
case Instruction::Mul:
|
||||
case Instruction::FMul:
|
||||
apfLHS.multiply(APFloat(RHS.IntVal), APFloat::rmNearestTiesToEven);
|
||||
GV.IntVal = apfLHS.bitcastToAPInt();
|
||||
break;
|
||||
|
||||
@@ -64,45 +64,35 @@ void Interpreter::initializeExecutionEngine() {
|
||||
Dest.TY##Val = Src1.TY##Val OP Src2.TY##Val; \
|
||||
break
|
||||
|
||||
#define IMPLEMENT_INTEGER_BINOP1(OP, TY) \
|
||||
case Type::IntegerTyID: { \
|
||||
Dest.IntVal = Src1.IntVal OP Src2.IntVal; \
|
||||
break; \
|
||||
}
|
||||
|
||||
|
||||
static void executeAddInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
static void executeFAddInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
switch (Ty->getTypeID()) {
|
||||
IMPLEMENT_INTEGER_BINOP1(+, Ty);
|
||||
IMPLEMENT_BINARY_OPERATOR(+, Float);
|
||||
IMPLEMENT_BINARY_OPERATOR(+, Double);
|
||||
default:
|
||||
cerr << "Unhandled type for Add instruction: " << *Ty << "\n";
|
||||
cerr << "Unhandled type for FAdd instruction: " << *Ty << "\n";
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
||||
static void executeSubInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
static void executeFSubInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
switch (Ty->getTypeID()) {
|
||||
IMPLEMENT_INTEGER_BINOP1(-, Ty);
|
||||
IMPLEMENT_BINARY_OPERATOR(-, Float);
|
||||
IMPLEMENT_BINARY_OPERATOR(-, Double);
|
||||
default:
|
||||
cerr << "Unhandled type for Sub instruction: " << *Ty << "\n";
|
||||
cerr << "Unhandled type for FSub instruction: " << *Ty << "\n";
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
||||
static void executeMulInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
static void executeFMulInst(GenericValue &Dest, GenericValue Src1,
|
||||
GenericValue Src2, const Type *Ty) {
|
||||
switch (Ty->getTypeID()) {
|
||||
IMPLEMENT_INTEGER_BINOP1(*, Ty);
|
||||
IMPLEMENT_BINARY_OPERATOR(*, Float);
|
||||
IMPLEMENT_BINARY_OPERATOR(*, Double);
|
||||
default:
|
||||
cerr << "Unhandled type for Mul instruction: " << *Ty << "\n";
|
||||
cerr << "Unhandled type for FMul instruction: " << *Ty << "\n";
|
||||
abort();
|
||||
}
|
||||
}
|
||||
@@ -550,11 +540,14 @@ void Interpreter::visitBinaryOperator(BinaryOperator &I) {
|
||||
GenericValue R; // Result
|
||||
|
||||
switch (I.getOpcode()) {
|
||||
case Instruction::Add: executeAddInst (R, Src1, Src2, Ty); break;
|
||||
case Instruction::Sub: executeSubInst (R, Src1, Src2, Ty); break;
|
||||
case Instruction::Mul: executeMulInst (R, Src1, Src2, Ty); break;
|
||||
case Instruction::FDiv: executeFDivInst (R, Src1, Src2, Ty); break;
|
||||
case Instruction::FRem: executeFRemInst (R, Src1, Src2, Ty); break;
|
||||
case Instruction::Add: R.IntVal = Src1.IntVal + Src2.IntVal; break;
|
||||
case Instruction::Sub: R.IntVal = Src1.IntVal - Src2.IntVal; break;
|
||||
case Instruction::Mul: R.IntVal = Src1.IntVal * Src2.IntVal; break;
|
||||
case Instruction::FAdd: executeFAddInst(R, Src1, Src2, Ty); break;
|
||||
case Instruction::FSub: executeFSubInst(R, Src1, Src2, Ty); break;
|
||||
case Instruction::FMul: executeFMulInst(R, Src1, Src2, Ty); break;
|
||||
case Instruction::FDiv: executeFDivInst(R, Src1, Src2, Ty); break;
|
||||
case Instruction::FRem: executeFRemInst(R, Src1, Src2, Ty); break;
|
||||
case Instruction::UDiv: R.IntVal = Src1.IntVal.udiv(Src2.IntVal); break;
|
||||
case Instruction::SDiv: R.IntVal = Src1.IntVal.sdiv(Src2.IntVal); break;
|
||||
case Instruction::URem: R.IntVal = Src1.IntVal.urem(Src2.IntVal); break;
|
||||
@@ -1258,18 +1251,21 @@ GenericValue Interpreter::getConstantExprValue (ConstantExpr *CE,
|
||||
GenericValue Dest;
|
||||
const Type * Ty = CE->getOperand(0)->getType();
|
||||
switch (CE->getOpcode()) {
|
||||
case Instruction::Add: executeAddInst (Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::Sub: executeSubInst (Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::Mul: executeMulInst (Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::Add: Dest.IntVal = Op0.IntVal + Op1.IntVal; break;
|
||||
case Instruction::Sub: Dest.IntVal = Op0.IntVal - Op1.IntVal; break;
|
||||
case Instruction::Mul: Dest.IntVal = Op0.IntVal * Op1.IntVal; break;
|
||||
case Instruction::FAdd: executeFAddInst(Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::FSub: executeFSubInst(Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::FMul: executeFMulInst(Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::FDiv: executeFDivInst(Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::FRem: executeFRemInst(Dest, Op0, Op1, Ty); break;
|
||||
case Instruction::SDiv: Dest.IntVal = Op0.IntVal.sdiv(Op1.IntVal); break;
|
||||
case Instruction::UDiv: Dest.IntVal = Op0.IntVal.udiv(Op1.IntVal); break;
|
||||
case Instruction::URem: Dest.IntVal = Op0.IntVal.urem(Op1.IntVal); break;
|
||||
case Instruction::SRem: Dest.IntVal = Op0.IntVal.srem(Op1.IntVal); break;
|
||||
case Instruction::And: Dest.IntVal = Op0.IntVal.And(Op1.IntVal); break;
|
||||
case Instruction::Or: Dest.IntVal = Op0.IntVal.Or(Op1.IntVal); break;
|
||||
case Instruction::Xor: Dest.IntVal = Op0.IntVal.Xor(Op1.IntVal); break;
|
||||
case Instruction::And: Dest.IntVal = Op0.IntVal & Op1.IntVal; break;
|
||||
case Instruction::Or: Dest.IntVal = Op0.IntVal | Op1.IntVal; break;
|
||||
case Instruction::Xor: Dest.IntVal = Op0.IntVal ^ Op1.IntVal; break;
|
||||
case Instruction::Shl:
|
||||
Dest.IntVal = Op0.IntVal.shl(Op1.IntVal.getZExtValue());
|
||||
break;
|
||||
|
||||
@@ -891,8 +891,11 @@ unsigned JITEmitter::addSizeOfGlobalsInConstantVal(const Constant *C,
|
||||
break;
|
||||
}
|
||||
case Instruction::Add:
|
||||
case Instruction::FAdd:
|
||||
case Instruction::Sub:
|
||||
case Instruction::FSub:
|
||||
case Instruction::Mul:
|
||||
case Instruction::FMul:
|
||||
case Instruction::UDiv:
|
||||
case Instruction::SDiv:
|
||||
case Instruction::URem:
|
||||
|
||||
Reference in New Issue
Block a user