Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [2943] branches/jikesRVM
|
From: <ans...@us...> - 2006-12-19 23:48:38
|
Revision: 2943
http://jnode.svn.sourceforge.net/jnode/?rev=2943&view=rev
Author: ansari82
Date: 2006-12-19 15:48:37 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
Eliminated compile warnings about MagicPermission, and added debug for jikes-compiled methods
Modified Paths:
--------------
branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Magic.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_ComplexLIR2MIRExpansion.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_Simplifier.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_StackManager.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptExceptionDeliverer.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptGCMapIterator.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_AddressConstantOperand.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateJnodeMagic.java
branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateMagic.java
branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmType.java
branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
branches/jikesRVM/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java
Modified: branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -72,6 +72,7 @@
import org.jnode.vm.classmgr.VmCompiledCode;
import org.jnode.vm.classmgr.VmField;
import org.jnode.vm.classmgr.VmIsolatedStatics;
+import org.jnode.vm.classmgr.VmMethod;
import org.jnode.vm.classmgr.VmMethodCode;
import org.jnode.vm.classmgr.VmNormalClass;
import org.jnode.vm.classmgr.VmSharedStatics;
@@ -82,8 +83,11 @@
import org.jnode.vm.memmgr.HeapHelper;
import org.jnode.vm.memmgr.VmHeapManager;
import org.jnode.vm.scheduler.VmProcessor;
+import org.jnode.vm.x86.compiler.l1a.X86Level1ACompiler;
import org.vmmagic.unboxed.UnboxedObject;
+import com.ibm.JikesRVM.JikesRVMOptCompiler;
+
/**
* Build the boot image from an assembler compiled bootstrap (in ELF format)
* combined with the precompiled Java classes.
@@ -195,6 +199,13 @@
final int optLevel = compilers.length - 1;
// Use the most optimizing compiler here
final NativeCodeCompiler compiler = compilers[optLevel];
+ NativeCodeCompiler backup, test = null;
+ for(int i = 0; i < compilers.length; i++) {
+ if(compilers[i] instanceof X86Level1ACompiler) {
+ test = compilers[i]; break;
+ }
+ }
+ if(test==null)backup=null; else backup=test;
int oldCount;
int newCount;
@@ -212,12 +223,24 @@
vmClass.resolveCpRefs(/*clsMgr*/);
again = true;
}
- final int mcnt;
+ int mcnt;
final int startLength = os.getLength();
- if (compHigh) {
+ if (compHigh && !vmClass.isCompiled()) {
log("Full Compile " + vmClass.getName(),
Project.MSG_VERBOSE);
- mcnt = vmClass.compileBootstrap(compiler, os, optLevel);
+ final int cnt = vmClass.getNoDeclaredMethods();
+ mcnt = 0;
+ for (int i = 0; i < cnt; i++) {
+ final VmMethod method = vmClass.getDeclaredMethod(i);
+ mcnt++;
+ if(compiler instanceof JikesRVMOptCompiler && !JikesRVMOptCompiler.compilableMethod(method)) {
+ backup.compileBootstrap(method, os, optLevel);
+ }
+ else {
+ compiler.compileBootstrap(method, os, optLevel);
+ }
+ }
+ vmClass.setCompiled();
totalHighMethods += mcnt;
totalHighMethodSize += (os.getLength() - startLength);
} else {
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/JikesRVMOptCompiler.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -9,11 +9,13 @@
import org.jnode.vm.Vm;
import org.jnode.vm.VmAddress;
import org.jnode.vm.VmMagic;
+import org.jnode.vm.annotation.MagicPermission;
import org.jnode.vm.classmgr.VmAddressMap;
import org.jnode.vm.classmgr.VmByteCode;
import org.jnode.vm.classmgr.VmCompiledExceptionHandler;
import org.jnode.vm.classmgr.VmConstClass;
import org.jnode.vm.classmgr.VmMethod;
+import org.jnode.vm.classmgr.VmType;
import org.jnode.vm.compiler.CompileError;
import org.jnode.vm.compiler.CompiledExceptionHandler;
import org.jnode.vm.compiler.CompiledMethod;
@@ -42,6 +44,7 @@
* @author Mohammad Ansari (ans...@us...)
*/
+@MagicPermission
public class JikesRVMOptCompiler extends AbstractX86Compiler {
// is the opt compiler usable?
@@ -115,14 +118,40 @@
}
public static boolean compilableMethod(VmMethod vmMethod) {
- if (vmMethod.getDeclaringClass().getName().contains("org.jnode.test")
-// || vmMethod.getDeclaringClass().getName().contains("org.jnode.vm.classmgr")
- ) {
+ if (vmMethod.getDeclaringClass().getName().contains("org.jnode.vm.classmgr.VmType")
+ && (
+ vmMethod.getName().contains("compare")
+ || vmMethod.getName().contains("equals")
+ || vmMethod.getName().contains("BootClass")
+ || vmMethod.getName().contains("i")
+ || vmMethod.getName().contains("linkAndInitialize")
+ || vmMethod.getName().contains("link")
+ || vmMethod.getName().startsWith("do")
+ || vmMethod.getName().startsWith("is")
+ || vmMethod.getName().startsWith("getA")
+ || vmMethod.getName().startsWith("getObjectClass")
+ || vmMethod.getName().startsWith("getP")
+ )
+ )
+ {
return true;
}
else return false;
}
+ public static boolean compilableClass(VmType vmClass) {
+ if (vmClass.getName().contains("org.jnode.vm.classmgr.Abstract")
+// || vmClass.getName().contains("org.jnode.vm.classmgr.ClassDecoder")
+ || vmClass.getName().contains("org.jnode.vm.classmgr.CompiledCodeList")
+// || vmClass.getName().contains("org.jnode.vm.classmgr.IMTBuilder")
+ || vmClass.getName().contains("org.jnode.vm.classmgr.MethodPragmaFlags")
+
+ ) {
+ return true;
+ }
+ else return false;
+ }
+
@Override
public NativeStream createNativeStream(ObjectResolver resolver) {
X86CpuID cpuid = (X86CpuID) VmProcessor.current().getCPUID();
@@ -174,6 +203,7 @@
public void compileBootstrap(VmMethod method, NativeStream os,
int level) {
+ System.out.println(method.getFullName());
int start = os.getLength();
final CompiledMethod cm;
final boolean abstractM = method.isAbstract();
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Magic.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Magic.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/VM_Magic.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -1,6 +1,7 @@
package com.ibm.JikesRVM;
import org.jnode.vm.VmMagic;
+import org.jnode.vm.annotation.MagicPermission;
import org.jnode.vm.compiler.EntryPoints;
import org.jnode.vm.x86.compiler.X86JumpTable;
import org.vmmagic.unboxed.Address;
@@ -12,6 +13,7 @@
import com.ibm.JikesRVM.classloader.VM_Type;
import com.ibm.JikesRVM.classloader.VM_Class;
+@MagicPermission
public class VM_Magic {
private static EntryPoints context = null;
@@ -81,8 +83,8 @@
}
- public static Address getIsolatedTocPointer() {
- return Address.fromInt(context.getVmProcessorIsolatedStaticsTable()
+ public static Offset getIsolatedTocPointer() {
+ return Offset.fromIntZeroExtend(context.getVmProcessorIsolatedStaticsTable()
.getOffset());
}
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_ComplexLIR2MIRExpansion.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_ComplexLIR2MIRExpansion.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_ComplexLIR2MIRExpansion.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -4,10 +4,11 @@
//$Id: OPT_ComplexLIR2MIRExpansion.java,v 1.14 2006/01/06 11:10:17 irogers Exp $
package com.ibm.JikesRVM.opt;
+import org.jnode.vm.annotation.MagicPermission;
+
import com.ibm.JikesRVM.*;
import com.ibm.JikesRVM.opt.ir.*;
import com.ibm.JikesRVM.classloader.*;
-import org.vmmagic.unboxed.Offset;
/**
* Handles the conversion from LIR to MIR of operators whose
@@ -17,6 +18,8 @@
* @modified Peter Sweeney
* @modified Ian Rogers
*/
+
+@MagicPermission
abstract class OPT_ComplexLIR2MIRExpansion extends OPT_IRTools {
/**
@@ -39,7 +42,7 @@
break;
case JNODE_ISOLATED_STATICS_opcode:
OPT_MemoryOperand jtocHome =
- OPT_MemoryOperand.BD(null,Offset.fromIntSignExtend(VM_Magic.getIsolatedTocPointer().toInt()),
+ OPT_MemoryOperand.BD(null,VM_Magic.getIsolatedTocPointer(),
(byte)OPT_GenericStackManager.WORDSIZE, null, null);
jtocHome.setFsSegmentOverride(true);
MIR_Move.mutate(s, IA32_MOV, JnodeMagic.getResult(s), jtocHome);
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_Simplifier.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_Simplifier.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_Simplifier.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -7,6 +7,8 @@
import com.ibm.JikesRVM.*;
import com.ibm.JikesRVM.classloader.*;
import com.ibm.JikesRVM.opt.ir.*;
+
+import org.jnode.vm.annotation.MagicPermission;
import org.vmmagic.unboxed.*;
/**
* A constant folder, strength reducer and axiomatic simplifier.
@@ -25,6 +27,8 @@
*
* @author Dave Grove
*/
+
+@MagicPermission
public abstract class OPT_Simplifier extends OPT_IRTools implements OPT_Operators {
// NOTE: The convention is that constant folding is controlled based
// on the type of the result of the operator, not the type of its inputs.
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_StackManager.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_StackManager.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/OPT_StackManager.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -11,6 +11,8 @@
import java.util.Iterator;
import java.util.HashSet;
import java.util.HashMap;
+
+import org.jnode.vm.annotation.MagicPermission;
import org.vmmagic.unboxed.Offset;
/**
@@ -24,6 +26,8 @@
* @author Mauricio J. Serrano
* @author Julian Dolby
*/
+
+@MagicPermission
public final class OPT_StackManager extends OPT_GenericStackManager
implements OPT_Operators {
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptExceptionDeliverer.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptExceptionDeliverer.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptExceptionDeliverer.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -26,79 +26,8 @@
Address catchBlockInstructionAddress,
Throwable exceptionObject,
VM_Registers registers) {
- VM_OptCompiledMethod optMethod = (VM_OptCompiledMethod)compiledMethod;
- Address fp = registers.getInnermostFramePointer();
- VM_Thread myThread = VM_Thread.getCurrentThread();
-
- if (TRACE) {
- VM.sysWrite("Frame size of ");
- VM.sysWrite(optMethod.getMethod());
- VM.sysWrite(" is ");
- VM.sysWrite(optMethod.getFrameFixedSize());
- VM.sysWrite("\n");
- }
-
- // reset sp to "empty params" state (ie same as it was after prologue)
- Address sp = fp.sub(optMethod.getFrameFixedSize());
- registers.gprs.set(STACK_POINTER, sp);
-
- // store exception object for later retrieval by catch block
- int offset = optMethod.getUnsignedExceptionOffset();
- if (offset != 0) {
- // only put the exception object in the stackframe if the catch block is expecting it.
- // (if the method hasn't allocated a stack slot for caught exceptions, then we can safely
- // drop the exceptionObject on the floor).
- VM_Magic.setObjectAtOffset(VM_Magic.addressAsObject(fp), Offset.fromIntSignExtend(-offset), exceptionObject);
- if (TRACE) {
- VM.sysWrite("Storing exception object ");
- VM.sysWrite(VM_Magic.objectAsAddress(exceptionObject));
- VM.sysWrite(" at offset ");
- VM.sysWrite(offset);
- VM.sysWrite(" from framepoint ");
- VM.sysWrite(fp);
- VM.sysWrite("\n");
- }
- }
-
- if (TRACE) {
- VM.sysWrite("Registers before delivering exception in ");
- VM.sysWrite(optMethod.getMethod());
- VM.sysWrite("\n");
- for (int i=0; i<NUM_GPRS; i++) {
- VM.sysWrite(GPR_NAMES[i]);
- VM.sysWrite(" = ");
- VM.sysWrite(registers.gprs.get(i));
- VM.sysWrite("\n");
- }
- }
-
- // set address at which to resume executing frame
- registers.ip = catchBlockInstructionAddress;
-
- if (TRACE) {
- VM.sysWrite("Set ip to ");
- VM.sysWrite(registers.ip);
- VM.sysWrite("\n");
- }
-
- VM.enableGC(); // disabled right before VM_Runtime.deliverException was called
-
- if (VM.VerifyAssertions) VM._assert(registers.inuse == true);
- registers.inuse = false;
-
- // 'give back' the portion of the stack we borrowed to run
- // exception delivery code when invoked for a hardware trap.
- // If this was a straight software trap (athrow) then setting
- // the stacklimit should be harmless, since the stacklimit should already have exactly
- // the value we are setting it too.
- if (!myThread.hardwareExceptionRegisters.inuse) {
- myThread.stackLimit = VM_Magic.objectAsAddress(myThread.stack).add(STACK_SIZE_GUARD);
- VM_Processor.getCurrentProcessor().activeThreadStackLimit = myThread.stackLimit;
- }
-
- // "branches" to catchBlockInstructionAddress
- VM_Magic.restoreHardwareExceptionState(registers);
- if (VM.VerifyAssertions) VM._assert(NOT_REACHED);
+ try{ throw new Exception("VM_OptExceptionDeliverer.deliverException() not implemented!"); }
+ catch (Exception e) { e.printStackTrace();}
}
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptGCMapIterator.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptGCMapIterator.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/VM_OptGCMapIterator.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -34,78 +34,8 @@
* save the volatile gprs.
*/
void updateLocateRegisters() {
-
- // HIGH MEMORY
- //
- // +---------------+ |
- // FP-> | saved FP | <-- this frame's caller's frame |
- // +---------------+ |
- // | cmid | <-- this frame's compiledmethod id |
- // +---------------+ |
- // | | |
- // | Spill Area | <-- spills and other method-specific |
- // | ... | compiler-managed storage |
- // +---------------+ |
- // | Saved FP | only SaveVolatile Frames |
- // | State | |
- // +---------------+ |
- // | VolGPR[0] |
- // | ... | only SaveVolatile Frames
- // | VolGPR[n] |
- // +---------------+
- // | NVolGPR[k] | <-- cm.getUnsignedNonVolatileOffset()
- // | ... | k == cm.getFirstNonVolatileGPR()
- // | NVolGPR[n] |
- // +---------------+
- //
- // LOW MEMORY
-
- int frameOffset = compiledMethod.getUnsignedNonVolatileOffset();
- if (frameOffset >= 0) {
- // get to the non vol area
- Address nonVolArea = framePtr.sub(frameOffset);
-
- // update non-volatiles
- int first = compiledMethod.getFirstNonVolatileGPR();
- if (first >= 0) {
- // move to the beginning of the nonVol area
- Address location = nonVolArea;
-
- for (int i = first; i < NUM_NONVOLATILE_GPRS; i++) {
- // determine what register index corresponds to this location
- int registerIndex = NONVOLATILE_GPRS[i];
- registerLocations.set(registerIndex, location);
- if (DEBUG) {
- VM.sysWrite("UpdateRegisterLocations: Register ");
- VM.sysWrite(registerIndex);
- VM.sysWrite(" to Location ");
- VM.sysWrite(location);
- VM.sysWrite("\n");
- }
- location = location.sub(BYTES_IN_ADDRESS);
- }
- }
-
- // update volatiles if needed
- if (compiledMethod.isSaveVolatile()) {
- // move to the beginning of the nonVol area
- Address location = nonVolArea.add(4 * NUM_VOLATILE_GPRS);
-
- for (int i = 0; i < NUM_VOLATILE_GPRS; i++) {
- // determine what register index corresponds to this location
- int registerIndex = VOLATILE_GPRS[i];
- registerLocations.set(registerIndex, location);
- if (DEBUG) {
- VM.sysWrite("UpdateRegisterLocations: Register ");
- VM.sysWrite(registerIndex);
- VM.sysWrite(" to Location ");
- VM.sysWrite(location);
- VM.sysWrite("\n");
- }
- location = location.sub(BYTES_IN_ADDRESS);
- }
- }
- }
+ try{ throw new Exception("VM_OptGCMapIterator() not implemented!"); }
+ catch (Exception e) { e.printStackTrace();}
}
/**
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_AddressConstantOperand.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_AddressConstantOperand.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_AddressConstantOperand.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -5,6 +5,8 @@
package com.ibm.JikesRVM.opt.ir;
import com.ibm.JikesRVM.opt.OPT_Bits;
+
+import org.jnode.vm.annotation.MagicPermission;
import org.vmmagic.unboxed.*;
import com.ibm.JikesRVM.VM_SizeConstants;
import com.ibm.JikesRVM.VM;
@@ -16,6 +18,8 @@
* @see OPT_Operand
* @author John Whaley
*/
+
+@MagicPermission
public final class OPT_AddressConstantOperand extends OPT_ConstantOperand {
/**
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateJnodeMagic.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateJnodeMagic.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateJnodeMagic.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -722,15 +722,4 @@
}
return true;
}
-
- private static void cmpHelper(OPT_BC2IR bc2ir,
- OPT_GenerationContext gc,
- OPT_ConditionOperand cond,
- OPT_Operand given_o2) {
- OPT_Operand o2 = given_o2 == null ? bc2ir.pop() : given_o2;
- OPT_Operand o1 = bc2ir.pop();
- OPT_RegisterOperand res = gc.temps.makeTempInt();
- bc2ir.appendInstruction(BooleanCmp.create(BOOLEAN_CMP_ADDR, res.copyRO(), o1, o2, cond, new OPT_BranchProfileOperand()));
- bc2ir.push(res.copyD2U());
- }
}
Modified: branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateMagic.java
===================================================================
--- branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateMagic.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/com/ibm/JikesRVM/opt/ir/OPT_GenerateMagic.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -822,7 +822,7 @@
return true;
}
- private static void cmpHelper(OPT_BC2IR bc2ir,
+ protected static void cmpHelper(OPT_BC2IR bc2ir,
OPT_GenerationContext gc,
OPT_ConditionOperand cond,
OPT_Operand given_o2) {
Modified: branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmType.java
===================================================================
--- branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmType.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/org/jnode/vm/classmgr/VmType.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -1915,6 +1915,10 @@
}
return rc;
}
+
+ public void setCompiled() {
+ state |= VmTypeState.ST_COMPILED;
+ }
/**
* Compile all the methods in this class during runtime.
@@ -2145,7 +2149,7 @@
final Throwable targetEx = ex.getTargetException();
if (targetEx != null) {
ex.getTargetException().printStackTrace();
- // Unsafe.die("VmType.doInitialize");
+ Unsafe.die("VmType.doInitialize: "+getName());
throw new ExceptionInInitializerError(ex
.getTargetException());
} else {
Modified: branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
===================================================================
--- branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -150,8 +150,8 @@
}
this.compilers[2] = new JikesRVMOptCompiler();
- //this.compilers[3] = this.compilers[2];
- this.compilers[3] = this.compilers[1];
+ this.compilers[3] = this.compilers[2];
+// this.compilers[3] = this.compilers[1];
this.testCompilers = null;
}
Modified: branches/jikesRVM/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java
===================================================================
--- branches/jikesRVM/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java 2006-12-19 21:14:50 UTC (rev 2942)
+++ branches/jikesRVM/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java 2006-12-19 23:48:37 UTC (rev 2943)
@@ -49,6 +49,6 @@
*
*****************************************************************/
- public void set(byte stack_pointer, Address sp) {/*TODO*/}
- public void set(int registerIndex, Address location) {/*TODO*/}
+// public void set(byte stack_pointer, Address sp) {/*TODO*/}
+// public void set(int registerIndex, Address location) {/*TODO*/}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
