harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcfi...@apache.org
Subject svn commit: r662020 [4/4] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/finalizer_weakref/ gc_gen/src/gen/ gc_gen/src/jni/ gc_gen/src/los/ gc_gen/src/mark_compact/ gc_gen/src/mark_sweep/ gc_gen/src/semi_space/ gc_gen/src/...
Date Sat, 31 May 2008 12:23:15 GMT
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp Sat May 31 05:23:11
2008
@@ -117,7 +117,7 @@
     TRACE2("enumeration", "vm_enumerate_static_fields()");
     assert(!hythread_is_suspend_enabled());
     GlobalClassLoaderIterator ClIterator;
-    BOOLEAN do_class_unloading = gc_supports_class_unloading();
+    Boolean do_class_unloading = gc_supports_class_unloading();
     ClassLoader *cl = ClIterator.first();
     while(cl) {
         GlobalClassLoaderIterator::ClassIterator itc;
@@ -176,7 +176,7 @@
     check_ref(ref);
 #endif // _DEBUG
 
-    gc_add_root_set_entry((Managed_Object_Handle *)ref, (BOOLEAN)is_pinned);
+    gc_add_root_set_entry((Managed_Object_Handle *)ref, (Boolean)is_pinned);
 } //vm_enumerate_root_reference
 
 
@@ -189,7 +189,7 @@
     check_ref(ref);
 #endif // _DEBUG
 
-    gc_add_weak_root_set_entry((Managed_Object_Handle *)ref, (BOOLEAN)is_pinned, FALSE);
+    gc_add_weak_root_set_entry((Managed_Object_Handle *)ref, (Boolean)is_pinned, FALSE);
 } //vm_enumerate_weak_root_reference
 
 
@@ -210,7 +210,7 @@
 #endif // REFS_USE_UNCOMPRESSED
 #endif // _DEBUG
 
-    gc_add_compressed_root_set_entry(ref, (BOOLEAN)is_pinned);
+    gc_add_compressed_root_set_entry(ref, (Boolean)is_pinned);
 } //vm_enumerate_compressed_root_reference
 
 
@@ -221,7 +221,7 @@
 vm_enumerate_root_interior_pointer(void **slot, size_t offset, BOOLEAN is_pinned)
 {
     assert(((IDATA)offset)>=0);
-    gc_add_root_set_entry_interior_pointer(slot, (int)offset, (BOOLEAN)is_pinned);
+    gc_add_root_set_entry_interior_pointer(slot, (int)offset, (Boolean)is_pinned);
 } //vm_enumerate_root_interior_pointer
 
 void 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp Sat May 31 05:23:11 2008
@@ -427,8 +427,8 @@
 
 int Objects_To_Finalize::do_finalization(int quantity) {
     /* BEGIN: added for NATIVE FINALIZER THREAD */
-    BOOLEAN native_finalizer_thread_flag = get_native_finalizer_thread_flag();
-    BOOLEAN native_finalizer_shutdown, native_finalizer_on_exit;
+    Boolean native_finalizer_thread_flag = get_native_finalizer_thread_flag();
+    Boolean native_finalizer_shutdown, native_finalizer_on_exit;
     /* END: added for NATIVE FINALIZER THREAD */
     
     //SetThreadPriority(GetCurrentThread(),THREAD_PRIORITY_HIGHEST);
@@ -448,8 +448,8 @@
         check_fields_obtained();
         assert(shutdown);
         assert(on_exit);
-        native_finalizer_shutdown = (BOOLEAN)*shutdown;
-        native_finalizer_on_exit = (BOOLEAN)*on_exit;
+        native_finalizer_shutdown = (Boolean)*shutdown;
+        native_finalizer_on_exit = (Boolean)*on_exit;
     }
     /* END: modified for NATIVE FINALIZER THREAD */
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp Sat May 31 05:23:11
2008
@@ -30,7 +30,7 @@
 #include "jni_utils.h"
 #include "slot.h"
 
-static BOOLEAN native_fin_thread_flag = FALSE;
+static Boolean native_fin_thread_flag = FALSE;
 static Fin_Thread_Info *fin_thread_info = NULL;
 unsigned int cpu_num_bits;
 
@@ -40,16 +40,16 @@
 static U_32 atomic_dec32(volatile apr_uint32_t *mem)
 {  return (U_32)apr_atomic_dec32(mem); }
 
-BOOLEAN get_native_finalizer_thread_flag()
+Boolean get_native_finalizer_thread_flag()
 {  return native_fin_thread_flag; }
 
-void set_native_finalizer_thread_flag(BOOLEAN flag)
+void set_native_finalizer_thread_flag(Boolean flag)
 {  native_fin_thread_flag = flag; }
 
-BOOLEAN get_finalizer_shutdown_flag()
+Boolean get_finalizer_shutdown_flag()
 {  return fin_thread_info->shutdown; }
 
-BOOLEAN get_finalizer_on_exit_flag()
+Boolean get_finalizer_on_exit_flag()
 {  return fin_thread_info->on_exit; }
 
 static unsigned int coarse_log(unsigned int num)
@@ -120,7 +120,7 @@
     }    
 }
 
-void finalizer_shutdown(BOOLEAN start_finalization_on_exit)
+void finalizer_shutdown(Boolean start_finalization_on_exit)
 {
     if(start_finalization_on_exit){
         gc_force_gc();
@@ -156,7 +156,7 @@
     return wait_time;
 }
 
-static void wait_finalization_end(BOOLEAN must_wait)
+static void wait_finalization_end(Boolean must_wait)
 {
     port_mutex_lock(&fin_thread_info->end_mutex);
     unsigned int fin_obj_num = vm_get_finalizable_objects_quantity();
@@ -177,7 +177,7 @@
     port_mutex_unlock(&fin_thread_info->end_mutex);
 }
 
-void activate_finalizer_threads(BOOLEAN wait)
+void activate_finalizer_threads(Boolean wait)
 {
     IDATA stat = hysem_set(fin_thread_info->pending_sem, fin_thread_info->thread_num);
     assert(stat == TM_ERROR_NONE);
@@ -252,7 +252,7 @@
  * Now we use hythread
  * p_TLS_vmthread->finalize_thread_flags = thread_id;
  */
-static BOOLEAN self_is_finalizer_thread(void)
+static Boolean self_is_finalizer_thread(void)
 {
     hythread_t self = hythread_self();
     

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp Sat May 31 05:23:11
2008
@@ -28,14 +28,14 @@
 #include "jthread.h"
 
 
-static BOOLEAN native_ref_thread_flag = FALSE;
+static Boolean native_ref_thread_flag = FALSE;
 static Ref_Enqueue_Thread_Info *ref_thread_info = NULL;
 
 
-BOOLEAN get_native_ref_enqueue_thread_flag()
+Boolean get_native_ref_enqueue_thread_flag()
 {  return native_ref_thread_flag; }
 
-void set_native_ref_enqueue_thread_flag(BOOLEAN flag)
+void set_native_ref_enqueue_thread_flag(Boolean flag)
 {  native_ref_thread_flag = flag; }
 
 
@@ -115,7 +115,7 @@
     port_mutex_unlock(&ref_thread_info->end_mutex);
 }
 
-void activate_ref_enqueue_thread(BOOLEAN wait)
+void activate_ref_enqueue_thread(Boolean wait)
 {
     IDATA stat = hysem_set(ref_thread_info->pending_sem, ref_thread_info->thread_num);
     assert(stat == TM_ERROR_NONE);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Sat May 31 05:23:11 2008
@@ -311,8 +311,8 @@
  */
 static jint check_compression() {
         // Check for a mismatch between whether the various VM components all compress references
or not.
-    BOOLEAN vm_compression = vm_is_heap_compressed();
-    BOOLEAN gc_compression = gc_supports_compressed_references();
+    Boolean vm_compression = vm_is_heap_compressed();
+    Boolean gc_compression = gc_supports_compressed_references();
     if (vm_compression) {
         if (!gc_compression) {
             LWARN(17, "VM component mismatch: the VM compresses references but the GC doesn't.");
@@ -323,7 +323,7 @@
         // always returns FALSE to the supports_compressed_references() call. 
         JIT **jit = &jit_compilers[0];
         if (!interpreter_enabled()) {
-            BOOLEAN jit_compression = (*jit)->supports_compressed_references();
+            Boolean jit_compression = (*jit)->supports_compressed_references();
             if (!jit_compression) {
                 LWARN(18, "VM component mismatch: the VM compresses references but a JIT
doesn't");
                 return JNI_ERR;
@@ -336,7 +336,7 @@
         }
         JIT **jit = &jit_compilers[0];
         if (!interpreter_enabled()) {
-            BOOLEAN jit_compression = (*jit)->supports_compressed_references();
+            Boolean jit_compression = (*jit)->supports_compressed_references();
             if (jit_compression) {
                 LWARN(20, "VM component mismatch: the VM doesn't compress references but
a JIT does");
                 return JNI_ERR;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Sat May 31 05:23:11
2008
@@ -328,7 +328,7 @@
  * Java properties are set as -Dkey[=value];
  * VM properties are set with the following syntax ("fully compatible" with RI):
  * - options are set with -XX:<option>=<string>
- * - BOOLEAN options may be turned on with -XX:+<option> and turned off with -XX:-<option>
+ * - Boolean options may be turned on with -XX:+<option> and turned off with -XX:-<option>
  * - Numeric options are set with -XX:<option>=<number>. 
  *   Numbers can include 'm' or 'M' for megabytes, 'k' or 'K' for kilobytes, and 'g' or
  *   'G' for gigabytes (for example, 32k is the same as 32768).

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp Sat May 31 05:23:11 2008
@@ -77,7 +77,7 @@
     _next_command_line_argument = (void (*)(JIT_Handle, const char *, const char *)) fn;
 
     GET_OPTIONAL_FUNCTION(fn, handle, "JIT_recompiled_method_callback");
-    _recompiled_method_callback = (BOOLEAN (*)(JIT_Handle, Method_Handle, void *)) fn;
+    _recompiled_method_callback = (Boolean (*)(JIT_Handle, Method_Handle, void *)) fn;
 
     GET_OPTIONAL_FUNCTION(fn, handle, "JIT_get_inline_depth");
     _get_inline_depth = (U_32 (*)(JIT_Handle, InlineInfoPtr, U_32)) fn;
@@ -104,13 +104,13 @@
     _get_address_of_this = (void * (*)(JIT_Handle, Method_Handle, const JitFrameContext *))
fn;
 
     GET_OPTIONAL_FUNCTION(fn, handle, "JIT_is_soe_area");
-    _is_soe_area = (BOOLEAN (*)(JIT_Handle, Method_Handle, const JitFrameContext *)) fn;
+    _is_soe_area = (Boolean (*)(JIT_Handle, Method_Handle, const JitFrameContext *)) fn;
 
     GET_FUNCTION(fn, handle, "JIT_compile_method_with_params");
     _compile_method_with_params = (JIT_Result (*)(JIT_Handle, Compile_Handle, Method_Handle,
OpenMethodExecutionParams)) fn;
 
     GET_OPTIONAL_FUNCTION(fn, handle, "JIT_supports_compressed_references");
-    _supports_compressed_references = (BOOLEAN (*)(JIT_Handle)) fn;
+    _supports_compressed_references = (Boolean (*)(JIT_Handle)) fn;
 
     GET_OPTIONAL_FUNCTION(fn, handle, "JIT_execute_method");
     _execute_method = (void(*)(JIT_Handle, jmethodID, jvalue*, jvalue*)) fn;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp Sat May 31 05:23:11
2008
@@ -314,7 +314,7 @@
 
     //*** Slow sequence
     const POINTER_SIZE_INT clss_off = (POINTER_SIZE_INT)&((VTable*)NULL)->clss;
-    BOOLEAN (*p_subclass)(Class_Handle, Class_Handle) = class_is_subtype;
+    Boolean (*p_subclass)(Class_Handle, Class_Handle) = class_is_subtype;
     if (do_slow) {
         cs = lil_parse_onto_end(cs,
             ":slowpath;"
@@ -1592,7 +1592,7 @@
     oh_discard_local_handle(obj_h);
     END_RAISE_AREA
 
-    BOOLEAN res = class_is_subtype(objClass, castClass);
+    Boolean res = class_is_subtype(objClass, castClass);
     if (!res) {
         exn_throw_by_name("java/lang/ClassCastException", objClass->get_java_name()->bytes);
     }
@@ -2203,7 +2203,7 @@
 }
 
 
-BOOLEAN class_is_subtype_fast(VTable *sub, Class *super)
+Boolean class_is_subtype_fast(VTable *sub, Class *super)
 {
     update_general_type_checking_stats(sub, super);
     return sub->clss->is_instanceof(super);
@@ -2214,7 +2214,7 @@
 // according to the Java instanceof rules.
 //
 // No VM_STATS values are modified here.
-BOOLEAN class_is_subtype(Class *s, Class *t)
+Boolean class_is_subtype(Class *s, Class *t)
 {
     if (s == t) {
         return TRUE;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp Sat May 31 05:23:11
2008
@@ -162,7 +162,7 @@
     {
         args[0].z = value.z;
 
-        // Allocate java/lang/BOOLEAN object:
+        // Allocate java/lang/Boolean object:
         clazz = (jclass)gh_jlboolean;
         static jmethodID init_Boolean;
         if(!init_Boolean) {
@@ -277,7 +277,7 @@
 
     switch (sig) { // Value argument signature
     case 'Z':
-        // Get the fieldID of the value field of a BOOLEAN object:
+        // Get the fieldID of the value field of a Boolean object:
         value_id = gid_boolean_value;
         value.z = GetBooleanField (env, wobj, value_id);
         break;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Sat May 31 05:23:11 2008
@@ -729,7 +729,7 @@
     Class* clss1 = jclass_to_struct_Class(clazz1);
     Class* clss2 = jclass_to_struct_Class(clazz2);
 
-    BOOLEAN isAssignable = class_is_subtype(clss1, clss2);
+    Boolean isAssignable = class_is_subtype(clss1, clss2);
     if (isAssignable) {
         return JNI_TRUE;
     } else {
@@ -1141,7 +1141,7 @@
     Class* clss = jclass_to_struct_Class(clazz);
     Class* obj_clss = jclass_to_struct_Class(obj_class);
 
-    BOOLEAN isInstance = obj_clss->is_instanceof(clss);
+    Boolean isInstance = obj_clss->is_instanceof(clss);
 
     return isInstance ? JNI_TRUE : JNI_FALSE;
 } //IsInstanceOf

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp Sat May 31 05:23:11 2008
@@ -347,7 +347,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -395,7 +395,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -443,7 +443,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -491,7 +491,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -538,7 +538,7 @@
 
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -588,7 +588,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -635,7 +635,7 @@
 
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {
@@ -685,7 +685,7 @@
     tmn_suspend_disable();       //---------------------------------v
     Vector_Handle java_array = (Vector_Handle)h->object;
     int length = get_vector_length(java_array);
-    BOOLEAN is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
+    Boolean is_pinned = gc_is_object_pinned((ManagedObject *)java_array);
     tmn_suspend_enable();        //---------------------------------^
 
     if(is_pinned) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_internal.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_internal.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_internal.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_internal.cpp Sat May 31 05:23:11
2008
@@ -29,7 +29,7 @@
 #include "vtable.h"
 #include "jvmti_internal.h"
 
-static BOOLEAN is_valid_instance(jobject obj, Class* clss)
+static Boolean is_valid_instance(jobject obj, Class* clss)
 {
     if (NULL == obj)
         return false;
@@ -54,28 +54,28 @@
     }
 
     Class* object_clss = mo->vt()->clss;
-    BOOLEAN result = object_clss->is_instanceof(clss);
+    Boolean result = object_clss->is_instanceof(clss);
     tmn_suspend_enable();        //---------------------------------^
 
     return result;
 }
 
-BOOLEAN is_valid_throwable_object(jobject exc)
+Boolean is_valid_throwable_object(jobject exc)
 {
     return is_valid_instance(exc, VM_Global_State::loader_env->java_lang_Throwable_Class);
 }
 
-BOOLEAN is_valid_thread_object(jthread thread)
+Boolean is_valid_thread_object(jthread thread)
 {
     return is_valid_instance(thread, VM_Global_State::loader_env->java_lang_Thread_Class);
 }
 
-BOOLEAN is_valid_thread_group_object(jthreadGroup group)
+Boolean is_valid_thread_group_object(jthreadGroup group)
 {
     return is_valid_instance(group, VM_Global_State::loader_env->java_lang_ThreadGroup_Class);
 }
 
-BOOLEAN is_valid_class_object(jclass klass)
+Boolean is_valid_class_object(jclass klass)
 {
     return is_valid_instance(klass, VM_Global_State::loader_env->JavaLangClass_Class);
 }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp Sat May 31 05:23:11 2008
@@ -188,7 +188,7 @@
 
 static void ti_add_root_set_entry(
         Managed_Object_Handle *root, 
-        BOOLEAN UNREF pinned)
+        Boolean UNREF pinned)
 {
     TRACE2("ti.root", "ti root " << root << " -> " << *root);
     ti_enumerate_root(root, *root);
@@ -196,8 +196,8 @@
 
 static void ti_add_weak_root_set_entry(
         Managed_Object_Handle *root,
-        BOOLEAN UNREF pinned,
-        BOOLEAN UNREF short_weak)
+        Boolean UNREF pinned,
+        Boolean UNREF short_weak)
 {
     TRACE2("ti.root", "ti root " << root << " -> " << *root);
     // XXX: should weak roots be enumerated?
@@ -207,7 +207,7 @@
 static void ti_add_root_set_entry_interior_pointer(
         void **slot, 
         int offset, 
-        BOOLEAN UNREF pinned)
+        Boolean UNREF pinned)
 {
     Managed_Object_Handle obj = (Managed_Object_Handle)
         ((UDATA)*slot - offset);
@@ -216,7 +216,7 @@
 
 static void ti_add_compressed_root_set_entry(
         U_32 *ref, 
-        BOOLEAN UNREF pinned)
+        Boolean UNREF pinned)
 {
     assert(REFS_IS_COMPRESSED_MODE);
 #ifndef REFS_USE_UNCOMPRESSED
@@ -341,13 +341,13 @@
 
     // FIXME: weird function table manipulations
     void (*save_gc_add_root_set_entry)
-        (Managed_Object_Handle *ref, BOOLEAN pinned);
+        (Managed_Object_Handle *ref, Boolean pinned);
     void (*save_gc_add_weak_root_set_entry)
-        (Managed_Object_Handle *ref1, BOOLEAN pinned, BOOLEAN short_weak);
+        (Managed_Object_Handle *ref1, Boolean pinned, Boolean short_weak);
     void (*save_gc_add_root_set_entry_interior_pointer)
-        (void **slot, int offset, BOOLEAN pinned);
+        (void **slot, int offset, Boolean pinned);
     void (*save_gc_add_compressed_root_set_entry)
-        (U_32 *ref, BOOLEAN pinned);
+        (U_32 *ref, Boolean pinned);
 
     // save away old values
     save_gc_add_root_set_entry =

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=662020&r1=662019&r2=662020&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
Sat May 31 05:23:11 2008
@@ -66,7 +66,7 @@
     return ch;
 }
 
-Class_Handle class_find_class_from_loader(Class_Loader_Handle 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

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp Sat May 31 05:23:11
2008
@@ -75,7 +75,7 @@
     }
     //SOE checking area is an area in the beginning of a method.
     //when unwinding from SOE EIP no need to call monexit -> no monenter was done
-    BOOLEAN is_soe_area = jit->is_soe_area(method, si_get_jit_context(si));
+    Boolean is_soe_area = jit->is_soe_area(method, si_get_jit_context(si));
     if (is_soe_area) {
         return;
     }
@@ -143,7 +143,7 @@
 //
 //
 
-BOOLEAN verify_object_header(void *ptr)
+Boolean verify_object_header(void *ptr)
 {
         return FALSE;
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp Sat May
31 05:23:11 2008
@@ -59,30 +59,30 @@
     }
 }
 
-typedef void (*add_root_set_entry_func)(Managed_Object_Handle *, BOOLEAN);
-static void add_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned)
+typedef void (*add_root_set_entry_func)(Managed_Object_Handle *, Boolean);
+static void add_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned)
 {
     TRACE2("verify.rse.root", "root " << *ref << " at " << ref);
     register_root(ref);
 }
 
 
-typedef void (*add_weak_root_set_entry_func)(Managed_Object_Handle *ref, BOOLEAN is_pinned,BOOLEAN
is_short_weak);
-static void add_weak_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned,BOOLEAN
is_short_weak)
+typedef void (*add_weak_root_set_entry_func)(Managed_Object_Handle *ref, Boolean is_pinned,Boolean
is_short_weak);
+static void add_weak_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned,Boolean
is_short_weak)
 {
     TRACE2("verify.rse.root", "weak root " << *ref << " at " << ref);
     register_root(ref);
 }
 
 
-typedef void (*add_compressed_root_set_entry_func)(U_32 *ref, BOOLEAN is_pinned);
-static void add_compressed_root_set_entry(U_32 *ref, BOOLEAN is_pinned)
+typedef void (*add_compressed_root_set_entry_func)(U_32 *ref, Boolean is_pinned);
+static void add_compressed_root_set_entry(U_32 *ref, Boolean is_pinned)
 {
     TRACE("compressed root " << *ref << " at " << ref << ", not verified");
 }
 
-typedef void (*add_root_set_entry_interior_pointer_func)(void **ref, int offset, BOOLEAN
is_pinned);
-static void add_root_set_entry_interior_pointer (void **ref, int offset, BOOLEAN is_pinned)
+typedef void (*add_root_set_entry_interior_pointer_func)(void **ref, int offset, Boolean
is_pinned);
+static void add_root_set_entry_interior_pointer (void **ref, int offset, Boolean is_pinned)
 {
     TRACE("interior root " << *ref << "(-" << offset << ") at " <<
ref);
     register_root(ref);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp Sat May 31 05:23:11 2008
@@ -292,7 +292,7 @@
 
 int vm_initialize_signals()
 {
-    BOOLEAN result = port_init_crash_handler(
+    Boolean result = port_init_crash_handler(
                         registrations,
                         sizeof(registrations)/sizeof(registrations[0]),
                         unwind_compiled_frame);
@@ -325,7 +325,7 @@
 
 int vm_shutdown_signals()
 {
-    BOOLEAN result = port_shutdown_crash_handler();
+    Boolean result = port_shutdown_crash_handler();
     if (!result)
         return -1;
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
Sat May 31 05:23:11 2008
@@ -199,7 +199,7 @@
 }
 
 
-static BOOLEAN is_class_initialized(Class *clss)
+static Boolean is_class_initialized(Class *clss)
 {
 #ifdef VM_STATS
     VM_Statistics::get_vm_stats().num_is_class_initialized++;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Sat
May 31 05:23:11 2008
@@ -257,7 +257,7 @@
                                                          void **slow_obj_alloc_proc,
                                                          bool inlining_allowed)
 {
-    BOOLEAN use_inline_allocation_sequence = TRUE;
+    Boolean use_inline_allocation_sequence = TRUE;
     size_t offset_gc_local = (U_8*)&(p_TLS_vmthread->_gc_private_information) - (U_8*)p_TLS_vmthread;
     unsigned current_offset = 1;
     unsigned limit_offset = 1;
@@ -711,7 +711,7 @@
     emitter.set_target(call_label);
     int out0, save_pfs, save_b0, save_gp;
     const int num_in_args = 2, num_out_args = 2;
-    BOOLEAN (*p_class_is_subtype)(Class *sub, Class *super);
+    Boolean (*p_class_is_subtype)(Class *sub, Class *super);
     p_class_is_subtype = class_is_subtype;
     emit_alloc_for_single_call(emitter, num_in_args, num_out_args,
         (void **)p_class_is_subtype,
@@ -1022,7 +1022,7 @@
 } //get_vm_rt_aastore_test_address_compactor
 
 
-static BOOLEAN is_class_initialized(Class *clss)
+static Boolean is_class_initialized(Class *clss)
 {
 #ifdef VM_STATS
     VM_Statistics::get_vm_stats().num_is_class_initialized++;
@@ -1062,7 +1062,7 @@
     //emitter.ipf_adds(SCRATCH_GENERAL_REG, (int)((U_8*)&dummy->state-(U_8*)dummy),
IN_REG0);
     emitter.ipf_adds(SCRATCH_GENERAL_REG3, 0, 0);
 
-    BOOLEAN (*p_is_class_initialized)(Class *clss);
+    Boolean (*p_is_class_initialized)(Class *clss);
     p_is_class_initialized = is_class_initialized;
     emit_call_with_gp(emitter, (void**)p_is_class_initialized, false);
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp Sat May 31
05:23:11 2008
@@ -202,7 +202,7 @@
     }
 }
 
-BOOLEAN jit_clears_ccv_in_monitor_enter()
+Boolean jit_clears_ccv_in_monitor_enter()
 {
     return FALSE;
 }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h Sat May
31 05:23:11 2008
@@ -112,7 +112,7 @@
 void gen_convert_class_arg(Merced_Code_Emitter &emitter, bool check_null);
 
 
-BOOLEAN jit_clears_ccv_in_monitor_enter();
+Boolean jit_clears_ccv_in_monitor_enter();
 
 // Add additional code that enforces calling conventions (most likely regarding
 // scratch registers) before calling/returing into managed code.

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp Sat May 31 05:23:11 2008
@@ -87,7 +87,7 @@
     return RESTORE_STACK_SIZE < available_stack_size;
 }
 
-BOOLEAN stack_overflow_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
+Boolean stack_overflow_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
 {
     TRACE2("signals", ("SOE detected at ip=%p, sp=%p",
                             regs->get_ip(), regs->get_sp()));
@@ -141,7 +141,7 @@
     return TRUE;
 }
 
-BOOLEAN null_reference_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
+Boolean null_reference_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
 {
     TRACE2("signals", "NPE detected at " << regs->get_ip());
 
@@ -181,28 +181,28 @@
     return TRUE;
 }
 
-BOOLEAN abort_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* fault_addr)
+Boolean abort_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* fault_addr)
 {
     TRACE2("signals", "Abort detected at " << regs->get_ip());
     // Crash always
     return FALSE;
 }
 
-BOOLEAN ctrl_backslash_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF
fault_addr)
+Boolean ctrl_backslash_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF
fault_addr)
 {
     TRACE2("signals", "Ctrl+\\ pressed");
     vm_dump_handler();
     return TRUE;
 }
 
-BOOLEAN ctrl_break_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF
fault_addr)
+Boolean ctrl_break_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF
fault_addr)
 {
     TRACE2("signals", "Ctrl+Break pressed");
     vm_dump_handler();
     return TRUE;
 }
 
-BOOLEAN ctrl_c_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF fault_addr)
+Boolean ctrl_c_handler(port_sigtype UNREF signum, Registers* UNREF regs, void* UNREF fault_addr)
 {
     TRACE2("signals", "Ctrl+C pressed");
     vm_interrupt_handler();
@@ -211,7 +211,7 @@
     return TRUE;
 }
 
-BOOLEAN native_breakpoint_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
+Boolean native_breakpoint_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
 {
     TRACE2("signals", "Native breakpoint detected at " << regs->get_ip());
 #ifdef _IPF_
@@ -235,10 +235,10 @@
     if (is_handled)
         return TRUE;
 
-    return (BOOLEAN)jvmti_jit_breakpoint_handler(regs);
+    return (Boolean)jvmti_jit_breakpoint_handler(regs);
 }
 
-BOOLEAN arithmetic_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
+Boolean arithmetic_handler(port_sigtype UNREF signum, Registers* regs, void* fault_addr)
 {
     TRACE2("signals", "ArithmeticException detected at " << regs->get_ip());
 #ifdef _IPF_



Mime
View raw message