Changeset 420

Show
Ignore:
Timestamp:
09/14/10 14:45:34 (18 months ago)
Author:
gaoyp10
Message:

delete a barrier

Location:
nanokit/nanovm/branches/rtgc-des-branch/src
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • nanokit/nanovm/branches/rtgc-des-branch/src/include/nopen/vmcore/vm_interface_internal.h

    r413 r420  
    413413        D_MEMBER(void, vm_ti_enumerate_heap_root, (jvmtiEnv* env, void* root, Managed_Object_Handle obj, jvmtiHeapRootKind root_kind)) 
    414414        D_MEMBER(ManagedObject*, gc_get_field_ref_barrier, (ManagedObject* obj, unsigned offset)) 
    415         D_MEMBER(void, gc_get_field_ref_barrier,(Managed_Object_Handle *reference_field_addr)) 
     415//      D_MEMBER(void, gc_get_field_ref_barrier,(Managed_Object_Handle *reference_field_addr)) 
    416416 
    417417        D_MEMBER(ManagedObject*, gc_get_static_ref_barrier, (ManagedObject** addr)) 

  • nanokit/nanovm/branches/rtgc-des-branch/src/modules/vmcore/src/gc/dll_gc.cpp

    r413 r420  
    3434 
    3535//default routines of gc interfaces 
    36 static void default_gc_get_field_ref_barrier(Managed_Object_Handle* reference_field_addr); 
    3736static Managed_Object_Handle default_gc_get_field_barrier(Managed_Object_Handle obj, unsigned offset); 
    3837static Managed_Object_Handle default_gc_put_field_barrier(Managed_Object_Handle obj, unsigned offset); 
    … …  
    5655 
    5756static void default_gc_heap_slot_write_ref_check(Managed_Object_Handle p_base_of_object_with_slot, 
    58                                                  Managed_object_Handle *p_slot, 
     57                                                 Managed_Object_Handle *p_slot, 
    5958                                                 Managed_Object_Handle value); 
    6059 
    … …  
    145144 
    146145    //set the initial default value 
    147     gc_intf->gc_get_field_ref_barrier = default_gc_get_field_ref_barrier; 
    148146    gc_intf->gc_get_field_barrier = default_gc_get_field_barrier; 
    149147    gc_intf->gc_put_field_barrier = default_gc_put_field_barrier; 
    … …  
    202200    //patch the Global_Env::vm_interface with gc barrier functions 
    203201    _OpenVm* vm_intf = (_OpenVm*)(VM_Global_State::loader_env->vm_interface); 
    204     vm_intf->gc_get_field_ref_barrier = gc_intf->gc_get_field_ref_barrier; 
    205202    vm_intf->gc_get_static_ref_barrier = gc_intf->gc_get_static_ref_barrier; 
    206203    vm_intf->gc_put_field_ref_barrier = gc_intf->gc_put_field_ref_barrier; 
    … …  
    454451} //default_gc_supports_class_unloading 
    455452  
    456 static void default_gc_get_field_ref_barrier(Managed_Object_Handle* reference_field_addr){ 
    457   return; 
    458 } 
    459453 
    460454static Managed_Object_Handle default_gc_get_field_barrier(Managed_Object_Handle obj, unsigned offset){ 

  • nanokit/nanovm/branches/rtgc-des-branch/src/modules/vmcore/src/object/vm_arrays.cpp

    r411 r420  
    604604                        } 
    605605                        // If ArrayStoreException hasn't been thrown, copy the element. 
    606                                                 gc_get_field_ref_barrier((Managed_Object_Handle*)(src_body+count));      
     606//                                              gc_get_field_ref_barrier((Managed_Object_Handle*)(src_body+count));      
    607607                        dst_body[count] = src_body[count]; 
    608608                        // There is not a gc_heap_write_ref call here since gc is disabled and we use gc_heap_wrote_object interface below.