Menu
▾
▴
[Pearcolator-devel] SF.net SVN: pearcolator: [13] src/org/binarytranslator/vmInterface
|
From: <mic...@us...> - 2007-03-28 13:09:57
|
Revision: 13
http://svn.sourceforge.net/pearcolator/?rev=13&view=rev
Author: michael_baer
Date: 2007-03-28 06:09:58 -0700 (Wed, 28 Mar 2007)
Log Message:
-----------
Updates due to package renaming
Modified Paths:
--------------
ext/org/jikesrvm/VM_RuntimeCompiler.java
ext/org/jikesrvm/classloader/VM_Method.java
ext/org/jikesrvm/classloader/VM_NormalMethod.java
ext/org/jikesrvm/opt/ir/OPT_BC2IR.java
ext/org/jikesrvm/opt/ir/OPT_GenerationContext.java
src/org/binarytranslator/generic/decoder/DecoderUtils.java
src/org/binarytranslator/vmInterface/DBT_Trace.java
src/org/binarytranslator/vmInterface/DynamicCodeRunner.java
Modified: ext/org/jikesrvm/VM_RuntimeCompiler.java
===================================================================
--- ext/org/jikesrvm/VM_RuntimeCompiler.java 2007-03-28 13:09:25 UTC (rev 12)
+++ ext/org/jikesrvm/VM_RuntimeCompiler.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -12,6 +12,8 @@
import org.jikesrvm.opt.*;
import org.jikesrvm.adaptive.*;
import org.jikesrvm.ArchitectureSpecific.VM_JNICompiler;
+import org.jikesrvm.runtime.VM_Time;
+import org.jikesrvm.scheduler.VM_Thread;
/**
* Harness to select which compiler to dynamically
Modified: ext/org/jikesrvm/classloader/VM_Method.java
===================================================================
--- ext/org/jikesrvm/classloader/VM_Method.java 2007-03-28 13:09:25 UTC (rev 12)
+++ ext/org/jikesrvm/classloader/VM_Method.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -11,6 +11,8 @@
import org.jikesrvm.*;
import org.jikesrvm.ArchitectureSpecific.VM_CodeArray;
import org.jikesrvm.ArchitectureSpecific.VM_LazyCompilationTrampolineGenerator;
+import org.jikesrvm.runtime.VM_Statics;
+import org.jikesrvm.runtime.VM_Entrypoints;
import java.io.DataInputStream;
import java.io.IOException;
Modified: ext/org/jikesrvm/classloader/VM_NormalMethod.java
===================================================================
--- ext/org/jikesrvm/classloader/VM_NormalMethod.java 2007-03-28 13:09:25 UTC (rev 12)
+++ ext/org/jikesrvm/classloader/VM_NormalMethod.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -13,6 +13,7 @@
import org.jikesrvm.opt.ir.OPT_HIRGenerator;
import org.jikesrvm.opt.ir.OPT_BC2IR;
import org.jikesrvm.opt.ir.OPT_GenerationContext;
+import org.jikesrvm.runtime.VM_DynamicLink;
/**
* A method of a java class that has bytecodes.
Modified: ext/org/jikesrvm/opt/ir/OPT_BC2IR.java
===================================================================
--- ext/org/jikesrvm/opt/ir/OPT_BC2IR.java 2007-03-28 13:09:25 UTC (rev 12)
+++ ext/org/jikesrvm/opt/ir/OPT_BC2IR.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -18,7 +18,8 @@
import org.jikesrvm.ArchitectureSpecific.OPT_RegisterPool;
import org.jikesrvm.adaptive.*;
import java.util.ArrayList;
-
+import org.jikesrvm.runtime.VM_Magic;
+import org.jikesrvm.runtime.VM_Entrypoints;
import org.vmmagic.pragma.*;
import org.vmmagic.unboxed.*;
Modified: ext/org/jikesrvm/opt/ir/OPT_GenerationContext.java
===================================================================
--- ext/org/jikesrvm/opt/ir/OPT_GenerationContext.java 2007-03-28 13:09:25 UTC (rev 12)
+++ ext/org/jikesrvm/opt/ir/OPT_GenerationContext.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -10,6 +10,8 @@
import org.jikesrvm.*;
import org.jikesrvm.ArchitectureSpecific.OPT_RegisterPool;
+import org.jikesrvm.runtime.VM_Entrypoints;
+import org.jikesrvm.runtime.VM_Statics;
import org.jikesrvm.classloader.*;
import org.jikesrvm.opt.*;
import org.vmmagic.unboxed.Offset;
Modified: src/org/binarytranslator/generic/decoder/DecoderUtils.java
===================================================================
--- src/org/binarytranslator/generic/decoder/DecoderUtils.java 2007-03-28 13:09:25 UTC (rev 12)
+++ src/org/binarytranslator/generic/decoder/DecoderUtils.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -172,6 +172,11 @@
protected int currentPC;
/**
+ * The pc value of the first instruction in the trace
+ */
+ protected int startingPC;
+
+ /**
* The OPT_BasicBlock which will contain the next translated instruction
*/
protected OPT_BasicBlock nextBlock;
@@ -269,7 +274,8 @@
gc = context;
ps = ((DBT_Trace)(gc.method)).ps;
currentPC = ((DBT_Trace)(gc.method)).pc;
-
+ startingPC = currentPC;
+
// Number of translated instructions
numberOfInstructions = 0;
@@ -539,7 +545,7 @@
// Intel can't distinguish branches within 16bytes, so neither
// can we, the top bit is saved for distinguished addresses we
// need to know to dynamically link things
- i.bcIndex = (currentPC >> 4) & 0x7FFF;
+ i.bcIndex = ((currentPC-startingPC) >> 4) & 0x7FFF;
}
currentBlock.appendInstruction(i);
}
@@ -549,7 +555,7 @@
* @param likely does this branch have a likely hint
*/
public OPT_BranchProfileOperand getConditionalBranchProfileOperand(boolean likely) {
- return gc.getConditionalBranchProfileOperand((currentPC >> 2) & 0xFFFF, likely);
+ return gc.getConditionalBranchProfileOperand(((currentPC-startingPC) >> 4) & 0x7FFF, likely);
}
Modified: src/org/binarytranslator/vmInterface/DBT_Trace.java
===================================================================
--- src/org/binarytranslator/vmInterface/DBT_Trace.java 2007-03-28 13:09:25 UTC (rev 12)
+++ src/org/binarytranslator/vmInterface/DBT_Trace.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -20,8 +20,8 @@
import org.jikesrvm.classloader.VM_MemberReference;
import org.jikesrvm.classloader.VM_Atom;
import org.jikesrvm.classloader.VM_BytecodeStream;
-import org.jikesrvm.VM_Statics;
-import org.jikesrvm.VM_DynamicLink;
+import org.jikesrvm.runtime.VM_Statics;
+import org.jikesrvm.runtime.VM_DynamicLink;
import org.jikesrvm.opt.ir.OPT_GenerationContext;
import org.jikesrvm.opt.ir.OPT_HIRGenerator;
import org.vmmagic.pragma.Uninterruptible;
Modified: src/org/binarytranslator/vmInterface/DynamicCodeRunner.java
===================================================================
--- src/org/binarytranslator/vmInterface/DynamicCodeRunner.java 2007-03-28 13:09:25 UTC (rev 12)
+++ src/org/binarytranslator/vmInterface/DynamicCodeRunner.java 2007-03-28 13:09:58 UTC (rev 13)
@@ -9,7 +9,7 @@
package org.binarytranslator.vmInterface;
import org.jikesrvm.VM;
import org.jikesrvm.ArchitectureSpecific.VM_CodeArray;
-import org.jikesrvm.VM_Magic;
+import org.jikesrvm.runtime.VM_Magic;
import org.vmmagic.pragma.DynamicBridge;
import org.vmmagic.pragma.Uninterruptible;
import org.vmmagic.pragma.NoInline;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
