[vmkit-commits] [vmkit] r73533 - in /vmkit/trunk/lib/N3/VMCore: CLIJit.cpp CLIJitMeta.cpp Opcodes.cpp VMArray.h VMClass.h VMObject.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jun 16 14:08:27 2009
New Revision: 73533

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


Modified:
    vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
    vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
    vmkit/trunk/lib/N3/VMCore/VMArray.h
    vmkit/trunk/lib/N3/VMCore/VMClass.h
    vmkit/trunk/lib/N3/VMCore/VMObject.h

Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.cpp?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Tue Jun 16 14:08:27 2009
@@ -111,7 +111,8 @@
       std::vector<Value*> args; //size = 2
       args.push_back(zero);
       if (boxed) {
-        args.push_back(ConstantInt::get(field->offset->getValue() + 1));
+        ConstantInt* CI = dyn_cast<ConstantInt>(field->offset);
+        args.push_back(ConstantInt::get(CI->getValue() + 1));
       } else {
         args.push_back(field->offset);
       }
@@ -122,7 +123,8 @@
       std::vector<Value*> args; //size = 2
       args.push_back(zero);
       if (boxed) {
-        args.push_back(ConstantInt::get(field->offset->getValue() + 1));
+        ConstantInt* CI = dyn_cast<ConstantInt>(field->offset);
+        args.push_back(ConstantInt::get(CI->getValue() + 1));
       } else {
         args.push_back(field->offset);
       }
@@ -158,8 +160,8 @@
 #endif
     // Constant Definitions
   Constant* const_int32_8 = mvm::MvmModule::constantZero;
-  ConstantInt* const_int32_9 = mvm::MvmModule::constantOne;
-  ConstantInt* const_int32_10 = mvm::MvmModule::constantTwo;
+  Constant* const_int32_9 = mvm::MvmModule::constantOne;
+  Constant* const_int32_10 = mvm::MvmModule::constantTwo;
   
   
   // Function Definitions
@@ -856,11 +858,11 @@
 
 }
 
-ConstantInt* VMArray::sizeOffset() {
+Constant* VMArray::sizeOffset() {
   return mvm::MvmModule::constantOne;
 }
 
-ConstantInt* VMArray::elementsOffset() {
+Constant* VMArray::elementsOffset() {
   return mvm::MvmModule::constantTwo;
 }
 
@@ -1502,7 +1504,7 @@
 
 void VMField::initField(VMObject* obj) {
   VMField* field = this;
-  ConstantInt* offset = field->offset;
+  Constant* offset = field->offset;
   const TargetData* targetData = mvm::MvmModule::executionEngine->getTargetData();
   bool stat = isStatic(field->flags);
   const Type* clType = stat ? field->classDef->staticType :
@@ -1510,7 +1512,7 @@
   
   const StructLayout* sl =
     targetData->getStructLayout((StructType*)(clType->getContainedType(0)));
-  uint64 ptrOffset = sl->getElementOffset(offset->getZExtValue());
+  uint64 ptrOffset = sl->getElementOffset(dyn_cast<ConstantInt>(offset)->getZExtValue());
   
   field->ptrOffset = ptrOffset;
 

Modified: vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp Tue Jun 16 14:08:27 2009
@@ -419,6 +419,6 @@
   return _llvmVar;
 }
 
-ConstantInt* VMObject::classOffset() {
+Constant* VMObject::classOffset() {
   return mvm::MvmModule::constantOne;
 }

Modified: vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Opcodes.cpp?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Opcodes.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Opcodes.cpp Tue Jun 16 14:08:27 2009
@@ -23,6 +23,7 @@
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Transforms/Scalar.h>
 #include <llvm/Target/TargetData.h>
+#include <llvm/Target/TargetMachine.h>
 #include <llvm/Target/TargetOptions.h>
 
 #include "mvm/JIT.h"

Modified: vmkit/trunk/lib/N3/VMCore/VMArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMArray.h?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMArray.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMArray.h Tue Jun 16 14:08:27 2009
@@ -34,8 +34,8 @@
   static const sint32 MaxArraySize;
   static const llvm::Type* llvmType;
 
-  static llvm::ConstantInt* sizeOffset();
-  static llvm::ConstantInt* elementsOffset();
+  static llvm::Constant* sizeOffset();
+  static llvm::Constant* elementsOffset();
   virtual void print(mvm::PrintBuffer* buf) const;
   virtual void TRACER;
 

Modified: vmkit/trunk/lib/N3/VMCore/VMClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMClass.h?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMClass.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMClass.h Tue Jun 16 14:08:27 2009
@@ -258,7 +258,7 @@
   virtual void TRACER;
   
   uint32 flags;
-  llvm::ConstantInt* offset;
+  llvm::Constant* offset;
   uint32 token;
   const UTF8* name;
   VMClass* classDef;

Modified: vmkit/trunk/lib/N3/VMCore/VMObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMObject.h?rev=73533&r1=73532&r2=73533&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMObject.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMObject.h Tue Jun 16 14:08:27 2009
@@ -84,7 +84,7 @@
   void notifyAll();
   void initialise(VMCommonClass* cl);
 
-  static llvm::ConstantInt* classOffset();
+  static llvm::Constant* classOffset();
   
   bool instanceOf(VMCommonClass* cl);