harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From x..@apache.org
Subject svn commit: r525380 - in /harmony/enhanced/drlvm/trunk/vm/gc_gen/src: common/gc_common.cpp finalizer_weakref/finalizer_weakref_metadata.cpp verify/verifier_common.cpp verify/verifier_scanner.cpp verify/verify_gc_effect.cpp
Date Wed, 04 Apr 2007 03:19:35 GMT
Author: xli
Date: Tue Apr  3 20:19:34 2007
New Revision: 525380

URL: http://svn.apache.org/viewvc?view=rev&rev=525380
Log:
HARMONY-3567 fixed some minor bugs in GCv5 verifier. Also resolved HARMONY-3557.

Modified:
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_common.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/finalizer_weakref/finalizer_weakref_metadata.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_scanner.cpp
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verify_gc_effect.cpp

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?view=diff&rev=525380&r1=525379&r2=525380
==============================================================================
--- 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 Tue Apr  3 20:19:34 2007
@@ -238,7 +238,7 @@
   }
 
   if (is_property_set("gc.use_large_page", VM_PROPERTIES) == 1){
-    char* value = get_property("gc.large_page", VM_PROPERTIES);
+    char* value = get_property("gc.use_large_page", VM_PROPERTIES);
     large_page_hint = strdup(value);
     destroy_property_value(value);
   }
@@ -318,6 +318,7 @@
   vm_resume_threads_after();
   return;
 }
+
 
 
 

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?view=diff&rev=525380&r1=525379&r2=525380
==============================================================================
--- 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
Tue Apr  3 20:19:34 2007
@@ -310,7 +310,7 @@
 void finref_repset_add_entry(GC *gc, REF* p_ref)
 {
   assert(*p_ref);
-  assert(*(unsigned int*)*p_ref);
+  assert(read_slot(p_ref));
   Finref_Metadata *metadata = gc->finref_metadata;
   finref_metadata_add_entry(gc, metadata->repset, metadata->repset_pool, (POINTER_SIZE_INT)p_ref);
 }

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?view=diff&rev=525380&r1=525379&r2=525380
==============================================================================
--- 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 Tue Apr  3 20:19:34
2007
@@ -130,9 +130,9 @@
       heap_verifier->need_verify_gc= TRUE;
     }else{
       printf("Parse verify option error.\n");
-      printf("Usage: -XDgc.verify=rooset,writebarrier,allocation,gc \n");
-      printf("Usage: -XDgc.verify=default \n");
-      printf("Usage: -XDgc.verify=all \n");
+      printf("Usage: -XX:gc.verify=rooset,writebarrier,allocation,gc \n");
+      printf("Usage: -XX:gc.verify=default \n");
+      printf("Usage: -XX:gc.verify=all \n");
       return FALSE;
     }
   }

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_scanner.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_scanner.cpp?view=diff&rev=525380&r1=525379&r2=525380
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_scanner.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_scanner.cpp Tue Apr  3 20:19:34
2007
@@ -150,7 +150,7 @@
   while(obj_set){
     POINTER_SIZE_INT* iter = vector_block_iterator_init(obj_set);
     while(!vector_block_iterator_end(obj_set,iter)){
-      Partial_Reveal_Object* p_obj = (Partial_Reveal_Object* )*iter;
+      Partial_Reveal_Object* p_obj = read_slot((REF*)iter);
       iter = vector_block_iterator_advance(obj_set,iter);
       /*p_obj can be NULL , When GC happened, the obj in Finalize objs list will be clear.*/
       //assert(p_obj != NULL);  
@@ -193,8 +193,12 @@
   if(heap_verifier->is_before_gc){
     verifier_trace_objsets(heap_verifier, gc->finref_metadata->obj_with_fin_pool);
   }else{
-    verify_live_finalizable_obj(heap_verifier, gc->finref_metadata->obj_with_fin_pool);
-    verifier_trace_objsets(heap_verifier, gc->finref_metadata->finalizable_obj_pool);
+	if(!heap_verifier->gc_verifier->is_before_fallback_collection){
+      verify_live_finalizable_obj(heap_verifier, gc->finref_metadata->obj_with_fin_pool);
+      verifier_trace_objsets(heap_verifier, gc->finref_metadata->finalizable_obj_pool);
+    }else{
+      verifier_trace_objsets(heap_verifier, gc->finref_metadata->obj_with_fin_pool);

+    }
   }
   heap_verifier->gc_verifier->is_tracing_resurrect_obj = FALSE;
   verifier_update_info_after_resurrect(heap_verifier);
@@ -380,5 +384,6 @@
   heap_verifier->live_obj_scanner = verifier_scan_live_objects;
   heap_verifier->all_obj_scanner   = verifier_scan_all_objects;
 }
+
 
 

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?view=diff&rev=525380&r1=525379&r2=525380
==============================================================================
--- 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 Tue Apr  3 20:19:34
2007
@@ -60,7 +60,7 @@
   while(live_fin_objs){
     POINTER_SIZE_INT * iter = vector_block_iterator_init(live_fin_objs);
     while(!vector_block_iterator_end(live_fin_objs, iter)){
-      Partial_Reveal_Object* p_fin_obj = (Partial_Reveal_Object*) *iter;
+      Partial_Reveal_Object* p_fin_obj = read_slot((REF*)iter);
       iter = vector_block_iterator_advance(live_fin_objs, iter);
       if(p_fin_obj==NULL) continue;
       assert(obj_is_marked_in_vt(p_fin_obj));
@@ -307,5 +307,6 @@
   verify_gc_reset(heap_verifier);  
   verifier_set_fallback_collection(heap_verifier->gc_verifier, FALSE);  
 }
+
 
 



Mime
View raw message