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/28 12:44:30 UTC
svn commit: r660898 [1/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/...
Author: mcfirst
Date: Wed May 28 03:44:26 2008
New Revision: 660898
URL: http://svn.apache.org/viewvc?rev=660898&view=rev
Log:
Unifying types with hycomp.h: replaced Boolean with BOOLEAN, returned TRUE/FALSE definition to DRLVM version of hycomp.h
Modified:
harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp
harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_block.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_properties.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_space.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/object_status.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/weak_roots.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_adapt.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_alloc.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_move_compact.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/gc_ms.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_alloc.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_compact.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_fallback_mark.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_mostly_concurrent.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_otf_concurrent.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_sweep_concurrent.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_alloc.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_forward.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector_alloc.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator_alloc.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_alloc.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/seq_list.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_pool.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_queue.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_stack.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/vector_block.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.h
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.h
harmony/enhanced/drlvm/trunk/vm/include/jni_types.h
harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h
harmony/enhanced/drlvm/trunk/vm/include/open/gc.h
harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
harmony/enhanced/drlvm/trunk/vm/include/open/platform_types.h
harmony/enhanced/drlvm/trunk/vm/include/open/rt_types.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm_ee.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm_gc.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm_method_access.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm_properties.h
harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h
harmony/enhanced/drlvm/trunk/vm/include/vm_java_support.h
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_exports.cpp
harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_stack_trace.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32IRManager.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Printer.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ipf/IpfInstCodeSelector.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/jet.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/rt.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/FastArrayFilling.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Inst.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/Opnd.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/abcd/classic_abcd.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/deadcodeeliminator.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/optimizer/memoryopt.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Type.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaByteCodeTranslator.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/translator/java/JavaLabelPrepass.h
harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/JITInterface.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/vm/VMInterface.cpp
harmony/enhanced/drlvm/trunk/vm/port/include/port_crash_handler.h
harmony/enhanced/drlvm/trunk/vm/port/include/port_modules.h
harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/include/stack_dump.h
harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/port_crash_handler.cpp
harmony/enhanced/drlvm/trunk/vm/port/src/modules/linux/native_modules_os.c
harmony/enhanced/drlvm/trunk/vm/port/src/modules/win/native_modules_os.c
harmony/enhanced/drlvm/trunk/vm/port/src/signals/port_signals.cpp
harmony/enhanced/drlvm/trunk/vm/port/src/signals/win/signals_common.cpp
harmony/enhanced/drlvm/trunk/vm/port/src/thread/include/port_thread_internal.h
harmony/enhanced/drlvm/trunk/vm/port/src/thread/linux/thread_os.c
harmony/enhanced/drlvm/trunk/vm/port/src/thread/win/thread_os.c
harmony/enhanced/drlvm/trunk/vm/vmcore/include/cci.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/class_member.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalizer_thread.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_export_rt.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_intf_cpp.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jni_utils.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/ref_enqueue_thread.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/signals.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Verifier_stub.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/root_set_enum_common.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dll_jit.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_internal.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_roots.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMClassRegistry.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/mon_enter_exit.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/include/stub_code_utils.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/signals.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.cpp Wed May 28 03:44:26 2008
@@ -884,13 +884,13 @@
method_lookup_table.add(method_handle, code_addr, size, data);
}
-Method_Handle DrlEMImpl::lookupCodeChunk(void *ip, Boolean is_ip_past,
+Method_Handle DrlEMImpl::lookupCodeChunk(void *ip, BOOLEAN is_ip_past,
void **code_addr, size_t *size, void **data)
{
return method_lookup_table.find(ip, is_ip_past, code_addr, size, data);
}
-Boolean DrlEMImpl::unregisterCodeChunk(void *addr)
+BOOLEAN DrlEMImpl::unregisterCodeChunk(void *addr)
{
return method_lookup_table.remove(addr);
}
Modified: harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h Wed May 28 03:44:26 2008
@@ -96,9 +96,9 @@
virtual JIT_Result compileMethod(Method_Handle method_handle);
virtual void registerCodeChunk(Method_Handle method_handle, void *code_addr,
size_t size, void *data);
- virtual Method_Handle lookupCodeChunk(void *addr, Boolean is_ip_past,
+ virtual Method_Handle lookupCodeChunk(void *addr, BOOLEAN is_ip_past,
void **code_addr, size_t *size, void **data);
- virtual Boolean unregisterCodeChunk(void *addr);
+ virtual BOOLEAN unregisterCodeChunk(void *addr);
virtual unsigned int getNumProfilerThreads() const { return tbsClients.empty() ? 0 : 1;}
virtual void classloaderUnloadingCallback(Class_Loader_Handle class_handle);
Modified: harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp Wed May 28 03:44:26 2008
@@ -52,14 +52,14 @@
size, data);
}
-static Method_Handle LookupCodeChunk(void *addr, Boolean is_ip_past, void **code_addr,
+static Method_Handle LookupCodeChunk(void *addr, BOOLEAN is_ip_past, void **code_addr,
size_t *size, void **data)
{
return DrlEMFactory::getEMInstance()->lookupCodeChunk(addr, is_ip_past,
code_addr, size, data);
}
-static Boolean UnregisterCodeChunk(void *addr)
+static BOOLEAN UnregisterCodeChunk(void *addr)
{
return DrlEMFactory::getEMInstance()->unregisterCodeChunk(addr);
}
Modified: harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.cpp Wed May 28 03:44:26 2008
@@ -103,7 +103,7 @@
#define USE_METHOD_LOOKUP_CACHE
-Boolean Method_Lookup_Table::remove(void *addr)
+BOOLEAN Method_Lookup_Table::remove(void *addr)
{
if (addr == NULL) {
return FALSE;
@@ -207,7 +207,7 @@
-Method_Code *Method_Lookup_Table::find(void *addr, Boolean is_ip_past)
+Method_Code *Method_Lookup_Table::find(void *addr, BOOLEAN is_ip_past)
{
if (addr == NULL) {
return NULL;
@@ -458,7 +458,7 @@
add(mc);
}
-Method_Handle Method_Lookup_Table::find(void *ip, Boolean is_ip_past,
+Method_Handle Method_Lookup_Table::find(void *ip, BOOLEAN is_ip_past,
void **code_addr, size_t *size, void **data)
{
Method_Code *mc = find(ip, is_ip_past);
Modified: harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/method_lookup.h Wed May 28 03:44:26 2008
@@ -50,13 +50,13 @@
void add(Method_Handle method_handle, void *code_addr,
size_t size, void *data);
- Method_Handle find(void *ip, Boolean is_ip_past, void **code_addr, size_t *size,
+ Method_Handle find(void *ip, BOOLEAN is_ip_past, void **code_addr, size_t *size,
void **data);
- Boolean remove(void *code_addr);
+ BOOLEAN remove(void *code_addr);
private:
void add(Method_Code *m);
- Method_Code *find(void *addr, Boolean is_ip_past);
+ Method_Code *find(void *addr, BOOLEAN is_ip_past);
unsigned size() { return _next_free_entry; }
Method_Code *get(unsigned i);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.cpp Wed May 28 03:44:26 2008
@@ -39,7 +39,7 @@
return;
}
-Boolean gc_sched_collection(GC* gc, unsigned int gc_cause)
+BOOLEAN gc_sched_collection(GC* gc, unsigned int gc_cause)
{
/*collection scheduler only schedules concurrent collection now.*/
if(GC_CAUSE_CONCURRENT_GC == gc_cause){
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/collection_scheduler.h Wed May 28 03:44:26 2008
@@ -27,7 +27,7 @@
void collection_scheduler_destruct(GC* gc);
void gc_update_collection_scheduler(GC* gc, int64 time_mutator, int64 time_collection);
-Boolean gc_sched_collection(GC* gc, unsigned int gc_cause);
+BOOLEAN gc_sched_collection(GC* gc, unsigned int gc_cause);
#endif
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.cpp Wed May 28 03:44:26 2008
@@ -47,10 +47,10 @@
void gc_enable_space_scheduler()
{ cc_scheduler_kind |= SPACE_BASED_SCHEDULER; }
-Boolean gc_use_time_scheduler()
+BOOLEAN gc_use_time_scheduler()
{ return cc_scheduler_kind & TIME_BASED_SCHEDULER; }
-Boolean gc_use_space_scheduler()
+BOOLEAN gc_use_space_scheduler()
{ return cc_scheduler_kind & SPACE_BASED_SCHEDULER; }
static int64 time_delay_to_start_mark = MAX_DELAY_TIME;
@@ -93,7 +93,7 @@
gc_enable_time_scheduler();
}
-static Boolean time_to_start_mark(GC* gc)
+static BOOLEAN time_to_start_mark(GC* gc)
{
if(!gc_use_time_scheduler()) return FALSE;
@@ -101,7 +101,7 @@
return (time_current - get_collection_end_time()) > time_delay_to_start_mark;
}
-static Boolean space_to_start_mark(GC* gc)
+static BOOLEAN space_to_start_mark(GC* gc)
{
if(!gc_use_space_scheduler()) return FALSE;
@@ -109,7 +109,7 @@
return (size_new_obj > space_threshold_to_start_mark);
}
-static Boolean gc_need_start_con_mark(GC* gc)
+static BOOLEAN gc_need_start_con_mark(GC* gc)
{
if(!gc_is_specify_con_mark() || gc_mark_is_concurrent()) return FALSE;
@@ -119,7 +119,7 @@
return FALSE;
}
-static Boolean gc_need_start_con_sweep(GC* gc)
+static BOOLEAN gc_need_start_con_sweep(GC* gc)
{
if(!gc_is_specify_con_sweep() || gc_sweep_is_concurrent()) return FALSE;
@@ -130,7 +130,7 @@
return FALSE;
}
-static Boolean gc_need_reset_after_con_collect(GC* gc)
+static BOOLEAN gc_need_reset_after_con_collect(GC* gc)
{
if(gc_sweep_is_concurrent() && !gc_con_is_in_sweeping(gc))
return TRUE;
@@ -138,7 +138,7 @@
return FALSE;
}
-static Boolean gc_need_start_con_enum(GC* gc)
+static BOOLEAN gc_need_start_con_enum(GC* gc)
{
/*TODO: support on-the-fly root set enumeration.*/
return FALSE;
@@ -285,7 +285,7 @@
return;
}
-Boolean gc_sched_con_collection(GC* gc, unsigned int gc_cause)
+BOOLEAN gc_sched_con_collection(GC* gc, unsigned int gc_cause)
{
if(!try_lock(gc->lock_collect_sched)) return FALSE;
vm_gc_lock_enum();
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/concurrent_collection_scheduler.h Wed May 28 03:44:26 2008
@@ -46,7 +46,7 @@
void con_collection_scheduler_initialize(GC* gc);
void con_collection_scheduler_destruct(GC* gc);
-Boolean gc_sched_con_collection(GC* gc, unsigned int gc_cause);
+BOOLEAN gc_sched_con_collection(GC* gc, unsigned int gc_cause);
void gc_update_con_collection_scheduler(GC* gc, int64 time_mutator, int64 time_collection);
void gc_decide_cc_scheduler_kind(char* cc_scheduler);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_block.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_block.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_block.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_block.cpp Wed May 28 03:44:26 2008
@@ -82,7 +82,7 @@
POINTER_SIZE_INT decommit_size = (POINTER_SIZE_INT)old_end - (POINTER_SIZE_INT)decommit_base;
assert(decommit_size && !(decommit_size%GC_BLOCK_SIZE_BYTES));
- Boolean result = vm_decommit_mem(decommit_base, decommit_size);
+ BOOLEAN result = vm_decommit_mem(decommit_base, decommit_size);
assert(result == TRUE);
space->heap_end = decommit_base;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp Wed May 28 03:44:26 2008
@@ -36,7 +36,7 @@
unsigned int Cur_Forward_Bit = 0x2;
unsigned int SPACE_ALLOC_UNIT;
-Boolean IGNORE_FORCE_GC = FALSE;
+BOOLEAN IGNORE_FORCE_GC = FALSE;
void gc_assign_free_area_to_mutators(GC* gc)
{
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.h Wed May 28 03:44:26 2008
@@ -165,10 +165,10 @@
/****************************************/
-inline Boolean obj_is_marked_in_vt(Partial_Reveal_Object *obj)
+inline BOOLEAN obj_is_marked_in_vt(Partial_Reveal_Object *obj)
{ return (((VT_SIZE_INT)obj_get_vt_raw(obj) & CONST_MARK_BIT) != 0); }
-inline Boolean obj_mark_in_vt(Partial_Reveal_Object *obj)
+inline BOOLEAN obj_mark_in_vt(Partial_Reveal_Object *obj)
{
VT vt = obj_get_vt_raw(obj);
if((VT_SIZE_INT)vt & CONST_MARK_BIT) return FALSE;
@@ -187,7 +187,7 @@
obj_set_vt(p_obj,(VT)((VT_SIZE_INT)vt & DUAL_MARKBITS_MASK));
}
-inline Boolean obj_is_marked_or_fw_in_oi(Partial_Reveal_Object *obj)
+inline BOOLEAN obj_is_marked_or_fw_in_oi(Partial_Reveal_Object *obj)
{ return ((get_obj_info_raw(obj) & DUAL_MARKBITS) != 0); }
@@ -206,8 +206,8 @@
return (Partial_Reveal_Object*)(ref_to_obj_ptr((REF)(get_obj_info_raw(obj) & ~CONST_FORWARD_BIT)));
}
-inline Boolean obj_is_fw_in_oi(Partial_Reveal_Object *obj)
-{ return (Boolean)(get_obj_info_raw(obj) & CONST_FORWARD_BIT); }
+inline BOOLEAN obj_is_fw_in_oi(Partial_Reveal_Object *obj)
+{ return (BOOLEAN)(get_obj_info_raw(obj) & CONST_FORWARD_BIT); }
inline void obj_set_fw_in_oi(Partial_Reveal_Object *obj,void *dest)
{
@@ -217,10 +217,10 @@
}
-inline Boolean obj_is_marked_in_oi(Partial_Reveal_Object *obj)
+inline BOOLEAN obj_is_marked_in_oi(Partial_Reveal_Object *obj)
{ return ((get_obj_info_raw(obj) & CONST_MARK_BIT) != 0); }
-FORCE_INLINE Boolean obj_mark_in_oi(Partial_Reveal_Object *obj)
+FORCE_INLINE BOOLEAN obj_mark_in_oi(Partial_Reveal_Object *obj)
{
Obj_Info_Type info = get_obj_info_raw(obj);
if ( info & CONST_MARK_BIT ) return FALSE;
@@ -251,7 +251,7 @@
return (Partial_Reveal_Object*) ( ref_to_obj_ptr( (REF)get_obj_info(obj) ) );
}
-inline Boolean obj_is_fw_in_oi(Partial_Reveal_Object *obj)
+inline BOOLEAN obj_is_fw_in_oi(Partial_Reveal_Object *obj)
{ return ((get_obj_info_raw(obj) & FLIP_FORWARD_BIT) != 0); }
inline void obj_set_fw_in_oi(Partial_Reveal_Object *obj, void *dest)
@@ -268,7 +268,7 @@
set_obj_info(obj, dst | FLIP_FORWARD_BIT);
}
-inline Boolean obj_mark_in_oi(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_mark_in_oi(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type info = get_obj_info_raw(p_obj);
assert((info & DUAL_MARKBITS ) != DUAL_MARKBITS);
@@ -280,7 +280,7 @@
return TRUE;
}
-inline Boolean obj_unmark_in_oi(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_unmark_in_oi(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type info = get_obj_info_raw(p_obj);
info = info & ~FLIP_MARK_BIT;
@@ -288,7 +288,7 @@
return TRUE;
}
-inline Boolean obj_is_marked_in_oi(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_is_marked_in_oi(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type info = get_obj_info_raw(p_obj);
return ((info & FLIP_MARK_BIT) != 0);
@@ -297,13 +297,13 @@
#endif /* MARK_BIT_FLIPPING */
/********************* for concurrent GC *******************************/
-inline Boolean obj_is_dirty_in_oi(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_is_dirty_in_oi(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type info = get_obj_info_raw(p_obj);
return ((info & OBJ_DIRTY_BIT) != 0);
}
-inline Boolean obj_dirty_in_oi(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_dirty_in_oi(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type info = get_obj_info_raw(p_obj);
if( info & OBJ_DIRTY_BIT ) return FALSE;
@@ -317,8 +317,8 @@
return TRUE;
}
-extern volatile Boolean obj_alloced_live;
-inline Boolean is_obj_alloced_live()
+extern volatile BOOLEAN obj_alloced_live;
+inline BOOLEAN is_obj_alloced_live()
{ return obj_alloced_live; }
inline void gc_enable_alloc_obj_live()
@@ -333,9 +333,9 @@
/***************************************************************/
-inline Boolean obj_is_survivor(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_is_survivor(Partial_Reveal_Object* p_obj)
{
- return (Boolean)(get_obj_info_raw(p_obj) & OBJ_AGE_BIT);
+ return (BOOLEAN)(get_obj_info_raw(p_obj) & OBJ_AGE_BIT);
}
inline void obj_set_age_bit(Partial_Reveal_Object* p_obj)
@@ -352,9 +352,9 @@
/***************************************************************/
-inline Boolean obj_is_remembered(Partial_Reveal_Object* p_obj)
+inline BOOLEAN obj_is_remembered(Partial_Reveal_Object* p_obj)
{
- return (Boolean)(get_obj_info_raw(p_obj) & OBJ_REM_BIT);
+ return (BOOLEAN)(get_obj_info_raw(p_obj) & OBJ_REM_BIT);
}
inline void obj_set_rem_bit(Partial_Reveal_Object* p_obj)
@@ -388,7 +388,7 @@
POINTER_SIZE_INT reserved_heap_size;
POINTER_SIZE_INT committed_heap_size;
unsigned int num_collections;
- Boolean in_collection;
+ BOOLEAN in_collection;
int64 time_collections;
float survive_ratio;
@@ -413,9 +413,9 @@
unsigned int collect_kind; /* MAJOR or MINOR */
unsigned int last_collect_kind;
unsigned int cause;/*GC_CAUSE_LOS_IS_FULL, GC_CAUSE_NOS_IS_FULL, or GC_CAUSE_RUNTIME_FORCE_GC*/
- Boolean collect_result; /* succeed or fail */
+ BOOLEAN collect_result; /* succeed or fail */
- Boolean generate_barrier;
+ BOOLEAN generate_barrier;
/* FIXME:: this is wrong! root_set belongs to mutator */
Vector_Block* root_set;
@@ -440,9 +440,9 @@
}GC;
-inline Boolean collect_last_is_minor(GC* gc)
+inline BOOLEAN collect_last_is_minor(GC* gc)
{
- return (Boolean)((gc->last_collect_kind & ALGO_MAJOR) == 0);
+ return (BOOLEAN)((gc->last_collect_kind & ALGO_MAJOR) == 0);
}
/* ============================================================================ */
@@ -456,12 +456,12 @@
inline void* gc_heap_base(GC* gc){ return gc->heap_start; }
inline void* gc_heap_ceiling(GC* gc){ return gc->heap_end; }
-inline Boolean address_belongs_to_gc_heap(void* addr, GC* gc)
+inline BOOLEAN address_belongs_to_gc_heap(void* addr, GC* gc)
{
return (addr >= gc_heap_base(gc) && addr < gc_heap_ceiling(gc));
}
-Boolean obj_belongs_to_gc_heap(Partial_Reveal_Object* p_obj);
+BOOLEAN obj_belongs_to_gc_heap(Partial_Reveal_Object* p_obj);
inline void gc_reset_collector_state(GC* gc){ gc->num_active_collectors = 0;}
@@ -477,7 +477,7 @@
/* generational GC related */
-extern Boolean NOS_PARTIAL_FORWARD;
+extern BOOLEAN NOS_PARTIAL_FORWARD;
//#define STATIC_NOS_MAPPING
#ifdef STATIC_NOS_MAPPING
@@ -490,8 +490,8 @@
#else /* STATIC_NOS_MAPPING */
extern void* nos_boundary;
- extern Boolean share_los_boundary;
- extern Boolean LOS_ADJUST_BOUNDARY;
+ extern BOOLEAN share_los_boundary;
+ extern BOOLEAN LOS_ADJUST_BOUNDARY;
#endif /* STATIC_NOS_MAPPING */
void gc_init_collector_alloc(GC* gc, Collector* collector);
@@ -499,10 +499,10 @@
void gc_destruct_collector_alloc(GC* gc, Collector* collector);
void gc_decide_collection_kind(GC* gc, unsigned int cause);
-FORCE_INLINE Boolean addr_belongs_to_nos(void* addr)
+FORCE_INLINE BOOLEAN addr_belongs_to_nos(void* addr)
{ return addr >= nos_boundary; }
-FORCE_INLINE Boolean obj_belongs_to_nos(Partial_Reveal_Object* p_obj)
+FORCE_INLINE BOOLEAN obj_belongs_to_nos(Partial_Reveal_Object* p_obj)
{ return addr_belongs_to_nos(p_obj); }
extern void* los_boundary;
@@ -510,10 +510,10 @@
/*This flag indicate whether lspace is using a sliding compaction
*Fixme: check if the performance is a problem with this global flag.
*/
-extern Boolean* p_global_lspace_move_obj;
-inline Boolean obj_is_moved(Partial_Reveal_Object* p_obj)
+extern BOOLEAN* p_global_lspace_move_obj;
+inline BOOLEAN obj_is_moved(Partial_Reveal_Object* p_obj)
{ return ((p_obj >= los_boundary) || (*p_global_lspace_move_obj)); }
-extern Boolean TRACE_JLC_VIA_VTABLE;
+extern BOOLEAN TRACE_JLC_VIA_VTABLE;
#endif //_GC_COMMON_H_
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.cpp Wed May 28 03:44:26 2008
@@ -27,12 +27,12 @@
#include "gc_concurrent.h"
#include "../common/gc_for_barrier.h"
-volatile Boolean concurrent_in_marking = FALSE;
-volatile Boolean concurrent_in_sweeping = FALSE;
-volatile Boolean mark_is_concurrent = FALSE;
-volatile Boolean sweep_is_concurrent = FALSE;
+volatile BOOLEAN concurrent_in_marking = FALSE;
+volatile BOOLEAN concurrent_in_sweeping = FALSE;
+volatile BOOLEAN mark_is_concurrent = FALSE;
+volatile BOOLEAN sweep_is_concurrent = FALSE;
-volatile Boolean gc_sweep_global_normal_chunk = FALSE;
+volatile BOOLEAN gc_sweep_global_normal_chunk = FALSE;
static void gc_check_con_mark(GC* gc)
{
@@ -99,7 +99,7 @@
void mostly_con_mark_terminate_reset();
void terminate_mostly_con_mark();
-void gc_finish_con_mark(GC* gc, Boolean need_STW)
+void gc_finish_con_mark(GC* gc, BOOLEAN need_STW)
{
gc_check_con_mark(gc);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_concurrent.h Wed May 28 03:44:26 2008
@@ -46,24 +46,24 @@
inline void gc_specify_con_sweep()
{ gc_set_con_gc(ALGO_CON_SWEEP); }
-inline Boolean gc_is_specify_con_gc()
+inline BOOLEAN gc_is_specify_con_gc()
{ return (GC_PROP & ALGO_CON) != 0; }
-inline Boolean gc_is_specify_con_enum()
+inline BOOLEAN gc_is_specify_con_enum()
{ return (GC_PROP & ALGO_CON_ENUM) == ALGO_CON_ENUM; }
-inline Boolean gc_is_specify_con_mark()
+inline BOOLEAN gc_is_specify_con_mark()
{ return (GC_PROP & ALGO_CON_MARK) == ALGO_CON_MARK; }
-inline Boolean gc_is_specify_con_sweep()
+inline BOOLEAN gc_is_specify_con_sweep()
{ return (GC_PROP & ALGO_CON_SWEEP) == ALGO_CON_SWEEP; }
-extern volatile Boolean concurrent_in_marking;
-extern volatile Boolean concurrent_in_sweeping;
-extern volatile Boolean mark_is_concurrent;
-extern volatile Boolean sweep_is_concurrent;
+extern volatile BOOLEAN concurrent_in_marking;
+extern volatile BOOLEAN concurrent_in_sweeping;
+extern volatile BOOLEAN mark_is_concurrent;
+extern volatile BOOLEAN sweep_is_concurrent;
-inline Boolean gc_mark_is_concurrent()
+inline BOOLEAN gc_mark_is_concurrent()
{
return mark_is_concurrent;
}
@@ -81,17 +81,17 @@
mark_is_concurrent = FALSE;
}
-inline Boolean gc_con_is_in_marking()
+inline BOOLEAN gc_con_is_in_marking()
{
return concurrent_in_marking;
}
-inline Boolean gc_con_is_in_marking(GC* gc)
+inline BOOLEAN gc_con_is_in_marking(GC* gc)
{
return gc->gc_concurrent_status == GC_CON_MARK_PHASE;
}
-inline Boolean gc_sweep_is_concurrent()
+inline BOOLEAN gc_sweep_is_concurrent()
{
return sweep_is_concurrent;
}
@@ -106,12 +106,12 @@
sweep_is_concurrent = FALSE;
}
-inline Boolean gc_con_is_in_sweeping()
+inline BOOLEAN gc_con_is_in_sweeping()
{
return concurrent_in_sweeping;
}
-inline Boolean gc_con_is_in_sweeping(GC* gc)
+inline BOOLEAN gc_con_is_in_sweeping(GC* gc)
{
return gc->gc_concurrent_status == GC_CON_SWEEP_PHASE;
}
@@ -141,7 +141,7 @@
void gc_reset_con_mark(GC* gc);
void gc_start_con_mark(GC* gc);
-void gc_finish_con_mark(GC* gc, Boolean need_STW);
+void gc_finish_con_mark(GC* gc, BOOLEAN need_STW);
int64 gc_get_con_mark_time(GC* gc);
void gc_start_con_sweep(GC* gc);
@@ -157,9 +157,9 @@
void gc_finish_con_GC(GC* gc, int64 time_mutator);
-extern volatile Boolean gc_sweep_global_normal_chunk;
+extern volatile BOOLEAN gc_sweep_global_normal_chunk;
-inline Boolean gc_is_sweep_global_normal_chunk()
+inline BOOLEAN gc_is_sweep_global_normal_chunk()
{ return gc_sweep_global_normal_chunk; }
inline void gc_set_sweep_global_normal_chunk()
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_class.h Wed May 28 03:44:26 2008
@@ -239,17 +239,17 @@
return vtable_get_gcvt(vtable);
}
-FORCE_INLINE Boolean object_has_ref_field(Partial_Reveal_Object *obj)
+FORCE_INLINE BOOLEAN object_has_ref_field(Partial_Reveal_Object *obj)
{
GC_VTable_Info *gcvt = obj_get_gcvt_raw(obj);
- return (Boolean)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_REFS);
+ return (BOOLEAN)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_REFS);
}
-FORCE_INLINE Boolean object_has_ref_field_before_scan(Partial_Reveal_Object *obj)
+FORCE_INLINE BOOLEAN object_has_ref_field_before_scan(Partial_Reveal_Object *obj)
{
Partial_Reveal_VTable *vt = decode_vt(obj_get_vt_raw(obj));
GC_VTable_Info *gcvt = vtable_get_gcvt_raw(vt);
- return (Boolean)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_REFS);
+ return (BOOLEAN)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_REFS);
}
FORCE_INLINE unsigned int object_ref_field_num(Partial_Reveal_Object *obj)
@@ -258,13 +258,13 @@
return gcvt->gc_number_of_ref_fields;
}
-FORCE_INLINE Boolean object_is_array(Partial_Reveal_Object *obj)
+FORCE_INLINE BOOLEAN object_is_array(Partial_Reveal_Object *obj)
{
GC_VTable_Info *gcvt = obj_get_gcvt_raw(obj);
- return (Boolean)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_ARRAY);
+ return (BOOLEAN)((POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_ARRAY);
}
-FORCE_INLINE Boolean obj_is_primitive_array(Partial_Reveal_Object *obj)
+FORCE_INLINE BOOLEAN obj_is_primitive_array(Partial_Reveal_Object *obj)
{
return object_is_array(obj) && !object_has_ref_field(obj);
}
@@ -296,7 +296,7 @@
FORCE_INLINE unsigned int vm_object_size(Partial_Reveal_Object *obj)
{
- Boolean is_array = object_is_array(obj);
+ BOOLEAN is_array = object_is_array(obj);
return is_array? array_object_size(obj) : nonarray_object_size(obj);
}
@@ -309,10 +309,10 @@
return (WeakReferenceType)((gcvt->gc_class_properties & CL_PROP_REFERENCE_TYPE_MASK) >> CL_PROP_REFERENCE_TYPE_SHIFT);
}
-FORCE_INLINE Boolean type_has_finalizer(Partial_Reveal_VTable *vt)
+FORCE_INLINE BOOLEAN type_has_finalizer(Partial_Reveal_VTable *vt)
{
GC_VTable_Info *gcvt = vtable_get_gcvt_raw(vt);
- return (Boolean)(POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_FINALIZER;
+ return (BOOLEAN)(POINTER_SIZE_INT)gcvt & GC_CLASS_FLAG_FINALIZER;
}
#endif //#ifndef _GC_TYPES_H_
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_for_vm.cpp Wed May 28 03:44:26 2008
@@ -41,11 +41,11 @@
#endif
static GC* p_global_gc = NULL;
-Boolean mutator_need_block;
+BOOLEAN mutator_need_block;
void gc_tls_init();
-Boolean gc_requires_barriers()
+BOOLEAN gc_requires_barriers()
{ return p_global_gc->generate_barrier; }
static void gc_get_system_info(GC *gc)
@@ -163,7 +163,7 @@
INFO2("gc.process", "GC: end of GC wrapup\n");
}
-Boolean gc_supports_compressed_references()
+BOOLEAN gc_supports_compressed_references()
{
#ifdef COMPRESS_REFERENCE
return TRUE;
@@ -173,7 +173,7 @@
}
/* this interface need reconsidering. is_pinned is unused. */
-void gc_add_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned)
+void gc_add_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned)
{
Partial_Reveal_Object** p_ref = (Partial_Reveal_Object**)ref;
Partial_Reveal_Object* p_obj = *p_ref;
@@ -195,12 +195,12 @@
gc_rootset_add_entry(p_global_gc, p_ref);
}
-void gc_add_root_set_entry_interior_pointer (void **slot, int offset, Boolean is_pinned)
+void gc_add_root_set_entry_interior_pointer (void **slot, int offset, BOOLEAN is_pinned)
{
add_root_set_entry_interior_pointer(slot, offset, is_pinned);
}
-void gc_add_compressed_root_set_entry(REF* ref, Boolean is_pinned)
+void gc_add_compressed_root_set_entry(REF* ref, BOOLEAN is_pinned)
{
REF *p_ref = (REF *)ref;
if(read_slot(p_ref) == NULL) return;
@@ -210,12 +210,12 @@
gc_compressed_rootset_add_entry(p_global_gc, p_ref);
}
-Boolean gc_supports_class_unloading()
+BOOLEAN gc_supports_class_unloading()
{
return TRACE_JLC_VIA_VTABLE;
}
-void gc_add_weak_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned, Boolean is_short_weak)
+void gc_add_weak_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned, BOOLEAN is_short_weak)
{
//assert(is_short_weak == FALSE); //Currently no need for short_weak_roots
Partial_Reveal_Object** p_ref = (Partial_Reveal_Object**)ref;
@@ -233,7 +233,7 @@
gc_weak_rootset_add_entry(p_global_gc, p_ref, is_short_weak);
}
-extern Boolean IGNORE_FORCE_GC;
+extern BOOLEAN IGNORE_FORCE_GC;
/* VM to force GC */
void gc_force_gc()
@@ -318,7 +318,7 @@
void gc_vm_initialized()
{ return; }
-Boolean gc_is_object_pinned (Managed_Object_Handle obj)
+BOOLEAN gc_is_object_pinned (Managed_Object_Handle obj)
{ return 0; }
void gc_pin_object (Managed_Object_Handle* p_object)
@@ -414,7 +414,7 @@
* }
*/
-extern Boolean JVMTI_HEAP_ITERATION;
+extern BOOLEAN JVMTI_HEAP_ITERATION;
void gc_iterate_heap() {
// data structures in not consistent for heap iteration
if (!JVMTI_HEAP_ITERATION) return;
@@ -431,14 +431,14 @@
void gc_set_mutator_block_flag()
{ mutator_need_block = TRUE; }
-Boolean gc_clear_mutator_block_flag()
+BOOLEAN gc_clear_mutator_block_flag()
{
- Boolean old_flag = mutator_need_block;
+ BOOLEAN old_flag = mutator_need_block;
mutator_need_block = FALSE;
return old_flag;
}
-Boolean obj_belongs_to_gc_heap(Partial_Reveal_Object* p_obj)
+BOOLEAN obj_belongs_to_gc_heap(Partial_Reveal_Object* p_obj)
{
return address_belongs_to_gc_heap(p_obj, p_global_gc);
}
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.cpp Wed May 28 03:44:26 2008
@@ -167,7 +167,7 @@
return block;
}
-static void gc_update_repointed_sets(GC* gc, Pool* pool, Boolean double_fix)
+static void gc_update_repointed_sets(GC* gc, Pool* pool, BOOLEAN double_fix)
{
GC_Metadata* metadata = gc->metadata;
@@ -221,7 +221,7 @@
return;
}
-void gc_fix_rootset(Collector* collector, Boolean double_fix)
+void gc_fix_rootset(Collector* collector, BOOLEAN double_fix)
{
GC* gc = collector->gc;
@@ -457,8 +457,8 @@
//#include <hash_set>
/* FIXME:: should better move to verifier dir */
-extern Boolean verify_live_heap;
-void gc_metadata_verify(GC* gc, Boolean is_before_gc)
+extern BOOLEAN verify_live_heap;
+void gc_metadata_verify(GC* gc, BOOLEAN is_before_gc)
{
GC_Metadata* metadata = gc->metadata;
assert(pool_is_empty(metadata->gc_rootset_pool));
@@ -549,7 +549,7 @@
}
#ifdef _DEBUG
-Boolean obj_is_mark_black_in_table(Partial_Reveal_Object* p_obj);
+BOOLEAN obj_is_mark_black_in_table(Partial_Reveal_Object* p_obj);
#endif
void gc_reset_dirty_set(GC* gc)
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_metadata.h Wed May 28 03:44:26 2008
@@ -57,12 +57,12 @@
void gc_metadata_initialize(GC* gc);
void gc_metadata_destruct(GC* gc);
-void gc_metadata_verify(GC* gc, Boolean is_before_gc);
+void gc_metadata_verify(GC* gc, BOOLEAN is_before_gc);
void gc_set_rootset(GC* gc);
void gc_reset_rootset(GC* gc);
void gc_clear_rootset(GC* gc);
-void gc_fix_rootset(Collector* collector, Boolean double_fix);
+void gc_fix_rootset(Collector* collector, BOOLEAN double_fix);
void gc_clear_remset(GC* gc);
@@ -71,7 +71,7 @@
void gc_clear_dirty_set(GC* gc);
void gc_identify_dead_weak_roots(GC *gc);
-void gc_update_weak_roots(GC *gc, Boolean double_fix);
+void gc_update_weak_roots(GC *gc, BOOLEAN double_fix);
void gc_reset_collectors_rem_set(GC *gc);
inline void gc_task_pool_clear(Pool* task_pool)
@@ -208,7 +208,7 @@
assert(collector->trace_stack);
}
-inline void gc_weak_rootset_add_entry(GC* gc, Partial_Reveal_Object** p_ref, Boolean is_short_weak)
+inline void gc_weak_rootset_add_entry(GC* gc, Partial_Reveal_Object** p_ref, BOOLEAN is_short_weak)
{
//assert(is_short_weak == FALSE); //Currently no need for short_weak_roots
assert( p_ref < gc_heap_base_address() || p_ref >= gc_heap_ceiling_address());
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_options.cpp Wed May 28 03:44:26 2008
@@ -33,33 +33,33 @@
extern POINTER_SIZE_INT TOSPACE_SIZE;
extern POINTER_SIZE_INT MOS_RESERVE_SIZE;
-extern Boolean GEN_NONGEN_SWITCH;
+extern BOOLEAN GEN_NONGEN_SWITCH;
-extern Boolean FORCE_FULL_COMPACT;
+extern BOOLEAN FORCE_FULL_COMPACT;
extern unsigned int NUM_MARKERS;
extern unsigned int NUM_COLLECTORS;
extern unsigned int MINOR_COLLECTORS;
extern unsigned int MAJOR_COLLECTORS;
-extern Boolean IGNORE_VTABLE_TRACING;
-extern Boolean IGNORE_FINREF;
+extern BOOLEAN IGNORE_VTABLE_TRACING;
+extern BOOLEAN IGNORE_FINREF;
-extern Boolean JVMTI_HEAP_ITERATION ;
-extern Boolean IGNORE_FORCE_GC;
+extern BOOLEAN JVMTI_HEAP_ITERATION ;
+extern BOOLEAN IGNORE_FORCE_GC;
POINTER_SIZE_INT HEAP_SIZE_DEFAULT = 256 * MB;
POINTER_SIZE_INT min_heap_size_bytes = 16 * MB;
POINTER_SIZE_INT max_heap_size_bytes = 0;
-Boolean share_los_boundary = FALSE;
+BOOLEAN share_los_boundary = FALSE;
unsigned int GC_PROP;
GC* gc_mc_create();
GC* gc_ms_create();
-static GC* gc_decide_collection_algo(char* unique_algo, Boolean has_los)
+static GC* gc_decide_collection_algo(char* unique_algo, BOOLEAN has_los)
{
/* if unique_algo is not set, gc_gen_decide_collection_algo is called. */
assert(unique_algo);
@@ -70,7 +70,7 @@
if(has_los)
GC_PROP |= ALGO_HAS_LOS;
- Boolean use_default = FALSE;
+ BOOLEAN use_default = FALSE;
GC* gc;
@@ -123,8 +123,8 @@
}
void gc_decide_con_algo(char* concurrent_algo);
-GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, Boolean has_los);
-void gc_set_gen_mode(Boolean status);
+GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, BOOLEAN has_los);
+void gc_set_gen_mode(BOOLEAN status);
GC* gc_parse_options()
{
@@ -150,7 +150,7 @@
unique_algo = vm_properties_get_value("gc.unique_algorithm", VM_PROPERTIES);
}
- Boolean has_los = FALSE;
+ BOOLEAN has_los = FALSE;
if (vm_property_is_set("gc.has_los", VM_PROPERTIES) == 1) {
has_los = vm_property_get_boolean("gc.has_los");
}
@@ -168,7 +168,7 @@
}
if (vm_property_is_set("gc.gen_mode", VM_PROPERTIES) == 1) {
- Boolean gen_mode = vm_property_get_boolean("gc.gen_mode");
+ BOOLEAN gen_mode = vm_property_get_boolean("gc.gen_mode");
gc_set_gen_mode(gen_mode);
}
@@ -187,7 +187,7 @@
gc->generate_barrier = gc_is_gen_mode();
if (vm_property_is_set("gc.generate_barrier", VM_PROPERTIES) == 1) {
- Boolean generate_barrier = vm_property_get_boolean("gc.generate_barrier");
+ BOOLEAN generate_barrier = vm_property_get_boolean("gc.generate_barrier");
gc->generate_barrier = (generate_barrier || gc->generate_barrier);
}
@@ -311,7 +311,7 @@
}
if (vm_property_is_set("gc.concurrent_gc", VM_PROPERTIES) == 1){
- Boolean use_all_concurrent_phase= vm_property_get_boolean("gc.concurrent_gc");
+ BOOLEAN use_all_concurrent_phase= vm_property_get_boolean("gc.concurrent_gc");
if(use_all_concurrent_phase){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
DIE(( "Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
@@ -324,7 +324,7 @@
}
if (vm_property_is_set("gc.concurrent_enumeration", VM_PROPERTIES) == 1){
- Boolean USE_CONCURRENT_ENUMERATION = vm_property_get_boolean("gc.concurrent_enumeration");
+ BOOLEAN USE_CONCURRENT_ENUMERATION = vm_property_get_boolean("gc.concurrent_enumeration");
if(USE_CONCURRENT_ENUMERATION){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
DIE(("Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
@@ -335,7 +335,7 @@
}
if (vm_property_is_set("gc.concurrent_mark", VM_PROPERTIES) == 1){
- Boolean USE_CONCURRENT_MARK = vm_property_get_boolean("gc.concurrent_mark");
+ BOOLEAN USE_CONCURRENT_MARK = vm_property_get_boolean("gc.concurrent_mark");
if(USE_CONCURRENT_MARK){
#ifndef USE_UNIQUE_MARK_SWEEP_GC
DIE(("Please define USE_UNIQUE_MARK_SWEEP_GC macro."));
@@ -347,7 +347,7 @@
}
if (vm_property_is_set("gc.concurrent_sweep", VM_PROPERTIES) == 1){
- Boolean USE_CONCURRENT_SWEEP= vm_property_get_boolean("gc.concurrent_sweep");
+ BOOLEAN USE_CONCURRENT_SWEEP= vm_property_get_boolean("gc.concurrent_sweep");
if(USE_CONCURRENT_SWEEP){
/*currently, concurrent sweeping only starts after concurrent marking.*/
assert(gc_is_specify_con_mark());
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h Wed May 28 03:44:26 2008
@@ -83,7 +83,7 @@
#endif
#ifdef PREFETCH_SUPPORTED
-extern Boolean mark_prefetch;
+extern BOOLEAN mark_prefetch;
#endif
#define ABS_DIFF(x, y) (((x)>(y))?((x)-(y)):((y)-(x)))
@@ -219,7 +219,7 @@
return address;
}
-inline Boolean vm_unmap_mem(void* start, POINTER_SIZE_INT size)
+inline BOOLEAN vm_unmap_mem(void* start, POINTER_SIZE_INT size)
{
unsigned int result;
#ifdef _WINDOWS_
@@ -248,7 +248,7 @@
return address;
}
-inline Boolean vm_free_mem(void* start, POINTER_SIZE_INT size)
+inline BOOLEAN vm_free_mem(void* start, POINTER_SIZE_INT size)
{
return vm_unmap_mem(start, size);
}
@@ -271,7 +271,7 @@
return address;
}
-inline Boolean vm_release_mem(void* start, POINTER_SIZE_INT size)
+inline BOOLEAN vm_release_mem(void* start, POINTER_SIZE_INT size)
{
return vm_unmap_mem(start, size);
}
@@ -290,7 +290,7 @@
return address;
}
-inline Boolean vm_decommit_mem(void* start, POINTER_SIZE_INT size)
+inline BOOLEAN vm_decommit_mem(void* start, POINTER_SIZE_INT size)
{
unsigned int result;
#ifdef _WINDOWS_
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_properties.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_properties.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_properties.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_properties.h Wed May 28 03:44:26 2008
@@ -92,9 +92,9 @@
ALGO_CON_MASK = 0x70000000,
};
-FORCE_INLINE Boolean gc_is_kind(unsigned int kind)
+FORCE_INLINE BOOLEAN gc_is_kind(unsigned int kind)
{
- return (Boolean)((GC_PROP & kind) == kind);
+ return (BOOLEAN)((GC_PROP & kind) == kind);
}
FORCE_INLINE void gc_set_gen_flag()
@@ -107,32 +107,32 @@
GC_PROP &= ~ALGO_IS_GEN;
}
-FORCE_INLINE Boolean gc_is_gen_mode()
+FORCE_INLINE BOOLEAN gc_is_gen_mode()
{
return gc_is_kind(ALGO_IS_GEN);
}
-FORCE_INLINE Boolean gc_has_los()
+FORCE_INLINE BOOLEAN gc_has_los()
{
return gc_is_kind(ALGO_HAS_LOS);
}
-FORCE_INLINE Boolean gc_has_nos()
+FORCE_INLINE BOOLEAN gc_has_nos()
{
return gc_is_kind(ALGO_HAS_NOS);
}
-FORCE_INLINE Boolean collect_is_major()
+FORCE_INLINE BOOLEAN collect_is_major()
{
return gc_is_kind(ALGO_MAJOR);
}
-FORCE_INLINE Boolean collect_is_minor()
+FORCE_INLINE BOOLEAN collect_is_minor()
{
return gc_has_nos() && !collect_is_major();
}
-FORCE_INLINE Boolean collect_is_major_normal()
+FORCE_INLINE BOOLEAN collect_is_major_normal()
{
return gc_is_kind(ALGO_MAJOR_NORMAL);
}
@@ -149,17 +149,17 @@
GC_PROP &= ~ALGO_MAJOR_MASK;
}
-FORCE_INLINE Boolean collect_is_fallback()
+FORCE_INLINE BOOLEAN collect_is_fallback()
{
return gc_is_kind(ALGO_MAJOR_FALLBACK);
}
-FORCE_INLINE Boolean major_is_marksweep()
+FORCE_INLINE BOOLEAN major_is_marksweep()
{
return gc_is_kind(ALGO_MARKSWEEP|ALGO_HAS_NOS);
}
-FORCE_INLINE Boolean major_is_compact_move()
+FORCE_INLINE BOOLEAN major_is_compact_move()
{
return gc_is_kind(ALGO_COMPACT_MOVE|ALGO_HAS_NOS);
}
@@ -170,7 +170,7 @@
GC_PROP |= ALGO_COMPACT_MOVE;
}
-FORCE_INLINE Boolean major_is_compact_slide()
+FORCE_INLINE BOOLEAN major_is_compact_slide()
{
return gc_is_kind(ALGO_COMPACT_SLIDE|ALGO_HAS_NOS);
}
@@ -181,17 +181,17 @@
GC_PROP |= ALGO_COMPACT_SLIDE;
}
-FORCE_INLINE Boolean minor_is_semispace()
+FORCE_INLINE BOOLEAN minor_is_semispace()
{
return gc_is_kind(ALGO_COPY_SEMISPACE|ALGO_HAS_NOS);
}
-FORCE_INLINE Boolean minor_is_forward()
+FORCE_INLINE BOOLEAN minor_is_forward()
{
return gc_is_kind(ALGO_COPY_FORWARD|ALGO_HAS_NOS);
}
-FORCE_INLINE Boolean collect_move_object()
+FORCE_INLINE BOOLEAN collect_move_object()
{
if(gc_has_nos())
return collect_is_minor() ||
@@ -200,7 +200,7 @@
return !gc_is_kind(ALGO_MS_NORMAL);
}
-FORCE_INLINE Boolean collect_is_compact_move()
+FORCE_INLINE BOOLEAN collect_is_compact_move()
{
if(gc_has_nos())
return collect_is_major() && gc_is_kind(ALGO_COMPACT_MOVE);
@@ -208,7 +208,7 @@
return gc_is_kind(ALGO_COMPACT_MOVE);
}
-FORCE_INLINE Boolean collect_is_ms_compact()
+FORCE_INLINE BOOLEAN collect_is_ms_compact()
{
if(gc_has_nos())
return collect_is_major() && gc_is_kind(ALGO_MS_COMPACT);
@@ -226,7 +226,7 @@
/* This is to distinct from the case of non-moving or trace-moving, where root slots
either are updated on-the-fly, or need not updating. The kind below needs to update
root slots after collection in an extra phase. i.e., collect_mark_and_move */
-FORCE_INLINE Boolean collect_need_update_repset()
+FORCE_INLINE BOOLEAN collect_need_update_repset()
{
return (gc_is_kind(ALGO_MAJOR) || gc_is_kind(ALGO_MS_COMPACT) || !gc_has_nos());
}
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_space.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_space.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_space.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_space.h Wed May 28 03:44:26 2008
@@ -47,7 +47,7 @@
float survive_ratio;
unsigned int collect_algorithm;
GC* gc;
- Boolean move_object;
+ BOOLEAN move_object;
Space_Statistics* space_statistic;
@@ -71,12 +71,12 @@
inline void* space_heap_start(Space* space){ return space->heap_start; }
inline void* space_heap_end(Space* space){ return space->heap_end; }
-inline Boolean address_belongs_to_space(void* addr, Space* space)
+inline BOOLEAN address_belongs_to_space(void* addr, Space* space)
{
return (addr >= space_heap_start(space) && addr < space_heap_end(space));
}
-inline Boolean obj_belongs_to_space(Partial_Reveal_Object *p_obj, Space* space)
+inline BOOLEAN obj_belongs_to_space(Partial_Reveal_Object *p_obj, Space* space)
{
return address_belongs_to_space((Partial_Reveal_Object*)p_obj, space);
}
@@ -93,7 +93,7 @@
float survive_ratio;
unsigned int collect_algorithm;
GC* gc;
- Boolean move_object;
+ BOOLEAN move_object;
Space_Statistics* space_statistic;
@@ -126,9 +126,9 @@
/* END of Blocked_Space --> */
}Blocked_Space;
-inline Boolean blocked_space_has_free_block(Blocked_Space *space){ return space->free_block_idx <= space->ceiling_block_idx; }
+inline BOOLEAN blocked_space_has_free_block(Blocked_Space *space){ return space->free_block_idx <= space->ceiling_block_idx; }
inline unsigned int blocked_space_free_mem_size(Blocked_Space *space){ return (space->ceiling_block_idx - space->free_block_idx + 1) << GC_BLOCK_SHIFT_COUNT; }
-inline Boolean blocked_space_used_mem_size(Blocked_Space *space){ return (space->free_block_idx - space->first_block_idx) << GC_BLOCK_SHIFT_COUNT; }
+inline BOOLEAN blocked_space_used_mem_size(Blocked_Space *space){ return (space->free_block_idx - space->first_block_idx) << GC_BLOCK_SHIFT_COUNT; }
void space_init_blocks(Blocked_Space* space);
void space_desturct_blocks(Blocked_Space* space);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/hashcode.h Wed May 28 03:44:26 2008
@@ -37,7 +37,7 @@
HASHCODE_SET_BUFFERED = HASHCODE_SET_BIT | HASHCODE_BUFFERED_BIT
};
-inline Boolean obj_is_sethash_in_vt(Partial_Reveal_Object* p_obj){
+inline BOOLEAN obj_is_sethash_in_vt(Partial_Reveal_Object* p_obj){
return (((VT_SIZE_INT)obj_get_vt_raw(p_obj) & HASHCODE_EXTENDED_VT_BIT) != 0);
}
@@ -46,19 +46,19 @@
obj_set_vt(p_obj,(VT)((VT_SIZE_INT)vt | HASHCODE_EXTENDED_VT_BIT));
}
-inline Boolean hashcode_is_set(Partial_Reveal_Object* p_obj)
+inline BOOLEAN hashcode_is_set(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type obj_info = get_obj_info_raw(p_obj);
return ((obj_info & HASHCODE_SET_BIT) != 0);
}
-inline Boolean hashcode_is_attached(Partial_Reveal_Object* p_obj)
+inline BOOLEAN hashcode_is_attached(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type obj_info = get_obj_info_raw(p_obj);
return ((obj_info & HASHCODE_ATTACHED_BIT) != 0);
}
-inline Boolean hashcode_is_buffered(Partial_Reveal_Object* p_obj)
+inline BOOLEAN hashcode_is_buffered(Partial_Reveal_Object* p_obj)
{
Obj_Info_Type obj_info = get_obj_info_raw(p_obj);
return ((obj_info & HASHCODE_BUFFERED_BIT) != 0);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.cpp Wed May 28 03:44:26 2008
@@ -23,7 +23,7 @@
#include "interior_pointer.h"
#include <vector>
-void gc_add_root_set_entry(Managed_Object_Handle *ref, Boolean is_pinned);
+void gc_add_root_set_entry(Managed_Object_Handle *ref, BOOLEAN is_pinned);
typedef struct slot_offset_entry_struct{
void** slot;
@@ -37,7 +37,7 @@
static unsigned int interior_pointer_num_count = 0;
-void add_root_set_entry_interior_pointer(void **slot, int offset, Boolean is_pinned)
+void add_root_set_entry_interior_pointer(void **slot, int offset, BOOLEAN is_pinned)
{
//check size;
if( interior_pointer_set.size() == interior_pointer_num_count )
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/interior_pointer.h Wed May 28 03:44:26 2008
@@ -24,7 +24,7 @@
#include "gc_common.h"
-void add_root_set_entry_interior_pointer(void **slot, int offset, Boolean is_pinned);
+void add_root_set_entry_interior_pointer(void **slot, int offset, BOOLEAN is_pinned);
void gc_copy_interior_pointer_table_to_rootset();
void update_rootset_interior_pointer();
void gc_reset_interior_pointer_table();
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/large_pages.cpp Wed May 28 03:44:26 2008
@@ -23,7 +23,7 @@
char* large_page_hint = NULL;
#if defined (_WINDOWS_)
-Boolean set_privilege(HANDLE process, LPCTSTR priv_name, Boolean is_enable)
+BOOLEAN set_privilege(HANDLE process, LPCTSTR priv_name, BOOLEAN is_enable)
{
HANDLE token;
TOKEN_PRIVILEGES tp;
@@ -48,13 +48,13 @@
return TRUE;
}
-Boolean obtain_lock_memory_priv()
+BOOLEAN obtain_lock_memory_priv()
{
HANDLE process = GetCurrentProcess();
return set_privilege(process, SE_LOCK_MEMORY_NAME, TRUE);
}
-Boolean release_lock_memory_priv()
+BOOLEAN release_lock_memory_priv()
{
HANDLE process = GetCurrentProcess();
return set_privilege(process, SE_LOCK_MEMORY_NAME, FALSE);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/object_status.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/object_status.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/object_status.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/object_status.h Wed May 28 03:44:26 2008
@@ -24,7 +24,7 @@
#include "../mark_sweep/wspace_mark_sweep.h"
-inline Boolean obj_is_dead_in_gen_minor_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_gen_minor_gc(Partial_Reveal_Object *p_obj)
{
/*
* The first condition is for supporting switch between nongen and gen minor collection.
@@ -37,38 +37,38 @@
return obj_belongs_to_nos(p_obj) && !obj_is_fw_in_oi(p_obj);
}
-inline Boolean obj_is_dead_in_nongen_minor_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_nongen_minor_gc(Partial_Reveal_Object *p_obj)
{
return (obj_belongs_to_nos(p_obj) && !obj_is_fw_in_oi(p_obj))
|| (!obj_belongs_to_nos(p_obj) && !obj_is_marked_in_oi(p_obj));
}
/* The caller must be in places where alloc color and mark color haven't been flipped */
-inline Boolean obj_is_dead_in_sweep_major_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_sweep_major_gc(Partial_Reveal_Object *p_obj)
{
return (obj_belongs_to_nos(p_obj) && !obj_is_marked_in_vt(p_obj))
|| (!obj_belongs_to_nos(p_obj) && !obj_is_mark_black_in_table(p_obj));
}
-inline Boolean obj_is_dead_in_compact_major_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_compact_major_gc(Partial_Reveal_Object *p_obj)
{
return !obj_is_marked_in_vt(p_obj);
}
#ifdef USE_UNIQUE_MARK_SWEEP_GC
-inline Boolean obj_is_dead_in_mark_sweep_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_mark_sweep_gc(Partial_Reveal_Object *p_obj)
{
return !obj_is_mark_black_in_table(p_obj);
}
#endif
#ifdef USE_UNIQUE_MOVE_COMPACT_GC
-inline Boolean obj_is_dead_in_move_compact_no_los_gc(Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_is_dead_in_move_compact_no_los_gc(Partial_Reveal_Object *p_obj)
{
return !obj_is_marked_in_vt(p_obj);
}
#endif
-inline Boolean gc_obj_is_dead(GC *gc, Partial_Reveal_Object *p_obj)
+inline BOOLEAN gc_obj_is_dead(GC *gc, Partial_Reveal_Object *p_obj)
{
assert(p_obj);
@@ -92,11 +92,11 @@
}
}
-inline Boolean fspace_obj_to_be_forwarded(Partial_Reveal_Object *p_obj)
+inline BOOLEAN fspace_obj_to_be_forwarded(Partial_Reveal_Object *p_obj)
{
return forward_first_half ? (p_obj < object_forwarding_boundary) : (p_obj>=object_forwarding_boundary);
}
-inline Boolean obj_need_move(GC *gc, Partial_Reveal_Object *p_obj)
+inline BOOLEAN obj_need_move(GC *gc, Partial_Reveal_Object *p_obj)
{
/* assert(!gc_obj_is_dead(gc, p_obj)); commented out for weakroot */
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.cpp Wed May 28 03:44:26 2008
@@ -443,7 +443,7 @@
}
/*If the tuning strategy give a bigger tuning_size than failure size, we just follow the strategy and set noforce.*/
- Boolean doforce = TRUE;
+ BOOLEAN doforce = TRUE;
POINTER_SIZE_INT failure_size = lspace_get_failure_size((Lspace*)lspace);
if( (tuner->kind == TRANS_FROM_MOS_TO_LOS) && (!tuner->reverse) && (tuner->tuning_size > failure_size) )
doforce = FALSE;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/space_tuner.h Wed May 28 03:44:26 2008
@@ -40,16 +40,16 @@
typedef struct Space_Tuner{
Transform_Kind kind;
/*This flags is set if the tuning direction changes in the process of tuning*/
- Boolean reverse;
+ BOOLEAN reverse;
POINTER_SIZE_INT tuning_size;
/*Used for LOS_Shrink*/
Block_Header* interim_blocks;
/*This flag is set when tuning strategy decide to tune los size.
*i.e. wasted memory is greater than wast_threshold. */
- Boolean need_tune;
+ BOOLEAN need_tune;
/*This flag is set if gc is caused by los alloc failure.*/
- Boolean force_tune;
+ BOOLEAN force_tune;
uint64 speed_los;
uint64 last_speed_los;
@@ -82,7 +82,7 @@
void gc_space_tuner_init_fake_blocks_for_los_shrink(GC* gc);
void gc_space_tuner_release_fake_blocks_for_los_shrink(GC* gc);
-inline Boolean gc_has_space_tuner(GC* gc)
-{ return (Boolean)(POINTER_SIZE_INT)gc->tuner; }
+inline BOOLEAN gc_has_space_tuner(GC* gc)
+{ return (BOOLEAN)(POINTER_SIZE_INT)gc->tuner; }
#endif /* _SPACE_TUNER_H_ */
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/weak_roots.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/weak_roots.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/weak_roots.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/weak_roots.cpp Wed May 28 03:44:26 2008
@@ -49,7 +49,7 @@
}
/* parameter pointer_addr_in_pool means it is p_ref or p_obj in pool */
-void gc_update_weak_roots(GC *gc, Boolean double_fix)
+void gc_update_weak_roots(GC *gc, BOOLEAN double_fix)
{
GC_Metadata* metadata = gc->metadata;
Pool *weakroot_pool = metadata->weakroot_pool;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.cpp Wed May 28 03:44:26 2008
@@ -33,8 +33,8 @@
#include "../common/object_status.h"
#include "../common/gc_concurrent.h"
-Boolean IGNORE_FINREF = FALSE;
-Boolean DURING_RESURRECTION = FALSE;
+BOOLEAN IGNORE_FINREF = FALSE;
+BOOLEAN DURING_RESURRECTION = FALSE;
static void finref_add_repset_from_pool(GC *gc, Pool *pool)
{
@@ -727,7 +727,7 @@
* 1. ms with compaction
* 2. ms as a mos collection algorithm
*/
-static inline void moving_mark_sweep_update_ref(GC *gc, REF *p_ref, Boolean double_fix)
+static inline void moving_mark_sweep_update_ref(GC *gc, REF *p_ref, BOOLEAN double_fix)
{
/* There are only two kinds of p_ref being added into finref_repset_pool:
* 1. p_ref is in a vector block from one finref pool;
@@ -771,7 +771,7 @@
}
/* only called in non-minor collection. parameter pointer_addr_in_pool means it is p_ref or p_obj in pool*/
-static void nondestructively_fix_finref_pool(GC *gc, Pool *pool, Boolean pointer_addr_in_pool, Boolean double_fix)
+static void nondestructively_fix_finref_pool(GC *gc, Pool *pool, BOOLEAN pointer_addr_in_pool, BOOLEAN double_fix)
{
Finref_Metadata *metadata = gc->finref_metadata;
REF *p_ref;
@@ -803,7 +803,7 @@
}
}
-void gc_update_finref_repointed_refs(GC *gc, Boolean double_fix)
+void gc_update_finref_repointed_refs(GC *gc, BOOLEAN double_fix)
{
assert(!collect_is_minor());
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref.h Wed May 28 03:44:26 2008
@@ -27,7 +27,7 @@
#include "finalizer_weakref_metadata.h"
#include "../thread/collector.h"
-extern Boolean IGNORE_FINREF;
+extern BOOLEAN IGNORE_FINREF;
/* Phanref status: for future use
* #define PHANTOM_REF_ENQUEUE_STATUS_MASK 0x3
@@ -54,7 +54,7 @@
return (REF*)((U_8*)p_obj+get_gc_referent_offset());
}
-extern Boolean DURING_RESURRECTION;
+extern BOOLEAN DURING_RESURRECTION;
typedef void (* Scan_Slot_Func)(Collector *collector, REF *p_ref);
inline void scan_weak_reference(Collector *collector, Partial_Reveal_Object *p_obj, Scan_Slot_Func scan_slot)
{
@@ -100,7 +100,7 @@
scan_slot(collector, p_referent_field);
}
-inline Boolean is_reference_obj(Partial_Reveal_Object *p_obj)
+inline BOOLEAN is_reference_obj(Partial_Reveal_Object *p_obj)
{
WeakReferenceType type = special_reference_type(p_obj);
if(type == NOT_REFERENCE)
@@ -115,7 +115,7 @@
extern void gc_put_finref_to_vm(GC *gc);
extern void put_all_fin_on_exit(GC *gc);
-extern void gc_update_finref_repointed_refs(GC *gc, Boolean double_fix);
+extern void gc_update_finref_repointed_refs(GC *gc, BOOLEAN double_fix);
extern void gc_activate_finref_threads(GC *gc);
void gc_copy_finaliable_obj_to_rootset(GC *gc);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp Wed May 28 03:44:26 2008
@@ -107,7 +107,7 @@
gc->finref_metadata = NULL;
}
-void gc_finref_metadata_verify(GC *gc, Boolean is_before_gc)
+void gc_finref_metadata_verify(GC *gc, BOOLEAN is_before_gc)
{
Finref_Metadata *metadata = gc->finref_metadata;
@@ -362,7 +362,7 @@
return finref_metadata_add_entry(gc, vector_block_in_use, metadata->fallback_ref_pool, (POINTER_SIZE_INT)obj_ptr_to_ref(p_obj));
}
-static Boolean pool_has_no_ref(Pool *pool)
+static BOOLEAN pool_has_no_ref(Pool *pool)
{
if(pool_is_empty(pool))
return TRUE;
@@ -381,32 +381,32 @@
return TRUE;
}
-Boolean obj_with_fin_pool_is_empty(GC *gc)
+BOOLEAN obj_with_fin_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->obj_with_fin_pool);
}
-Boolean finalizable_obj_pool_is_empty(GC *gc)
+BOOLEAN finalizable_obj_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->finalizable_obj_pool);
}
-Boolean softref_pool_is_empty(GC *gc)
+BOOLEAN softref_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->softref_pool);
}
-Boolean weakref_pool_is_empty(GC *gc)
+BOOLEAN weakref_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->weakref_pool);
}
-Boolean phanref_pool_is_empty(GC *gc)
+BOOLEAN phanref_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->phanref_pool);
}
-Boolean finref_repset_pool_is_empty(GC *gc)
+BOOLEAN finref_repset_pool_is_empty(GC *gc)
{
return pool_has_no_ref(gc->finref_metadata->repset_pool);
}
@@ -431,7 +431,7 @@
finref_metadata_clear_pool(gc->finref_metadata->repset_pool);
}
-Boolean finref_copy_pool(Pool *src_pool, Pool *dest_pool, GC *gc)
+BOOLEAN finref_copy_pool(Pool *src_pool, Pool *dest_pool, GC *gc)
{
Vector_Block *dest_block = finref_get_free_block(gc);
pool_iterator_init(src_pool);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.h Wed May 28 03:44:26 2008
@@ -52,8 +52,8 @@
Vector_Block *finalizable_obj_set; // buffer for finalizable_obj_pool
Vector_Block *repset; // buffer for repset_pool
- Boolean pending_finalizers; // there are objects waiting to be finalized
- Boolean pending_weakrefs; // there are weak references waiting to be enqueued
+ BOOLEAN pending_finalizers; // there are objects waiting to be finalized
+ BOOLEAN pending_weakrefs; // there are weak references waiting to be enqueued
unsigned int gc_referent_offset; // the referent field's offset in Reference Class; it is a constant during VM's liftime
}Finref_Metadata;
@@ -63,7 +63,7 @@
extern void gc_finref_metadata_initialize(GC *gc);
extern void gc_finref_metadata_destruct(GC *gc);
-extern void gc_finref_metadata_verify(GC *gc, Boolean is_before_gc);
+extern void gc_finref_metadata_verify(GC *gc, BOOLEAN is_before_gc);
extern void gc_set_obj_with_fin(GC *gc);
extern void collector_reset_weakref_sets(Collector *collector);
@@ -79,15 +79,15 @@
extern void finref_repset_add_entry(GC *gc, REF* ref);
extern Vector_Block *finref_add_fallback_ref(GC *gc, Vector_Block *vector_block_in_use, Partial_Reveal_Object *p_ref);
-extern Boolean obj_with_fin_pool_is_empty(GC *gc);
-extern Boolean finalizable_obj_pool_is_empty(GC *gc);
-extern Boolean softref_pool_is_empty(GC *gc);
-extern Boolean weakref_pool_is_empty(GC *gc);
-extern Boolean phanref_pool_is_empty(GC *gc);
-extern Boolean finref_repset_pool_is_empty(GC *gc);
+extern BOOLEAN obj_with_fin_pool_is_empty(GC *gc);
+extern BOOLEAN finalizable_obj_pool_is_empty(GC *gc);
+extern BOOLEAN softref_pool_is_empty(GC *gc);
+extern BOOLEAN weakref_pool_is_empty(GC *gc);
+extern BOOLEAN phanref_pool_is_empty(GC *gc);
+extern BOOLEAN finref_repset_pool_is_empty(GC *gc);
extern void finref_metadata_clear_pool(Pool *pool);
-extern Boolean finref_copy_pool(Pool* src_pool, Pool* dest_pool, GC* gc);
+extern BOOLEAN finref_copy_pool(Pool* src_pool, Pool* dest_pool, GC* gc);
extern void gc_clear_weakref_pools(GC *gc);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.cpp Wed May 28 03:44:26 2008
@@ -42,11 +42,11 @@
POINTER_SIZE_INT MIN_NOS_SIZE = 0;
POINTER_SIZE_INT MAX_NOS_SIZE = 0;
-Boolean GEN_NONGEN_SWITCH = FALSE;
+BOOLEAN GEN_NONGEN_SWITCH = FALSE;
-Boolean JVMTI_HEAP_ITERATION = true;
+BOOLEAN JVMTI_HEAP_ITERATION = true;
-Boolean LOS_ADJUST_BOUNDARY = FALSE;
+BOOLEAN LOS_ADJUST_BOUNDARY = FALSE;
GC* gc_gen_create()
{
@@ -56,7 +56,7 @@
return gc;
}
-void gc_set_gen_mode(Boolean status)
+void gc_set_gen_mode(BOOLEAN status)
{
if(status){
gc_set_gen_flag();
@@ -445,9 +445,9 @@
}
-Boolean FORCE_FULL_COMPACT = FALSE;
-Boolean IGNORE_VTABLE_TRACING = FALSE;
-Boolean TRACE_JLC_VIA_VTABLE = FALSE;
+BOOLEAN FORCE_FULL_COMPACT = FALSE;
+BOOLEAN IGNORE_VTABLE_TRACING = FALSE;
+BOOLEAN TRACE_JLC_VIA_VTABLE = FALSE;
void gc_gen_decide_collection_kind(GC_Gen* gc, unsigned int cause)
{
@@ -464,7 +464,7 @@
return;
}
-GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, Boolean has_los)
+GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, BOOLEAN has_los)
{
GC_PROP = ALGO_POOL_SHARE | ALGO_DEPTH_FIRST;
@@ -474,7 +474,7 @@
/* default is has LOS */
GC_PROP |= ALGO_HAS_LOS;
- Boolean use_default = FALSE;
+ BOOLEAN use_default = FALSE;
if(minor_algo){
string_to_upper(minor_algo);
@@ -522,9 +522,9 @@
return gc;
}
-static Boolean nos_alloc_block(Space* nos, Allocator* allocator)
+static BOOLEAN nos_alloc_block(Space* nos, Allocator* allocator)
{
- Boolean result;
+ BOOLEAN result;
if(minor_is_semispace())
result = sspace_alloc_block((Sspace*)nos, allocator);
else
@@ -546,7 +546,7 @@
because MOS takes all space after fallback or LOS extension.
Allocator should be cleared. */
Allocator *allocator = (Allocator *)gc_get_tls();
- Boolean ok = nos_alloc_block(gc->nos, allocator);
+ BOOLEAN ok = nos_alloc_block(gc->nos, allocator);
/* we don't care about the return value. If no block available, that means,
first allocation after mutator resumption will probably trigger OOME. */
}
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen.h Wed May 28 03:44:26 2008
@@ -33,7 +33,7 @@
struct GC_Gen_Stats;
#endif
-void gc_set_gen_mode(Boolean status);
+void gc_set_gen_mode(BOOLEAN status);
/* some globals */
extern POINTER_SIZE_INT NOS_SIZE;
@@ -62,7 +62,7 @@
POINTER_SIZE_INT reserved_heap_size;
POINTER_SIZE_INT committed_heap_size;
unsigned int num_collections;
- Boolean in_collection;
+ BOOLEAN in_collection;
int64 time_collections;
float survive_ratio;
@@ -87,9 +87,9 @@
unsigned int collect_kind; /* MAJOR or MINOR */
unsigned int last_collect_kind;
unsigned int cause;/*GC_CAUSE_LOS_IS_FULL, GC_CAUSE_NOS_IS_FULL, or GC_CAUSE_RUNTIME_FORCE_GC*/
- Boolean collect_result; /* succeed or fail */
+ BOOLEAN collect_result; /* succeed or fail */
- Boolean generate_barrier;
+ BOOLEAN generate_barrier;
/* FIXME:: this is wrong! root_set belongs to mutator */
Vector_Block* root_set;
@@ -119,9 +119,9 @@
Space *mos;
Space *los;
- Boolean next_collect_force_major;
+ BOOLEAN next_collect_force_major;
Gen_Mode_Adaptor* gen_mode_adaptor;
- Boolean force_gen_mode;
+ BOOLEAN force_gen_mode;
#ifdef GC_GEN_STATS
GC_Gen_Stats* stats; /*used to record stats when collection*/
@@ -168,7 +168,7 @@
void gc_set_mos(GC_Gen* gc, Space* mos);
void gc_set_los(GC_Gen* gc, Space* los);
-GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, Boolean has_los);
+GC* gc_gen_decide_collection_algo(char* minor_algo, char* major_algo, BOOLEAN has_los);
void gc_gen_decide_collection_kind(GC_Gen* gc, unsigned int cause);
void gc_gen_adapt(GC_Gen* gc, int64 pause_time);
@@ -191,7 +191,7 @@
void gc_gen_start_concurrent_mark(GC_Gen* gc);
-extern Boolean GEN_NONGEN_SWITCH ;
+extern BOOLEAN GEN_NONGEN_SWITCH ;
POINTER_SIZE_INT mos_free_space_size(Space* mos);
POINTER_SIZE_INT nos_free_space_size(Space* nos);
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_adapt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_adapt.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_adapt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_adapt.cpp Wed May 28 03:44:26 2008
@@ -220,7 +220,7 @@
else gc->next_collect_force_major = FALSE;
/*If major is caused by LOS, or collection kind is ALGO_MAJOR_EXTEND, all survive ratio is not updated.*/
- extern Boolean mos_extended;
+ extern BOOLEAN mos_extended;
if((gc->cause != GC_CAUSE_LOS_IS_FULL) && !mos_extended ){
survive_ratio = (float)mos->period_surviving_size/(float)mos->committed_heap_size;
mos->survive_ratio = survive_ratio;
@@ -299,7 +299,7 @@
/* FIXME:: In this algorithm, it assumes NOS is a full forward space.
Semispace GC's NOS has survivor_area. Need careful rethinking.
But this algorithm so far can be a good approximation. */
-Boolean gc_compute_new_space_size(GC_Gen* gc, POINTER_SIZE_INT* mos_size, POINTER_SIZE_INT* nos_size)
+BOOLEAN gc_compute_new_space_size(GC_Gen* gc, POINTER_SIZE_INT* mos_size, POINTER_SIZE_INT* nos_size)
{
Blocked_Space* nos = (Blocked_Space*)gc->nos;
Blocked_Space* mos = (Blocked_Space*)gc->mos;
@@ -394,7 +394,7 @@
POINTER_SIZE_INT new_nos_size;
POINTER_SIZE_INT new_mos_size;
- Boolean result = gc_compute_new_space_size(gc, &new_mos_size, &new_nos_size);
+ BOOLEAN result = gc_compute_new_space_size(gc, &new_mos_size, &new_nos_size);
if(!result) return;
@@ -456,7 +456,7 @@
POINTER_SIZE_INT new_nos_size;
POINTER_SIZE_INT new_mos_size;
- Boolean result = gc_compute_new_space_size(gc, &new_mos_size, &new_nos_size);
+ BOOLEAN result = gc_compute_new_space_size(gc, &new_mos_size, &new_nos_size);
if(!result) return;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.cpp Wed May 28 03:44:26 2008
@@ -22,7 +22,7 @@
#include "gen.h"
#include "gen_stats.h"
-Boolean gc_profile = FALSE;
+BOOLEAN gc_profile = FALSE;
void gc_gen_stats_initialize(GC_Gen* gc)
{
@@ -63,7 +63,7 @@
Collector** collector = gc->collectors;
GC_Gen_Stats* gc_gen_stats = gc->stats;
GC_Gen_Collector_Stats* collector_stats;
- Boolean is_los_collected = gc_gen_stats->is_los_collected;
+ BOOLEAN is_los_collected = gc_gen_stats->is_los_collected;
if(collect_is_minor()) {
@@ -100,7 +100,7 @@
void gc_gen_stats_verbose(GC_Gen* gc)
{
GC_Gen_Stats* stats = gc->stats;
- Boolean is_los_collected = stats->is_los_collected;
+ BOOLEAN is_los_collected = stats->is_los_collected;
if (collect_is_minor()){
TRACE2("gc.space", "GC: NOS Collection stats: "
<<"\nGC: " << (gc_is_gen_mode()?"generational":"nongenerational")
@@ -195,7 +195,7 @@
Collector** collector = gc->collectors;
GC_Gen_Collector_Stats* stats;
- Boolean is_los_collected = gc->stats->is_los_collected;
+ BOOLEAN is_los_collected = gc->stats->is_los_collected;
/*variable used to accumulate each collector's stats when major collection*/
unsigned int total_process_rootset_ref = 0;
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.h?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/gen/gen_stats.h Wed May 28 03:44:26 2008
@@ -20,7 +20,7 @@
#include "gen.h"
-extern Boolean gc_profile;
+extern BOOLEAN gc_profile;
typedef struct GC_Gen_Stats {
unsigned int num_minor_collections;
@@ -49,7 +49,7 @@
int nos_mos_collection_algo_major;
/*los related info when minor or major*/
- Boolean is_los_collected; /*whether large obj space is collected or not*/
+ BOOLEAN is_los_collected; /*whether large obj space is collected or not*/
unsigned int los_suviving_obj_num;
POINTER_SIZE_INT los_suviving_obj_size;
float los_surviving_ratio;
@@ -72,7 +72,7 @@
gc->stats->los_collection_algo = algo;
}
-inline void gc_gen_stats_set_los_collected_flag(GC_Gen* gc, Boolean flag)
+inline void gc_gen_stats_set_los_collected_flag(GC_Gen* gc, BOOLEAN flag)
{
gc->stats->is_los_collected = flag;
}
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.cpp?rev=660898&r1=660897&r2=660898&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.cpp Wed May 28 03:44:26 2008
@@ -26,9 +26,9 @@
#include "java_support.h"
Class_Handle GCHelper_clss;
-Boolean java_helper_inlined;
+BOOLEAN java_helper_inlined;
-void HelperClass_set_GenMode(Boolean status)
+void HelperClass_set_GenMode(BOOLEAN status)
{
if(!java_helper_inlined) return;