You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mc...@apache.org on 2008/05/31 14:23:15 UTC

svn commit: r662020 [3/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/...

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/gc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/gc.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/gc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/gc.h Sat May 31 05:23:11 2008
@@ -110,7 +110,7 @@
  * <code>*offset_of_limit</code> and the "limit" pointer. If not, then it should return
  * <code>FALSE</code>.
  */
-GCExport BOOLEAN gc_supports_frontier_allocation(unsigned *offset_of_current, unsigned *offset_of_limit);
+GCExport Boolean gc_supports_frontier_allocation(unsigned *offset_of_current, unsigned *offset_of_limit);
 
 /**
  * This API is used by the VM to notify the GC that the
@@ -149,13 +149,13 @@
 /**
  * Is called by the VM to enumerate the root reference.
  */
-GCExport void gc_add_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned);
+GCExport void gc_add_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned);
 
 /**
  * Resembles <code>gc_add_root_set_entry()</code> but is passed the address of a slot
  * containing a compressed reference.
  */
-GCExport void gc_add_compressed_root_set_entry(U_32 *ref, BOOLEAN is_pinned);
+GCExport void gc_add_compressed_root_set_entry(U_32 *ref, Boolean is_pinned);
 
 /**
  * Is called by the VM to enumerate weak root reference.
@@ -167,7 +167,7 @@
  *                        before object becomes eligible for finalization
  */
 GCExport void gc_add_weak_root_set_entry(Managed_Object_Handle *slot, 
-    BOOLEAN is_pinned, BOOLEAN is_short_weak);
+    Boolean is_pinned, Boolean is_short_weak);
 
 /**
  * Enumerate a managed pointer.  
@@ -179,7 +179,7 @@
  * @note Is this function needed for Java? -salikh
  */
 GCExport void gc_add_root_set_entry_managed_pointer(void **slot,
-                                                    BOOLEAN is_pinned);
+                                                    Boolean is_pinned);
 
 /**
  * Call from the VM to the gc to enumerate an interior pointer. <code>**ref</code> is a
@@ -199,7 +199,7 @@
  *
  * @note Optional function, never called by Java virtual machine.
  */
-GCExport void gc_add_root_set_entry_interior_pointer (void **slot, int offset, BOOLEAN is_pinned);
+GCExport void gc_add_root_set_entry_interior_pointer (void **slot, int offset, Boolean is_pinned);
  
 
 
@@ -328,7 +328,7 @@
  * @return <code>TRUE</code> if the GC requires write barriers before every store to
  *         a field of a reference type.
  */
-GCExport BOOLEAN gc_requires_barriers();
+GCExport Boolean gc_requires_barriers();
 
 //@}
 /** @name Routines to support threads
@@ -500,7 +500,7 @@
  *
  * Routine to support the functionality required by JNI to see if an object is pinned.
  */
-GCExport BOOLEAN gc_is_object_pinned (Managed_Object_Handle obj);
+GCExport Boolean gc_is_object_pinned (Managed_Object_Handle obj);
 
 
 /*
@@ -559,19 +559,19 @@
  * garbage collector with virtual machine executable.
  */
 
-extern void (*gc_add_root_set_entry)(Managed_Object_Handle *ref, BOOLEAN is_pinned);
-extern void (*gc_add_compressed_root_set_entry)(U_32 *ref, BOOLEAN is_pinned);
-extern void (*gc_add_root_set_entry_interior_pointer)(void **slot, int offset, BOOLEAN is_pinned);
-extern void (*gc_add_weak_root_set_entry)(Managed_Object_Handle *ref1, BOOLEAN is_pinned,BOOLEAN is_short_weak);
-extern void (*gc_add_root_set_entry_managed_pointer)(void **slot, BOOLEAN is_pinned);
+extern void (*gc_add_root_set_entry)(Managed_Object_Handle *ref, Boolean is_pinned);
+extern void (*gc_add_compressed_root_set_entry)(U_32 *ref, Boolean is_pinned);
+extern void (*gc_add_root_set_entry_interior_pointer)(void **slot, int offset, Boolean is_pinned);
+extern void (*gc_add_weak_root_set_entry)(Managed_Object_Handle *ref1, Boolean is_pinned,Boolean is_short_weak);
+extern void (*gc_add_root_set_entry_managed_pointer)(void **slot, Boolean is_pinned);
 extern void (*gc_class_prepared)(Class_Handle ch, VTable_Handle vth);
 extern int64 (*gc_get_collection_count)();
 extern int64 (*gc_get_collection_time)();
 VMEXPORT extern void (*gc_force_gc)();
 VMEXPORT extern int64 (*gc_free_memory)();
 extern int (*gc_init)();
-extern BOOLEAN (*gc_supports_frontier_allocation)(unsigned *offset_of_current, unsigned *offset_of_limit);
-extern BOOLEAN (*gc_is_object_pinned)(Managed_Object_Handle obj);
+extern Boolean (*gc_supports_frontier_allocation)(unsigned *offset_of_current, unsigned *offset_of_limit);
+extern Boolean (*gc_is_object_pinned)(Managed_Object_Handle obj);
 extern Managed_Object_Handle (*gc_alloc)(unsigned size, 
                                          Allocation_Handle type,
                                          void *thread_pointer);
@@ -585,7 +585,7 @@
 VMEXPORT extern int64 (*gc_total_memory)();
 VMEXPORT extern int64 (*gc_max_memory)();
 extern void (*gc_wrapup)();
-extern BOOLEAN (*gc_requires_barriers)();
+extern Boolean (*gc_requires_barriers)();
 extern void (*gc_test_safepoint)();
 
 
@@ -597,7 +597,7 @@
 extern void (*gc_iterate_heap)();
 extern void (*gc_finalize_on_exit)();
 extern void (*gc_set_mutator_block_flag)();
-extern BOOLEAN (*gc_clear_mutator_block_flag)();
+extern Boolean (*gc_clear_mutator_block_flag)();
 
 
 
@@ -634,7 +634,7 @@
  * garbage collector with virtual machine executable.
  */
 
-extern BOOLEAN (*gc_supports_compressed_references)();
+extern Boolean (*gc_supports_compressed_references)();
 
 extern void (*gc_heap_write_ref)(Managed_Object_Handle p_base_of_object_with_slot,
                                  unsigned offset,
@@ -662,7 +662,7 @@
 VMEXPORT extern void * (*gc_heap_base_address)();
 VMEXPORT extern void * (*gc_heap_ceiling_address)();
 
-extern BOOLEAN (*gc_supports_class_unloading)();
+extern Boolean (*gc_supports_class_unloading)();
 
 #else // USE_GC_STATIC
 
@@ -675,7 +675,7 @@
  * @return <code>TRUE</code> if references within objects and vector 
  *         elements are to be treated as offsets rather than raw pointers.
  */
-GCExport BOOLEAN gc_supports_compressed_references();
+GCExport Boolean gc_supports_compressed_references();
 
 /**
  * These interfaces are marked for replacement for the IPF by the following
@@ -787,9 +787,9 @@
 /**
  * Clears the mutator need block flag when heavy finalizable object load lightens
  */
-GCExport BOOLEAN gc_clear_mutator_block_flag();
+GCExport Boolean gc_clear_mutator_block_flag();
 
-GCExport BOOLEAN gc_supports_class_unloading();
+GCExport Boolean gc_supports_class_unloading();
 
 // XXX move this elsewhere -salikh
 #ifdef JNIEXPORT

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h Sat May 31 05:23:11 2008
@@ -190,12 +190,6 @@
 
 #endif
 
-#if !defined(FALSE)
-#define FALSE   ((BOOLEAN) 0)
-#if !defined(TRUE)
-#define TRUE    ((BOOLEAN) (!FALSE))
-#endif
-#endif
 
 #if !defined(NULL)
 #if defined(__cplusplus)

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h Sat May 31 05:23:11 2008
@@ -57,9 +57,19 @@
  * Various Numeric Types
  */
 
-// uint16, int16, uint64, int64,
+// Boolean, uint16, int16, uint64, int64,
 // POINTER_SIZE_INT
 
+// We can't use bool in non-C++ code
+#ifndef TRUE
+#define TRUE  1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+typedef unsigned Boolean;
+
 //::For long long int, add the LL 
 #ifndef __WORDSIZE // exclude remark #193: zero used for undefined preprocessing identifier
 #define __WORDSIZE 0

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h Sat May 31 05:23:11 2008
@@ -51,61 +51,61 @@
 */
 typedef struct OpenMethodExecutionParams {
     /** call corresponding VM helper upon entry to the managed method */
-    BOOLEAN  exe_notify_method_entry : 1;
+    Boolean  exe_notify_method_entry : 1;
 
     /** call corresponding VM helper upon exit from the managed method */
-    BOOLEAN  exe_notify_method_exit : 1;
+    Boolean  exe_notify_method_exit : 1;
 
     /** call corresponding VM helper upon reading a value of a field which has <field access mask> set */
-    BOOLEAN  exe_notify_field_access  : 1;
+    Boolean  exe_notify_field_access  : 1;
 
     /** call corresponding VM helper upon setting a value of a field which has <field modification mask> set */
-    BOOLEAN  exe_notify_field_modification : 1;
+    Boolean  exe_notify_field_modification : 1;
 
     /**
     * call corresponding VM helper upon exception throw,
     * if by default the throw code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_exception_throw : 1;
+    Boolean  exe_notify_exception_throw : 1;
 
     /**
     * call corresponding VM helper upon exception catch,
     * if by default the exception propagation code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_exception_catch : 1;
+    Boolean  exe_notify_exception_catch : 1;
 
     /**
     * call corresponding VM helper upon entering a monitor,
     * if by default the monitor enter code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_monitor_enter : 1;
+    Boolean  exe_notify_monitor_enter : 1;
 
     /**
     * call corresponding VM helper upon exiting a monitor,
     * if by default the monitor exit code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_monitor_exit : 1;
+    Boolean  exe_notify_monitor_exit : 1;
 
     /**
     * call corresponding VM helper upon entering a contended monitor,
     * if by default the contended monitor enter code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_contended_monitor_enter : 1;
+    Boolean  exe_notify_contended_monitor_enter : 1;
 
     /**
     * call corresponding VM helper upon exiting a contended monitor,
     * if by default the contended monitor exit code does not enter any VM helper
     * (for example, in case of JIT optimizations)
     */
-    BOOLEAN  exe_notify_contended_monitor_exit : 1;
+    Boolean  exe_notify_contended_monitor_exit : 1;
 
     /** perform method in-lining during compilation (JIT-specific) */
-    BOOLEAN  exe_do_method_inlining : 1;
+    Boolean  exe_do_method_inlining : 1;
 
     /**
     * Keep correspondence between bytecode offsets and native instruction IPs (JIT-specific).
@@ -113,7 +113,7 @@
     * may hinder this mapping. It should also store the map after method compilation so that
     * later VM could use appropriate ExeJPDA interfaces to retrieve the mapping.
     */
-    BOOLEAN  exe_do_code_mapping : 1;
+    Boolean  exe_do_code_mapping : 1;
 
     /**
     * Keep correspondence between bytecode local variables and locations of the
@@ -122,28 +122,28 @@
     * which may hinder this mapping. It should also store the map after method compilation
     * so that later VM could use appropriate ExeJPDA interfaces to retrieve the mapping.
     */
-    BOOLEAN  exe_do_local_var_mapping : 1;
+    Boolean  exe_do_local_var_mapping : 1;
 
     /** call corresponding VM helper upon setting a value of any field of reference type */
-    BOOLEAN  exe_insert_write_barriers : 1;
+    Boolean  exe_insert_write_barriers : 1;
 
     /**
     * Provide possibility to obtain reference to the current 'this' object by
     * means of get_address_of_this method. Used for JVMTI debug support.
     */
-    BOOLEAN  exe_provide_access_to_this : 1;
+    Boolean  exe_provide_access_to_this : 1;
 
     /**
     * Provide restoring of arguments in the stack after the call
     * of the unwind_frame method so that method could be called again
     * with the same arguments. Used for JVMTI debug support.
     */
-    BOOLEAN  exe_restore_context_after_unwind : 1;
+    Boolean  exe_restore_context_after_unwind : 1;
 
     /**
     * Sent CompileMethodLoad event when a method is compiled and loaded into memory 
     */
-    BOOLEAN  exe_notify_compiled_method_load : 1;
+    Boolean  exe_notify_compiled_method_load : 1;
 
 } OpenMethodExecutionParams;
 
@@ -166,7 +166,7 @@
         uint64 *p_br[8];
         uint64 nats_lo;
         uint64 nats_hi;
-        BOOLEAN is_ip_past;
+        Boolean is_ip_past;
         uint64 ar_fpsr;
         uint64 ar_unat;
         uint64 ar_lc;
@@ -201,7 +201,7 @@
         // To restore processor flags during transfer
         U_32 eflags;
 
-        BOOLEAN is_ip_past;
+        Boolean is_ip_past;
     } JitFrameContext;
 
 #else // "_IA32_"
@@ -225,7 +225,7 @@
         // To restore processor flags during transfer
         U_32 eflags;
 
-        BOOLEAN is_ip_past;
+        Boolean is_ip_past;
     } JitFrameContext;
 
 #endif // "_IA32_"

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm.h Sat May 31 05:23:11 2008
@@ -130,7 +130,7 @@
 /**
  * @return <code>TRUE</code> if an inner class is public.
  */ 
- VMEXPORT BOOLEAN class_is_inner_class_public(Class_Handle ch, unsigned idx);
+ VMEXPORT Boolean class_is_inner_class_public(Class_Handle ch, unsigned idx);
 
 /**
  * @return an inner class
@@ -158,7 +158,7 @@
  *
  * FIXME: move to internal headers
  */
- VMEXPORT BOOLEAN field_is_enumerable_reference(Field_Handle fh);
+ VMEXPORT Boolean field_is_enumerable_reference(Field_Handle fh);
 
 ////
 // end field-related functions.

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h Sat May 31 05:23:11 2008
@@ -262,7 +262,7 @@
                                              void         *end_ip,
                                              void         *handler_ip,
                                              Class_Handle  catch_cl,
-                                             BOOLEAN       exc_obj_is_dead));
+                                             Boolean       exc_obj_is_dead));
 
 //-----------------------------------------------------------------------------
 // Constant pool resolution

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h Sat May 31 05:23:11 2008
@@ -155,7 +155,7 @@
  * 
  * Used for debugging.
  */
-VMEXPORT BOOLEAN verify_object_header(void *ptr);
+VMEXPORT Boolean verify_object_header(void *ptr);
 
 /**
  *  Routines to support lifecycle management of resources associated
@@ -187,7 +187,7 @@
  */
 VMEXPORT void vm_finalize_object(Managed_Object_Handle p_obj);
 
-VMEXPORT void set_native_finalizer_thread_flag(BOOLEAN flag);
+VMEXPORT void set_native_finalizer_thread_flag(Boolean flag);
 
 VMEXPORT void vm_heavy_finalizer_block_mutator(void);
 //@}
@@ -198,7 +198,7 @@
  */
 VMEXPORT void vm_enqueue_reference(Managed_Object_Handle p_obj);
 
-VMEXPORT void set_native_ref_enqueue_thread_flag(BOOLEAN flag);
+VMEXPORT void set_native_ref_enqueue_thread_flag(Boolean flag);
 
 /*
  * Returns handle of a class for a specified vtable

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h Sat May 31 05:23:11 2008
@@ -277,7 +277,7 @@
 DECLARE_OPEN(void, method_set_target_handler_info,
     (Method_Handle method, JIT_Handle j, unsigned eh_number,
      void* start_ip, void* end_ip, void* handler_ip,
-     Class_Handle catch_cl, BOOLEAN exc_obj_is_dead));
+     Class_Handle catch_cl, Boolean exc_obj_is_dead));
 
 /**
  * Returns the handle for an accessible method overriding <i>method</i> in <i>klass</i> 

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_properties.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_properties.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_properties.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_properties.h Sat May 31 05:23:11 2008
@@ -67,7 +67,7 @@
 DECLARE_OPEN(void, vm_properties_destroy_keys, (char** keys));
 
 /**
- * Tries to interpret property value as <code>BOOLEAN</code> and returns it. 
+ * Tries to interpret property value as <code>Boolean</code> and returns it. 
  * In case of failure returns <code>default_value</code>.
  */
 DECLARE_OPEN(BOOLEAN, vm_property_get_boolean, (const char* property, BOOLEAN default_value, PropertyTable table_number));

Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h Sat May 31 05:23:11 2008
@@ -37,13 +37,13 @@
  * may be called from native code.
  */
 
-BOOLEAN class_is_subtype(Class *sub, Class *super);
+Boolean class_is_subtype(Class *sub, Class *super);
 
 /**
  * Like <code>class_is_subtype</code>, but <code>sub</code> must not be an 
  * interface class.
  */
-BOOLEAN class_is_subtype_fast(VTable *sub, Class *super);
+Boolean class_is_subtype_fast(VTable *sub, Class *super);
 
 
 #ifdef __cplusplus

Modified: harmony/enhanced/drlvm/trunk/vm/include/vm_java_support.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/vm_java_support.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/vm_java_support.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/vm_java_support.h Sat May 31 05:23:11 2008
@@ -65,7 +65,7 @@
 *         function before compiling a method and return <code>JIT_FAILURE</code> if
 *         <code>method_is_java</code> returned <code>FALSE</code>.
 */ 
-VMEXPORT BOOLEAN method_is_java(Method_Handle mh);
+VMEXPORT Boolean method_is_java(Method_Handle mh);
 VMEXPORT unsigned     field_get_flags(Field_Handle f);
 VMEXPORT unsigned     class_get_flags(Class_Handle cl);
 

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp Sat May 31 05:23:11 2008
@@ -38,7 +38,7 @@
     EXPORT extern void JIT_get_root_set_for_thread_dump(JIT_Handle, Method_Handle, GC_Enumeration_Handle, JitFrameContext *);
     EXPORT extern void JIT_fix_handler_context(JIT_Handle, Method_Handle, JitFrameContext *);
     EXPORT extern void * JIT_get_address_of_this(JIT_Handle, Method_Handle, const JitFrameContext *);
-    EXPORT extern BOOLEAN JIT_supports_compressed_references(JIT_Handle);
+    EXPORT extern Boolean JIT_supports_compressed_references(JIT_Handle);
     EXPORT extern void JIT_execute_method(JIT_Handle,jmethodID method, jvalue *return_value, jvalue *args);
 }
 
@@ -120,7 +120,7 @@
     interpreter->stack_dump = &stack_dump;
 }
 
-EXPORT BOOLEAN JIT_supports_compressed_references(JIT_Handle UNREF jh) {
+EXPORT Boolean JIT_supports_compressed_references(JIT_Handle UNREF jh) {
 #ifdef REFS_USE_UNCOMPRESSED
     return false;
 #else

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_stack_trace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_stack_trace.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_stack_trace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_stack_trace.cpp Sat May 31 05:23:11 2008
@@ -52,7 +52,7 @@
     return si->ip;
 }
 
-static inline BOOLEAN
+static inline Boolean
 interp_si_method_is_native(Method_Handle m) {
     assert(m);
     Method *meth = (Method *)m;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp Sat May 31 05:23:11 2008
@@ -1365,7 +1365,7 @@
         case Type::UInt64:  
         case Type::Single:  
         case Type::Double:  
-        case Type::BOOLEAN:  
+        case Type::Boolean:  
         case Type::Float:   return typeManager.getPrimitiveType(tag);
         default:            return new(memoryManager) Type(tag);
     }
@@ -1378,7 +1378,7 @@
     switch (tag) {
         case Type::Int8:
         case Type::UInt8:
-        case Type::BOOLEAN:
+        case Type::Boolean:
             size = OpndSize_8;
             break;
         case Type::Int16:   

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp Sat May 31 05:23:11 2008
@@ -1446,7 +1446,7 @@
             case Type::UInt8:
                 os<<*(U_8*)p;
                 break;
-            case Type::BOOLEAN:
+            case Type::Boolean:
                 os<<(*(I_8*)p?true:false);
                 break;
             case Type::Int16:   

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp Sat May 31 05:23:11 2008
@@ -3193,7 +3193,7 @@
 DataKind IpfInstCodeSelector::toDataKind(Type::Tag tag) {
 
     switch(tag) {
-        case Type::BOOLEAN                : return DATA_U8;
+        case Type::Boolean                : return DATA_U8;
         case Type::Char                   : return DATA_U16;
         case Type::Int8                   : return DATA_I8;
         case Type::Int16                  : return DATA_I16;
@@ -3236,7 +3236,7 @@
         case Type::NullObject   : return OPND_G_REG;
         case Type::SystemObject : return OPND_G_REG;
         case Type::SystemClass  : return OPND_G_REG;
-        case Type::BOOLEAN      : return OPND_G_REG;
+        case Type::Boolean      : return OPND_G_REG;
         case Type::Char         : return OPND_G_REG;
         case Type::Int8         : return OPND_G_REG;
         case Type::Int16        : return OPND_G_REG;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp Sat May 31 05:23:11 2008
@@ -823,7 +823,7 @@
  * Noop in Jitrino.JET.
  * @return FALSE
  */
-extern "C" JITEXPORT BOOLEAN JIT_recompiled_method_callback(
+extern "C" JITEXPORT Boolean JIT_recompiled_method_callback(
         JIT_Handle jit, Method_Handle  method, void * callback_data)
 {
     return FALSE;
@@ -908,7 +908,7 @@
  * platform.
  */
 extern "C" JITEXPORT
-BOOLEAN JIT_supports_compressed_references(JIT_Handle jit)
+Boolean JIT_supports_compressed_references(JIT_Handle jit)
 {
     return ::Jitrino::Jet::supports_compresed_refs();
 }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h Sat May 31 05:23:11 2008
@@ -113,7 +113,7 @@
 /**
 * @brief Returns 'TRUE' if EIP referenced by context points to SOE checking area of the method
 */
-BOOLEAN rt_is_soe_area(JIT_Handle jit, Method_Handle method, const JitFrameContext * context);
+Boolean rt_is_soe_area(JIT_Handle jit, Method_Handle method, const JitFrameContext * context);
 
 /**
  * @brief Returns address of 'this' argument for the given method.

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp Sat May 31 05:23:11 2008
@@ -428,7 +428,7 @@
     *psp = sp_val;
 }
 
-BOOLEAN rt_is_soe_area(JIT_Handle jit, Method_Handle method, const JitFrameContext * context) {
+Boolean rt_is_soe_area(JIT_Handle jit, Method_Handle method, const JitFrameContext * context) {
     char * pinfo = (char*)method_get_info_block_jit(method, jit);
 
     assert(MethodInfoBlock::is_valid_data(pinfo));

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp Sat May 31 05:23:11 2008
@@ -287,7 +287,7 @@
 #endif
         switch (((Type*)arrayRef->getType()->asArrayType()->getElementType())->tag) {
             case Type::Int8:
-            case Type::BOOLEAN:
+            case Type::Boolean:
             case Type::UInt8:
                 val |= (val << 8);
                 val |= (val << 16);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h Sat May 31 05:23:11 2008
@@ -522,7 +522,7 @@
     BranchInst(Opcode op, LabelInst* target)
         : Inst(op, Modifier(), Type::Void, OpndManager::getNullOpnd()), targetLabel(target) {};
     BranchInst(Opcode op, Opnd* src, LabelInst* target)
-        : Inst(op, Modifier(), Type::BOOLEAN, OpndManager::getNullOpnd(), src), 
+        : Inst(op, Modifier(), Type::Boolean, OpndManager::getNullOpnd(), src), 
           targetLabel(target) {}
     BranchInst(Opcode op,
                ComparisonModifier mod,

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.cpp Sat May 31 05:23:11 2008
@@ -134,7 +134,7 @@
 Type* 
 OpndManager::getOpndTypeFromLdType(Type* ldType) {
     switch (ldType->tag) {
-    case Type::BOOLEAN:  case Type::Char:
+    case Type::Boolean:  case Type::Char:
     case Type::Int8:     case Type::Int16:     case Type::Int32:
     case Type::UInt8:    case Type::UInt16:    case Type::UInt32:
         return typeManager.getInt32Type();

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp Sat May 31 05:23:11 2008
@@ -263,7 +263,7 @@
     assert(inst);
 
     Type::Tag inst_type = inst->getType();
-    if ( !Type::isInteger(inst_type) && inst_type != Type::BOOLEAN &&
+    if ( !Type::isInteger(inst_type) && inst_type != Type::Boolean &&
          inst_type != Type::Char ) {
         // note: some operations of unsupported type can produce operands of
         // supported (int) types, for example,

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp Sat May 31 05:23:11 2008
@@ -126,7 +126,7 @@
 {
     switch (tag) {
     case Type::Void: return 0;
-    case Type::BOOLEAN: return 1;
+    case Type::Boolean: return 1;
     case Type::Char: return 16;
     case Type::Int8: return 8;
     case Type::Int16: return 16;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp Sat May 31 05:23:11 2008
@@ -2411,7 +2411,7 @@
 {
     switch (tag) {
     case Type::Void: return 0;
-    case Type::BOOLEAN: return 1;
+    case Type::Boolean: return 1;
     case Type::Char: return 16;
     case Type::Int8: return 8;
     case Type::Int16: return 16;

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp Sat May 31 05:23:11 2008
@@ -112,7 +112,7 @@
     case Type::UIntPtr: return getUIntPtrType();
     case Type::Void: return getVoidType();
     case Type::Tau:     return getTauType();
-    case Type::BOOLEAN: return getBooleanType();
+    case Type::Boolean: return getBooleanType();
     case Type::Char:    return getCharType();
     default:            assert(0); return NULL;
     }
@@ -156,7 +156,7 @@
     case Type::ArrayLength:
     case Type::ArrayElementType:
         return t;
-    case Type::BOOLEAN:
+    case Type::Boolean:
     case Type::Char:
     case Type::Int8:
     case Type::Int16:
@@ -229,7 +229,7 @@
         return isSubTypeOf(toInternalType(type1->getNonValueSupertype()), type2);
     case Type::Tau:
     case Type::Void:
-    case Type::BOOLEAN:
+    case Type::Boolean:
     case Type::IntPtr:
     case Type::Int8:
     case Type::Int16:
@@ -414,7 +414,7 @@
 
     tauType = new (memManager) Type(Type::Tau);
     voidType = new (memManager) Type(Type::Void);
-    booleanType = initBuiltinType(Type::BOOLEAN);
+    booleanType = initBuiltinType(Type::Boolean);
     charType = initBuiltinType(Type::Char);
     intPtrType = initBuiltinType(Type::IntPtr);
     int8Type = initBuiltinType(Type::Int8);
@@ -866,7 +866,7 @@
     switch (tag) {
     case Type::Void:             s = "VSystem/Void";     break;
     case Type::Tau:              s = "VSystem/Tau";     break;
-    case Type::BOOLEAN:          s = "VSystem/BOOLEAN";  break;
+    case Type::Boolean:          s = "VSystem/Boolean";  break;
     case Type::Char:             s = "VSystem/Char";     break;
     case Type::IntPtr:           s = "VSystem/IntPtr";   break;
     case Type::Int8:             s = "VSystem/SByte";    break;
@@ -900,7 +900,7 @@
     switch (tag) {
     case Tau:              s = "tau"; break;
     case Void:             s = "void"; break;
-    case BOOLEAN:          s = "bool"; break;
+    case Boolean:          s = "bool"; break;
     case Char:             s = "char"; break;
     case IntPtr:           s = "intptr"; break;
     case Int8:             s = "I_8"; break;
@@ -1041,7 +1041,7 @@
     switch (t) {
     case Tau:             s = "tau"; break;
     case Void:            s = "v  "; break;
-    case BOOLEAN:         s = "b  "; break;
+    case Boolean:         s = "b  "; break;
     case Char:            s = "chr"; break;
     case IntPtr:          s = "i  "; break;
     case Int8:            s = "i1 "; break;
@@ -1115,7 +1115,7 @@
     switch (t->tag) {
     case Type::Tau:
     case Type::Void:
-    case Type::BOOLEAN:
+    case Type::Boolean:
     case Type::Char:
     case Type::IntPtr:
     case Type::Int8:
@@ -1230,7 +1230,7 @@
 
     DECL_TAG_ITEM(Tau, "tau "),
     DECL_TAG_ITEM(Void, "v   "),
-    DECL_TAG_ITEM(BOOLEAN, "b   "),
+    DECL_TAG_ITEM(Boolean, "b   "),
     DECL_TAG_ITEM(Char, "chr "),
 
     DECL_TAG_ITEM(IntPtr, "i   "),

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h Sat May 31 05:23:11 2008
@@ -61,7 +61,7 @@
         //   (1.1) Built-in value types
         Tau,     // essentially a void type, used for 
         Void,    
-        BOOLEAN,
+        Boolean,
         Char,
         IntPtr,  // ptr-sized integer
         Int8,
@@ -159,7 +159,7 @@
     bool    isUnmanagedPtr()   {return isUnmanagedPtr(tag); }
     bool    isFP()             {return isFloatingPoint(tag);}
     bool    isVoid()           {return (tag == Type::Void);        }
-    bool    isBoolean()        {return (tag == Type::BOOLEAN);     }
+    bool    isBoolean()        {return (tag == Type::Boolean);     }
     bool    isChar()           {return (tag == Type::Char);        }
     bool    isInt1()           {return (tag == Type::Int8);        }
     bool    isInt2()           {return (tag == Type::Int16);       }

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp Sat May 31 05:23:11 2008
@@ -739,7 +739,7 @@
                     case Type::Int64:   constVal=irBuilder.genLdConstant(*(int64*)fieldAddr);break;
                     case Type::Single:  constVal=irBuilder.genLdConstant(*(float*)fieldAddr);break;
                     case Type::Double:  constVal=irBuilder.genLdConstant(*(double*)fieldAddr);break;
-                    case Type::BOOLEAN: constVal=irBuilder.genLdConstant(*(bool*)fieldAddr);break;
+                    case Type::Boolean: constVal=irBuilder.genLdConstant(*(bool*)fieldAddr);break;
                     case Type::UnmanagedPtr:  assert(fieldIsMagic); 
 #ifdef _IA32_
                             constVal=irBuilder.genLdConstant(*(I_32*)fieldAddr);

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h Sat May 31 05:23:11 2008
@@ -263,7 +263,7 @@
     static JavaVarType getJavaType(Type *type) {
         assert(type);
         switch(type->tag) {
-        case Type::BOOLEAN:  case Type::Char:
+        case Type::Boolean:  case Type::Char:
         case Type::Int8:     case Type::Int16:     case Type::Int32:
             return I;
         case Type::Int64:

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp Sat May 31 05:23:11 2008
@@ -155,7 +155,7 @@
 // recompiled
 // Returns TRUE if any code was modified and FALSE otherwise
 extern "C"
-JITEXPORT BOOLEAN
+JITEXPORT Boolean
 JIT_recompiled_method_callback(JIT_Handle jit,
                                Method_Handle recompiled_method,
                                void *callback_data)
@@ -387,7 +387,7 @@
 }
 
 extern "C"
-JITEXPORT BOOLEAN
+JITEXPORT Boolean
 JIT_is_soe_area
 (JIT_Handle jit, Method_Handle method,
                         const ::JitFrameContext   *context)
@@ -418,7 +418,7 @@
 }
 
 extern "C"
-JITEXPORT BOOLEAN
+JITEXPORT Boolean
 JIT_supports_compressed_references(JIT_Handle jit)
 {
 #ifdef _EM64T_

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=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp Sat May 31 05:23:11 2008
@@ -107,7 +107,7 @@
 static  field_get_offset_t  field_get_offset = 0;
 static  field_get_type_info_t  field_get_type_info = 0;
 static  field_is_final_t  field_is_final = 0;
-static  field_is_magic_t  field_is_magic = 0; //BOOLEAN field_is_magic(Field_Handle fh);
+static  field_is_magic_t  field_is_magic = 0; //Boolean field_is_magic(Field_Handle fh);
 static  field_is_private_t  field_is_private = 0;
 static  field_is_static_t  field_is_static = 0;
 static  field_is_volatile_t  field_is_volatile = 0;
@@ -509,7 +509,7 @@
 TypeManager::getBuiltinValueTypeVMTypeHandle(Type::Tag type) {
     switch (type) {
     case Type::Void:    return class_get_class_of_primitive_type(VM_DATA_TYPE_VOID);
-    case Type::BOOLEAN: return class_get_class_of_primitive_type(VM_DATA_TYPE_BOOLEAN);
+    case Type::Boolean: return class_get_class_of_primitive_type(VM_DATA_TYPE_BOOLEAN);
     case Type::Char:    return class_get_class_of_primitive_type(VM_DATA_TYPE_CHAR);
     case Type::Int8:    return class_get_class_of_primitive_type(VM_DATA_TYPE_INT8);
     case Type::Int16:   return class_get_class_of_primitive_type(VM_DATA_TYPE_INT16);

Modified: harmony/enhanced/drlvm/trunk/vm/port/include/port_crash_handler.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/port_crash_handler.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/port_crash_handler.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/port_crash_handler.h Sat May 31 05:23:11 2008
@@ -99,7 +99,7 @@
  * execution should continue. <code>FALSE</code> if signal is not handled
  * by the process and crash handler should execute crash sequence.
  */
-typedef BOOLEAN (*port_signal_handler)(
+typedef Boolean (*port_signal_handler)(
     port_sigtype signum,
     Registers *regs,
     void* fault_addr);
@@ -135,7 +135,7 @@
  * @return <code>TRUE</code> if initalization is successful.
  * <code>FALSE</code> if initialization failed.
  */
-VMEXPORT BOOLEAN port_init_crash_handler(
+VMEXPORT Boolean port_init_crash_handler(
     port_signal_handler_registration *registrations,
     unsigned count,
     port_unwind_compiled_frame unwind_callback);
@@ -243,7 +243,7 @@
  * <code>FALSE</code> if action was not added because no memory could
  * be allocated.
  */
-VMEXPORT BOOLEAN port_crash_handler_add_action(port_crash_handler_action action);
+VMEXPORT Boolean port_crash_handler_add_action(port_crash_handler_action action);
 
 /**
  * Shutdown signals and crash handler. All signals are assigned their
@@ -255,7 +255,7 @@
  * @return <code>TRUE</code> if shutdown is
  * successful. <code>FALSE</code> if shutdown failed.
  */
-VMEXPORT BOOLEAN port_shutdown_crash_handler();
+VMEXPORT Boolean port_shutdown_crash_handler();
 
 
 /**
@@ -284,7 +284,7 @@
 * @param [in] addr  - memory location to deinstrument.
 * @return <code>TRUE</code> if instrumented; FALSE otherwise.
 */
-VMEXPORT BOOLEAN port_is_breakpoint_set(void* addr);
+VMEXPORT Boolean port_is_breakpoint_set(void* addr);
 
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/port/include/port_modules.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/port_modules.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/port_modules.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/port_modules.h Sat May 31 05:23:11 2008
@@ -62,7 +62,7 @@
 * @param count_ptr - count of modules in the returned list
 * @return <code>TRUE</code> if OK; FALSE if error occured.
 */
-VMEXPORT BOOLEAN port_get_all_modules(native_module_t** list_ptr, int* count_ptr);
+VMEXPORT Boolean port_get_all_modules(native_module_t** list_ptr, int* count_ptr);
 
 /**
 * Dumps the list of modules loaded to the current process..

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/include/stack_dump.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/include/stack_dump.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/include/stack_dump.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/include/stack_dump.h Sat May 31 05:23:11 2008
@@ -59,14 +59,14 @@
 /* Returns 0  when execution should be continued with (updated) Registers
    Returns 1  when crash occured and process should invoke a debugger
    Returns -1 when crash occured and process should be terminated */
-int port_process_signal(port_sigtype signum, Registers *regs, void* fault_addr, BOOLEAN iscrash);
+int port_process_signal(port_sigtype signum, Registers *regs, void* fault_addr, Boolean iscrash);
 
 #ifdef WIN32
 void create_minidump(LPEXCEPTION_POINTERS exp);
 #endif
 
 
-BOOLEAN sd_is_handler_registered(port_sigtype signum);
+Boolean sd_is_handler_registered(port_sigtype signum);
 
 
 #ifdef __cplusplus

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/port_crash_handler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/port_crash_handler.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/port_crash_handler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/port_crash_handler.cpp Sat May 31 05:23:11 2008
@@ -50,7 +50,7 @@
 static port_unwind_compiled_frame g_unwind_callback = NULL;
 
 
-BOOLEAN port_init_crash_handler(
+Boolean port_init_crash_handler(
     port_signal_handler_registration *registrations,
     unsigned count,
     port_unwind_compiled_frame unwind_callback)
@@ -115,7 +115,7 @@
     return crash_output_flags;
 }
 
-BOOLEAN port_crash_handler_add_action(port_crash_handler_action action)
+Boolean port_crash_handler_add_action(port_crash_handler_action action)
 {
     crash_additional_actions *a =
         (crash_additional_actions*)STD_MALLOC(sizeof(crash_additional_actions));
@@ -128,7 +128,7 @@
     return TRUE;
 }
 
-BOOLEAN port_shutdown_crash_handler()
+Boolean port_shutdown_crash_handler()
 {
     if (shutdown_signals() != 0)
         return FALSE;
@@ -150,7 +150,7 @@
 /* Returns 0  when execution should be continued with (updated) Registers
    Returns 1  when crash occured and process should invoke a debugger
    Returns -1 when crash occured and process should be terminated */
-int port_process_signal(port_sigtype signum, Registers *regs, void* fault_addr, BOOLEAN iscrash)
+int port_process_signal(port_sigtype signum, Registers *regs, void* fault_addr, Boolean iscrash)
 {
     if (!iscrash)
     {
@@ -160,7 +160,7 @@
 
         if (signal_callbacks[signum] != NULL)
         {
-            BOOLEAN cres =
+            Boolean cres =
                 signal_callbacks[signum](signum, regs, fault_addr);
 
             if (cres) // signal was processed
@@ -188,7 +188,7 @@
     return -1;
 }
 
-BOOLEAN sd_is_handler_registered(port_sigtype signum)
+Boolean sd_is_handler_registered(port_sigtype signum)
 {
     return signal_callbacks[signum] != NULL;
 }

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/modules/linux/native_modules_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/modules/linux/native_modules_os.c?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/modules/linux/native_modules_os.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/modules/linux/native_modules_os.c Sat May 31 05:23:11 2008
@@ -36,8 +36,8 @@
 {
     void*               start;
     void*               end;
-    BOOLEAN             acc_r;
-    BOOLEAN             acc_x;
+    Boolean             acc_r;
+    Boolean             acc_x;
     char*               name;
     raw_module*         next;
 };
@@ -123,7 +123,7 @@
     return module;
 }
 
-BOOLEAN port_get_all_modules(native_module_t** list_ptr, int* count_ptr)
+Boolean port_get_all_modules(native_module_t** list_ptr, int* count_ptr)
 {
     char buf[PATH_MAX];
     pid_t pid;

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/modules/win/native_modules_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/modules/win/native_modules_os.c?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/modules/win/native_modules_os.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/modules/win/native_modules_os.c Sat May 31 05:23:11 2008
@@ -29,7 +29,7 @@
 
 static native_module_t* fill_module(MODULEENTRY32 src);
 
-BOOLEAN port_get_all_modules(native_module_t** list_ptr, int* count_ptr)
+Boolean port_get_all_modules(native_module_t** list_ptr, int* count_ptr)
 {
     HANDLE hModuleSnap = INVALID_HANDLE_VALUE; 
     MODULEENTRY32 module; 

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/signals/port_signals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/signals/port_signals.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/signals/port_signals.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/signals/port_signals.cpp Sat May 31 05:23:11 2008
@@ -59,7 +59,7 @@
     return port_write_memory(addr, 1, &prev);
 }
 
-BOOLEAN port_is_breakpoint_set(void* addr)
+Boolean port_is_breakpoint_set(void* addr)
 {
     unsigned char byte;
 

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_common.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_common.cpp Sat May 31 05:23:11 2008
@@ -78,7 +78,7 @@
                         void* fault_addr, size_t code, size_t flags)
 { // this exception handler is executed *after* VEH handler returned
     int result;
-    BOOLEAN iscrash = (DWORD)flags == EXCEPTION_NONCONTINUABLE;
+    Boolean iscrash = (DWORD)flags == EXCEPTION_NONCONTINUABLE;
 
     switch ((DWORD)code)
     {

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/thread/include/port_thread_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/thread/include/port_thread_internal.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/thread/include/port_thread_internal.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/thread/include/port_thread_internal.h Sat May 31 05:23:11 2008
@@ -77,7 +77,7 @@
     port_suspend_req_t req_type; /* request type for signal handler */
     osthread_t suspendee; /* The thread which is processed */
     sem_t yield_sem; /* Semaphore to inform signal sender */
-    BOOLEAN signal_set; /* Is SIGUSR2 handler set up */
+    Boolean signal_set; /* Is SIGUSR2 handler set up */
 #endif /* !WIN32 */
 
 } port_shared_data_t;
@@ -95,11 +95,11 @@
     size_t guard_stack_size;
     size_t mem_protect_size;
 
-    BOOLEAN guard_page_set;
-    BOOLEAN restore_guard_page;
+    Boolean guard_page_set;
+    Boolean restore_guard_page;
 
-    BOOLEAN foreign; /* The thread was attached */
-    //BOOLEAN temp; /* Is indicated by 0ed guard_page_addr instead */
+    Boolean foreign; /* The thread was attached */
+    //Boolean temp; /* Is indicated by 0ed guard_page_addr instead */
 
     /* vv Signal handling stuff vv */
 #ifndef WIN32 /* UNIX */
@@ -113,9 +113,9 @@
     int     crash_stage;
 
     /* Flag to indicate that debugger should be attached right in OS handler */
-    BOOLEAN debugger;
+    Boolean debugger;
     /* Flag to produce minidump/core on the second exception catch */
-    BOOLEAN   produce_core;
+    Boolean   produce_core;
 
 } port_tls_data_t;
 
@@ -154,8 +154,8 @@
 
 
 /* Is used in both threading and signals */
-int port_thread_attach_local(port_tls_data_t* tlsdata, BOOLEAN temp,
-                                BOOLEAN foreign, size_t stack_size);
+int port_thread_attach_local(port_tls_data_t* tlsdata, Boolean temp,
+                                Boolean foreign, size_t stack_size);
 /* Detaches temporarily attached thread */
 int port_thread_detach_temporary();
 

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/thread/linux/thread_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/thread/linux/thread_os.c?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/thread/linux/thread_os.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/thread/linux/thread_os.c Sat May 31 05:23:11 2008
@@ -203,7 +203,7 @@
     return res;
 }
 
-static int set_guard_page(port_tls_data_t* tlsdata, BOOLEAN set)
+static int set_guard_page(port_tls_data_t* tlsdata, Boolean set)
 {
     int res;
     stack_t sigalt;
@@ -357,7 +357,7 @@
     return 0;
 }
 
-static int init_stack(port_tls_data_t* tlsdata, size_t stack_size, BOOLEAN temp)
+static int init_stack(port_tls_data_t* tlsdata, size_t stack_size, Boolean temp)
 {
     int err;
     size_t stack_begin;
@@ -388,8 +388,8 @@
     return setup_stack(tlsdata);
 }
 
-int port_thread_attach_local(port_tls_data_t* tlsdata, BOOLEAN temp,
-                                    BOOLEAN foreign, size_t stack_size)
+int port_thread_attach_local(port_tls_data_t* tlsdata, Boolean temp,
+                                    Boolean foreign, size_t stack_size)
 {
     int res;
 

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/thread_os.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/thread_os.c?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/thread_os.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/thread_os.c Sat May 31 05:23:11 2008
@@ -125,7 +125,7 @@
     return res;
 }
 
-static int set_guard_page(port_tls_data_t* tlsdata, BOOLEAN set)
+static int set_guard_page(port_tls_data_t* tlsdata, Boolean set)
 {
     if (!tlsdata)
         tlsdata = get_private_tls_data();
@@ -257,7 +257,7 @@
     return 0;
 }
 
-static int init_stack(port_tls_data_t* tlsdata, size_t stack_size, BOOLEAN temp)
+static int init_stack(port_tls_data_t* tlsdata, size_t stack_size, Boolean temp)
 {
     int err;
     size_t stack_begin;
@@ -286,8 +286,8 @@
     return setup_stack(tlsdata);
 }
 
-int port_thread_attach_local(port_tls_data_t* tlsdata, BOOLEAN temp,
-                                    BOOLEAN foreign, size_t stack_size)
+int port_thread_attach_local(port_tls_data_t* tlsdata, Boolean temp,
+                                    Boolean foreign, size_t stack_size)
 {
     int res;
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/cci.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/cci.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/cci.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/cci.h Sat May 31 05:23:11 2008
@@ -44,8 +44,8 @@
     void set_id(int id) { _id = id; }
     int get_id() const { return _id; }
 
-    void set_relocatable(BOOLEAN r) { _relocatable = r; }
-    BOOLEAN get_relocatable() const { return _relocatable; }
+    void set_relocatable(Boolean r) { _relocatable = r; }
+    Boolean get_relocatable() const { return _relocatable; }
 
     void set_heat(unsigned heat) { _heat = heat; }
     unsigned get_heat() const { return _heat; }
@@ -59,7 +59,7 @@
     int get_jit_index() const;
 
     // Note: _data_blocks can only be used for inline info for now
-    BOOLEAN has_inline_info() const { return _data_blocks != NULL; }
+    Boolean has_inline_info() const { return _data_blocks != NULL; }
     void* get_inline_info() const { return &_data_blocks->bytes[0]; }
 
     unsigned get_num_target_exception_handlers() const;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h Sat May 31 05:23:11 2008
@@ -227,10 +227,10 @@
     TypeDesc* get_field_type_desc() { return _field_type_desc; }
     void set_field_type_desc(TypeDesc* td) { _field_type_desc = td; }
 
-    BOOLEAN is_injected() {return _is_injected;}
+    Boolean is_injected() {return _is_injected;}
     void set_injected() { _is_injected = 1; }
 
-    BOOLEAN is_magic_type()    {return  _is_magic_type;}
+    Boolean is_magic_type()    {return  _is_magic_type;}
     
     void set_track_access(bool value) {
         track_access = value ? 1 : 0 ;
@@ -616,7 +616,7 @@
     bool is_clinit()        {return _flags.is_clinit?true:false;}
     bool is_finalize()      {return _flags.is_finalize?true:false;}
     bool is_overridden()    {return _flags.is_overridden?true:false;}
-    BOOLEAN  is_nop()       {return _flags.is_nop;}
+    Boolean  is_nop()       {return _flags.is_nop;}
 
     unsigned get_index()    {return _index;}
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h Sat May 31 05:23:11 2008
@@ -132,19 +132,19 @@
         return (void *)_get_address_of_this(this, method, context);
     }
     
-    BOOLEAN
+    Boolean
         is_soe_area(Method_Handle            method,
         const JitFrameContext* context
         )
     {
         if (_is_soe_area != 0) {
-            return (BOOLEAN)_is_soe_area(this, method, context);
+            return (Boolean)_is_soe_area(this, method, context);
         }
         return 0;
         
     }
 
-    BOOLEAN
+    Boolean
     recompiled_method_callback(Method_Handle  recompiled_method,
                                void          *callback_data)
     {
@@ -154,7 +154,7 @@
         return FALSE;
     }
 
-    BOOLEAN 
+    Boolean 
     supports_compressed_references()
     {
         if (_supports_compressed_references != NULL) {
@@ -272,18 +272,18 @@
                             const JitFrameContext* context
                             );
 
-    BOOLEAN
+    Boolean
         (*_is_soe_area)(JIT_Handle              jit,
         Method_Handle                           method,
         const JitFrameContext*                  context
         );
 
-    BOOLEAN
+    Boolean
     (*_recompiled_method_callback)(JIT_Handle jit,
                                    Method_Handle  recompiled_method, 
                                    void          *callback_data);
 
-    BOOLEAN 
+    Boolean 
     (*_supports_compressed_references)(JIT_Handle jit);
 
     void

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h Sat May 31 05:23:11 2008
@@ -53,8 +53,8 @@
 void vm_enqueue_references();
 void vm_ref_enqueue_func(void);   // added for NATIVE REFERENCE ENQUEUE THREAD
 
-BOOLEAN get_native_finalizer_thread_flag(); // added for NATIVE FINALIZER THREAD
-BOOLEAN get_native_ref_enqueue_thread_flag(); // added for NATIVE REF ENQUEUE THREAD
+Boolean get_native_finalizer_thread_flag(); // added for NATIVE FINALIZER THREAD
+Boolean get_native_ref_enqueue_thread_flag(); // added for NATIVE REF ENQUEUE THREAD
 void wait_native_fin_threads_detached(void); // added for NATIVE FINALIZER THREAD
 void wait_native_ref_thread_detached(void); // added for NATIVE REF ENQUEUE THREAD
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalizer_thread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalizer_thread.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalizer_thread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalizer_thread.h Sat May 31 05:23:11 2008
@@ -58,18 +58,18 @@
     vm_thread_t *thread_ids;
     volatile unsigned int thread_num;
     
-    volatile BOOLEAN shutdown;
-    volatile BOOLEAN on_exit;
+    volatile Boolean shutdown;
+    volatile Boolean on_exit;
     volatile unsigned int working_thread_num;
     volatile unsigned int end_waiting_num;      // thread num waiting for finalization end
 }Fin_Thread_Info;
 
 
-extern BOOLEAN get_finalizer_shutdown_flag();
-extern BOOLEAN get_finalizer_on_exit_flag();
+extern Boolean get_finalizer_shutdown_flag();
+extern Boolean get_finalizer_on_exit_flag();
 extern void finalizer_threads_init(JavaVM *java_vm, JNIEnv* jni_env);
-extern void finalizer_shutdown(BOOLEAN start_finalization_on_exit);
-extern void activate_finalizer_threads(BOOLEAN wait);
+extern void finalizer_shutdown(Boolean start_finalization_on_exit);
+extern void activate_finalizer_threads(Boolean wait);
 
 inline void native_sync_run_finalization(void)
 { activate_finalizer_threads(TRUE); };

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h Sat May 31 05:23:11 2008
@@ -44,7 +44,7 @@
 // The callback that corresponds to vm_register_jit_recompiled_method_callback.  
 // The JIT should return TRUE if any code was modified (consequently the VM will ensure 
 // correctness such as synchronizing I- and D-caches), and FALSE otherwise.
-JITEXPORT BOOLEAN 
+JITEXPORT Boolean 
 JIT_recompiled_method_callback(JIT_Handle jit,
                                Method_Handle  recompiled_method,
                                void          *callback_data); 
@@ -146,7 +146,7 @@
 // Returns TRUE if the JIT will compress references within objects and vector elements by representing 
 // them as offsets rather than raw pointers. The JIT should call the VM function vm_is_heap_compressed()
 // during initialization in order to decide whether it should compress references.
-JITEXPORT BOOLEAN 
+JITEXPORT Boolean 
 JIT_supports_compressed_references(JIT_Handle jit);
 
 // end compressed references

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h Sat May 31 05:23:11 2008
@@ -176,7 +176,7 @@
     // - context  -- The register context.
     //
 
-    virtual BOOLEAN
+    virtual Boolean
         is_soe_area(Method_Handle            method,  // in
         const JitFrameContext   *context              // in
         ) = 0;
@@ -188,14 +188,14 @@
                         void * UNREF addr1,
                         void * UNREF addr2){ };
 
-    virtual BOOLEAN
+    virtual Boolean
     recompiled_method_callback(Method_Handle   UNREF recompiled_method,
                                void          * UNREF callback_data) { return FALSE; };
 
     // Returns TRUE if the JIT will compress references within objects and vector elements by representing 
     // them as offsets rather than raw pointers. The JIT should call the VM function vm_is_heap_compressed()
     // during initialization in order to decide whether it should compress references.
-    virtual BOOLEAN 
+    virtual Boolean 
     supports_compressed_references() = 0;
 
     /**

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=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h Sat May 31 05:23:11 2008
@@ -103,7 +103,7 @@
 extern ObjectHandle gh_aofloat;     //[F
 extern ObjectHandle gh_aodouble;    //[D
 
-extern ObjectHandle gh_jlboolean;   //java.lang.BOOLEAN
+extern ObjectHandle gh_jlboolean;   //java.lang.Boolean
 extern ObjectHandle gh_jlbyte;      //java.lang.Byte
 extern ObjectHandle gh_jlchar;      //java.lang.Character
 extern ObjectHandle gh_jlshort;     //java.lang.Short
@@ -112,7 +112,7 @@
 extern ObjectHandle gh_jlfloat;     //java.lang.Float
 extern ObjectHandle gh_jldouble;    //java.lang.Double
 
-extern jfieldID gid_boolean_value;  //java.lang.BOOLEAN's field: value;
+extern jfieldID gid_boolean_value;  //java.lang.Boolean's field: value;
 extern jfieldID gid_byte_value;     //java.lang.Byte's field: value;
 extern jfieldID gid_char_value;     //java.lang.Character's field: value;
 extern jfieldID gid_short_value;    //java.lang.Short's field: value;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h Sat May 31 05:23:11 2008
@@ -418,10 +418,10 @@
 jvmtiError JNICALL jvmtiGetNCAIEnvironment(jvmtiEnv* jvmti_env, ...);
 
 // Object check functions
-BOOLEAN is_valid_throwable_object(jthread thread);
-BOOLEAN is_valid_thread_object(jthread thread);
-BOOLEAN is_valid_thread_group_object(jthreadGroup group);
-BOOLEAN is_valid_class_object(jclass klass);
+Boolean is_valid_throwable_object(jthread thread);
+Boolean is_valid_thread_object(jthread thread);
+Boolean is_valid_thread_group_object(jthreadGroup group);
+Boolean is_valid_class_object(jclass klass);
 
 // JIT support
 jvmtiError jvmti_translate_jit_error(OpenExeJpdaError error);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/ref_enqueue_thread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/ref_enqueue_thread.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/ref_enqueue_thread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/ref_enqueue_thread.h Sat May 31 05:23:11 2008
@@ -40,7 +40,7 @@
     hycond_t end_cond;      // ref enqueue end condition variable
     osmutex_t end_mutex;    // ref enqueue end mutex
     
-    BOOLEAN shutdown;
+    Boolean shutdown;
     volatile unsigned int thread_num;
     volatile unsigned int end_waiting_num;  // thread num waiting for finalization end
 }Ref_Enqueue_Thread_Info;
@@ -48,7 +48,7 @@
 
 extern void ref_enqueue_thread_init(JavaVM *java_vm, JNIEnv* jni_env);
 extern void ref_enqueue_shutdown(void);
-extern void activate_ref_enqueue_thread(BOOLEAN wait);
+extern void activate_ref_enqueue_thread(Boolean wait);
 
 inline void native_sync_enqueue_references(void)
 { activate_ref_enqueue_thread(TRUE); };

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/signals.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/signals.h?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/signals.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/signals.h Sat May 31 05:23:11 2008
@@ -31,14 +31,14 @@
 int vm_initialize_signals();
 int vm_shutdown_signals();
 
-BOOLEAN null_reference_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN stack_overflow_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN abort_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN ctrl_backslash_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN ctrl_break_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN ctrl_c_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN native_breakpoint_handler(port_sigtype signum, Registers* regs, void* fault_addr);
-BOOLEAN arithmetic_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean null_reference_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean stack_overflow_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean abort_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean ctrl_backslash_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean ctrl_break_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean ctrl_c_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean native_breakpoint_handler(port_sigtype signum, Registers* regs, void* fault_addr);
+Boolean arithmetic_handler(port_sigtype signum, Registers* regs, void* fault_addr);
 
 
 inline bool is_in_ti_handler(vm_thread_t vmthread, void* ip)

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=662020&r1=662019&r2=662020&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 Sat May 31 05:23:11 2008
@@ -545,7 +545,7 @@
     return ch->get_number_of_inner_classes();
 }
 
-BOOLEAN class_is_inner_class_public(Class_Handle ch, unsigned idx)
+Boolean class_is_inner_class_public(Class_Handle ch, unsigned idx)
 {
     assert(ch);
     return (ch->get_inner_class_access_flags(idx) & ACC_PUBLIC) != 0;
@@ -967,7 +967,7 @@
                                     void         *end_ip,
                                     void         *handler_ip,
                                     Class_Handle  catch_cl,
-                                    BOOLEAN       exc_obj_is_dead)
+                                    Boolean       exc_obj_is_dead)
 {
     assert(m);
     ((Method *)m)->set_target_exception_handler_info((JIT *)j,
@@ -1085,7 +1085,7 @@
     //return VM_VECTOR_FIRST_ELEM_OFFSET_REF;
 }
 
-BOOLEAN method_is_java(Method_Handle mh)
+Boolean method_is_java(Method_Handle mh)
 {
     assert(mh);
     return TRUE;
@@ -1386,7 +1386,7 @@
 } //field_is_magic
 
 
-BOOLEAN field_is_enumerable_reference(Field_Handle fh)
+Boolean field_is_enumerable_reference(Field_Handle fh)
 {
     assert((Field *)fh);
     return ((field_is_reference(fh) && !field_is_magic(fh)));
@@ -1891,7 +1891,7 @@
     {
         return default_value;
     }
-    BOOLEAN return_value = default_value;
+    Boolean return_value = default_value;
     if (0 == strcmp("no", value)
         || 0 == strcmp("off", value)
         || 0 == strcmp("false", value)

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp Sat May 31 05:23:11 2008
@@ -663,7 +663,7 @@
 {
     CodeChunkInfo *jit_info;
     for (jit_info = _jits;  jit_info;  jit_info = jit_info->_next) {
-        BOOLEAN result = VM_Global_State::loader_env->em_interface->UnregisterCodeChunk(
+        Boolean result = VM_Global_State::loader_env->em_interface->UnregisterCodeChunk(
             jit_info->get_code_block_addr());
         assert(TRUE == result);
         // ensure that jit_info was deleted

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp Sat May 31 05:23:11 2008
@@ -49,10 +49,10 @@
     /**
      * Get verifier enable status
      */
-    BOOLEAN is_forced = env->verify_all;
-    BOOLEAN is_strict = env->verify_strict;
-    BOOLEAN is_bootstrap = m_class_loader->IsBootstrap();
-    BOOLEAN is_enabled = env->verify;
+    Boolean is_forced = env->verify_all;
+    Boolean is_strict = env->verify_strict;
+    Boolean is_bootstrap = m_class_loader->IsBootstrap();
+    Boolean is_enabled = env->verify;
 
     /**
      * Verify class
@@ -108,7 +108,7 @@
         return true;
     }
     // get verifier enable status
-    BOOLEAN is_strict = env->verify_strict;
+    Boolean is_strict = env->verify_strict;
 
     // unlock a class before calling to verifier
     unlock();

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=662020&r1=662019&r2=662020&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 Sat May 31 05:23:11 2008
@@ -519,7 +519,7 @@
     TRACE2("enumeration", "enumerating classes");
     LMAutoUnlock aulock( &(ClassLoader::m_tableLock) );
     
-    BOOLEAN do_class_unloading = gc_supports_class_unloading();
+    Boolean do_class_unloading = gc_supports_class_unloading();
     for(unsigned int i = 0; i < m_nextEntry; i++) {
         //assert (m_table[i]->m_loader);
         if (m_table[i]->m_markBit) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp Sat May 31 05:23:11 2008
@@ -612,7 +612,7 @@
     Method_Change_Notification_Record *nr;
     for (nr = _notify_recompiled_records;  nr != NULL;  nr = nr->next) {
         JIT *jit_to_be_notified = nr->jit;
-        BOOLEAN code_was_modified = 
+        Boolean code_was_modified = 
             jit_to_be_notified->recompiled_method_callback(this, nr->callback_data);
         if (code_was_modified) {
 #ifdef _IPF_

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp?rev=662020&r1=662019&r2=662020&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp Sat May 31 05:23:11 2008
@@ -37,11 +37,11 @@
 static void default_gc_iterate_heap();
 static void default_gc_finalize_on_exit();
 static void default_gc_set_mutator_block_flag();
-static BOOLEAN default_gc_clear_mutator_block_flag();
+static Boolean default_gc_clear_mutator_block_flag();
 static int64 default_gc_max_memory();
 static void default_gc_wrapup();
-static BOOLEAN default_gc_requires_barriers();
-static BOOLEAN default_gc_supports_compressed_references();
+static Boolean default_gc_requires_barriers();
+static Boolean default_gc_supports_compressed_references();
 static void default_gc_heap_slot_write_ref(Managed_Object_Handle p_base_of_object_with_slot,
                                            Managed_Object_Handle *p_slot,
                                            Managed_Object_Handle value);
@@ -55,24 +55,24 @@
 static void default_gc_heap_wrote_object(Managed_Object_Handle p_base_of_object_just_written);
 static void default_gc_add_compressed_root_set_entry(U_32 *ref);
 static void default_gc_add_root_set_entry_managed_pointer(void **slot,
-                                                          BOOLEAN is_pinned);
+                                                          Boolean is_pinned);
 static void *default_gc_heap_base_address();
 static void *default_gc_heap_ceiling_address();
 static void default_gc_test_safepoint();
 /* $$$ GMJ static I_32 default_gc_get_hashcode(Managed_Object_Handle); */
 
-static BOOLEAN default_gc_supports_frontier_allocation(unsigned *offset_of_current, unsigned *offset_of_limit);
+static Boolean default_gc_supports_frontier_allocation(unsigned *offset_of_current, unsigned *offset_of_limit);
 static void default_gc_add_weak_root_set_entry(
-        Managed_Object_Handle*, BOOLEAN, BOOLEAN);
+        Managed_Object_Handle*, Boolean, Boolean);
 
-static BOOLEAN default_gc_supports_class_unloading();
+static Boolean default_gc_supports_class_unloading();
 
-BOOLEAN (*gc_supports_compressed_references)() = 0;
-void (*gc_add_root_set_entry)(Managed_Object_Handle *ref, BOOLEAN is_pinned) = 0;
-void (*gc_add_weak_root_set_entry)(Managed_Object_Handle *ref, BOOLEAN is_pinned,BOOLEAN is_short_weak) = 0;
-void (*gc_add_compressed_root_set_entry)(U_32 *ref, BOOLEAN is_pinned) = 0;
-void (*gc_add_root_set_entry_interior_pointer)(void **slot, int offset, BOOLEAN is_pinned) = 0;
-void (*gc_add_root_set_entry_managed_pointer)(void **slot, BOOLEAN is_pinned) = 0;
+Boolean (*gc_supports_compressed_references)() = 0;
+void (*gc_add_root_set_entry)(Managed_Object_Handle *ref, Boolean is_pinned) = 0;
+void (*gc_add_weak_root_set_entry)(Managed_Object_Handle *ref, Boolean is_pinned,Boolean is_short_weak) = 0;
+void (*gc_add_compressed_root_set_entry)(U_32 *ref, Boolean is_pinned) = 0;
+void (*gc_add_root_set_entry_interior_pointer)(void **slot, int offset, Boolean is_pinned) = 0;
+void (*gc_add_root_set_entry_managed_pointer)(void **slot, Boolean is_pinned) = 0;
 void (*gc_class_prepared)(Class_Handle ch, VTable_Handle vth) = 0;
 int64 (*gc_get_collection_count)() = 0;
 int64 (*gc_get_collection_time)() = 0;
@@ -93,7 +93,7 @@
                                  Managed_Object_Handle value) = 0;
 void (*gc_heap_wrote_object)(Managed_Object_Handle p_base_of_object_just_written) = 0;
 int (*gc_init)() = 0;
-BOOLEAN (*gc_is_object_pinned)(Managed_Object_Handle obj) = 0;
+Boolean (*gc_is_object_pinned)(Managed_Object_Handle obj) = 0;
 
 Managed_Object_Handle (*gc_alloc)(unsigned size, 
                                   Allocation_Handle p_vtable,
@@ -103,7 +103,7 @@
                                        void *thread_pointer) = 0;
 
 void (*gc_vm_initialized)() = 0;
-BOOLEAN (*gc_requires_barriers)() = default_gc_requires_barriers;
+Boolean (*gc_requires_barriers)() = default_gc_requires_barriers;
 void (*gc_thread_init)(void *gc_information) = 0;
 void (*gc_thread_kill)(void *gc_information) = 0;
 unsigned int (*gc_time_since_last_gc)()      = 0;
@@ -115,7 +115,7 @@
 
 void (*gc_wrapup)() = default_gc_wrapup;
 void (*gc_write_barrier)(Managed_Object_Handle p_base_of_obj_with_slot) = 0;
-BOOLEAN (*gc_supports_frontier_allocation)(unsigned *offset_of_current, unsigned *offset_of_limit) = 0;
+Boolean (*gc_supports_frontier_allocation)(unsigned *offset_of_current, unsigned *offset_of_limit) = 0;
 
 void (*gc_pin_object)(Managed_Object_Handle* p_object) = 0;
 void (*gc_unpin_object)(Managed_Object_Handle* p_object) = 0;
@@ -126,9 +126,9 @@
 
 void (*gc_finalize_on_exit)() = 0;
 void (*gc_set_mutator_block_flag)() = 0;
-BOOLEAN (*gc_clear_mutator_block_flag)() = 0;
+Boolean (*gc_clear_mutator_block_flag)() = 0;
 
-BOOLEAN (*gc_supports_class_unloading)() = 0;
+Boolean (*gc_supports_class_unloading)() = 0;
 
 static apr_dso_handle_sym_t getFunction(apr_dso_handle_t *handle, const char *name, const char *dllName)
 {
@@ -171,26 +171,26 @@
     }
 
 
-    gc_supports_compressed_references = (BOOLEAN (*)())
+    gc_supports_compressed_references = (Boolean (*)())
         getFunctionOptional(handle, 
                             "gc_supports_compressed_references", 
                             dllName,
                             (apr_dso_handle_sym_t)default_gc_supports_compressed_references); 
     
-    gc_add_root_set_entry = (void (*)(Managed_Object_Handle *ref, BOOLEAN is_pinned)) 
+    gc_add_root_set_entry = (void (*)(Managed_Object_Handle *ref, Boolean is_pinned)) 
         getFunction(handle, "gc_add_root_set_entry", dllName); 
 
-    gc_add_weak_root_set_entry = (void (*)(Managed_Object_Handle *, BOOLEAN, BOOLEAN)) 
+    gc_add_weak_root_set_entry = (void (*)(Managed_Object_Handle *, Boolean, Boolean)) 
         getFunctionOptional(handle, "gc_add_weak_root_set_entry", dllName,
                 (apr_dso_handle_sym_t) default_gc_add_weak_root_set_entry); 
 
-    gc_add_compressed_root_set_entry = (void (*)(U_32 *ref, BOOLEAN is_pinned)) 
+    gc_add_compressed_root_set_entry = (void (*)(U_32 *ref, Boolean is_pinned)) 
         getFunctionOptional(handle, 
                             "gc_add_compressed_root_set_entry", 
                             dllName,
                             (apr_dso_handle_sym_t)default_gc_add_compressed_root_set_entry); 
-    gc_add_root_set_entry_interior_pointer = (void (*)(void **slot, int offset, BOOLEAN is_pinned)) getFunction(handle, "gc_add_root_set_entry_interior_pointer", dllName);
-    gc_add_root_set_entry_managed_pointer = (void (*)(void **slot, BOOLEAN is_pinned))
+    gc_add_root_set_entry_interior_pointer = (void (*)(void **slot, int offset, Boolean is_pinned)) getFunction(handle, "gc_add_root_set_entry_interior_pointer", dllName);
+    gc_add_root_set_entry_managed_pointer = (void (*)(void **slot, Boolean is_pinned))
         getFunctionOptional(handle,
                             "gc_add_root_set_entry_managed_pointer",
                             dllName,
@@ -232,7 +232,7 @@
                             dllName,
                             (apr_dso_handle_sym_t)default_gc_heap_wrote_object);
     gc_init = (int (*)()) getFunction(handle, "gc_init", dllName);
-    gc_is_object_pinned = (BOOLEAN (*)(Managed_Object_Handle obj)) getFunction(handle, "gc_is_object_pinned", dllName);
+    gc_is_object_pinned = (Boolean (*)(Managed_Object_Handle obj)) getFunction(handle, "gc_is_object_pinned", dllName);
 
 
     gc_alloc = (Managed_Object_Handle (*)(unsigned size, 
@@ -273,7 +273,7 @@
         getFunctionOptional(handle, "gc_set_mutator_block_flag", dllName,
             (apr_dso_handle_sym_t)default_gc_set_mutator_block_flag);
 
-    gc_clear_mutator_block_flag = (BOOLEAN (*)())
+    gc_clear_mutator_block_flag = (Boolean (*)())
         getFunctionOptional(handle, "gc_clear_mutator_block_flag", dllName,
             (apr_dso_handle_sym_t)default_gc_clear_mutator_block_flag);
 
@@ -281,7 +281,7 @@
         getFunctionOptional(handle, "gc_get_hashcode", dllName, (apr_dso_handle_sym_t) default_gc_get_hashcode);
 
     gc_vm_initialized = (void (*)()) getFunction(handle, "gc_vm_initialized", dllName);
-    gc_requires_barriers = (BOOLEAN (*)()) 
+    gc_requires_barriers = (Boolean (*)()) 
         getFunctionOptional(handle, "gc_requires_barriers", dllName,
             (apr_dso_handle_sym_t)default_gc_requires_barriers);
     gc_thread_init = (void (*)(void *gc_information)) getFunction(handle, "gc_thread_init", dllName);
@@ -301,7 +301,7 @@
                             "gc_heap_ceiling_address", 
                             dllName, 
                             (apr_dso_handle_sym_t)default_gc_heap_ceiling_address);
-    gc_supports_frontier_allocation = (BOOLEAN (*)(unsigned *offset_of_current, unsigned *offset_of_limit)) 
+    gc_supports_frontier_allocation = (Boolean (*)(unsigned *offset_of_current, unsigned *offset_of_limit)) 
         getFunctionOptional(handle, 
                             "gc_supports_frontier_allocation", 
                             dllName, 
@@ -313,7 +313,7 @@
             (apr_dso_handle_sym_t)default_gc_write_barrier);
     gc_test_safepoint = (void (*)()) getFunctionOptional(handle, "gc_test_safepoint", dllName, (apr_dso_handle_sym_t)default_gc_test_safepoint);
 
-    gc_supports_class_unloading = (BOOLEAN (*)())
+    gc_supports_class_unloading = (Boolean (*)())
         getFunctionOptional(handle, 
                             "gc_supports_class_unloading", 
                             dllName,
@@ -347,7 +347,7 @@
     return result;
 } //vm_is_a_gc_dll
 
-static BOOLEAN default_gc_requires_barriers()
+static Boolean default_gc_requires_barriers()
 {
     return FALSE;
 } //default_gc_requires_barriers
@@ -358,7 +358,7 @@
 } //default_gc_wrapup
 
 
-static BOOLEAN default_gc_supports_compressed_references()
+static Boolean default_gc_supports_compressed_references()
 {
     return FALSE;
 } //default_gc_supports_compressed_references
@@ -438,7 +438,7 @@
 
 
 static void default_gc_add_root_set_entry_managed_pointer(void ** UNREF slot,
-                                                          BOOLEAN UNREF is_pinned)
+                                                          Boolean UNREF is_pinned)
 {
     LDIE(8,"Fatal GC error: managed pointers are not supported.");
 } //default_gc_add_root_set_entry_managed_pointer
@@ -451,7 +451,7 @@
 } //default_gc_heap_base_address
 
 
-static BOOLEAN default_gc_supports_frontier_allocation(unsigned * UNREF offset_of_current, unsigned * UNREF offset_of_limit)
+static Boolean default_gc_supports_frontier_allocation(unsigned * UNREF offset_of_current, unsigned * UNREF offset_of_limit)
 {
     return FALSE;
 }
@@ -524,7 +524,7 @@
 }
 
 
-static BOOLEAN default_gc_clear_mutator_block_flag()
+static Boolean default_gc_clear_mutator_block_flag()
 {
     WARN_ONCE(44, "The GC did not provide clear mutator block flag");
     return FALSE;
@@ -541,14 +541,14 @@
 }
 
 static void default_gc_add_weak_root_set_entry(
-        Managed_Object_Handle* root, BOOLEAN pinned, BOOLEAN is_short)
+        Managed_Object_Handle* root, Boolean pinned, Boolean is_short)
 {
     WARN_ONCE(9, "The GC did not provide {0}" << "gc_add_weak_root_set_entry()");
     // default to strong reference semantics
     gc_add_root_set_entry(root, pinned);
 }
 
-static BOOLEAN default_gc_supports_class_unloading()
+static Boolean default_gc_supports_class_unloading()
 {
     return TRUE;
 } //default_gc_supports_class_unloading