Revision: 15784
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15784&view=revAuthor: steveb-oss
Date: 2009-09-18 09:03:36 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
Another minor refactoring fix missed in r15782.
Modified Paths:
--------------
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java
rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ia32/Barriers.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -78,7 +78,7 @@
asm.emitPUSH_Reg(reg); // offset
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticWriteBarrierMethod.getOffset()));
}
static void compilePutstaticBarrierImm(Assembler asm, Offset fieldOffset, int locationMetadata) {
@@ -86,7 +86,7 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 3);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapWriteBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticWriteBarrierMethod.getOffset()));
}
static void compileArrayLoadBarrier(Assembler asm, boolean pushResult) {
@@ -121,7 +121,7 @@
asm.emitPUSH_Reg(reg);
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}
@@ -129,7 +129,7 @@
asm.emitPUSH_Imm(fieldOffset.toInt());
asm.emitPUSH_Imm(locationMetadata);
BaselineCompilerImpl.genParameterRegisterLoad(asm, 2);
- asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectNonHeapReadBarrierMethod.getOffset()));
+ asm.emitCALL_Abs(Magic.getTocPointer().plus(Entrypoints.objectStaticReadBarrierMethod.getOffset()));
asm.emitPUSH_Reg(T0);
}
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 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/baseline/ppc/Barriers.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -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.objectNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticWriteBarrierMethod.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.objectNonHeapWriteBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticWriteBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T1, fieldOffset); // offset
comp.peekAddr(T0, 0); // value to store
@@ -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.objectNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticReadBarrierMethod.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.objectNonHeapReadBarrierMethod.getOffset());
+ asm.emitLAddrToc(S0, Entrypoints.objectStaticReadBarrierMethod.getOffset());
asm.emitMTCTR(S0);
asm.emitLVALAddr(T0, fieldOffset); // offset
asm.emitLVAL(T1, locationMetadata);
Modified: rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/compilers/opt/hir2lir/ExpandRuntimeServices.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -478,7 +478,7 @@
LocationOperand loc = PutStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.objectNonHeapWriteBarrierMethod;
+ RVMMethod target = Entrypoints.objectStaticWriteBarrierMethod;
Instruction wb =
Call.create3(CALL,
null,
@@ -504,7 +504,7 @@
LocationOperand loc = GetStatic.getLocation(inst);
FieldReference field = loc.getFieldRef();
if (!field.getFieldContentsType().isPrimitiveType()) {
- RVMMethod target = Entrypoints.objectNonHeapReadBarrierMethod;
+ RVMMethod target = Entrypoints.objectStaticReadBarrierMethod;
Instruction rb =
Call.create2(CALL,
GetStatic.getClearResult(inst),
Modified: rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java
===================================================================
--- rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 08:44:24 UTC (rev 15783)
+++ rvmroot/trunk/rvm/src/org/jikesrvm/runtime/Entrypoints.java 2009-09-18 09:03:36 UTC (rev 15784)
@@ -273,9 +273,9 @@
public static final NormalMethod objectFieldReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectFieldRead", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
- public static final NormalMethod objectNonHeapWriteBarrierMethod =
+ public static final NormalMethod objectStaticWriteBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticWrite", "(Ljava/lang/Object;Lorg/vmmagic/unboxed/Offset;I)V");
- public static final NormalMethod objectNonHeapReadBarrierMethod =
+ public static final NormalMethod objectStaticReadBarrierMethod =
getMethod(org.jikesrvm.mm.mminterface.Barriers.class, "objectStaticRead", "(Lorg/vmmagic/unboxed/Offset;I)Ljava/lang/Object;");
public static final NormalMethod modifyCheckMethod =
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
