[vmkit-commits] [vmkit] r60178 - in /vmkit/trunk/lib: JnJVM/LLVMRuntime/runtime-default.ll JnJVM/VMCore/JnjvmModule.cpp Mvm/Runtime/LLVMRuntime.ll

[Nicolas Geoffray]

Author: geoffray
Date: Thu Nov 27 12:47:04 2008
New Revision: 60178

URL: http://llvm.org/viewvc/llvm-project?rev=60178&view=rev
Log:
Match the VT type to llvm-gcc's and remove the constant pool type,
which is ust i8**. This makes .ll output more readable.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/lib/Mvm/Runtime/LLVMRuntime.ll

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll?rev=60178&r1=60177&r2=60178&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Thu Nov 27 12:47:04 2008
@@ -3,10 +3,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;; A virtual table is an array of function pointers.
-%VT = type i8**
-
-;;; The type of a constant pool. Jnjvm will make this into a i8**
-%ConstantPool = type i8*
+%VT = type i32 (...)**
 
 %Jnjvm = type {%VT, %JavaClass*, [9 x %JavaClass*]}
 
@@ -46,11 +43,11 @@
 
 ;;; The CacheNode type. The second field is the last called method. The
 ;;; last field is for multi vm environment.
-%CacheNode = type { i8*, %JavaClass*, %CacheNode*, %Enveloppe*, %ConstantPool* }
+%CacheNode = type { i8*, %JavaClass*, %CacheNode*, %Enveloppe*, i8** }
 
 ;;; The Enveloppe type, which contains the first cache and all the info
 ;;; to lookup in the constant pool.
-%Enveloppe = type { %CacheNode*, %ConstantPool*, i8*, i32 }
+%Enveloppe = type { %CacheNode*, i8**, i8*, i32 }
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;; Constant calls for Jnjvm runtime internal objects field accesses ;;;;;;;;;
@@ -117,7 +114,7 @@
 ;;; getConstantPoolAt - Get the value in the constant pool of this class.
 ;;; This function is removed by Jnjvm after the GVn pass, therefore it does
 ;;; not have an actual implementation.
-declare i8* @getConstantPoolAt(i8* (%JavaClass*, i32, ...)*, %ConstantPool*,
+declare i8* @getConstantPoolAt(i8* (%JavaClass*, i32, ...)*, i8**,
                                %JavaClass*, i32, ...) readnone
 
 ;;; vtableLookup - Look up the offset in a virtual table of a specific

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=60178&r1=60177&r2=60178&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Thu Nov 27 12:47:04 2008
@@ -938,8 +938,7 @@
 
   JnjvmType = 
     PointerType::getUnqual(module->getTypeByName("Jnjvm"));
-  ConstantPoolType = 
-    PointerType::getUnqual(module->getTypeByName("ConstantPool"));
+  ConstantPoolType = ptrPtrType;
   
   JavaObjectType = 
     PointerType::getUnqual(module->getTypeByName("JavaObject"));

Modified: vmkit/trunk/lib/Mvm/Runtime/LLVMRuntime.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/LLVMRuntime.ll?rev=60178&r1=60177&r2=60178&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/LLVMRuntime.ll (original)
+++ vmkit/trunk/lib/Mvm/Runtime/LLVMRuntime.ll Thu Nov 27 12:47:04 2008
@@ -3,7 +3,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;; A virtual table is an array of function pointers.
-%VT = type i8**
+%VT = type i32 (...)**
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Printing functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;