Revision: 15783
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15783&view=revAuthor: steveb-oss
Date: 2009-09-18 08:44:24 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
Fix breakage of PPC r15782 (previous commit).
Modified Paths:
--------------
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 03:57:39 UTC (rev 15782)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 08:44:24 UTC (rev 15783)
@@ -34,7 +34,7 @@
// T2 already contains the offset of the field on entry
static void compilePutfieldBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 1); // object base
asm.emitNullCheck(T0);
@@ -46,7 +46,7 @@
// on entry java stack contains ...|target_ref|ref_to_store|
static void compilePutfieldBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 1); // object base
asm.emitNullCheck(T0);
@@ -60,7 +60,7 @@
// T1 already contains the offset of the field on entry
static void compilePutstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // value to store
asm.emitLVAL(T2, locationMetadata);
@@ -70,7 +70,7 @@
// on entry java stack contains ...|ref_to_store|
static void compilePutstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T1, fieldOffset); // offset
comp.peekAddr(T0, 0); // value to store
@@ -81,7 +81,7 @@
// on entry T0, T1 already contain the appropriate values
static void compileArrayLoadBarrier(BaselineCompilerImpl comp) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceArrayReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectArrayReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitBCCTRL(); // MemoryManager.arrayLoadReadBarrier(T0,T1)
}
@@ -90,7 +90,7 @@
// T1 already contains the offset of the field on entry
static void compileGetfieldBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // object base
asm.emitNullCheck(T0);
@@ -101,7 +101,7 @@
// on entry java stack contains ...|source_ref|
static void compileGetfieldBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceFieldReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectFieldReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
comp.peekAddr(T0, 0); // object base
asm.emitNullCheck(T0);
@@ -114,7 +114,7 @@
// T0 already contains the offset of the field on entry
static void compileGetstaticBarrier(BaselineCompilerImpl comp, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVAL(T1, locationMetadata);
asm.emitBCCTRL(); // MemoryManager.getstaticReadBarrier(T0,T1)
@@ -123,7 +123,7 @@
// on entry java stack contains ...|
static void compileGetstaticBarrierImm(BaselineCompilerImpl comp, Offset fieldOffset, int locationMetadata) {
Assembler asm = comp.asm;
- asm.emitLAddrToc(S0, Entrypoints.referenceNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectNonHeapReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T0, fieldOffset); // offset
asm.emitLVAL(T1, locationMetadata);
Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-18 03:57:39 UTC (rev 15782)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/BaselineCompilerImpl.java 2009-09-18 08:44:24 UTC (rev 15783)
@@ -965,7 +965,7 @@
@Override
protected final void emit_aaload() {
genBoundsCheck();
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
Barriers.compileArrayLoadBarrier(this);
pushAddr(T0);
} else {
@@ -2470,7 +2470,7 @@
protected final void emit_unresolved_getstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(T0, fieldRef, true);
TypeReference fieldType = fieldRef.getFieldContentsType();
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && fieldType.isReferenceType()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && fieldType.isReferenceType()) {
Barriers.compileGetstaticBarrier(this, fieldType.getId());
pushAddr(T0);
return;
@@ -2500,7 +2500,7 @@
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
TypeReference fieldType = fieldRef.getFieldContentsType();
- if (NEEDS_REFERENCE_GETSTATIC_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETSTATIC_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
Barriers.compileGetstaticBarrierImm(this, fieldOffset, fieldType.getId());
pushAddr(T0);
return;
@@ -2528,7 +2528,7 @@
*/
protected final void emit_unresolved_putstatic(FieldReference fieldRef) {
emitDynamicLinkingSequence(T1, fieldRef, true);
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType()) {
Barriers.compilePutstaticBarrier(this, fieldRef.getId()); // NOTE: offset is in T0 from emitDynamicLinkingSequence
discardSlots(1);
return;
@@ -2557,7 +2557,7 @@
protected final void emit_resolved_putstatic(FieldReference fieldRef) {
RVMField field = fieldRef.peekResolvedField();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTSTATIC_BARRIER && !fieldRef.getFieldContentsType().isPrimitiveType() && !field.isUntraced()) {
Barriers.compilePutstaticBarrierImm(this, fieldOffset, fieldRef.getId());
discardSlots(1);
return;
@@ -2587,7 +2587,7 @@
TypeReference fieldType = fieldRef.getFieldContentsType();
// T1 = field offset from emitDynamicLinkingSequence()
emitDynamicLinkingSequence(T1, fieldRef, true);
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && fieldType.isReferenceType()) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && fieldType.isReferenceType()) {
Barriers.compileGetfieldBarrier(this, fieldType.getId());
discardSlots(1);
pushAddr(T0);
@@ -2637,7 +2637,7 @@
RVMField field = fieldRef.peekResolvedField();
TypeReference fieldType = fieldRef.getFieldContentsType();
Offset fieldOffset = field.getOffset();
- if (NEEDS_REFERENCE_GETFIELD_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
+ if (NEEDS_OBJECT_GETFIELD_BARRIER && fieldType.isReferenceType() && !field.isUntraced()) {
Barriers.compileGetfieldBarrierImm(this, fieldOffset, fieldType.getId());
discardSlots(1);
pushAddr(T0);
@@ -2688,7 +2688,7 @@
emitDynamicLinkingSequence(T2, fieldRef, true);
if (fieldType.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER) {
// NOTE: offset is in T2 from emitDynamicLinkingSequence
Barriers.compilePutfieldBarrier(this, fieldRef.getId());
discardSlots(2);
@@ -2742,7 +2742,7 @@
TypeReference fieldType = fieldRef.getFieldContentsType();
if (fieldType.isReferenceType()) {
// 32/64bit reference store
- if (NEEDS_REFERENCE_PUTFIELD_BARRIER && !field.isUntraced()) {
+ if (NEEDS_OBJECT_PUTFIELD_BARRIER && !field.isUntraced()) {
Barriers.compilePutfieldBarrierImm(this, fieldOffset, fieldRef.getId());
discardSlots(2);
} else {
@@ -3743,7 +3743,7 @@
* @param reg The register to hold the counter array.
*/
private void loadCounterArray(int reg) {
- if (NEEDS_REFERENCE_ALOAD_BARRIER) {
+ if (NEEDS_OBJECT_ALOAD_BARRIER) {
asm.emitLAddrToc(T0, Entrypoints.edgeCountersField.getOffset());
asm.emitLVAL(T1, getEdgeCounterIndex());
Barriers.compileArrayLoadBarrier(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf_______________________________________________
Jikesrvm-commits mailing list
Jikesrvm-commits@...
https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits
