archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8019517: PPC64 (part 102): cppInterpreter: implement G1 support

Browse source 
Reviewed-by: kvn
This commit is contained in:
Goetz Lindenmaier 2013-07-03 01:29:13 +02:00
parent c12f5a0180
commit 7c47a187f2
1 changed files with 1 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
View file

@ -30,7 +30,6 @@
#include "interpreter/bytecodeInterpreter.inline.hpp" #include "interpreter/bytecodeInterpreter.inline.hpp"
#include "interpreter/interpreter.hpp" #include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp" #include "interpreter/interpreterRuntime.hpp"
#include "memory/cardTableModRefBS.hpp"
#include "memory/resourceArea.hpp" #include "memory/resourceArea.hpp"
#include "oops/methodCounters.hpp" #include "oops/methodCounters.hpp"
#include "oops/objArrayKlass.hpp" #include "oops/objArrayKlass.hpp"
@ -503,8 +502,6 @@ BytecodeInterpreter::run(interpreterState istate) {
interpreterState orig = istate; interpreterState orig = istate;
#endif #endif
static volatile jbyte* _byte_map_base; // adjusted card table base for oop store barrier
register intptr_t* topOfStack = (intptr_t *)istate->stack(); /* access with STACK macros */ register intptr_t* topOfStack = (intptr_t *)istate->stack(); /* access with STACK macros */
register address pc = istate->bcp(); register address pc = istate->bcp();
register jubyte opcode; register jubyte opcode;
@ -512,12 +509,9 @@ BytecodeInterpreter::run(interpreterState istate) {
register ConstantPoolCache* cp = istate->constants(); // method()->constants()->cache() register ConstantPoolCache* cp = istate->constants(); // method()->constants()->cache()
#ifdef LOTS_OF_REGS #ifdef LOTS_OF_REGS
register JavaThread* THREAD = istate->thread(); register JavaThread* THREAD = istate->thread();
register volatile jbyte* BYTE_MAP_BASE = _byte_map_base;
#else #else
#undef THREAD #undef THREAD
#define THREAD istate->thread() #define THREAD istate->thread()
#undef BYTE_MAP_BASE
#define BYTE_MAP_BASE _byte_map_base
#endif #endif
#ifdef USELABELS #ifdef USELABELS
@ -630,9 +624,6 @@ BytecodeInterpreter::run(interpreterState istate) {
#ifdef VM_JVMTI #ifdef VM_JVMTI
_jvmti_interp_events = JvmtiExport::can_post_interpreter_events(); _jvmti_interp_events = JvmtiExport::can_post_interpreter_events();
#endif #endif
BarrierSet* bs = Universe::heap()->barrier_set();
assert(bs->kind() == BarrierSet::CardTableModRef, "Wrong barrier set kind");
_byte_map_base = (volatile jbyte*)(((CardTableModRefBS*)bs)->byte_map_base);
return; return;
} }
break; break;
@ -1708,11 +1699,7 @@ run:
VM_JAVA_ERROR(vmSymbols::java_lang_ArrayStoreException(), ""); VM_JAVA_ERROR(vmSymbols::java_lang_ArrayStoreException(), "");
} }
} }
oop* elem_loc = (oop*)(((address) arrObj->base(T_OBJECT)) + index * sizeof(oop)); ((objArrayOopDesc *) arrObj)->obj_at_put(index, rhsObject);
// *(oop*)(((address) arrObj->base(T_OBJECT)) + index * sizeof(oop)) = rhsObject;
*elem_loc = rhsObject;
// Mark the card
OrderAccess::release_store(&BYTE_MAP_BASE[(uintptr_t)elem_loc >> CardTableModRefBS::card_shift], 0);
UPDATE_PC_AND_TOS_AND_CONTINUE(1, -3); UPDATE_PC_AND_TOS_AND_CONTINUE(1, -3);
} }
CASE(_bastore): CASE(_bastore):
@ -2052,7 +2039,6 @@ run:
} else if (tos_type == atos) { } else if (tos_type == atos) {
VERIFY_OOP(STACK_OBJECT(-1)); VERIFY_OOP(STACK_OBJECT(-1));
obj->release_obj_field_put(field_offset, STACK_OBJECT(-1)); obj->release_obj_field_put(field_offset, STACK_OBJECT(-1));
OrderAccess::release_store(&BYTE_MAP_BASE[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0);
} else if (tos_type == btos) { } else if (tos_type == btos) {
obj->release_byte_field_put(field_offset, STACK_INT(-1)); obj->release_byte_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ltos) { } else if (tos_type == ltos) {
@ -2073,7 +2059,6 @@ run:
} else if (tos_type == atos) { } else if (tos_type == atos) {
VERIFY_OOP(STACK_OBJECT(-1)); VERIFY_OOP(STACK_OBJECT(-1));
obj->obj_field_put(field_offset, STACK_OBJECT(-1)); obj->obj_field_put(field_offset, STACK_OBJECT(-1));
OrderAccess::release_store(&BYTE_MAP_BASE[(uintptr_t)obj >> CardTableModRefBS::card_shift], 0);
} else if (tos_type == btos) { } else if (tos_type == btos) {
obj->byte_field_put(field_offset, STACK_INT(-1)); obj->byte_field_put(field_offset, STACK_INT(-1));
} else if (tos_type == ltos) { } else if (tos_type == ltos) {