mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-05 13:26:55 +00:00
Move EVER MORE stuff over to LLVMContext.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75703 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -43,7 +43,7 @@ Module *BrainF::parse(std::istream *in1, int mem, CompileFlags cf,
|
||||
comflag = cf;
|
||||
|
||||
header(Context);
|
||||
readloop(0, 0, 0);
|
||||
readloop(0, 0, 0, Context);
|
||||
delete builder;
|
||||
return module;
|
||||
}
|
||||
@@ -77,16 +77,16 @@ void BrainF::header(LLVMContext& C) {
|
||||
builder = new IRBuilder<>(BasicBlock::Create(label, brainf_func));
|
||||
|
||||
//%arr = malloc i8, i32 %d
|
||||
ConstantInt *val_mem = ConstantInt::get(APInt(32, memtotal));
|
||||
ConstantInt *val_mem = C.getConstantInt(APInt(32, memtotal));
|
||||
ptr_arr = builder->CreateMalloc(IntegerType::Int8Ty, val_mem, "arr");
|
||||
|
||||
//call void @llvm.memset.i32(i8 *%arr, i8 0, i32 %d, i32 1)
|
||||
{
|
||||
Value *memset_params[] = {
|
||||
ptr_arr,
|
||||
ConstantInt::get(APInt(8, 0)),
|
||||
C.getConstantInt(APInt(8, 0)),
|
||||
val_mem,
|
||||
ConstantInt::get(APInt(32, 1))
|
||||
C.getConstantInt(APInt(32, 1))
|
||||
};
|
||||
|
||||
CallInst *memset_call = builder->
|
||||
@@ -97,12 +97,12 @@ void BrainF::header(LLVMContext& C) {
|
||||
//%arrmax = getelementptr i8 *%arr, i32 %d
|
||||
if (comflag & flag_arraybounds) {
|
||||
ptr_arrmax = builder->
|
||||
CreateGEP(ptr_arr, ConstantInt::get(APInt(32, memtotal)), "arrmax");
|
||||
CreateGEP(ptr_arr, C.getConstantInt(APInt(32, memtotal)), "arrmax");
|
||||
}
|
||||
|
||||
//%head.%d = getelementptr i8 *%arr, i32 %d
|
||||
curhead = builder->CreateGEP(ptr_arr,
|
||||
ConstantInt::get(APInt(32, memtotal/2)),
|
||||
C.getConstantInt(APInt(32, memtotal/2)),
|
||||
headreg);
|
||||
|
||||
|
||||
@@ -124,8 +124,8 @@ void BrainF::header(LLVMContext& C) {
|
||||
if (comflag & flag_arraybounds)
|
||||
{
|
||||
//@aberrormsg = internal constant [%d x i8] c"\00"
|
||||
Constant *msg_0 = ConstantArray::
|
||||
get("Error: The head has left the tape.", true);
|
||||
Constant *msg_0 =
|
||||
C.getConstantArray("Error: The head has left the tape.", true);
|
||||
|
||||
GlobalVariable *aberrormsg = new GlobalVariable(
|
||||
*module,
|
||||
@@ -138,7 +138,7 @@ void BrainF::header(LLVMContext& C) {
|
||||
//declare i32 @puts(i8 *)
|
||||
Function *puts_func = cast<Function>(module->
|
||||
getOrInsertFunction("puts", IntegerType::Int32Ty,
|
||||
PointerType::getUnqual(IntegerType::Int8Ty), NULL));
|
||||
C.getPointerTypeUnqual(IntegerType::Int8Ty), NULL));
|
||||
|
||||
//brainf.aberror:
|
||||
aberrorbb = BasicBlock::Create(label, brainf_func);
|
||||
@@ -172,7 +172,8 @@ void BrainF::header(LLVMContext& C) {
|
||||
}
|
||||
}
|
||||
|
||||
void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb,
|
||||
LLVMContext &C) {
|
||||
Symbol cursym = SYM_NONE;
|
||||
int curvalue = 0;
|
||||
Symbol nextsym = SYM_NONE;
|
||||
@@ -228,7 +229,7 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
{
|
||||
//%head.%d = getelementptr i8 *%head.%d, i32 %d
|
||||
curhead = builder->
|
||||
CreateGEP(curhead, ConstantInt::get(APInt(32, curvalue)),
|
||||
CreateGEP(curhead, C.getConstantInt(APInt(32, curvalue)),
|
||||
headreg);
|
||||
|
||||
//Error block for array out of bounds
|
||||
@@ -263,7 +264,7 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
|
||||
//%tape.%d = add i8 %tape.%d, %d
|
||||
Value *tape_1 = builder->
|
||||
CreateAdd(tape_0, ConstantInt::get(APInt(8, curvalue)), tapereg);
|
||||
CreateAdd(tape_0, C.getConstantInt(APInt(8, curvalue)), tapereg);
|
||||
|
||||
//store i8 %tape.%d, i8 *%head.%d\n"
|
||||
builder->CreateStore(tape_1, curhead);
|
||||
@@ -283,13 +284,13 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
|
||||
// Make part of PHI instruction now, wait until end of loop to finish
|
||||
PHINode *phi_0 =
|
||||
PHINode::Create(PointerType::getUnqual(IntegerType::Int8Ty),
|
||||
PHINode::Create(C.getPointerTypeUnqual(IntegerType::Int8Ty),
|
||||
headreg, testbb);
|
||||
phi_0->reserveOperandSpace(2);
|
||||
phi_0->addIncoming(curhead, bb_0);
|
||||
curhead = phi_0;
|
||||
|
||||
readloop(phi_0, bb_1, testbb);
|
||||
readloop(phi_0, bb_1, testbb, C);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -428,7 +429,7 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
|
||||
//%test.%d = icmp eq i8 %tape.%d, 0
|
||||
ICmpInst *test_0 = new ICmpInst(*testbb, ICmpInst::ICMP_EQ, tape_0,
|
||||
ConstantInt::get(APInt(8, 0)), testreg);
|
||||
C.getConstantInt(APInt(8, 0)), testreg);
|
||||
|
||||
//br i1 %test.%d, label %main.%d, label %main.%d
|
||||
BasicBlock *bb_0 = BasicBlock::Create(label, brainf_func);
|
||||
@@ -439,7 +440,7 @@ void BrainF::readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb) {
|
||||
|
||||
//%head.%d = phi i8 *[%head.%d, %main.%d]
|
||||
PHINode *phi_1 = builder->
|
||||
CreatePHI(PointerType::getUnqual(IntegerType::Int8Ty), headreg);
|
||||
CreatePHI(C.getPointerTypeUnqual(IntegerType::Int8Ty), headreg);
|
||||
phi_1->reserveOperandSpace(1);
|
||||
phi_1->addIncoming(head_0, testbb);
|
||||
curhead = phi_1;
|
||||
|
@@ -70,7 +70,8 @@ class BrainF {
|
||||
|
||||
/// The main loop for parsing. It calls itself recursively
|
||||
/// to handle the depth of nesting of "[]".
|
||||
void readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb);
|
||||
void readloop(PHINode *phi, BasicBlock *oldbb,
|
||||
BasicBlock *testbb, LLVMContext &Context);
|
||||
|
||||
/// Constants during parsing
|
||||
int memtotal;
|
||||
|
@@ -36,7 +36,7 @@
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
using namespace llvm;
|
||||
|
||||
static Function *CreateFibFunction(Module *M) {
|
||||
static Function *CreateFibFunction(Module *M, LLVMContext &Context) {
|
||||
// Create the fib function and insert it into module M. This function is said
|
||||
// to return an int and take an int parameter.
|
||||
Function *FibF =
|
||||
@@ -47,8 +47,8 @@ static Function *CreateFibFunction(Module *M) {
|
||||
BasicBlock *BB = BasicBlock::Create("EntryBlock", FibF);
|
||||
|
||||
// Get pointers to the constants.
|
||||
Value *One = ConstantInt::get(Type::Int32Ty, 1);
|
||||
Value *Two = ConstantInt::get(Type::Int32Ty, 2);
|
||||
Value *One = Context.getConstantInt(Type::Int32Ty, 1);
|
||||
Value *Two = Context.getConstantInt(Type::Int32Ty, 2);
|
||||
|
||||
// Get pointer to the integer argument of the add1 function...
|
||||
Argument *ArgX = FibF->arg_begin(); // Get the arg.
|
||||
@@ -97,7 +97,7 @@ int main(int argc, char **argv) {
|
||||
Module *M = new Module("test", Context);
|
||||
|
||||
// We are about to create the "fib" function:
|
||||
Function *FibF = CreateFibFunction(M);
|
||||
Function *FibF = CreateFibFunction(M, Context);
|
||||
|
||||
// Now we going to create JIT
|
||||
ExistingModuleProvider *MP = new ExistingModuleProvider(M);
|
||||
|
@@ -69,7 +69,7 @@ int main() {
|
||||
BasicBlock *BB = BasicBlock::Create("EntryBlock", Add1F);
|
||||
|
||||
// Get pointers to the constant `1'.
|
||||
Value *One = ConstantInt::get(Type::Int32Ty, 1);
|
||||
Value *One = Context.getConstantInt(Type::Int32Ty, 1);
|
||||
|
||||
// Get pointers to the integer argument of the add1 function...
|
||||
assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg
|
||||
@@ -94,7 +94,7 @@ int main() {
|
||||
BB = BasicBlock::Create("EntryBlock", FooF);
|
||||
|
||||
// Get pointers to the constant `10'.
|
||||
Value *Ten = ConstantInt::get(Type::Int32Ty, 10);
|
||||
Value *Ten = Context.getConstantInt(Type::Int32Ty, 10);
|
||||
|
||||
// Pass Ten to the call call:
|
||||
CallInst *Add1CallRes = CallInst::Create(Add1F, Ten, "add1", BB);
|
||||
|
@@ -30,7 +30,8 @@ int main() {
|
||||
Module *M = new Module("test", Context);
|
||||
|
||||
// Create the main function: first create the type 'int ()'
|
||||
FunctionType *FT = FunctionType::get(Type::Int32Ty, /*not vararg*/false);
|
||||
FunctionType *FT =
|
||||
Context.getFunctionType(Type::Int32Ty, /*not vararg*/false);
|
||||
|
||||
// By passing a module as the last parameter to the Function constructor,
|
||||
// it automatically gets appended to the Module.
|
||||
@@ -41,8 +42,8 @@ int main() {
|
||||
BasicBlock *BB = BasicBlock::Create("EntryBlock", F);
|
||||
|
||||
// Get pointers to the constant integers...
|
||||
Value *Two = ConstantInt::get(Type::Int32Ty, 2);
|
||||
Value *Three = ConstantInt::get(Type::Int32Ty, 3);
|
||||
Value *Two = Context.getConstantInt(Type::Int32Ty, 2);
|
||||
Value *Three = Context.getConstantInt(Type::Int32Ty, 3);
|
||||
|
||||
// Create the add instruction... does not insert...
|
||||
Instruction *Add = BinaryOperator::Create(Instruction::Add, Two, Three,
|
||||
|
@@ -44,7 +44,7 @@ static Function* createAdd1(Module *M) {
|
||||
BasicBlock *BB = BasicBlock::Create("EntryBlock", Add1F);
|
||||
|
||||
// Get pointers to the constant `1'.
|
||||
Value *One = ConstantInt::get(Type::Int32Ty, 1);
|
||||
Value *One = M->getContext().getConstantInt(Type::Int32Ty, 1);
|
||||
|
||||
// Get pointers to the integer argument of the add1 function...
|
||||
assert(Add1F->arg_begin() != Add1F->arg_end()); // Make sure there's an arg
|
||||
@@ -72,8 +72,8 @@ static Function *CreateFibFunction(Module *M) {
|
||||
BasicBlock *BB = BasicBlock::Create("EntryBlock", FibF);
|
||||
|
||||
// Get pointers to the constants.
|
||||
Value *One = ConstantInt::get(Type::Int32Ty, 1);
|
||||
Value *Two = ConstantInt::get(Type::Int32Ty, 2);
|
||||
Value *One = M->getContext().getConstantInt(Type::Int32Ty, 1);
|
||||
Value *Two = M->getContext().getConstantInt(Type::Int32Ty, 2);
|
||||
|
||||
// Get pointer to the integer argument of the add1 function...
|
||||
Argument *ArgX = FibF->arg_begin(); // Get the arg.
|
||||
|
Reference in New Issue
Block a user