harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x..@apache.org
Subject svn commit: r553073 - in /harmony/enhanced/drlvm/trunk/vm/gc_gen/src: los/lspace_alloc_collect.cpp mark_sweep/sspace_alloc.cpp mark_sweep/sspace_mark_sweep.cpp mark_sweep/sspace_verify.h
Date Wed, 04 Jul 2007 04:38:21 GMT
Author: xli
Date: Tue Jul  3 21:38:21 2007
New Revision: 553073

URL: http://svn.apache.org/viewvc?view=rev&rev=553073
Log:
Fix HARMONY-4325 : undefine verify macros in 01_mark_sweep.patch for Tick project 

Modified:
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace_alloc_collect.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_alloc.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_mark_sweep.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_verify.h

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace_alloc_collect.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace_alloc_collect.cpp?view=diff&rev=553073&r1=553072&r2=553073
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace_alloc_collect.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/los/lspace_alloc_collect.cpp Tue Jul  3 21:38:21
2007
@@ -258,7 +258,7 @@
 
     if( obj_info != 0 ) {
       collector_remset_add_entry(collector, (Partial_Reveal_Object **)dest_addr);
-      collector_remset_add_entry(collector, (Partial_Reveal_Object **)obj_info);
+      collector_remset_add_entry(collector, (Partial_Reveal_Object **)(POINTER_SIZE_INT)obj_info);
     }
       
     obj_set_fw_in_oi(p_obj, dest_addr);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_alloc.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_alloc.cpp?view=diff&rev=553073&r1=553072&r2=553073
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_alloc.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_alloc.cpp Tue Jul  3 21:38:21
2007
@@ -25,7 +25,7 @@
   unsigned int word_index = color_bits_index / BITS_PER_WORD;
   unsigned int index_in_word = color_bits_index % BITS_PER_WORD;
   
-  return table[word_index] & (cur_alloc_color << index_in_word);
+  return (Boolean)(table[word_index] & (cur_alloc_color << index_in_word));
 }
 
 static void alloc_slot_in_table(POINTER_SIZE_INT *table, unsigned int slot_index)

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_mark_sweep.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_mark_sweep.cpp?view=diff&rev=553073&r1=553072&r2=553073
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_mark_sweep.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_mark_sweep.cpp Tue Jul  3
21:38:21 2007
@@ -28,7 +28,7 @@
 
 static void ops_color_flip(void)
 {
-  uint32 temp = cur_alloc_color;
+  POINTER_SIZE_INT temp = cur_alloc_color;
   cur_alloc_color = cur_mark_color;
   cur_mark_color = temp;
   alloc_mask_in_table = ~alloc_mask_in_table;

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_verify.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_verify.h?view=diff&rev=553073&r1=553072&r2=553073
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_verify.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/mark_sweep/sspace_verify.h Tue Jul  3 21:38:21
2007
@@ -19,9 +19,9 @@
 
 #include "../common/gc_common.h"
 
-#define SSPACE_VERIFY
-#define SSPACE_CHUNK_INFO
-#define SSPACE_ALLOC_INFO
+//#define SSPACE_VERIFY
+//#define SSPACE_CHUNK_INFO
+//#define SSPACE_ALLOC_INFO
 //#define SSPACE_TIME
 
 struct Sspace;



Mime
View raw message