[vmkit-commits] [vmkit] r82207 - in /vmkit/trunk/lib/N3/PNetLib: PNetLib.cpp PNetString.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Sep 18 02:41:27 2009
New Revision: 82207

URL: http://llvm.org/viewvc/llvm-project?rev=82207&view=rev
Log:
Move to new LLVM API.


Modified:
    vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
    vmkit/trunk/lib/N3/PNetLib/PNetString.cpp

Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=82207&r1=82206&r2=82207&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Fri Sep 18 02:41:27 2009
@@ -691,38 +691,38 @@
 }
 
 static void decapsulePrimitive(VMObject* arg, const llvm::Type* type, std::vector<llvm::GenericValue>& args) {
-  if (type == llvm::Type::Int1Ty) {
+  if (type == llvm::Type::getInt1Ty(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     gv.IntVal = llvm::APInt(1, (bool)((uint32*)arg)[VALUE_OFFSET]);
     args.push_back(gv);
-  } else if (type == llvm::Type::Int8Ty) {
+  } else if (type == llvm::Type::getInt8Ty(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     gv.IntVal = llvm::APInt(8, (uint8)((uint32*)arg)[VALUE_OFFSET]);
     args.push_back(gv);
-  } else if (type == llvm::Type::Int16Ty) {
+  } else if (type == llvm::Type::getInt16Ty(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     gv.IntVal = llvm::APInt(16, (uint16)((uint32*)arg)[VALUE_OFFSET]);
     args.push_back(gv);
-  } else if (type == llvm::Type::Int32Ty) {
+  } else if (type == llvm::Type::getInt32Ty(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     gv.IntVal = llvm::APInt(32, (uint32)((uint32*)arg)[VALUE_OFFSET]);
     args.push_back(gv);
-  } else if (type == llvm::Type::Int64Ty) {
+  } else if (type == llvm::Type::getInt64Ty(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     uint32* ptr = &((uint32*)arg)[VALUE_OFFSET];
     gv.IntVal = llvm::APInt(64, ((uint64*)ptr)[0]);
     args.push_back(gv);
-  } else if (type == llvm::Type::FloatTy) {
+  } else if (type == llvm::Type::getFloatTy(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     float* ptr = &((float*)arg)[VALUE_OFFSET];
     gv.FloatVal = ((float*)ptr)[0];
     args.push_back(gv);
-  } else if (type == llvm::Type::DoubleTy) {
+  } else if (type == llvm::Type::getDoubleTy(llvm::getGlobalContext())) {
     llvm::GenericValue gv;
     uint32* ptr = &((uint32*)arg)[VALUE_OFFSET];
     gv.DoubleVal = ((double*)ptr)[0];
     args.push_back(gv);
-  } else if (type == llvm::PointerType::getUnqual(llvm::Type::Int8Ty)) {
+  } else if (type == llvm::PointerType::getUnqual(llvm::Type::getInt8Ty(llvm::getGlobalContext()))) {
     llvm::GenericValue gv(((void**)arg)[VALUE_OFFSET]);
     args.push_back(gv);
   } else {
@@ -759,7 +759,7 @@
   
   for ( ;i != e; ++i, ++index) {
     const llvm::Type* type = i->getType();
-    if (llvm::isa<llvm::PointerType>(type) && type != llvm::PointerType::getUnqual(llvm::Type::Int8Ty)) {
+    if (llvm::isa<llvm::PointerType>(type) && type != llvm::PointerType::getUnqual(llvm::Type::getInt8Ty(llvm::getGlobalContext()))) {
       llvm::GenericValue gv(args->elements[index]);
       gvargs.push_back(gv);
     } else {

Modified: vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetString.cpp?rev=82207&r1=82206&r2=82207&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetString.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetString.cpp Fri Sep 18 02:41:27 2009
@@ -52,7 +52,7 @@
     if (!str->_llvmVar) {
       const Type* pty = mvm::MvmModule::ptrType;
       Constant* cons = 
-        ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty, uint64_t (this)),
+        ConstantExpr::getIntToPtr(ConstantInt::get(Type::getInt64Ty(getGlobalContext()), uint64_t (this)),
                                   pty);
       str->_llvmVar = new GlobalVariable(*(vm->getLLVMModule()), pty, true,
                                     GlobalValue::ExternalLinkage,