harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r650537 - in /harmony/enhanced/drlvm/trunk/vm: em/src/ include/open/ jitrino/src/vm/ vmcore/include/ vmcore/src/class_support/ vmcore/src/jni/ vmcore/src/kernel_classes/native/ vmcore/src/verifier-3363/base/
Date Tue, 22 Apr 2008 14:50:30 GMT
Author: mcfirst
Date: Tue Apr 22 07:50:08 2008
New Revision: 650537

URL: http://svn.apache.org/viewvc?rev=650537&view=rev
Log:
Replaced ClassLoaderHandle with Class_Loader_Handle, which is consistent with other '_Handle's

Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
    harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h
    harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
    harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
    harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h
    harmony/enhanced/drlvm/trunk/vm/include/open/types.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_loading.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_manipulation.h
    harmony/enhanced/drlvm/trunk/vm/include/open/vm_type_access.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/vf_resolve.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Tue Apr 22 07:50:08 2008
@@ -874,7 +874,7 @@
 
 
 
-void DrlEMImpl::classloaderUnloadingCallback(ClassLoaderHandle class_handle) {
+void DrlEMImpl::classloaderUnloadingCallback(Class_Loader_Handle class_handle) {
     //notify every profile collector about classloader unloading
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h Tue Apr 22 07:50:08 2008
@@ -101,7 +101,7 @@
     virtual Boolean unregisterCodeChunk(void *addr);
     virtual unsigned int getNumProfilerThreads() const { return tbsClients.empty() ? 0 :
1;}
 
-    virtual void classloaderUnloadingCallback(ClassLoaderHandle class_handle); 
+    virtual void classloaderUnloadingCallback(Class_Loader_Handle class_handle); 
 
 //EM_PC interface impl:
     virtual void methodProfileIsReady(MethodProfile* mp);

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlProfileCollectionFramework.h Tue Apr 22 07:50:08
2008
@@ -64,7 +64,7 @@
     
     virtual void addUseJit(JIT_Handle jit) { useJits.push_back(jit);}
     
-    virtual void classloaderUnloadingCallback(ClassLoaderHandle h) {}
+    virtual void classloaderUnloadingCallback(Class_Loader_Handle h) {}
 
     EM_PC_Interface* em;
     std::string name;

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.cpp Tue Apr 22 07:50:08 2008
@@ -205,11 +205,11 @@
     em->methodProfileIsReady(mp);
 }
 
-static void addProfilesForClassloader(ClassLoaderHandle h, EBProfiles& from, EBProfiles&
to, bool erase) {
+static void addProfilesForClassloader(Class_Loader_Handle h, EBProfiles& from, EBProfiles&
to, bool erase) {
     for (EBProfiles::iterator it = from.begin(), end = from.end(); it!=end; ++it) {
         EBMethodProfile* profile = *it;
         Class_Handle ch =  method_get_class(profile->mh);;
-        ClassLoaderHandle clh = class_get_class_loader(ch);
+        Class_Loader_Handle clh = class_get_class_loader(ch);
         if (clh == h) {
             to.push_back(profile);
             if (erase) {
@@ -239,7 +239,7 @@
     }
 }
 
-void EBProfileCollector::classloaderUnloadingCallback(ClassLoaderHandle h) {
+void EBProfileCollector::classloaderUnloadingCallback(Class_Loader_Handle h) {
     port_mutex_lock(&profilesLock);
     
     //can't modify profiles map in async mode here -> it could be iterated by the checker
thread without lock

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h Tue Apr 22 07:50:08 2008
@@ -60,7 +60,7 @@
     virtual uint32 getTimeout() const {return timeout;}
     virtual void onTimeout();
     virtual MethodProfile* getMethodProfile(Method_Handle mh) const ;
-    virtual void classloaderUnloadingCallback(ClassLoaderHandle h);
+    virtual void classloaderUnloadingCallback(Class_Loader_Handle h);
     
     EBMethodProfile* createProfile(Method_Handle mh);
     void syncModeJitCallback(MethodProfile* mp);

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.cpp Tue Apr 22 07:50:08 2008
@@ -291,18 +291,18 @@
 }
 
 
-static void addProfilesForClassloader(ClassLoaderHandle h, EdgeProfiles& from, EdgeProfiles&
to) {
+static void addProfilesForClassloader(Class_Loader_Handle h, EdgeProfiles& from, EdgeProfiles&
to) {
     for (EdgeProfiles::iterator it = from.begin(), end = from.end(); it!=end; ++it) {
         EdgeMethodProfile* profile = *it;
         Class_Handle ch =  method_get_class(profile->mh);;
-        ClassLoaderHandle clh = class_get_class_loader(ch);
+        Class_Loader_Handle clh = class_get_class_loader(ch);
         if (clh == h) {
             to.push_back(profile);
         }
     }
 }
 
-void EdgeProfileCollector::classloaderUnloadingCallback(ClassLoaderHandle h) {
+void EdgeProfileCollector::classloaderUnloadingCallback(Class_Loader_Handle h) {
     port_mutex_lock(&profilesLock);
 
     //can't modify profiles map in async mode here -> it could be iterated by the checker
thread without lock

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EdgeProfileCollector.h Tue Apr 22 07:50:08 2008
@@ -45,7 +45,7 @@
     virtual uint32 getInitialTimeout() const {return initialTimeout;}
     virtual uint32 getTimeout() const {return timeout;}
     virtual void onTimeout();
-    virtual void classloaderUnloadingCallback(ClassLoaderHandle h);
+    virtual void classloaderUnloadingCallback(Class_Loader_Handle h);
 
     MethodProfile* getMethodProfile(Method_Handle mh) const ;
     EdgeMethodProfile* createProfile(Method_Handle mh, uint32 numCounters, uint32* counterKeys,
uint32 checkSum);

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp Tue Apr 22 07:50:08 2008
@@ -71,7 +71,7 @@
 }
 
 static void 
-ClassloaderUnloadingCallback(ClassLoaderHandle class_handle) {
+ClassloaderUnloadingCallback(Class_Loader_Handle class_handle) {
     DrlEMFactory::getEMInstance()->classloaderUnloadingCallback(class_handle);       

 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h Tue Apr 22 07:50:08 2008
@@ -129,7 +129,7 @@
    */
         void (*ProfilerThreadTimeout) ();
 
-        void (*ClassloaderUnloadingCallback) (ClassLoaderHandle class_handle);
+        void (*ClassloaderUnloadingCallback) (Class_Loader_Handle class_handle);
 
     };
     typedef const struct _OpenEmVm* OpenEmVmHandle;

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/types.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/types.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/types.h Tue Apr 22 07:50:08 2008
@@ -78,7 +78,7 @@
 typedef UDATA Allocation_Handle;
 typedef UDATA Runtime_Type_Handle;
 typedef void* NativeCodePtr;
-typedef struct ClassLoader* ClassLoaderHandle;
+typedef struct ClassLoader* Class_Loader_Handle;
 typedef struct ManagedObject* ManagedPointer;
 
 /**

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_loading.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_loading.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_loading.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_loading.h Tue Apr 22 07:50:08 2008
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-DECLARE_OPEN(ClassLoaderHandle, class_get_class_loader, (Class_Handle ch));
+DECLARE_OPEN(Class_Loader_Handle, class_get_class_loader, (Class_Handle ch));
 
 /**
 * @return A class corresponding to a primitive type. For all primitive types t
@@ -72,7 +72,7 @@
  * @return The handle for C++ class representation, if found. Otherwise, <code>NULL</code>.
  */
 DECLARE_OPEN(Class_Handle, class_loader_lookup_class,
-    (ClassLoaderHandle classloader, const char* name));
+    (Class_Loader_Handle classloader, const char* name));
 
 
 /**
@@ -85,7 +85,7 @@
  * @return The handle for the C++ class representation, if loaded successfully; otherwise,
<code>NULL</code>.
  */
 DECLARE_OPEN(Class_Handle, class_loader_load_class,
-    (ClassLoaderHandle classloader, const char* name));
+    (Class_Loader_Handle classloader, const char* name));
 
 /** @ingroup Extended 
  *
@@ -150,7 +150,7 @@
  * @param data             - the pointer to the verifier data
  */
 DECLARE_OPEN(void, class_loader_set_verifier_data_ptr,
-    (ClassLoaderHandle classloader, void* data));
+    (Class_Loader_Handle classloader, void* data));
 
 /**
  * Returns the pointer to verifier-specific data associated with the given class loader.
@@ -159,21 +159,21 @@
  * 
  * @return The pointer to the verifier data
  */
-DECLARE_OPEN(void*, class_loader_get_verifier_data_ptr, (ClassLoaderHandle classloader));
+DECLARE_OPEN(void*, class_loader_get_verifier_data_ptr, (Class_Loader_Handle classloader));
 
 /**
  * Acquires the lock on a given class loader. 
  *
  * @param classloader - the handle to the C++ class loader structure to acquire lock on.
  */
-DECLARE_OPEN(void, class_loader_lock, (ClassLoaderHandle classloader));
+DECLARE_OPEN(void, class_loader_lock, (Class_Loader_Handle classloader));
 
 /**
  * Releases the lock on a given class loader. 
  *
  * @param classloader - the handle to the C++ class loader structure to release lock on.

  */
-DECLARE_OPEN(void, class_loader_unlock, (ClassLoaderHandle classloader));
+DECLARE_OPEN(void, class_loader_unlock, (Class_Loader_Handle classloader));
 
 #ifdef __cplusplus
 }

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_manipulation.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_manipulation.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_manipulation.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_manipulation.h Tue Apr 22 07:50:08
2008
@@ -106,7 +106,7 @@
  *
  * @note An assertion is raised if <i>klass</i> equals to <code>NULL</code>.
  */
-DECLARE_OPEN(ClassLoaderHandle, class_get_class_loader, (Class_Handle klass));
+DECLARE_OPEN(Class_Loader_Handle, class_get_class_loader, (Class_Handle klass));
 
 /**
  * Checks whether the current class is a primitive type.

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_type_access.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_type_access.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_type_access.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_type_access.h Tue Apr 22 07:50:08 2008
@@ -87,7 +87,7 @@
 * Gets Type_Info_Handle from the given type name.
 * Does'n resolve type if not resolved
 */
-DECLARE_OPEN(Type_Info_Handle, type_info_create_from_java_descriptor, (ClassLoaderHandle
cl, const char* typeName));
+DECLARE_OPEN(Type_Info_Handle, type_info_create_from_java_descriptor, (Class_Loader_Handle
cl, const char* typeName));
 
 /**
 * Get the name of the class referenced by this type info handle

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp Tue Apr 22 07:50:08 2008
@@ -1213,7 +1213,7 @@
 }
 
 Type* CompilationInterface::getTypeFromDescriptor(Class_Handle enclClass, const char* descriptor)
{
-    ClassLoaderHandle loader = class_get_class_loader(enclClass);
+    Class_Loader_Handle loader = class_get_class_loader(enclClass);
     Type_Info_Handle tih = type_info_create_from_java_descriptor(loader, descriptor);
     return getTypeFromDrlVMTypeHandle(tih);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h Tue Apr 22 07:50:08 2008
@@ -34,9 +34,9 @@
 
 VMEXPORT Class_Handle jni_get_class_handle(JNIEnv*, jclass);
 VMEXPORT jclass jni_class_from_handle(JNIEnv*, Class_Handle);
-VMEXPORT jobject jni_class_loader_from_handle(JNIEnv*, ClassLoaderHandle);
-ClassLoaderHandle class_loader_lookup(jobject loader);
-void class_loader_load_native_lib(const char* lib, ClassLoaderHandle loader);
+VMEXPORT jobject jni_class_loader_from_handle(JNIEnv*, Class_Loader_Handle);
+Class_Loader_Handle class_loader_lookup(jobject loader);
+void class_loader_load_native_lib(const char* lib, Class_Loader_Handle loader);
 
 VMEXPORT jvalue *get_jvalue_arg_array(Method *method, va_list args);
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Tue Apr 22 07:50:08
2008
@@ -799,7 +799,7 @@
 } // class_resolve_nonstatic_field
 
 
-ClassLoaderHandle
+Class_Loader_Handle
 class_get_class_loader(Class_Handle ch)
 {
     assert(ch);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp Tue Apr 22 07:50:08
2008
@@ -122,31 +122,31 @@
     return hfield->is_protected();
 } // field_is_protected
 
-void class_loader_set_verifier_data_ptr(ClassLoaderHandle classloader, void* data)
+void class_loader_set_verifier_data_ptr(Class_Loader_Handle classloader, void* data)
 {
     assert(classloader);
     classloader->SetVerifyData(data);
 } // class_loader_set_verifier_data_ptr
 
-void* class_loader_get_verifier_data_ptr(ClassLoaderHandle classloader)
+void* class_loader_get_verifier_data_ptr(Class_Loader_Handle classloader)
 {
     assert(classloader);
     return classloader->GetVerifyData();
 } // class_loader_get_verifier_data_ptr
 
-void class_loader_lock(ClassLoaderHandle classloader)
+void class_loader_lock(Class_Loader_Handle classloader)
 {
     assert(classloader);
     classloader->Lock();
 } // class_loader_lock
 
-void class_loader_unlock(ClassLoaderHandle classloader)
+void class_loader_unlock(Class_Loader_Handle classloader)
 {
     assert(classloader);
     classloader->Unlock();
 } // class_loader_unlock
 
-Class_Handle class_loader_lookup_class(ClassLoaderHandle classloader, const char* name)
+Class_Handle class_loader_lookup_class(Class_Loader_Handle classloader, const char* name)
 {
     assert(classloader);
     assert(name);
@@ -155,7 +155,7 @@
     return classloader->LookupClass(class_name);
 } // class_loader_lookup_class
 
-Class_Handle class_loader_load_class(ClassLoaderHandle classloader, const char* name)
+Class_Handle class_loader_load_class(Class_Loader_Handle classloader, const char* name)
 {
     assert(classloader);
     assert(name);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Tue Apr 22 07:50:08
2008
@@ -147,7 +147,7 @@
         natives_unload_library(info->handle);        
     }
 
-    env->em_interface->ClassloaderUnloadingCallback((ClassLoaderHandle)this);
+    env->em_interface->ClassloaderUnloadingCallback((Class_Loader_Handle)this);
     delete CodeMemoryManager;
     CodeMemoryManager = NULL;
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/type_access.cpp Tue Apr 22 07:50:08
2008
@@ -25,7 +25,7 @@
 #include "open/vm_type_access.h"
 
 Type_Info_Handle type_info_create_from_java_descriptor(
-    ClassLoaderHandle cl, const char* typeName) {
+    Class_Loader_Handle cl, const char* typeName) {
     return type_desc_create_from_java_descriptor(typeName, cl);
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp Tue Apr 22 07:50:08 2008
@@ -55,7 +55,7 @@
     return struct_Class_to_jclass((Class*)clss);
 }
 
-jobject jni_class_loader_from_handle(JNIEnv*, ClassLoaderHandle clh)
+jobject jni_class_loader_from_handle(JNIEnv*, Class_Loader_Handle clh)
 {
     if (!clh) return NULL;
     hythread_suspend_disable();
@@ -72,7 +72,7 @@
     return (jobject)res;
 }
 
-ClassLoaderHandle class_loader_lookup(jobject loader)
+Class_Loader_Handle class_loader_lookup(jobject loader)
 {
     if (!loader) return NULL;
 
@@ -86,7 +86,7 @@
 } //class_loader_lookup
 
 void class_loader_load_native_lib(const char* lib,
-                                   ClassLoaderHandle cl)
+                                   Class_Loader_Handle cl)
 {
     cl->LoadNativeLibrary(lib);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp
Tue Apr 22 07:50:08 2008
@@ -45,7 +45,7 @@
 // This function is for native library support
 // It takes a class name with .s not /s. 
 // FIXME: caller could convert it itself
-Class_Handle class_find_loaded(ClassLoaderHandle loader, const char* name)
+Class_Handle class_find_loaded(Class_Loader_Handle loader, const char* name)
 {
     char* name3 = strdup(name);
     char* p = name3;
@@ -66,7 +66,7 @@
     return ch;
 }
 
-Class_Handle class_find_class_from_loader(ClassLoaderHandle loader, const char* n, Boolean
init)
+Class_Handle class_find_class_from_loader(Class_Loader_Handle loader, const char* n, Boolean
init)
 {
     ASSERT_RAISE_AREA;
     assert(hythread_is_suspend_enabled()); // -salikh
@@ -174,7 +174,7 @@
     } 
 
     const char* buf = GetStringUTFChars(jenv, name, NULL);
-    ClassLoaderHandle loader = class_loader_lookup(cl);
+    Class_Loader_Handle loader = class_loader_lookup(cl);
     Class_Handle clss = class_find_loaded(loader, buf);
     ReleaseStringUTFChars(jenv, name, buf);
 
@@ -210,7 +210,7 @@
   (JNIEnv *jenv, jclass, jclass clazz)
 {
     Class_Handle clss = jni_get_class_handle(jenv, clazz);
-    ClassLoaderHandle clh = class_get_class_loader(clss);
+    Class_Loader_Handle clh = class_get_class_loader(clss);
     return jni_class_loader_from_handle(jenv, clh);
 }
 
@@ -599,12 +599,12 @@
     const char *str_filename = GetStringUTFChars(jenv, filename, NULL);
 
     // load native library
-    ClassLoaderHandle loader;
+    Class_Loader_Handle loader;
     if( classLoader ) {
         loader = class_loader_lookup(classLoader);
     } else {
         // bootstrap class loader
-        loader = (ClassLoaderHandle)
+        loader = (Class_Loader_Handle)
             jni_get_vm_env(jenv)->bootstrap_class_loader;
     }
     class_loader_load_native_lib(str_filename, loader);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/context_base.cpp Tue Apr
22 07:50:08 2008
@@ -335,7 +335,7 @@
     if( !class_constraints ) return;
 
     vf_ClassLoaderData_t *cl_data;
-    ClassLoaderHandle currentClassLoader = class_get_class_loader(k_class);
+    Class_Loader_Handle currentClassLoader = class_get_class_loader(k_class);
 
     // lock data modification
     class_loader_lock( currentClassLoader );

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp Tue Apr 22 07:50:08
2008
@@ -151,7 +151,7 @@
 {
 
     // get class loader of current class
-    ClassLoaderHandle class_loader = class_get_class_loader(klass);
+    Class_Loader_Handle class_loader = class_get_class_loader(klass);
 
     // get class loader verify data
     vf_ClassLoaderData_t *cl_data =

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/vf_resolve.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/vf_resolve.cpp?rev=650537&r1=650536&r2=650537&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/vf_resolve.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/vf_resolve.cpp Tue Apr 22
07:50:08 2008
@@ -74,7 +74,7 @@
     Class_Handle result;
 
     // get class loader
-    ClassLoaderHandle class_loader = class_get_class_loader( k_class );
+    Class_Loader_Handle class_loader = class_get_class_loader( k_class );
 
     result = need_load ?
         class_loader_load_class( class_loader, name )



Mime
View raw message