Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 70830 invoked from network); 28 May 2008 10:45:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 28 May 2008 10:45:01 -0000 Received: (qmail 52574 invoked by uid 500); 28 May 2008 10:45:02 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 52541 invoked by uid 500); 28 May 2008 10:45:02 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 52523 invoked by uid 99); 28 May 2008 10:45:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 03:45:02 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2008 10:44:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2EF622388A1B; Wed, 28 May 2008 03:44:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r660898 [2/4] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/finalizer_weakref/ gc_gen/src/gen/ gc_gen/src/jni/ gc_gen/src/los/ gc_gen/src/mark_compact/ gc_gen/src/mark_sweep/ gc_gen/src/semi_space/ gc_gen/src/... Date: Wed, 28 May 2008 10:44:30 -0000 To: commits@harmony.apache.org From: mcfirst@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080528104438.2EF622388A1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/jni/java_support.h Wed May 28 03:44:26 2008 @@ -26,9 +26,9 @@ #include "../common/gc_platform.h" extern Class_Handle GCHelper_clss; -extern Boolean java_helper_inlined; +extern BOOLEAN java_helper_inlined; -void HelperClass_set_GenMode(Boolean status); +void HelperClass_set_GenMode(BOOLEAN status); void HelperClass_set_NosBoundary(void* boundary); #endif /*_JAVA_SUPPORT_H_*/ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.cpp Wed May 28 03:44:26 2008 @@ -22,7 +22,7 @@ #include "lspace.h" void* los_boundary = NULL; -Boolean* p_global_lspace_move_obj; +BOOLEAN* p_global_lspace_move_obj; struct GC_Gen; void gc_set_los(GC_Gen* gc, Space* lspace); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace.h Wed May 28 03:44:26 2008 @@ -48,7 +48,7 @@ unsigned int collect_algorithm; GC* gc; /*LOS_Shrink:This field stands for sliding compact to lspace */ - Boolean move_object; + BOOLEAN move_object; Space_Statistics* space_statistic; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace.h Wed May 28 03:44:26 2008 @@ -36,7 +36,7 @@ float survive_ratio; unsigned int collect_algorithm; GC* gc; - Boolean move_object; + BOOLEAN move_object; Space_Statistics* space_statistic; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_alloc.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_alloc.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_alloc.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_alloc.cpp Wed May 28 03:44:26 2008 @@ -21,7 +21,7 @@ #include "mspace.h" -static Boolean mspace_alloc_block(Mspace* mspace, Allocator* allocator) +static BOOLEAN mspace_alloc_block(Mspace* mspace, Allocator* allocator) { alloc_context_reset(allocator); @@ -63,7 +63,7 @@ /* grab a new block */ Mspace* mspace = (Mspace*)allocator->alloc_space;; - Boolean ok = mspace_alloc_block(mspace, allocator); + BOOLEAN ok = mspace_alloc_block(mspace, allocator); if(!ok) return NULL; p_return = thread_local_alloc(size, allocator); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_extend_compact.cpp Wed May 28 03:44:26 2008 @@ -27,7 +27,7 @@ static volatile Block *nos_first_free_block = NULL; static volatile Block *first_block_to_move = NULL; -Boolean mos_extended = FALSE; +BOOLEAN mos_extended = FALSE; static void set_first_and_end_block_to_move(Collector *collector, unsigned int mem_changed_size) { @@ -59,7 +59,7 @@ decommit_size = (POINTER_SIZE_INT)committed_nos_end - (POINTER_SIZE_INT)decommit_base; assert(decommit_size && !(decommit_size % SPACE_ALLOC_UNIT)); - Boolean result = vm_decommit_mem(decommit_base, decommit_size); + BOOLEAN result = vm_decommit_mem(decommit_base, decommit_size); assert(result == TRUE); nspace->committed_heap_size = (POINTER_SIZE_INT)decommit_base - (POINTER_SIZE_INT)nspace->heap_start; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_move_compact.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_move_compact.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_move_compact.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_compact/mspace_move_compact.cpp Wed May 28 03:44:26 2008 @@ -36,7 +36,7 @@ Space* gc_get_mos(GC_Gen* gc); Space* gc_get_los(GC_Gen* gc); -extern Boolean verify_live_heap; +extern BOOLEAN verify_live_heap; volatile unsigned int debug_num_compact_blocks; static void mspace_move_objects(Collector* collector, Mspace* mspace) @@ -46,7 +46,7 @@ Block_Header *local_last_dest = dest_block; void* dest_sector_addr = dest_block->base; - Boolean is_fallback = collect_is_fallback(); + BOOLEAN is_fallback = collect_is_fallback(); #ifdef USE_32BITS_HASHCODE Hashcode_Buf* old_hashcode_buf = NULL; @@ -193,7 +193,7 @@ Blocked_Space* nos = (Blocked_Space*)gc_get_nos((GC_Gen*)gc); unsigned int num_active_collectors = gc->num_active_collectors; - Boolean is_fallback = collect_is_fallback(); + BOOLEAN is_fallback = collect_is_fallback(); /* Pass 1: ************************************************** mark all live objects in heap, and save all the slots that Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/gc_ms.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/gc_ms.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/gc_ms.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/gc_ms.h Wed May 28 03:44:26 2008 @@ -33,7 +33,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; @@ -58,9 +58,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; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace.h Wed May 28 03:44:26 2008 @@ -42,7 +42,7 @@ float survive_ratio; unsigned int collect_algorithm; GC *gc; - Boolean move_object; + BOOLEAN move_object; Space_Statistics* space_statistic; @@ -60,8 +60,8 @@ /* END of Space --> */ - Boolean need_compact; - Boolean need_fix; /* There are repointed ref needing fixing */ + BOOLEAN need_compact; + BOOLEAN need_fix; /* There are repointed ref needing fixing */ Size_Segment **size_segments; Pool ***pfc_pools; Pool ***pfc_pools_backup; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_alloc.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_alloc.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_alloc.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_alloc.h Wed May 28 03:44:26 2008 @@ -28,13 +28,13 @@ extern volatile POINTER_SIZE_INT cur_mark_mask; -inline Boolean slot_is_alloc_in_table(POINTER_SIZE_INT *table, unsigned int slot_index) +inline BOOLEAN slot_is_alloc_in_table(POINTER_SIZE_INT *table, unsigned int slot_index) { unsigned int color_bits_index = slot_index * COLOR_BITS_PER_OBJ; unsigned int word_index = color_bits_index / BITS_PER_WORD; unsigned int index_in_word = color_bits_index % BITS_PER_WORD; - return (Boolean)(table[word_index] & (cur_alloc_color << index_in_word)); + return (BOOLEAN)(table[word_index] & (cur_alloc_color << index_in_word)); } inline unsigned int composed_slot_index(unsigned int word_index, unsigned int index_in_word) Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.cpp Wed May 28 03:44:26 2008 @@ -23,14 +23,14 @@ static Size_Segment *size_segments[SIZE_SEGMENT_NUM]; static Pool **pfc_pools[SIZE_SEGMENT_NUM]; static Pool **pfc_pools_backup[SIZE_SEGMENT_NUM]; -static Boolean *pfc_steal_flags[SIZE_SEGMENT_NUM]; +static BOOLEAN *pfc_steal_flags[SIZE_SEGMENT_NUM]; static Free_Chunk_List aligned_free_chunk_lists[NUM_ALIGNED_FREE_CHUNK_BUCKET]; static Free_Chunk_List unaligned_free_chunk_lists[NUM_UNALIGNED_FREE_CHUNK_BUCKET]; static Free_Chunk_List hyper_free_chunk_list; -static void init_size_segment(Size_Segment *seg, unsigned int size_min, unsigned int size_max, unsigned int gran_shift_bits, Boolean local_alloc) +static void init_size_segment(Size_Segment *seg, unsigned int size_min, unsigned int size_max, unsigned int gran_shift_bits, BOOLEAN local_alloc) { seg->size_min = size_min; seg->size_max = size_max; @@ -60,7 +60,7 @@ for(i = SIZE_SEGMENT_NUM; i--;){ pfc_pools[i] = (Pool**)STD_MALLOC(sizeof(Pool*) * size_segments[i]->chunk_num); pfc_pools_backup[i] = (Pool**)STD_MALLOC(sizeof(Pool*) * size_segments[i]->chunk_num); - pfc_steal_flags[i] = (Boolean*)STD_MALLOC(sizeof(Boolean) * size_segments[i]->chunk_num); + pfc_steal_flags[i] = (BOOLEAN*)STD_MALLOC(sizeof(BOOLEAN) * size_segments[i]->chunk_num); for(j=size_segments[i]->chunk_num; j--;){ pfc_pools[i][j] = sync_pool_create(); pfc_pools_backup[i][j] = sync_pool_create(); @@ -97,7 +97,7 @@ wspace_put_free_chunk(wspace, free_chunk); } -static void pfc_pool_set_steal_flag(Pool *pool, unsigned int steal_threshold, Boolean &steal_flag) +static void pfc_pool_set_steal_flag(Pool *pool, unsigned int steal_threshold, BOOLEAN &steal_flag) { Chunk_Header *chunk = (Chunk_Header*)pool_get_entry(pool); while(chunk){ @@ -466,7 +466,7 @@ return chunk; } -Free_Chunk *wspace_get_hyper_free_chunk(Wspace *wspace, unsigned int chunk_size, Boolean is_normal_chunk) +Free_Chunk *wspace_get_hyper_free_chunk(Wspace *wspace, unsigned int chunk_size, BOOLEAN is_normal_chunk) { assert(chunk_size >= CHUNK_GRANULARITY); assert(!(chunk_size % CHUNK_GRANULARITY)); @@ -597,7 +597,7 @@ return NULL; } -static POINTER_SIZE_INT free_mem_in_used_chunk_list(Wspace *wspace, Boolean show_chunk_info) +static POINTER_SIZE_INT free_mem_in_used_chunk_list(Wspace *wspace, BOOLEAN show_chunk_info) { POINTER_SIZE_INT used_chunk_size = 0; POINTER_SIZE_INT used_chunk_num = 0; @@ -622,7 +622,7 @@ return free_mem_size; } -static POINTER_SIZE_INT free_mem_in_pfc_pools(Wspace *wspace, Boolean show_chunk_info) +static POINTER_SIZE_INT free_mem_in_pfc_pools(Wspace *wspace, BOOLEAN show_chunk_info) { Size_Segment **size_segs = wspace->size_segments; Pool ***pfc_pools = wspace->pfc_pools; @@ -666,7 +666,7 @@ return free_mem_size; } -static POINTER_SIZE_INT free_mem_in_free_lists(Wspace *wspace, Free_Chunk_List *lists, unsigned int list_num, Boolean show_chunk_info) +static POINTER_SIZE_INT free_mem_in_free_lists(Wspace *wspace, Free_Chunk_List *lists, unsigned int list_num, BOOLEAN show_chunk_info) { POINTER_SIZE_INT free_mem_size = 0; @@ -697,7 +697,7 @@ return free_mem_size; } -static POINTER_SIZE_INT free_mem_in_hyper_free_list(Wspace *wspace, Boolean show_chunk_info) +static POINTER_SIZE_INT free_mem_in_hyper_free_list(Wspace *wspace, BOOLEAN show_chunk_info) { POINTER_SIZE_INT free_mem_size = 0; @@ -721,7 +721,7 @@ return free_mem_size; } -POINTER_SIZE_INT free_mem_in_wspace(Wspace *wspace, Boolean show_chunk_info) +POINTER_SIZE_INT free_mem_in_wspace(Wspace *wspace, BOOLEAN show_chunk_info) { POINTER_SIZE_INT free_mem_size = 0; @@ -754,7 +754,7 @@ #ifdef SSPACE_CHUNK_INFO -void wspace_chunks_info(Wspace *wspace, Boolean show_info) +void wspace_chunks_info(Wspace *wspace, BOOLEAN show_info) { if(!show_info) return; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_chunk.h Wed May 28 03:44:26 2008 @@ -182,10 +182,10 @@ } Chunk; */ -inline Boolean is_free_chunk_merged(Free_Chunk* free_chunk) +inline BOOLEAN is_free_chunk_merged(Free_Chunk* free_chunk) { assert(free_chunk->status & CHUNK_FREE); - return (Boolean)(free_chunk->status & CHUNK_MERGED); + return (BOOLEAN)(free_chunk->status & CHUNK_MERGED); } inline void free_chunk_list_init(Free_Chunk_List *list) @@ -375,7 +375,7 @@ unsigned int size_min; unsigned int size_max; unsigned int seg_index; - Boolean local_alloc; + BOOLEAN local_alloc; unsigned int chunk_num; unsigned int gran_shift_bits; POINTER_SIZE_INT granularity; @@ -549,7 +549,7 @@ extern Free_Chunk *wspace_get_normal_free_chunk(Wspace *wspace); extern Free_Chunk *wspace_get_abnormal_free_chunk(Wspace *wspace, unsigned int chunk_size); -extern Free_Chunk *wspace_get_hyper_free_chunk(Wspace *wspace, unsigned int chunk_size, Boolean is_normal_chunk); +extern Free_Chunk *wspace_get_hyper_free_chunk(Wspace *wspace, unsigned int chunk_size, BOOLEAN is_normal_chunk); extern void wspace_init_pfc_pool_iterator(Wspace *wspace); extern Pool *wspace_grab_next_pfc_pool(Wspace *wspace); @@ -557,7 +557,7 @@ extern Chunk_Header *wspace_steal_pfc(Wspace *wspace, unsigned int index); -extern POINTER_SIZE_INT free_mem_in_wspace(Wspace *wspace, Boolean show_chunk_info); +extern POINTER_SIZE_INT free_mem_in_wspace(Wspace *wspace, BOOLEAN show_chunk_info); extern void zeroing_free_chunk(Free_Chunk *chunk); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_compact.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_compact.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_compact.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_compact.cpp Wed May 28 03:44:26 2008 @@ -61,7 +61,7 @@ } /* One assumption: pfc_pool is not empty */ -static Boolean pfc_pool_roughly_sort(Pool *pfc_pool, Chunk_Header **least_free_chunk, Chunk_Header **most_free_chunk) +static BOOLEAN pfc_pool_roughly_sort(Pool *pfc_pool, Chunk_Header **least_free_chunk, Chunk_Header **most_free_chunk) { Chunk_Header *bucket_head[PFC_SORT_NUM]; /* Sorted chunk buckets' heads */ Chunk_Header *bucket_tail[PFC_SORT_NUM]; /* Sorted chunk buckets' tails */ @@ -242,12 +242,12 @@ for(; pfc_pool; pfc_pool = wspace_grab_next_pfc_pool(wspace)){ if(pool_is_empty(pfc_pool)) continue; - Boolean pfc_pool_need_compact = pfc_pool_roughly_sort(pfc_pool, &least_free_chunk, &most_free_chunk); + BOOLEAN pfc_pool_need_compact = pfc_pool_roughly_sort(pfc_pool, &least_free_chunk, &most_free_chunk); if(!pfc_pool_need_compact) continue; Chunk_Header *dest = get_least_free_chunk(&least_free_chunk, &most_free_chunk); Chunk_Header *src = get_most_free_chunk(&least_free_chunk, &most_free_chunk); - Boolean src_is_new = TRUE; + BOOLEAN src_is_new = TRUE; while(dest && src){ if(src_is_new) src->slot_index = 0; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_fallback_mark.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_fallback_mark.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_fallback_mark.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_fallback_mark.cpp Wed May 28 03:44:26 2008 @@ -21,10 +21,10 @@ static Wspace *wspace_in_fallback_marking; -static FORCE_INLINE Boolean obj_mark_black(Partial_Reveal_Object *obj) +static FORCE_INLINE BOOLEAN obj_mark_black(Partial_Reveal_Object *obj) { if(obj_belongs_to_space(obj, (Space*)wspace_in_fallback_marking)){ - Boolean marked_by_self = obj_mark_black_in_table(obj); + BOOLEAN marked_by_self = obj_mark_black_in_table(obj); #ifndef USE_UNIQUE_MARK_SWEEP_GC /* When fallback happens, some objects in MOS have their fw bit set, which is actually their mark bit in the last minor gc. Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark.cpp Wed May 28 03:44:26 2008 @@ -19,7 +19,7 @@ #include "../finalizer_weakref/finalizer_weakref.h" static Wspace *wspace_in_marking; -static FORCE_INLINE Boolean obj_mark_gray(Partial_Reveal_Object *obj) +static FORCE_INLINE BOOLEAN obj_mark_gray(Partial_Reveal_Object *obj) { if(obj_belongs_to_space(obj, (Space*)wspace_in_marking)) return obj_mark_gray_in_table(obj); @@ -27,10 +27,10 @@ return obj_mark_in_vt(obj); } -static FORCE_INLINE Boolean obj_mark_black(Partial_Reveal_Object *obj) +static FORCE_INLINE BOOLEAN obj_mark_black(Partial_Reveal_Object *obj) { if(obj_belongs_to_space(obj, (Space*)wspace_in_marking)){ - Boolean marked_by_self = obj_mark_black_in_table(obj); + BOOLEAN marked_by_self = obj_mark_black_in_table(obj); #ifndef USE_UNIQUE_MARK_SWEEP_GC /* When fallback happens, some objects in MOS have their fw bit set, which is actually their mark bit in the last minor gc. @@ -55,7 +55,7 @@ /* The caller must be in places where alloc color and mark color haven't been flipped */ -Boolean obj_is_marked_in_table(Partial_Reveal_Object *obj) +BOOLEAN obj_is_marked_in_table(Partial_Reveal_Object *obj) { unsigned int index_in_word; volatile POINTER_SIZE_INT *p_color_word = get_color_word_in_table(obj, index_in_word); @@ -64,7 +64,7 @@ POINTER_SIZE_INT color_word = *p_color_word; POINTER_SIZE_INT mark_color = cur_mark_gray_color << index_in_word; - return (Boolean)(color_word & mark_color); + return (BOOLEAN)(color_word & mark_color); } static FORCE_INLINE void scan_slot(Collector *collector, REF *p_ref) Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_mostly_concurrent.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_mostly_concurrent.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_mostly_concurrent.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_mostly_concurrent.cpp Wed May 28 03:44:26 2008 @@ -19,9 +19,9 @@ #include "../finalizer_weakref/finalizer_weakref.h" #include "../thread/marker.h" -volatile Boolean need_terminate_mostly_con_mark; +volatile BOOLEAN need_terminate_mostly_con_mark; -Boolean obj_is_marked_in_table(Partial_Reveal_Object *obj); +BOOLEAN obj_is_marked_in_table(Partial_Reveal_Object *obj); static FORCE_INLINE void scan_slot(Collector* marker, REF *p_ref) { @@ -93,7 +93,7 @@ void terminate_mostly_con_mark() { need_terminate_mostly_con_mark = TRUE; } -static Boolean concurrent_mark_need_terminating(GC* gc) +static BOOLEAN concurrent_mark_need_terminating(GC* gc) { if(need_terminate_mostly_con_mark) return TRUE; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_otf_concurrent.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_otf_concurrent.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_otf_concurrent.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_otf_concurrent.cpp Wed May 28 03:44:26 2008 @@ -18,7 +18,7 @@ #include "../finalizer_weakref/finalizer_weakref.h" #include "../thread/marker.h" -Boolean obj_is_marked_in_table(Partial_Reveal_Object *obj); +BOOLEAN obj_is_marked_in_table(Partial_Reveal_Object *obj); static FORCE_INLINE void scan_slot(Collector* marker, REF *p_ref) { @@ -85,7 +85,7 @@ } } -static Boolean concurrent_mark_need_terminating(GC* gc) +static BOOLEAN concurrent_mark_need_terminating(GC* gc) { GC_Metadata *metadata = gc->metadata; return gc_local_dirtyset_is_empty(gc) && pool_is_empty(metadata->gc_dirty_set_pool); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.cpp Wed May 28 03:44:26 2008 @@ -35,7 +35,7 @@ /******************** General interfaces for Mark-Sweep-Compact ***********************/ -Boolean obj_is_mark_black_in_table(Partial_Reveal_Object *obj) +BOOLEAN obj_is_mark_black_in_table(Partial_Reveal_Object *obj) { POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -58,7 +58,7 @@ } /* Argument need_construct stands for whether or not the dual-directon list needs constructing */ -Chunk_Header_Basic *wspace_grab_next_chunk(Wspace *wspace, Chunk_Header_Basic *volatile *shared_next_chunk, Boolean need_construct) +Chunk_Header_Basic *wspace_grab_next_chunk(Wspace *wspace, Chunk_Header_Basic *volatile *shared_next_chunk, BOOLEAN need_construct) { Chunk_Header_Basic *cur_chunk = *shared_next_chunk; @@ -173,7 +173,7 @@ #endif } -static void normal_chunk_fix_repointed_refs(Chunk_Header *chunk, Boolean double_fix) +static void normal_chunk_fix_repointed_refs(Chunk_Header *chunk, BOOLEAN double_fix) { /* Init field slot_index and depad the last index word in table for fixing */ chunk->slot_index = 0; @@ -221,7 +221,7 @@ } } -static void abnormal_chunk_fix_repointed_refs(Chunk_Header *chunk, Boolean double_fix) +static void abnormal_chunk_fix_repointed_refs(Chunk_Header *chunk, BOOLEAN double_fix) { if(double_fix) object_double_fix_ref_slots((Partial_Reveal_Object*)chunk->base); @@ -232,7 +232,7 @@ #endif } -static void wspace_fix_repointed_refs(Collector *collector, Wspace *wspace, Boolean double_fix) +static void wspace_fix_repointed_refs(Collector *collector, Wspace *wspace, BOOLEAN double_fix) { Chunk_Header_Basic *chunk = wspace_grab_next_chunk(wspace, &next_chunk_for_fixing, TRUE); @@ -369,7 +369,7 @@ * we need double fix object slots, * because some objects are forwarded from nos to mos and compacted into another chunk afterwards. */ - Boolean double_fix = collect_is_major() && wspace->need_compact; + BOOLEAN double_fix = collect_is_major() && wspace->need_compact; wspace_fix_repointed_refs(collector, wspace, double_fix); atomic_inc32(&num_fixing_collectors); @@ -382,7 +382,7 @@ /* Leftover: *************************************************/ if(wspace->need_fix){ - Boolean double_fix = collect_is_major() && wspace->need_compact; + BOOLEAN double_fix = collect_is_major() && wspace->need_compact; gc_fix_rootset(collector, double_fix); #ifdef SSPACE_TIME wspace_fix_time(FALSE); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_mark_sweep.h Wed May 28 03:44:26 2008 @@ -24,7 +24,7 @@ #define PFC_REUSABLE_RATIO 0.1 #define WSPACE_COMPACT_RATIO 0.06 -inline Boolean chunk_is_reusable(Chunk_Header *chunk) +inline BOOLEAN chunk_is_reusable(Chunk_Header *chunk) { return (float)(chunk->slot_num-chunk->alloc_num)/chunk->slot_num > PFC_REUSABLE_RATIO; } #define OBJ_ALLOC_BIT_IN_TABLE 0x01 @@ -58,7 +58,7 @@ extern volatile POINTER_SIZE_INT cur_alloc_mask; extern volatile POINTER_SIZE_INT cur_mark_mask; -inline Boolean is_super_obj(Partial_Reveal_Object *obj) +inline BOOLEAN is_super_obj(Partial_Reveal_Object *obj) { //return get_obj_info_raw(obj) & SUPER_OBJ_MASK;/* if(vm_object_size(obj) > SUPER_OBJ_THRESHOLD){ @@ -108,7 +108,7 @@ #if 0 /* Accurate marking: TRUE stands for being marked by this collector, and FALSE for another collector */ -inline Boolean obj_mark_in_table(Partial_Reveal_Object *obj) +inline BOOLEAN obj_mark_in_table(Partial_Reveal_Object *obj) { volatile POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -141,7 +141,7 @@ #endif -FORCE_INLINE Boolean obj_is_mark_gray_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_is_mark_gray_in_table(Partial_Reveal_Object *obj) { POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -155,9 +155,9 @@ return FALSE; } -Boolean obj_is_mark_black_in_table(Partial_Reveal_Object *obj); +BOOLEAN obj_is_mark_black_in_table(Partial_Reveal_Object *obj); -FORCE_INLINE Boolean obj_is_mark_black_in_table(Partial_Reveal_Object *obj, unsigned int size) +FORCE_INLINE BOOLEAN obj_is_mark_black_in_table(Partial_Reveal_Object *obj, unsigned int size) { POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -173,7 +173,7 @@ } -FORCE_INLINE Boolean obj_mark_gray_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_mark_gray_in_table(Partial_Reveal_Object *obj) { volatile POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -203,7 +203,7 @@ return FALSE; } -FORCE_INLINE Boolean obj_mark_black_in_table(Partial_Reveal_Object *obj, unsigned int size) +FORCE_INLINE BOOLEAN obj_mark_black_in_table(Partial_Reveal_Object *obj, unsigned int size) { //assert(obj_is_mark_in_table(obj)); volatile POINTER_SIZE_INT *p_color_word; @@ -233,7 +233,7 @@ } -FORCE_INLINE Boolean obj_mark_black_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_mark_black_in_table(Partial_Reveal_Object *obj) { // assert(obj_is_mark_in_table(obj)); volatile POINTER_SIZE_INT *p_color_word; @@ -262,7 +262,7 @@ return FALSE; } -FORCE_INLINE Boolean obj_dirty_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_dirty_in_table(Partial_Reveal_Object *obj) { volatile POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -289,7 +289,7 @@ return FALSE; } -FORCE_INLINE Boolean obj_is_dirty_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_is_dirty_in_table(Partial_Reveal_Object *obj) { POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -304,7 +304,7 @@ return FALSE; } -FORCE_INLINE Boolean obj_clear_mark_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_clear_mark_in_table(Partial_Reveal_Object *obj) { volatile POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -333,7 +333,7 @@ } -FORCE_INLINE Boolean obj_clear_dirty_in_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_clear_dirty_in_table(Partial_Reveal_Object *obj) { volatile POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -362,7 +362,7 @@ } -FORCE_INLINE Boolean obj_is_alloc_in_color_table(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_is_alloc_in_color_table(Partial_Reveal_Object *obj) { POINTER_SIZE_INT *p_color_word; unsigned int index_in_word; @@ -370,20 +370,20 @@ POINTER_SIZE_INT current_word = *p_color_word; POINTER_SIZE_INT obj_alloc_color_bit_in_word = cur_alloc_color << index_in_word; - return (Boolean)(current_word & obj_alloc_color_bit_in_word); + return (BOOLEAN)(current_word & obj_alloc_color_bit_in_word); } -FORCE_INLINE Boolean obj_need_take_snapshot(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_need_take_snapshot(Partial_Reveal_Object *obj) { return !obj_is_mark_black_in_table(obj) && !obj_is_dirty_in_table(obj); } -FORCE_INLINE Boolean obj_need_remember(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_need_remember(Partial_Reveal_Object *obj) { return (obj_is_mark_gray_in_table(obj) || obj_is_mark_black_in_table(obj)) && !obj_is_dirty_in_table(obj); } -FORCE_INLINE Boolean obj_need_remember_oldvar(Partial_Reveal_Object *obj) +FORCE_INLINE BOOLEAN obj_need_remember_oldvar(Partial_Reveal_Object *obj) { return !obj_is_mark_gray_in_table(obj) && !obj_is_mark_black_in_table(obj); } @@ -431,7 +431,7 @@ extern void wspace_compact(Collector *collector, Wspace *wspace); extern void wspace_merge_free_chunks(GC *gc, Wspace *wspace); extern void wspace_remerge_free_chunks(GC *gc, Wspace *wspace); -extern Chunk_Header_Basic *wspace_grab_next_chunk(Wspace *wspace, Chunk_Header_Basic *volatile *shared_next_chunk, Boolean need_construct); +extern Chunk_Header_Basic *wspace_grab_next_chunk(Wspace *wspace, Chunk_Header_Basic *volatile *shared_next_chunk, BOOLEAN need_construct); extern void pfc_set_slot_index(Chunk_Header *chunk, unsigned int first_free_word_index, POINTER_SIZE_INT alloc_color); extern void pfc_reset_slot_index(Chunk_Header *chunk); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_sweep_concurrent.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_sweep_concurrent.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_sweep_concurrent.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_sweep_concurrent.cpp Wed May 28 03:44:26 2008 @@ -79,7 +79,7 @@ return free_chunk_list; } -Boolean wspace_get_free_chunk_concurrent(Wspace *wspace, Free_Chunk* chunk) +BOOLEAN wspace_get_free_chunk_concurrent(Wspace *wspace, Free_Chunk* chunk) { POINTER_SIZE_INT chunk_size = CHUNK_SIZE(chunk); assert(!(chunk_size % CHUNK_GRANULARITY)); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.cpp Wed May 28 03:44:26 2008 @@ -79,7 +79,7 @@ return (void*)(heap_offset + (POINTER_SIZE_INT)gc_heap_base(gc_in_verify)); } -static Boolean obj_addr_overlapped(Obj_Addr addr1, Obj_Addr addr2) +static BOOLEAN obj_addr_overlapped(Obj_Addr addr1, Obj_Addr addr2) { unsigned int offset1 = addr1 & VERIFY_CARD_LOW_MASK; unsigned int size1 = (addr1 & VERIFY_CARD_HIGH_MASK) >> VERIFY_CARD_SIZE_BYTES_SHIFT; @@ -144,7 +144,7 @@ } /* size is rounded up size */ -static Boolean obj_position_is_correct(void *addr, unsigned int size) +static BOOLEAN obj_position_is_correct(void *addr, unsigned int size) { Chunk_Header *chunk = NULL; @@ -214,7 +214,7 @@ mark_card_add_entry(addr, size); } -static void verify_mark(void *addr, unsigned int size, Boolean destructively) +static void verify_mark(void *addr, unsigned int size, BOOLEAN destructively) { assert(address_belongs_to_gc_heap(addr, gc_in_verify)); @@ -300,7 +300,7 @@ assert(!*p_value++); } -static POINTER_SIZE_INT wspace_live_obj_num(Wspace *wspace, Boolean gc_finished) +static POINTER_SIZE_INT wspace_live_obj_num(Wspace *wspace, BOOLEAN gc_finished) { Chunk_Header *chunk = (Chunk_Header*)space_heap_start((Space*)wspace); Chunk_Header *wspace_ceiling = (Chunk_Header*)space_heap_end((Space*)wspace); @@ -439,11 +439,11 @@ static Vector_Block *trace_stack = NULL; POINTER_SIZE_INT live_obj_in_verify_marking = 0; -static Boolean obj_mark_in_vtable(GC *gc, Partial_Reveal_Object *obj) +static BOOLEAN obj_mark_in_vtable(GC *gc, Partial_Reveal_Object *obj) { assert(address_belongs_to_gc_heap(obj, gc)); assert((vm_object_size(obj) <= SUPER_OBJ_THRESHOLD) || (get_obj_info_raw(obj) & SUPER_OBJ_MASK)); - Boolean marked = obj_mark_in_vt(obj); + BOOLEAN marked = obj_mark_in_vt(obj); #ifdef SSPACE_VERIFY if(marked) live_obj_in_verify_marking++; #endif @@ -594,7 +594,7 @@ static uint64 fix_start_time; static uint64 merge_start_time; -void wspace_gc_time(GC *gc, Boolean before_gc) +void wspace_gc_time(GC *gc, BOOLEAN before_gc) { if(before_gc){ gc_start_time = tsc(); @@ -606,7 +606,7 @@ } } -void wspace_mark_time(Boolean before_mark) +void wspace_mark_time(BOOLEAN before_mark) { assert(before_mark == FALSE); if(before_mark){ @@ -619,7 +619,7 @@ } } -void wspace_sweep_time(Boolean before_sweep, Boolean wspace_need_compact) +void wspace_sweep_time(BOOLEAN before_sweep, BOOLEAN wspace_need_compact) { assert(before_sweep == FALSE); if(before_sweep){ @@ -635,7 +635,7 @@ } } -void wspace_compact_time(Boolean before_compact) +void wspace_compact_time(BOOLEAN before_compact) { assert(before_compact == FALSE); if(before_compact){ @@ -648,7 +648,7 @@ } } -void wspace_fix_time(Boolean before_fix) +void wspace_fix_time(BOOLEAN before_fix) { assert(before_fix == FALSE); if(before_fix){ @@ -661,7 +661,7 @@ } } -void wspace_merge_time(Boolean before_merge) +void wspace_merge_time(BOOLEAN before_merge) { assert(before_merge == FALSE); if(before_merge){ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/wspace_verify.h Wed May 28 03:44:26 2008 @@ -39,15 +39,15 @@ void wspace_verify_after_sweep(GC *gc); void wspace_verify_after_collection(GC *gc); -void wspace_chunks_info(Wspace *wspace, Boolean show_info); +void wspace_chunks_info(Wspace *wspace, BOOLEAN show_info); void wspace_alloc_info(unsigned int size); void wspace_alloc_info_summary(void); -void wspace_gc_time(GC *gc, Boolean before_gc); -void wspace_mark_time(Boolean before_mark); -void wspace_sweep_time(Boolean before_sweep, Boolean wspace_need_compact); -void wspace_compact_time(Boolean before_compact); -void wspace_fix_time(Boolean before_fix); -void wspace_merge_time(Boolean before_merge); +void wspace_gc_time(GC *gc, BOOLEAN before_gc); +void wspace_mark_time(BOOLEAN before_mark); +void wspace_sweep_time(BOOLEAN before_sweep, BOOLEAN wspace_need_compact); +void wspace_compact_time(BOOLEAN before_compact); +void wspace_fix_time(BOOLEAN before_fix); +void wspace_merge_time(BOOLEAN before_merge); #endif // _SSPACE_VERIFY_H_ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.cpp Wed May 28 03:44:26 2008 @@ -223,7 +223,7 @@ unsigned int sspace_first_idx = sspace->first_block_idx; - Boolean is_major_collection = collect_is_major(); + BOOLEAN is_major_collection = collect_is_major(); if( is_major_collection ){ /* prepare for from-space, first half */ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace.h Wed May 28 03:44:26 2008 @@ -33,7 +33,7 @@ float survive_ratio; unsigned int collect_algorithm; GC* gc; - Boolean move_object; + BOOLEAN move_object; Space_Statistics* space_statistic; @@ -76,7 +76,7 @@ void sspace_destruct(Sspace *sspace); void* sspace_alloc(unsigned size, Allocator *allocator); -Boolean sspace_alloc_block(Sspace* sspace, Allocator* allocator); +BOOLEAN sspace_alloc_block(Sspace* sspace, Allocator* allocator); void sspace_collection(Sspace* sspace); void sspace_prepare_for_collection(Sspace* sspace); @@ -90,28 +90,28 @@ POINTER_SIZE_INT sspace_free_space_size(Sspace* nos); POINTER_SIZE_INT sspace_used_space_size(Sspace* nos); -FORCE_INLINE Boolean sspace_has_free_block(Sspace* sspace) +FORCE_INLINE BOOLEAN sspace_has_free_block(Sspace* sspace) { return (sspace->cur_free_block != NULL); } -FORCE_INLINE Boolean obj_belongs_to_tospace(Partial_Reveal_Object* p_obj) +FORCE_INLINE BOOLEAN obj_belongs_to_tospace(Partial_Reveal_Object* p_obj) { return ( p_obj >= tospace_start && p_obj < tospace_end ); } -FORCE_INLINE Boolean obj_belongs_to_survivor_area(Sspace* sspace, Partial_Reveal_Object* p_obj) +FORCE_INLINE BOOLEAN obj_belongs_to_survivor_area(Sspace* sspace, Partial_Reveal_Object* p_obj) { return (p_obj >= sspace->survivor_area_start && p_obj < sspace->survivor_area_end); } /* to be forwarded to MOS or was forwarded by other thread */ -FORCE_INLINE Boolean obj_be_forwarded(Sspace* sspace, Partial_Reveal_Object* p_obj) +FORCE_INLINE BOOLEAN obj_be_forwarded(Sspace* sspace, Partial_Reveal_Object* p_obj) { /* NOTE:: Tricky! When the thread checks, the oi could be set a forward address by another thread. */ Obj_Info_Type oi = get_obj_info_raw(p_obj); - Boolean be_forwarded = (Boolean)(oi & (FORWARD_BIT|OBJ_AGE_BIT)); + BOOLEAN be_forwarded = (BOOLEAN)(oi & (FORWARD_BIT|OBJ_AGE_BIT)); assert( obj_belongs_to_survivor_area(sspace, p_obj)? be_forwarded:1); return be_forwarded; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_alloc.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_alloc.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_alloc.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_alloc.cpp Wed May 28 03:44:26 2008 @@ -17,7 +17,7 @@ #include "sspace.h" -Boolean sspace_alloc_block(Sspace* sspace, Allocator* allocator) +BOOLEAN sspace_alloc_block(Sspace* sspace, Allocator* allocator) { alloc_context_reset(allocator); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_forward.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_forward.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_forward.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_forward.cpp Wed May 28 03:44:26 2008 @@ -17,7 +17,7 @@ #include "sspace.h" -static Boolean semispace_alloc_block(Sspace* sspace, Allocator* allocator) +static BOOLEAN semispace_alloc_block(Sspace* sspace, Allocator* allocator) { alloc_context_reset(allocator); @@ -58,7 +58,7 @@ /* grab a new block */ Sspace* sspace = (Sspace*)allocator->alloc_space; - Boolean ok = semispace_alloc_block(sspace, allocator); + BOOLEAN ok = semispace_alloc_block(sspace, allocator); if(!ok) return NULL; p_return = thread_local_alloc(size, allocator); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/semi_space/sspace_gen_ss_pool.cpp Wed May 28 03:44:26 2008 @@ -105,7 +105,7 @@ if(!obj_belongs_to_nos(p_obj) || obj_belongs_to_tospace(p_obj)) return; Partial_Reveal_Object* p_target_obj = NULL; - Boolean to_rem_slot = FALSE; + BOOLEAN to_rem_slot = FALSE; /* Fastpath: object has already been forwarded, update the ref slot */ if(obj_is_fw_in_oi(p_obj)){ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.cpp Wed May 28 03:44:26 2008 @@ -336,7 +336,7 @@ } } -Boolean is_collector_finished(GC* gc) +BOOLEAN is_collector_finished(GC* gc) { unsigned int num_active_collectors = gc->num_active_collectors; unsigned int i = 0; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector.h Wed May 28 03:44:26 2008 @@ -88,7 +88,7 @@ POINTER_SIZE_INT segment_live_size[NORMAL_SIZE_SEGMENT_NUM]; unsigned int result; - Boolean collector_is_active; + BOOLEAN collector_is_active; /*for collect statistics info*/ #ifdef GC_GEN_STATS @@ -115,13 +115,13 @@ void gc_gen_hook_for_collector_init(Collector *collector); #endif -Boolean is_collector_finished(GC* gc); +BOOLEAN is_collector_finished(GC* gc); void wait_collection_finish(GC* gc); int64 gc_get_collector_time(GC* gc); -inline Boolean gc_collection_result(GC* gc) +inline BOOLEAN gc_collection_result(GC* gc) { - Boolean result = TRUE; + BOOLEAN result = TRUE; for(unsigned i=0; inum_active_collectors; i++){ Collector* collector = gc->collectors[i]; result &= collector->result; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector_alloc.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector_alloc.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector_alloc.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/collector_alloc.h Wed May 28 03:44:26 2008 @@ -48,8 +48,8 @@ unsigned int size = vm_object_size(p_obj); #ifdef USE_32BITS_HASHCODE - Boolean obj_is_set_hashcode = hashcode_is_set(p_obj); - Boolean obj_hashcode_attached = FALSE; + BOOLEAN obj_is_set_hashcode = hashcode_is_set(p_obj); + BOOLEAN obj_hashcode_attached = FALSE; if(obj_is_set_hashcode){ size += GC_OBJECT_ALIGNMENT; /* the tospace of semispace GC may have objects with hashcode attached*/ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.cpp Wed May 28 03:44:26 2008 @@ -29,7 +29,7 @@ POINTER_SIZE_INT PREFETCH_DISTANCE = 1024; POINTER_SIZE_INT ZEROING_SIZE = 2*KB; POINTER_SIZE_INT PREFETCH_STRIDE = 64; -Boolean PREFETCH_ENABLED = FALSE; +BOOLEAN PREFETCH_ENABLED = FALSE; #endif void gc_tls_init() Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/gc_thread.h Wed May 28 03:44:26 2008 @@ -36,7 +36,7 @@ extern POINTER_SIZE_INT PREFETCH_DISTANCE; extern POINTER_SIZE_INT ZEROING_SIZE; extern POINTER_SIZE_INT PREFETCH_STRIDE; -extern Boolean PREFETCH_ENABLED; +extern BOOLEAN PREFETCH_ENABLED; #else /* ALLOC_PREFETCH ^^^^^^^^^^^^^^^^ */ #define ZEROING_SIZE 2*KB #endif /* !ALLOC_PREFETCH */ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.cpp Wed May 28 03:44:26 2008 @@ -160,7 +160,7 @@ return; } -Boolean is_mark_finished(GC* gc) +BOOLEAN is_mark_finished(GC* gc) { unsigned int num_active_marker = gc->num_active_markers; unsigned int i = 0; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/marker.h Wed May 28 03:44:26 2008 @@ -73,7 +73,7 @@ POINTER_SIZE_INT segment_live_size[NORMAL_SIZE_SEGMENT_NUM]; unsigned int result; - Boolean marker_is_active; + BOOLEAN marker_is_active; VmEventHandle markroot_finished_event; @@ -95,7 +95,7 @@ void marker_execute_task_concurrent(GC* gc, TaskType task_func, Space* space); void wait_mark_finish(GC* gc); -Boolean is_mark_finished(GC* gc); +BOOLEAN is_mark_finished(GC* gc); int64 gc_get_marker_time(GC* gc); #endif //_MARKER_H_ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.cpp Wed May 28 03:44:26 2008 @@ -142,7 +142,7 @@ return; } -Boolean gc_local_dirtyset_is_empty(GC* gc) +BOOLEAN gc_local_dirtyset_is_empty(GC* gc) { lock(gc->mutator_list_lock); @@ -215,7 +215,7 @@ size_new_obj_desturcted_mutator_alloced += mutator->new_obj_size; } -POINTER_SIZE_INT gc_get_new_object_size(GC* gc, Boolean need_reset) +POINTER_SIZE_INT gc_get_new_object_size(GC* gc, BOOLEAN need_reset) { POINTER_SIZE_INT new_obj_size = 0; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator.h Wed May 28 03:44:26 2008 @@ -60,11 +60,11 @@ void gc_reset_mutator_context(GC* gc); void gc_prepare_mutator_remset(GC* gc); -Boolean gc_local_dirtyset_is_empty(GC* gc); +BOOLEAN gc_local_dirtyset_is_empty(GC* gc); Vector_Block* gc_get_local_dirty_set(GC* gc, unsigned int shared_id); void gc_start_mutator_time_measure(GC* gc); int64 gc_get_mutator_time(GC* gc); -POINTER_SIZE_INT gc_get_new_object_size(GC* gc, Boolean need_reset); +POINTER_SIZE_INT gc_get_new_object_size(GC* gc, BOOLEAN need_reset); inline void mutator_post_signal(Mutator* mutator, unsigned int handshake_signal) { Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator_alloc.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator_alloc.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator_alloc.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/thread/mutator_alloc.cpp Wed May 28 03:44:26 2008 @@ -31,7 +31,7 @@ //#define GC_OBJ_SIZE_STATISTIC -volatile Boolean obj_alloced_live = FALSE; +volatile BOOLEAN obj_alloced_live = FALSE; #ifdef GC_OBJ_SIZE_STATISTIC #define GC_OBJ_SIZE_STA_MAX 256*KB @@ -58,7 +58,7 @@ } #endif -extern Boolean mutator_need_block; +extern BOOLEAN mutator_need_block; Managed_Object_Handle gc_alloc(unsigned size, Allocation_Handle ah, void *unused_gc_tls) { @@ -71,7 +71,7 @@ size = (size & NEXT_TO_HIGH_BIT_CLEAR_MASK); Allocator* allocator = (Allocator*)gc_get_tls(); - Boolean type_has_fin = type_has_finalizer((Partial_Reveal_VTable*)decode_vt((VT)ah)); + BOOLEAN type_has_fin = type_has_finalizer((Partial_Reveal_VTable*)decode_vt((VT)ah)); if(type_has_fin && !IGNORE_FINREF && mutator_need_block) vm_heavy_finalizer_block_mutator(); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp Wed May 28 03:44:26 2008 @@ -22,12 +22,12 @@ #include "fspace.h" #ifdef PREFETCH_SUPPORTED -Boolean mark_prefetch = FALSE; +BOOLEAN mark_prefetch = FALSE; #endif -Boolean NOS_PARTIAL_FORWARD = FALSE; +BOOLEAN NOS_PARTIAL_FORWARD = FALSE; -Boolean forward_first_half; +BOOLEAN forward_first_half; void* object_forwarding_boundary=NULL; Fspace *fspace_initialize(GC* gc, void* start, POINTER_SIZE_INT fspace_size, POINTER_SIZE_INT commit_size) @@ -106,7 +106,7 @@ unsigned int first_idx = fspace->first_block_idx; unsigned int marked_start_idx = 0; //was for oi markbit reset, now useless unsigned int marked_last_idx = 0; - Boolean is_major_collection = collect_is_major(); + BOOLEAN is_major_collection = collect_is_major(); if( is_major_collection || NOS_PARTIAL_FORWARD == FALSE || !gc_is_gen_mode()) Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.h Wed May 28 03:44:26 2008 @@ -30,7 +30,7 @@ * still be preserved in fspace, that means to give them time to die. */ -extern Boolean forward_first_half; +extern BOOLEAN forward_first_half; /* boundary splitting fspace into forwarding part and remaining part */ extern void* object_forwarding_boundary; @@ -50,7 +50,7 @@ #endif void* fspace_alloc(unsigned size, Allocator *allocator); -Boolean fspace_alloc_block(Fspace* fspace, Allocator* allocator); +BOOLEAN fspace_alloc_block(Fspace* fspace, Allocator* allocator); void fspace_reset_after_collection(Fspace* fspace); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_alloc.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_alloc.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_alloc.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_alloc.cpp Wed May 28 03:44:26 2008 @@ -23,7 +23,7 @@ #include "../common/gc_concurrent.h" #include "../common/collection_scheduler.h" -Boolean fspace_alloc_block(Fspace* fspace, Allocator* allocator) +BOOLEAN fspace_alloc_block(Fspace* fspace, Allocator* allocator) { alloc_context_reset(allocator); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace_gen_forward_pool.cpp Wed May 28 03:44:26 2008 @@ -29,7 +29,7 @@ #ifdef GC_GEN_STATS #include "../gen/gen_stats.h" #endif -static FORCE_INLINE Boolean fspace_object_to_be_forwarded(Partial_Reveal_Object *p_obj, Fspace *fspace) +static FORCE_INLINE BOOLEAN fspace_object_to_be_forwarded(Partial_Reveal_Object *p_obj, Fspace *fspace) { assert(obj_belongs_to_nos(p_obj)); return forward_first_half? (p_obj < object_forwarding_boundary):(p_obj>=object_forwarding_boundary); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/seq_list.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/seq_list.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/seq_list.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/seq_list.h Wed May 28 03:44:26 2008 @@ -54,7 +54,7 @@ STD_FREE(seq_list); } -inline Boolean seq_list_add(Seq_List* seq_list, List_Node* node) +inline BOOLEAN seq_list_add(Seq_List* seq_list, List_Node* node) { #ifdef _DEBUG seq_list->node_num ++; @@ -85,7 +85,7 @@ return NULL; } -inline Boolean seq_list_has_next(Seq_List* seq_list) +inline BOOLEAN seq_list_has_next(Seq_List* seq_list) { return seq_list->curr != seq_list->head; } @@ -105,7 +105,7 @@ return NULL; } -inline Boolean seq_list_remove(Seq_List* seq_list, List_Node* node) +inline BOOLEAN seq_list_remove(Seq_List* seq_list, List_Node* node) { List_Node* prev_node = seq_list_lookup_prev_node(seq_list, node); if(prev_node==NULL) return FALSE; //need assertion here. Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_pool.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_pool.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_pool.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_pool.h Wed May 28 03:44:26 2008 @@ -29,7 +29,7 @@ inline Pool* sync_pool_create(){ return sync_stack_init(); } inline void sync_pool_destruct(Pool* pool){ sync_stack_destruct(pool); } -inline Boolean pool_is_empty(Pool* pool){ return sync_stack_is_empty(pool);} +inline BOOLEAN pool_is_empty(Pool* pool){ return sync_stack_is_empty(pool);} inline void pool_empty(Pool* pool) { sync_stack_empty(pool); } inline unsigned int pool_size(Pool* pool){ return sync_stack_size(pool); } @@ -43,7 +43,7 @@ inline void pool_put_entry(Pool* pool, void* value) { assert(value); - Boolean ok = sync_stack_push(pool, (Node*)value); + BOOLEAN ok = sync_stack_push(pool, (Node*)value); assert(ok); } Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_queue.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_queue.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_queue.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_queue.h Wed May 28 03:44:26 2008 @@ -96,7 +96,7 @@ return; } -Boolean sync_queue_pull(Sync_Queue* queue, unsigned int * pvalue) +BOOLEAN sync_queue_pull(Sync_Queue* queue, unsigned int * pvalue) { Queue_Link head, tail, next, tmp1, tmp2; while(TRUE){ Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_stack.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_stack.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_stack.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/sync_stack.h Wed May 28 03:44:26 2008 @@ -119,7 +119,7 @@ return 0; } -inline Boolean sync_stack_push(Sync_Stack* stack, Node* node) +inline BOOLEAN sync_stack_push(Sync_Stack* stack, Node* node) { Stack_Top cur_top = stack->top; node->next = stack_top_get_entry(cur_top); @@ -142,7 +142,7 @@ /* it does not matter whether this is atomic or not, because it is only invoked when there is no contention or only for rough idea */ -inline Boolean sync_stack_is_empty(Sync_Stack* stack) +inline BOOLEAN sync_stack_is_empty(Sync_Stack* stack) { return (stack_top_get_entry(stack->top) == NULL); } Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/vector_block.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/vector_block.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/vector_block.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/utils/vector_block.h Wed May 28 03:44:26 2008 @@ -52,18 +52,18 @@ inline unsigned int vector_block_entry_count(Vector_Block* block) { return (unsigned int)(block->tail - block->head); } -inline Boolean vector_block_is_full(Vector_Block* block) +inline BOOLEAN vector_block_is_full(Vector_Block* block) { return block->tail == block->heap_end; } /* -inline Boolean vector_block_is_empty(Vector_Block* block) +inline BOOLEAN vector_block_is_empty(Vector_Block* block) { return block->tail == block->head; } -inline Boolean vector_block_is_full(Vector_Block* block) +inline BOOLEAN vector_block_is_full(Vector_Block* block) { return (block->tail - block->entries) == VECTOR_BLOCK_ENTRY_NUM; } */ -inline Boolean vector_block_is_empty(Vector_Block* block) +inline BOOLEAN vector_block_is_empty(Vector_Block* block) { return block->tail == block->head; } inline void vector_block_add_entry(Vector_Block* block, POINTER_SIZE_INT value) @@ -107,17 +107,17 @@ #define VECTOR_BLOCK_FULL_BIT 0x02 #define VECTOR_BLOCK_SHARE_ID_SHIFT 0x05 #define VECTOR_BLOCK_EXCLUSIVE_ID 0xFFff -inline Boolean vector_block_is_shared(Vector_Block* block) +inline BOOLEAN vector_block_is_shared(Vector_Block* block) { - return (Boolean)((POINTER_SIZE_INT)block->next & VECTOR_BLOCK_SHARE_BIT); + return (BOOLEAN)((POINTER_SIZE_INT)block->next & VECTOR_BLOCK_SHARE_BIT); } -inline Boolean vector_block_is_set_full(Vector_Block* block) +inline BOOLEAN vector_block_is_set_full(Vector_Block* block) { - return (Boolean)((POINTER_SIZE_INT)block->next & VECTOR_BLOCK_FULL_BIT); + return (BOOLEAN)((POINTER_SIZE_INT)block->next & VECTOR_BLOCK_FULL_BIT); } -inline Boolean vector_block_set_full(Vector_Block* block) +inline BOOLEAN vector_block_set_full(Vector_Block* block) { POINTER_SIZE_INT old_shared_var = (POINTER_SIZE_INT) block->next; POINTER_SIZE_INT new_shared_var = old_shared_var | VECTOR_BLOCK_FULL_BIT; @@ -133,7 +133,7 @@ } -inline Boolean vector_block_set_shared(Vector_Block* block, unsigned int share_id) +inline BOOLEAN vector_block_set_shared(Vector_Block* block, unsigned int share_id) { POINTER_SIZE_INT new_shared_var = (POINTER_SIZE_INT)((share_id << VECTOR_BLOCK_SHARE_ID_SHIFT) | VECTOR_BLOCK_SHARE_BIT); POINTER_SIZE_INT old_shared_var = (POINTER_SIZE_INT) block->next; @@ -147,7 +147,7 @@ } } -inline Boolean vector_block_not_full_set_unshared(Vector_Block* block) +inline BOOLEAN vector_block_not_full_set_unshared(Vector_Block* block) { POINTER_SIZE_INT new_shared_var = (POINTER_SIZE_INT) 0; POINTER_SIZE_INT old_shared_var = (POINTER_SIZE_INT) block->next; @@ -164,7 +164,7 @@ return FALSE; } -inline Boolean vector_block_set_exclusive(Vector_Block* block) +inline BOOLEAN vector_block_set_exclusive(Vector_Block* block) { POINTER_SIZE_INT new_shared_var = (POINTER_SIZE_INT)((VECTOR_BLOCK_EXCLUSIVE_ID << VECTOR_BLOCK_SHARE_ID_SHIFT) | VECTOR_BLOCK_SHARE_BIT); POINTER_SIZE_INT old_shared_var = (POINTER_SIZE_INT) block->next; @@ -201,7 +201,7 @@ inline POINTER_SIZE_INT* vector_block_iterator_advance(Vector_Block* block, POINTER_SIZE_INT* iter) { return ++iter; } -inline Boolean vector_block_iterator_end(Vector_Block* block, POINTER_SIZE_INT* iter) +inline BOOLEAN vector_block_iterator_end(Vector_Block* block, POINTER_SIZE_INT* iter) { return iter == block->tail; } inline POINTER_SIZE_INT* vector_block_get_last_entry(Vector_Block* block) @@ -222,15 +222,15 @@ #endif } -inline Boolean vector_stack_is_empty(Vector_Block* block) +inline BOOLEAN vector_stack_is_empty(Vector_Block* block) { return (block->head == block->tail); } /* -inline Boolean vector_stack_is_empty(Vector_Block* block) +inline BOOLEAN vector_stack_is_empty(Vector_Block* block) { return (block->head - block->entries) == VECTOR_BLOCK_ENTRY_NUM; } */ -inline Boolean vector_stack_is_full(Vector_Block* block) +inline BOOLEAN vector_stack_is_full(Vector_Block* block) { return (block->head == block->entries); } inline void vector_stack_push(Vector_Block* block, POINTER_SIZE_INT value) Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp Wed May 28 03:44:26 2008 @@ -19,7 +19,7 @@ #include "verify_gc_effect.h" #include "verify_mutator_effect.h" -Boolean verifier_compare_objs_pools(Pool* objs_pool_before_gc, Pool* objs_pool_after_gc, Pool* free_pool ,Object_Comparator object_comparator) +BOOLEAN verifier_compare_objs_pools(Pool* objs_pool_before_gc, Pool* objs_pool_after_gc, Pool* free_pool ,Object_Comparator object_comparator) { Vector_Block* objs_set_before_gc = pool_get_entry(objs_pool_before_gc); Vector_Block* objs_set_after_gc = pool_get_entry(objs_pool_after_gc); @@ -55,7 +55,7 @@ } } -Boolean verifier_copy_rootsets(GC* gc, Heap_Verifier* heap_verifier) +BOOLEAN verifier_copy_rootsets(GC* gc, Heap_Verifier* heap_verifier) { Heap_Verifier_Metadata* verifier_metadata = heap_verifier->heap_verifier_metadata; GC_Verifier* gc_verifier = heap_verifier->gc_verifier; @@ -81,7 +81,7 @@ return TRUE; } -Boolean verify_rootset_slot(REF* p_ref, Heap_Verifier* heap_verifier) +BOOLEAN verify_rootset_slot(REF* p_ref, Heap_Verifier* heap_verifier) { Partial_Reveal_Object* p_obj = read_slot(p_ref); assert(address_belongs_to_gc_heap(p_obj,heap_verifier->gc)); @@ -145,7 +145,7 @@ } -Boolean verifier_parse_options(Heap_Verifier* heap_verifier, char* options) +BOOLEAN verifier_parse_options(Heap_Verifier* heap_verifier, char* options) { char* verifier_options = options; char* option = NULL; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h Wed May 28 03:44:26 2008 @@ -49,12 +49,12 @@ Allocation_Verifier* allocation_verifier; Heap_Verifier_Metadata* heap_verifier_metadata; - Boolean is_before_gc; - Boolean gc_is_gen_mode; - Boolean need_verify_gc; - Boolean need_verify_allocation; - Boolean need_verify_rootset; - Boolean need_verify_writebarrier; + BOOLEAN is_before_gc; + BOOLEAN gc_is_gen_mode; + BOOLEAN need_verify_gc; + BOOLEAN need_verify_allocation; + BOOLEAN need_verify_rootset; + BOOLEAN need_verify_writebarrier; Object_Scanner all_obj_scanner; Object_Scanner live_obj_scanner; @@ -62,7 +62,7 @@ -typedef Boolean (*Object_Comparator)(POINTER_SIZE_INT*, POINTER_SIZE_INT*); +typedef BOOLEAN (*Object_Comparator)(POINTER_SIZE_INT*, POINTER_SIZE_INT*); extern Heap_Verifier* get_heap_verifier(); @@ -72,13 +72,13 @@ extern void verifier_scan_los_objects(Space* space, Heap_Verifier* heap_verifier); -Boolean verifier_copy_rootsets(GC* gc, Heap_Verifier* heap_verifier); -Boolean verifier_compare_objs_pools(Pool* objs_pool_before_gc, Pool* objs_pool_after_gc, Pool* free_pool ,Object_Comparator object_comparator); -Boolean verifier_parse_options(Heap_Verifier* heap_verifier, char* options); +BOOLEAN verifier_copy_rootsets(GC* gc, Heap_Verifier* heap_verifier); +BOOLEAN verifier_compare_objs_pools(Pool* objs_pool_before_gc, Pool* objs_pool_after_gc, Pool* free_pool ,Object_Comparator object_comparator); +BOOLEAN verifier_parse_options(Heap_Verifier* heap_verifier, char* options); void verifier_log_before_gc(Heap_Verifier* heap_verifier); void verifier_log_after_gc(Heap_Verifier* heap_verifier); void verifier_log_start(char* message); -Boolean verify_rootset_slot(REF* p_ref, Heap_Verifier* heap_verifier); +BOOLEAN verify_rootset_slot(REF* p_ref, Heap_Verifier* heap_verifier); @@ -87,24 +87,24 @@ inline void verifier_set_gen_mode(Heap_Verifier* heap_verifier) { heap_verifier->gc_is_gen_mode = gc_is_gen_mode(); } -inline Boolean need_verify_gc_effect(Heap_Verifier* heap_verifier) +inline BOOLEAN need_verify_gc_effect(Heap_Verifier* heap_verifier) { return heap_verifier->need_verify_gc && !heap_verifier->is_before_gc; } -inline Boolean need_scan_live_objs(Heap_Verifier* heap_verifier) +inline BOOLEAN need_scan_live_objs(Heap_Verifier* heap_verifier) { if(heap_verifier->need_verify_gc) return TRUE; else if(heap_verifier->need_verify_writebarrier && !heap_verifier->is_before_gc) return TRUE; else return FALSE; } -inline Boolean need_verify_mutator_effect(Heap_Verifier* heap_verifier) +inline BOOLEAN need_verify_mutator_effect(Heap_Verifier* heap_verifier) { if(!heap_verifier->is_before_gc) return FALSE; return heap_verifier->need_verify_allocation || heap_verifier->need_verify_rootset || heap_verifier->need_verify_writebarrier; } -inline Boolean need_scan_all_objs(Heap_Verifier* heap_verifier) +inline BOOLEAN need_scan_all_objs(Heap_Verifier* heap_verifier) { if(!heap_verifier->is_before_gc) return FALSE; return heap_verifier->need_verify_allocation || heap_verifier->need_verify_writebarrier; @@ -170,9 +170,9 @@ *p_ref = (REF)((POINTER_SIZE_INT)ref & ~VERIFY_WB_MARK_BIT); } -inline Boolean wb_is_marked_in_slot(REF* p_ref){ +inline BOOLEAN wb_is_marked_in_slot(REF* p_ref){ REF ref = *p_ref; - return (Boolean)((POINTER_SIZE_INT)ref & VERIFY_WB_MARK_BIT); + return (BOOLEAN)((POINTER_SIZE_INT)ref & VERIFY_WB_MARK_BIT); } inline REF verifier_get_object_slot(REF* p_ref) @@ -189,8 +189,8 @@ obj_set_vt(p_obj, (VT)((POINTER_SIZE_INT)vt | UNREACHABLE_OBJ_MARK_IN_VT)); } -inline Boolean is_unreachable_obj(Partial_Reveal_Object* p_obj) +inline BOOLEAN is_unreachable_obj(Partial_Reveal_Object* p_obj) { - return (Boolean)((POINTER_SIZE_INT)obj_get_vt_raw(p_obj) & UNREACHABLE_OBJ_MARK_IN_VT); + return (BOOLEAN)((POINTER_SIZE_INT)obj_get_vt_raw(p_obj) & UNREACHABLE_OBJ_MARK_IN_VT); }*/ #endif Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.cpp Wed May 28 03:44:26 2008 @@ -105,7 +105,7 @@ heap_verifier->heap_verifier_metadata = NULL; } -Vector_Block* gc_verifier_metadata_extend(Pool* pool, Boolean is_set_pool) +Vector_Block* gc_verifier_metadata_extend(Pool* pool, BOOLEAN is_set_pool) { /*add a slot to pool point back to verifier_metadata, then we do not need the global var verifer_metadata*/ lock(verifier_metadata->alloc_lock); @@ -155,7 +155,7 @@ return block; } -void verifier_clear_pool(Pool* working_pool, Pool* free_pool, Boolean is_vector_stack) +void verifier_clear_pool(Pool* working_pool, Pool* free_pool, BOOLEAN is_vector_stack) { Vector_Block* working_block = pool_get_entry(working_pool); while(working_block){ @@ -166,7 +166,7 @@ } } -void verifier_remove_pool(Pool* working_pool, Pool* free_pool, Boolean is_vector_stack) +void verifier_remove_pool(Pool* working_pool, Pool* free_pool, BOOLEAN is_vector_stack) { verifier_clear_pool(working_pool, free_pool, is_vector_stack); sync_pool_destruct(working_pool); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_metadata.h Wed May 28 03:44:26 2008 @@ -57,10 +57,10 @@ struct Heap_Verifier; void gc_verifier_metadata_initialize(Heap_Verifier* heap_verifier); void gc_verifier_metadata_destruct(Heap_Verifier* heap_verifier); -Vector_Block* gc_verifier_metadata_extend(Pool* pool, Boolean is_set_pool); +Vector_Block* gc_verifier_metadata_extend(Pool* pool, BOOLEAN is_set_pool); -void verifier_clear_pool(Pool* working_pool, Pool* free_pool, Boolean is_vector_stack); -void verifier_remove_pool(Pool* working_pool, Pool* free_pool, Boolean is_vector_stack); +void verifier_clear_pool(Pool* working_pool, Pool* free_pool, BOOLEAN is_vector_stack); +void verifier_remove_pool(Pool* working_pool, Pool* free_pool, BOOLEAN is_vector_stack); void verifier_copy_pool_reverse_order(Pool* dest_pool, Pool* source_pool); void verifier_copy_pool(Pool* dest_pool, Pool* source_pool); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp Wed May 28 03:44:26 2008 @@ -145,7 +145,7 @@ } } -static Boolean fspace_object_was_forwarded(Partial_Reveal_Object *p_obj, Fspace *fspace, Heap_Verifier* heap_verifier) +static BOOLEAN fspace_object_was_forwarded(Partial_Reveal_Object *p_obj, Fspace *fspace, Heap_Verifier* heap_verifier) { GC_Verifier* gc_verifier = heap_verifier->gc_verifier; assert(obj_belongs_to_space(p_obj, (Space*)fspace)); @@ -217,7 +217,7 @@ } #ifdef USE_32BITS_HASHCODE -inline Object_Hashcode_Inform* verifier_copy_hashcode(Partial_Reveal_Object* p_obj, Heap_Verifier* heap_verifier, Boolean is_before_gc) +inline Object_Hashcode_Inform* verifier_copy_hashcode(Partial_Reveal_Object* p_obj, Heap_Verifier* heap_verifier, BOOLEAN is_before_gc) { hash_obj_distance ++; @@ -264,7 +264,7 @@ } #else #define GCGEN_HASH_MASK 0x1fc -inline Object_Hashcode_Inform* verifier_copy_hashcode(Partial_Reveal_Object* p_obj, Heap_Verifier* heap_verifier, Boolean is_before_gc) +inline Object_Hashcode_Inform* verifier_copy_hashcode(Partial_Reveal_Object* p_obj, Heap_Verifier* heap_verifier, BOOLEAN is_before_gc) { hash_obj_distance ++; @@ -375,11 +375,11 @@ } -Boolean compare_live_obj_inform(POINTER_SIZE_INT* obj_container1,POINTER_SIZE_INT* obj_container2) +BOOLEAN compare_live_obj_inform(POINTER_SIZE_INT* obj_container1,POINTER_SIZE_INT* obj_container2) { Live_Object_Inform* obj_inform_1 = (Live_Object_Inform*)*obj_container1; Live_Object_Inform* obj_inform_2 = (Live_Object_Inform*)*obj_container2; - Boolean ret=TRUE; + BOOLEAN ret=TRUE; if(((POINTER_SIZE_INT)obj_inform_1->vt_raw) == ((POINTER_SIZE_INT)obj_inform_2->vt_raw)){ if(obj_inform_1->obj_info != obj_inform_2->obj_info) { @@ -434,7 +434,7 @@ return ret; } -Boolean compare_obj_hash_inform(POINTER_SIZE_INT* container1,POINTER_SIZE_INT* container2) +BOOLEAN compare_obj_hash_inform(POINTER_SIZE_INT* container1,POINTER_SIZE_INT* container2) { Object_Hashcode_Inform* obj_hash_1 = (Object_Hashcode_Inform*) *container1; Object_Hashcode_Inform* obj_hash_2 = (Object_Hashcode_Inform*) *container2; @@ -457,7 +457,7 @@ Heap_Verifier_Metadata* verifier_metadata = heap_verifier->heap_verifier_metadata; Pool* free_pool = verifier_metadata->free_set_pool; - Boolean passed = verifier_compare_objs_pools(verifier_metadata->objects_pool_before_gc, + BOOLEAN passed = verifier_compare_objs_pools(verifier_metadata->objects_pool_before_gc, verifier_metadata->objects_pool_after_gc , free_pool, compare_live_obj_inform); if(!passed) gc_verifier->is_verification_passed = FALSE; #ifndef BUILD_IN_REFERENT Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.h Wed May 28 03:44:26 2008 @@ -26,9 +26,9 @@ Vector_Block* objects_set; Vector_Block* hashcode_set; - Boolean is_tracing_resurrect_obj; + BOOLEAN is_tracing_resurrect_obj; unsigned int collect_kind; - Boolean is_before_fallback_collection; + BOOLEAN is_before_fallback_collection; POINTER_SIZE_INT num_live_objects_before_gc; POINTER_SIZE_INT num_live_objects_after_gc; @@ -51,7 +51,7 @@ POINTER_SIZE_INT num_hash_after_gc; - Boolean is_verification_passed; + BOOLEAN is_verification_passed; }GC_Verifier; #define OBJ_INFO_MASK (~0x3ff) @@ -95,12 +95,12 @@ inline void verifier_set_gc_collect_kind(GC_Verifier* gc_verifier, unsigned int collect_kind) { gc_verifier->collect_kind = collect_kind; } -inline Boolean verifier_collect_is_minor(GC_Verifier* gc_verifier) +inline BOOLEAN verifier_collect_is_minor(GC_Verifier* gc_verifier) { return (gc_verifier->collect_kind & ALGO_MAJOR) == 0; } -inline void verifier_set_fallback_collection(GC_Verifier* gc_verifier, Boolean is_before_fallback) +inline void verifier_set_fallback_collection(GC_Verifier* gc_verifier, BOOLEAN is_before_fallback) { gc_verifier->is_before_fallback_collection = is_before_fallback; } #endif Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.cpp Wed May 28 03:44:26 2008 @@ -21,7 +21,7 @@ #include "verify_mutator_effect.h" char* GC_VERIFY = NULL; -Boolean verify_live_heap; +BOOLEAN verify_live_heap; Heap_Verifier* heap_verifier; @@ -106,7 +106,7 @@ verifier_clear_gc_verification(heap_verifier); } -void gc_verify_heap(GC* gc, Boolean is_before_gc) +void gc_verify_heap(GC* gc, BOOLEAN is_before_gc) { heap_verifier->is_before_gc = is_before_gc; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_live_heap.h Wed May 28 03:44:26 2008 @@ -20,11 +20,11 @@ #include "../common/gc_common.h" -extern Boolean verify_live_heap; +extern BOOLEAN verify_live_heap; void gc_init_heap_verification(GC* gc); void gc_terminate_heap_verification(GC* gc); -void gc_verify_heap(GC* gc, Boolean is_before_gc); +void gc_verify_heap(GC* gc, BOOLEAN is_before_gc); void event_mutator_allocate_newobj(Partial_Reveal_Object* p_newobj, POINTER_SIZE_INT size, VT vt_raw); void event_gc_collect_kind_changed(GC* gc); Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.cpp?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.cpp Wed May 28 03:44:26 2008 @@ -66,7 +66,7 @@ } -Boolean verify_new_object(New_Object* new_obj, Heap_Verifier* heap_verifier) +BOOLEAN verify_new_object(New_Object* new_obj, Heap_Verifier* heap_verifier) { if(!heap_verifier->need_verify_allocation) return TRUE; Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.h (original) +++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_mutator_effect.h Wed May 28 03:44:26 2008 @@ -41,20 +41,20 @@ Vector_Block* new_objects_set; - Boolean is_verification_passed; + BOOLEAN is_verification_passed; }Allocation_Verifier; typedef struct WriteBarrier_Verifier{ POINTER_SIZE_INT num_slots_in_remset; POINTER_SIZE_INT num_ref_wb_in_remset; POINTER_SIZE_INT num_ref_wb_after_scanning; - Boolean is_verification_passed; + BOOLEAN is_verification_passed; }WriteBarrier_Verifier; typedef struct RootSet_Verifier{ POINTER_SIZE_INT num_slots_in_rootset; POINTER_SIZE_INT num_error_slots; - Boolean is_verification_passed; + BOOLEAN is_verification_passed; }RootSet_Verifier; Modified: harmony/enhanced/drlvm/trunk/vm/include/jni_types.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/jni_types.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/jni_types.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/jni_types.h Wed May 28 03:44:26 2008 @@ -318,7 +318,7 @@ */ /* - * Boolean constants + * BOOLEAN constants */ /** * Constant which defines boolean truth in native Java functions. It Modified: harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h?rev=660898&r1=660897&r2=660898&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/em_vm.h Wed May 28 03:44:26 2008 @@ -110,7 +110,7 @@ * @return the handle of the method that occupies found code chunk. NULL if * no method is found. */ - Method_Handle (*LookupCodeChunk) (void *addr, Boolean is_ip_past, + Method_Handle (*LookupCodeChunk) (void *addr, BOOLEAN is_ip_past, void **code_addr, size_t *size, void **data); /** @@ -121,7 +121,7 @@ * @return TRUE if removal was successful, FALSE * otherwise, e.g. if code chunk was not found. */ - Boolean (*UnregisterCodeChunk) (void *addr); + BOOLEAN (*UnregisterCodeChunk) (void *addr); /** * The method is used to callback EM from the profiler thread supported