X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=examples%2FHowToUseJIT%2FHowToUseJIT.cpp;h=5fa4237179f7605fd0694f0b02394ec3ef17ea48;hb=73b43b9b549a75fb0015c825df68abd95705a67c;hp=3762dfe3cb43cd24e8f1018ff0b60e2cb1844137;hpb=1d9f262b9dac7032e94857c1079b4ee62e0509d9;p=oota-llvm.git

diff --git a/examples/HowToUseJIT/HowToUseJIT.cpp b/examples/HowToUseJIT/HowToUseJIT.cpp
index 3762dfe3cb4..5fa4237179f 100644
--- a/examples/HowToUseJIT/HowToUseJIT.cpp
+++ b/examples/HowToUseJIT/HowToUseJIT.cpp
@@ -1,45 +1,46 @@
 //===-- examples/HowToUseJIT/HowToUseJIT.cpp - An example use of the JIT --===//
-// 
+//
 //                     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.
+//
 //===----------------------------------------------------------------------===//
 //
 //  This small program provides an example of how to quickly build a small
-//  module with two functions and execute it with the JIT. 
-// 
-// Goal: 
+//  module with two functions and execute it with the JIT.
+//
+// Goal:
 //  The goal of this snippet is to create in the memory
 //  the LLVM module consisting of two functions as follow:
 //
 // int add1(int x) {
 //   return x+1;
 // }
-// 
+//
 // int foo() {
 //   return add1(10);
 // }
-// 
-// then compile the module via JIT, then execute the `foo' 
+//
+// then compile the module via JIT, then execute the `foo'
 // function and return result to a driver, i.e. to a "host program".
-// 
+//
 // Some remarks and questions:
-// 
+//
 // - could we invoke some code using noname functions too?
-//   e.g. evaluate "foo()+foo()" without fears to introduce 
+//   e.g. evaluate "foo()+foo()" without fears to introduce
 //   conflict of temporary function name with some real
 //   existing function name?
-// 
+//
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
-#include "llvm/Type.h"
+#include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/ModuleProvider.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/JIT.h"
+#include "llvm/ExecutionEngine/Interpreter.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include <iostream>
 using namespace llvm;
@@ -51,14 +52,16 @@ int main() {
   // Create the add1 function entry and insert this entry into module M.  The
   // function will have a return type of "int" and take an argument of "int".
   // The '0' terminates the list of argument types.
-  Function *Add1F = M->getOrInsertFunction("add1", Type::IntTy, Type::IntTy, 0);
+  Function *Add1F =
+    cast<Function>(M->getOrInsertFunction("add1", Type::Int32Ty, Type::Int32Ty,
+                                          (Type *)0));
 
   // Add a basic block to the function. As before, it automatically inserts
   // because of the last argument.
-  BasicBlock *BB = new BasicBlock("EntryBlock", Add1F);
-  
+  BasicBlock *BB = BasicBlock::Create("EntryBlock", Add1F);
+
   // Get pointers to the constant `1'.
-  Value *One = ConstantSInt::get(Type::IntTy, 1);
+  Value *One = ConstantInt::get(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
@@ -66,31 +69,31 @@ int main() {
   ArgX->setName("AnArg");            // Give it a nice symbolic name for fun.
 
   // Create the add instruction, inserting it into the end of BB.
-  Instruction *Add = BinaryOperator::createAdd(One, ArgX, "addresult", BB);
-  
+  Instruction *Add = BinaryOperator::CreateAdd(One, ArgX, "addresult", BB);
+
   // Create the return instruction and add it to the basic block
-  new ReturnInst(Add, BB);
+  ReturnInst::Create(Add, BB);
 
   // Now, function add1 is ready.
 
 
   // Now we going to create function `foo', which returns an int and takes no
   // arguments.
-  Function *FooF = M->getOrInsertFunction("foo", Type::IntTy, 0);
+  Function *FooF =
+    cast<Function>(M->getOrInsertFunction("foo", Type::Int32Ty, (Type *)0));
 
   // Add a basic block to the FooF function.
-  BB = new BasicBlock("EntryBlock", FooF);
+  BB = BasicBlock::Create("EntryBlock", FooF);
 
   // Get pointers to the constant `10'.
-  Value *Ten = ConstantSInt::get(Type::IntTy, 10);
+  Value *Ten = ConstantInt::get(Type::Int32Ty, 10);
 
   // Pass Ten to the call call:
-  std::vector<Value*> Params;
-  Params.push_back(Ten);
-  CallInst * Add1CallRes = new CallInst(Add1F, Params, "add1", BB);
-    
+  CallInst *Add1CallRes = CallInst::Create(Add1F, Ten, "add1", BB);
+  Add1CallRes->setTailCall(true);
+
   // Create the return instruction and add it to the basic block.
-  new ReturnInst(Add1CallRes, BB);
+  ReturnInst::Create(Add1CallRes, BB);
 
   // Now we create the JIT.
   ExistingModuleProvider* MP = new ExistingModuleProvider(M);
@@ -104,6 +107,6 @@ int main() {
   GenericValue gv = EE->runFunction(FooF, noargs);
 
   // Import result of execution:
-  std::cout << "Result: " << gv.IntVal << "\n";
+  std::cout << "Result: " << gv.IntVal.toStringUnsigned(10) << "\n";
   return 0;
 }