comparison src/share/vm/graal/graalCompilerToVM.cpp @ 8490:1567c6cc6561

Towards porting G1 WBs
author Christos Kotselidis <christos.kotselidis@oracle.com>
date Wed, 20 Feb 2013 16:15:43 +0100
parents 92d21814cf7b
children 9412b1915547
comparison
equal deleted inserted replaced
8489:92d21814cf7b 8490:1567c6cc6561
36 #include "graal/graalEnv.hpp" 36 #include "graal/graalEnv.hpp"
37 #include "graal/graalJavaAccess.hpp" 37 #include "graal/graalJavaAccess.hpp"
38 #include "graal/graalCodeInstaller.hpp" 38 #include "graal/graalCodeInstaller.hpp"
39 #include "graal/graalVMToCompiler.hpp" 39 #include "graal/graalVMToCompiler.hpp"
40 #include "graal/graalVmIds.hpp" 40 #include "graal/graalVmIds.hpp"
41 #include "gc_implementation/g1/heapRegion.hpp"
41 42
42 43
43 Method* getMethodFromHotSpotMethod(oop hotspot_method) { 44 Method* getMethodFromHotSpotMethod(oop hotspot_method) {
44 assert(hotspot_method != NULL && hotspot_method->is_a(HotSpotResolvedJavaMethod::klass()), "sanity"); 45 assert(hotspot_method != NULL && hotspot_method->is_a(HotSpotResolvedJavaMethod::klass()), "sanity");
45 return asMethod(HotSpotResolvedJavaMethod::metaspaceMethod(hotspot_method)); 46 return asMethod(HotSpotResolvedJavaMethod::metaspaceMethod(hotspot_method));
718 set_long("inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub())); 719 set_long("inlineCacheMissStub", VmIds::addStub(SharedRuntime::get_ic_miss_stub()));
719 set_long("handleExceptionStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_handle_exception_nofpu_id))); 720 set_long("handleExceptionStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_handle_exception_nofpu_id)));
720 set_long("handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack())); 721 set_long("handleDeoptStub", VmIds::addStub(SharedRuntime::deopt_blob()->unpack()));
721 set_long("monitorEnterStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_monitorenter_id))); 722 set_long("monitorEnterStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_monitorenter_id)));
722 set_long("monitorExitStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_monitorexit_id))); 723 set_long("monitorExitStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_monitorexit_id)));
723 set_long("g1WBSlowStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_g1_wb_slow_id))); 724 set_long("wbPreCallStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_wb_pre_call_id)));
725 set_long("wbPostCallStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_wb_post_call_id)));
724 set_long("verifyOopStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_verify_oop_id))); 726 set_long("verifyOopStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_verify_oop_id)));
725 set_long("vmErrorStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_vm_error_id))); 727 set_long("vmErrorStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_vm_error_id)));
726 set_long("deoptimizeStub", VmIds::addStub(SharedRuntime::deopt_blob()->uncommon_trap())); 728 set_long("deoptimizeStub", VmIds::addStub(SharedRuntime::deopt_blob()->uncommon_trap()));
727 set_long("unwindExceptionStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_unwind_exception_call_id))); 729 set_long("unwindExceptionStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_unwind_exception_call_id)));
728 set_long("osrMigrationEndStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_OSR_migration_end_id))); 730 set_long("osrMigrationEndStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_OSR_migration_end_id)));
762 set_int("deoptActionNone", Deoptimization::Action_none); 764 set_int("deoptActionNone", Deoptimization::Action_none);
763 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile); 765 set_int("deoptActionMaybeRecompile", Deoptimization::Action_maybe_recompile);
764 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret); 766 set_int("deoptActionReinterpret", Deoptimization::Action_reinterpret);
765 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant); 767 set_int("deoptActionMakeNotEntrant", Deoptimization::Action_make_not_entrant);
766 set_int("deoptActionMakeNotCompilable", Deoptimization::Action_make_not_compilable); 768 set_int("deoptActionMakeNotCompilable", Deoptimization::Action_make_not_compilable);
767 769 set_int("g1CardQueueIndexOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_index()));
770 set_int("g1CardQueueBufferOffset", in_bytes(JavaThread::dirty_card_queue_offset() + PtrQueue::byte_offset_of_buf()));
771 set_int("logOfHRGrainBytes", HeapRegion::LogOfHRGrainBytes);
772
773 set_int("g1SATBQueueMarkingOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_active()));
774 set_int("g1SATBQueueIndexOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_index()));
775 set_int("g1SATBQueueBufferOffset", in_bytes(JavaThread::satb_mark_queue_offset() + PtrQueue::byte_offset_of_buf()));
768 776
769 BarrierSet* bs = Universe::heap()->barrier_set(); 777 BarrierSet* bs = Universe::heap()->barrier_set();
770 switch (bs->kind()) { 778 switch (bs->kind()) {
771 case BarrierSet::CardTableModRef: 779 case BarrierSet::CardTableModRef:
772 case BarrierSet::CardTableExtension: { 780 case BarrierSet::CardTableExtension: {