[vmkit-commits] [vmkit] r60874 - in /vmkit/trunk/lib/JnJVM: LLVMRuntime/runtime-default.ll VMCore/JavaCache.h VMCore/JavaJIT.cpp VMCore/JavaRuntimeJIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Dec 11 04:51:34 2008
New Revision: 60874

URL: http://llvm.org/viewvc/llvm-project?rev=60874&view=rev
Log:
User the UTF8 sign instead of the Signdef directly.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp

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=60874&r1=60873&r2=60874&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-default.ll Thu Dec 11 04:51:34 2008
@@ -26,7 +26,7 @@
 
 ;;; The Enveloppe type, which contains the first cache and all the info
 ;;; to lookup in the constant pool.
-%Enveloppe = type { %CacheNode*, %UTF8*, i8*, i8*, %CacheNode }
+%Enveloppe = type { %CacheNode*, %UTF8*, %UTF8*, i8*, i8*, %CacheNode }
 
 ;;; The task class mirror.
 ;;; Field 1: The class state

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h?rev=60874&r1=60873&r2=60874&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaCache.h Thu Dec 11 04:51:34 2008
@@ -33,7 +33,6 @@
 namespace jnjvm {
 
 class Enveloppe;
-class Signdef;
 class UserClass;
 class UTF8;
 
@@ -77,7 +76,7 @@
 
   /// methodSign - The signature of the method to be called.
   ///
-  Signdef* methodSign;
+  const UTF8* methodSign;
 
   /// cacheLock - The linked list may be modified by concurrent thread. This
   /// lock ensures that the list stays consistent.
@@ -93,7 +92,7 @@
   ///
   CacheNode bootCache;
 
-  /// Evenloppe - Default constructor. Does nothing.
+  /// Enveloppe - Default constructor. Does nothing.
   ///
   Enveloppe() : bootCache(this) {}
 
@@ -101,7 +100,7 @@
   /// so as the resolution process knows which interface method the
   /// invokeinterface bytecode refers to.
   ///
-  Enveloppe(mvm::BumpPtrAllocator& Alloc, const UTF8* name, Signdef* sign) : 
+  Enveloppe(mvm::BumpPtrAllocator& Alloc, const UTF8* name, const UTF8* sign) :
     bootCache(this) {
     
     initialise(Alloc, name, sign);
@@ -110,7 +109,7 @@
   /// initialise - Initialises the enveloppe, and allocates the first cache.
   ///
   void initialise(mvm::BumpPtrAllocator& Alloc, const UTF8* name,
-                  Signdef* sign) {
+                  const UTF8* sign) {
     allocator = &Alloc;
     firstCache = &bootCache;
     methodName = name;

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaJIT.cpp Thu Dec 11 04:51:34 2008
@@ -2004,7 +2004,7 @@
     compilingMethod->enveloppes[nbEnveloppes++];
   if (!inlining)
     enveloppe.initialise(compilingClass->classLoader->allocator, name,
-                         signature);
+                         signature->keyName);
    
   Value* llvmEnv = module->getEnveloppe(&enveloppe, currentBlock);
 #else

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaRuntimeJIT.cpp Thu Dec 11 04:51:34 2008
@@ -55,7 +55,7 @@
     UserClass* methodCl = 0;
     UserClass* lookup = ocl->isArray() ? ocl->super : ocl->asClass();
     JavaMethod* dmeth = lookup->lookupMethod(enveloppe->methodName,
-                                             enveloppe->methodSign->keyName,
+                                             enveloppe->methodSign,
                                              false, true, &methodCl);
 
 #if !defined(ISOLATE_SHARING) && !defined(SERVICE)