//
// The LLVM Compiler Infrastructure
//
-// This file was developed by Valery A. Khamenya and is distributed under the
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
#include "llvm/ExecutionEngine/JIT.h"
#include "llvm/ExecutionEngine/Interpreter.h"
#include "llvm/ExecutionEngine/GenericValue.h"
-#include <iostream>
+#include "llvm/Support/raw_ostream.h"
using namespace llvm;
static Function *CreateFibFunction(Module *M) {
(Type *)0));
// Add a basic block to the function.
- BasicBlock *BB = new BasicBlock("EntryBlock", FibF);
+ BasicBlock *BB = BasicBlock::Create("EntryBlock", FibF);
// Get pointers to the constants.
Value *One = ConstantInt::get(Type::Int32Ty, 1);
ArgX->setName("AnArg"); // Give it a nice symbolic name for fun.
// Create the true_block.
- BasicBlock *RetBB = new BasicBlock("return", FibF);
+ BasicBlock *RetBB = BasicBlock::Create("return", FibF);
// Create an exit block.
- BasicBlock* RecurseBB = new BasicBlock("recurse", FibF);
+ BasicBlock* RecurseBB = BasicBlock::Create("recurse", FibF);
- // Create the "if (arg < 2) goto exitbb"
+ // Create the "if (arg <= 2) goto exitbb"
Value *CondInst = new ICmpInst(ICmpInst::ICMP_SLE, ArgX, Two, "cond", BB);
- new BranchInst(RetBB, RecurseBB, CondInst, BB);
+ BranchInst::Create(RetBB, RecurseBB, CondInst, BB);
// Create: ret int 1
- new ReturnInst(One, RetBB);
+ ReturnInst::Create(One, RetBB);
// create fib(x-1)
- Value *Sub = BinaryOperator::createSub(ArgX, One, "arg", RecurseBB);
- CallInst *CallFibX1 = new CallInst(FibF, Sub, "fibx1", RecurseBB);
+ Value *Sub = BinaryOperator::CreateSub(ArgX, One, "arg", RecurseBB);
+ CallInst *CallFibX1 = CallInst::Create(FibF, Sub, "fibx1", RecurseBB);
CallFibX1->setTailCall();
// create fib(x-2)
- Sub = BinaryOperator::createSub(ArgX, Two, "arg", RecurseBB);
- CallInst *CallFibX2 = new CallInst(FibF, Sub, "fibx2", RecurseBB);
+ Sub = BinaryOperator::CreateSub(ArgX, Two, "arg", RecurseBB);
+ CallInst *CallFibX2 = CallInst::Create(FibF, Sub, "fibx2", RecurseBB);
CallFibX2->setTailCall();
// fib(x-1)+fib(x-2)
- Value *Sum = BinaryOperator::createAdd(CallFibX1, CallFibX2,
+ Value *Sum = BinaryOperator::CreateAdd(CallFibX1, CallFibX2,
"addresult", RecurseBB);
// Create the return instruction and add it to the basic block
- new ReturnInst(Sum, RecurseBB);
+ ReturnInst::Create(Sum, RecurseBB);
return FibF;
}
ExistingModuleProvider *MP = new ExistingModuleProvider(M);
ExecutionEngine *EE = ExecutionEngine::create(MP, false);
- std::cerr << "verifying... ";
+ errs() << "verifying... ";
if (verifyModule(*M)) {
- std::cerr << argv[0] << ": Error constructing function!\n";
+ errs() << argv[0] << ": Error constructing function!\n";
return 1;
}
- std::cerr << "OK\n";
- std::cerr << "We just constructed this LLVM module:\n\n---------\n" << *M;
- std::cerr << "---------\nstarting fibonacci(" << n << ") with JIT...\n";
+ errs() << "OK\n";
+ errs() << "We just constructed this LLVM module:\n\n---------\n" << *M;
+ errs() << "---------\nstarting fibonacci(" << n << ") with JIT...\n";
// Call the Fibonacci function with argument n:
std::vector<GenericValue> Args(1);
- Args[0].Int32Val = n;
+ Args[0].IntVal = APInt(32, n);
GenericValue GV = EE->runFunction(FibF, Args);
// import result of execution
- std::cout << "Result: " << GV.Int32Val << "\n";
+ outs() << "Result: " << GV.IntVal << "\n";
return 0;
}