Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5143] trunk/core/src/core/org/jnode/vm
|
From: <cr...@us...> - 2009-03-22 14:45:23
|
Revision: 5143
http://jnode.svn.sourceforge.net/jnode/?rev=5143&view=rev
Author: crawley
Date: 2009-03-22 14:45:17 +0000 (Sun, 22 Mar 2009)
Log Message:
-----------
Javadoc fixes
Modified Paths:
--------------
trunk/core/src/core/org/jnode/vm/classmgr/VmPrimitiveClass.java
trunk/core/src/core/org/jnode/vm/classmgr/VmStatics.java
trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
trunk/core/src/core/org/jnode/vm/classmgr/VmUTF8Convert.java
trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java
trunk/core/src/core/org/jnode/vm/compiler/CompiledIMT.java
trunk/core/src/core/org/jnode/vm/compiler/CompiledMethod.java
trunk/core/src/core/org/jnode/vm/compiler/CompilerBytecodeViewer.java
trunk/core/src/core/org/jnode/vm/compiler/NativeCodeCompiler.java
trunk/core/src/core/org/jnode/vm/compiler/OptimizingBytecodeVisitor.java
trunk/core/src/core/org/jnode/vm/compiler/ir/CodeGenerator.java
trunk/core/src/core/org/jnode/vm/compiler/ir/Constant.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java
trunk/core/src/core/org/jnode/vm/compiler/ir/IRGenerator.java
trunk/core/src/core/org/jnode/vm/compiler/ir/Operand.java
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmPrimitiveClass.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmPrimitiveClass.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmPrimitiveClass.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -22,7 +22,9 @@
import java.security.ProtectionDomain;
+import org.jnode.vm.JvmType;
+
/**
* @author Ewout Prangsma (ep...@us...)
*/
@@ -68,24 +70,23 @@
}
/**
- * Is this a wide primitive type; long or double
+ * Is this a wide primitive type; i.e. a long or double
*/
public final boolean isWide() {
return wide;
}
/**
- * Is this a floatingpoint primitive type; float or double
+ * Is this a floating point primitive type; i.e. a float or double
*/
public final boolean isFloatingPoint() {
return floatingPoint;
}
/**
- * Gets the JvmType of this type.
+ * Gets the {@link JvmType} value for this type.
*
- * @return
- * @see org.jnode.vm.JvmType
+ * @return the {@link JvmType} (integer) value
*/
public int getJvmType() {
return jvmType;
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmStatics.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmStatics.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmStatics.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -150,7 +150,7 @@
* Gets the type at the given index.
*
* @param idx
- * @return
+ * @return the type entry
*/
final VmType getTypeEntry(int idx) {
allocator.testType(idx, TYPE_CLASS);
@@ -409,7 +409,7 @@
/**
* Gets my statics allocator.
*
- * @return
+ * @return the allocator
*/
protected final VmStaticsAllocator getAllocator() {
return allocator;
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmType.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmType.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -252,6 +252,7 @@
* @param superClassName
* @param loader
* @param accessFlags
+ * @param protectionDomain the protection domain of this type.
*/
protected VmType(String name, String superClassName, VmClassLoader loader,
int accessFlags, ProtectionDomain protectionDomain) {
@@ -266,6 +267,7 @@
* @param superClass
* @param loader
* @param typeSize
+ * @param protectionDomain the protection domain of this type.
*/
VmType(String name, VmNormalClass<? super T> superClass,
VmClassLoader loader, int typeSize,
@@ -340,7 +342,7 @@
* Load the system classes during our bootstrap process.
*
* @param clc
- * @return VmClass[]
+ * @return the VmType objects for the system classes
* @throws ClassNotFoundException
*/
@SuppressWarnings("unchecked")
@@ -2349,10 +2351,9 @@
}
/**
- * Gets the JvmType of this type.
+ * Gets the {@link JvmType} value for this type.
*
- * @return
- * @see org.jnode.vm.JvmType
+ * @return the {@link JvmType} value (integer).
*/
public int getJvmType() {
return JvmType.REFERENCE;
Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmUTF8Convert.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmUTF8Convert.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmUTF8Convert.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -61,17 +61,19 @@
static final boolean WRITE_PSEUDO_UTF8 = true;
/**
- * Convert the given sequence of (pseudo-)utf8 formatted bytes into a
- * String.
- * <p/>
+ * Convert the given sequence of UTF8 coded bytes into an interned Java String.
+ * <p>
* The acceptable input formats are controlled by the STRICTLY_CHECK_FORMAT,
* ALLOW_NORMAL_UTF8, and ALLOW_PSEUDO_UTF8 flags.
*
- * @param utf8 (pseudo-)utf8 byte array
- * @return unicode string
- * @throws UTFDataFormatException if the (pseudo-)utf8 byte array is not valid (pseudo-)utf8
+ * @param data a buffer containing the UTF8 data.
+ * @param result a temporary character buffer used to build the string.
+ * @param length the number of bytes to pull from the data buffer.
+ * @return the resulting String
+ * @throws UTFDataFormatException if the UTF8 is invalid
*/
- public static String fromUTF8(ByteBuffer data, char[] result, int length) throws UTFDataFormatException {
+ public static String fromUTF8(ByteBuffer data, char[] result, int length)
+ throws UTFDataFormatException {
int result_index = 0;
for (int i = 0, n = length; i < n;) {
byte b = data.get();
Modified: trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -84,7 +84,7 @@
* Gets the MagicClass instance for the given type.
*
* @param type
- * @return
+ * @return a MagicClass instance
* @throws InternalError When type is no magic type.
*/
public static MagicClass get(VmType<?> type) {
Modified: trunk/core/src/core/org/jnode/vm/compiler/CompiledIMT.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/CompiledIMT.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/CompiledIMT.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -30,7 +30,7 @@
/**
* Gets the address of the IMT code table.
*
- * @return
+ * @return the address
*/
public abstract Object getIMTAddress();
Modified: trunk/core/src/core/org/jnode/vm/compiler/CompiledMethod.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/CompiledMethod.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/CompiledMethod.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -142,7 +142,7 @@
/**
* Gets (creates if needed) a compiled code id.
*
- * @return
+ * @return a compiled code id.
*/
public final int getCompiledCodeId() {
if (ccId < 0) {
Modified: trunk/core/src/core/org/jnode/vm/compiler/CompilerBytecodeViewer.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/CompilerBytecodeViewer.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/CompilerBytecodeViewer.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -1192,9 +1192,6 @@
viewer.visit_tableswitch(defValue, lowValue, highValue, addresses);
}
- /**
- * @see org.jnode.vm.compiler.InlineBytecodeVisitor#visit_inlinedReturn()
- */
public void visit_inlinedReturn(int jvmType) {
viewer.out("inlinedReturn [type " + jvmType + "]");
}
Modified: trunk/core/src/core/org/jnode/vm/compiler/NativeCodeCompiler.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/NativeCodeCompiler.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/NativeCodeCompiler.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -295,7 +295,7 @@
* @param method
* @param cm
* @param os
- * @param level
+ * @param level Optimization level
* @param isBootstrap
* @return The new bytecode visitor.
*/
@@ -318,9 +318,8 @@
/**
* Gets the magic value of this compiler.
*
- * @return
+ * @return the magic value
* @see org.jnode.vm.VmStackFrame#MAGIC_COMPILED
- * @see org.jnode.vm.VmStackFrame#MAGIC_INTERPRETED
* @see org.jnode.vm.VmStackFrame#MAGIC_MASK
*/
public abstract int getMagic();
@@ -328,21 +327,21 @@
/**
* Gets the name of this compiler.
*
- * @return
+ * @return the compiler name
*/
public abstract String getName();
/**
* Create an iterator that can iterator of GCMaps generated by this compiler.
*
- * @return
+ * @return the iterator
*/
public abstract GCMapIterator createGCMapIterator();
/**
* Gets the names of the packages that are required by this compiler.
*
- * @return
+ * @return the names
*/
public abstract String[] getCompilerPackages();
}
Modified: trunk/core/src/core/org/jnode/vm/compiler/OptimizingBytecodeVisitor.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/OptimizingBytecodeVisitor.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/OptimizingBytecodeVisitor.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -694,7 +694,7 @@
/**
* Have we visited a return statement?
*
- * @return
+ * @return {@code true} if we have visited a return statement, {code false} otherwise.
*/
public boolean isReturnVisited() {
return visitedReturn;
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/CodeGenerator.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/CodeGenerator.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/CodeGenerator.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -49,14 +49,14 @@
public abstract void checkLabel(int address);
/**
- * @return
+ * @return the register pool
*/
public abstract RegisterPool<T> getRegisterPool();
/**
* Returns true of this CPU supports 3 address operands
*
- * @return
+ * @return {@code true} if the 3 address operands are supported, otherwise {@code false}.
*/
public abstract boolean supports3AddrOps();
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/Constant.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/Constant.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/Constant.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -147,316 +147,192 @@
///////////////// BINARY OPERATIONS ////////////////////
- /**
- * @param c2
- */
public Constant<T> iAdd(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 + i2);
}
- /**
- * @param c2
- */
public Constant<T> iSub(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 - i2);
}
- /**
- * @param c2
- */
public Constant<T> iMul(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 * i2);
}
- /**
- * @param c2
- */
public Constant<T> iDiv(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 / i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iRem(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 % i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iAnd(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 & i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iOr(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 | i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iXor(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 ^ i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iShl(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 << i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iShr(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 >> i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> iUshr(Constant<T> c2) {
int i1 = ((IntConstant<T>) this).getValue();
int i2 = ((IntConstant<T>) c2).getValue();
return new IntConstant<T>(i1 >>> i2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lAdd(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 + l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lSub(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 - l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lMul(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 * l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lDiv(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 / l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lRem(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 % l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lAnd(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 & l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lOr(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 | l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lXor(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 ^ l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lShl(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 << l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lShr(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 >> l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> lUshr(Constant<T> c2) {
long l1 = ((LongConstant<T>) this).getValue();
long l2 = ((LongConstant<T>) c2).getValue();
return new LongConstant<T>(l1 >>> l2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> fAdd(Constant<T> c2) {
float f1 = ((FloatConstant<T>) this).getValue();
float f2 = ((FloatConstant<T>) c2).getValue();
return new FloatConstant<T>(f1 + f2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> fSub(Constant<T> c2) {
float f1 = ((FloatConstant<T>) this).getValue();
float f2 = ((FloatConstant<T>) c2).getValue();
return new FloatConstant<T>(f1 - f2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> fMul(Constant<T> c2) {
float f1 = ((FloatConstant<T>) this).getValue();
float f2 = ((FloatConstant<T>) c2).getValue();
return new FloatConstant<T>(f1 * f2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> fDiv(Constant<T> c2) {
float f1 = ((FloatConstant<T>) this).getValue();
float f2 = ((FloatConstant<T>) c2).getValue();
return new FloatConstant<T>(f1 / f2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> fRem(Constant<T> c2) {
float f1 = ((FloatConstant<T>) this).getValue();
float f2 = ((FloatConstant<T>) c2).getValue();
return new FloatConstant<T>(f1 / f2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> dAdd(Constant<T> c2) {
double d1 = ((DoubleConstant<T>) this).getValue();
double d2 = ((DoubleConstant<T>) c2).getValue();
return new DoubleConstant<T>(d1 + d2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> dSub(Constant<T> c2) {
double d1 = ((DoubleConstant<T>) this).getValue();
double d2 = ((DoubleConstant<T>) c2).getValue();
return new DoubleConstant<T>(d1 - d2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> dMul(Constant<T> c2) {
double d1 = ((DoubleConstant<T>) this).getValue();
double d2 = ((DoubleConstant<T>) c2).getValue();
return new DoubleConstant<T>(d1 * d2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> dDiv(Constant<T> c2) {
double d1 = ((DoubleConstant<T>) this).getValue();
double d2 = ((DoubleConstant<T>) c2).getValue();
return new DoubleConstant<T>(d1 / d2);
}
- /**
- * @param c2
- * @return
- */
public Constant<T> dRem(Constant<T> c2) {
double d1 = ((DoubleConstant<T>) this).getValue();
double d2 = ((DoubleConstant<T>) c2).getValue();
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlock.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -126,13 +126,11 @@
}
/**
- * @return
+ * @return the variables for the basic block
*/
public Variable<T>[] getVariables() {
if (variables == null) {
- if (variables == null) {
- variables = idominator.getVariables();
- }
+ variables = idominator.getVariables();
}
if (variables == null) {
throw new AssertionError("variables are null!");
@@ -141,14 +139,14 @@
}
/**
- * @param variables
+ * @param variables new variables for the basic block
*/
public void setVariables(Variable<T>[] variables) {
this.variables = variables;
}
/**
- * @return
+ * @return the stack offset for the basic block
*/
public int getStackOffset() {
if (stackOffset < 0) {
@@ -197,21 +195,21 @@
}
/**
- * @return
+ * @return the successors
*/
public List<IRBasicBlock<T>> getSuccessors() {
return successors;
}
/**
- * @return
+ * @return the idominator
*/
public IRBasicBlock<T> getIDominator() {
return idominator;
}
/**
- * @return
+ * @return the block name
*/
public String getName() {
return name;
@@ -252,7 +250,7 @@
}
/**
- * @return
+ * @return the post-order number
*/
public int getPostOrderNumber() {
return postOrderNumber;
@@ -304,42 +302,42 @@
}
/**
- * @return
+ * @return the dominance frontier
*/
public List<IRBasicBlock<T>> getDominanceFrontier() {
return dominanceFrontier;
}
/**
- * @return
+ * @return the dominated blocks
*/
public List<IRBasicBlock<T>> getDominatedBlocks() {
return dominatedBlocks;
}
/**
- * @return
+ * @return the quads
*/
public List<Quad<T>> getQuads() {
return quads;
}
/**
- * @return
+ * @return the def list
*/
public List<Operand> getDefList() {
return defList;
}
/**
- * @return
+ * @return the end PC
*/
public int getEndPC() {
return endPC;
}
/**
- * @return
+ * @return the start PC
*/
public int getStartPC() {
return startPC;
@@ -360,7 +358,7 @@
}
/**
- * @return
+ * @return {@code if this block is the start of an exception handler
*/
public boolean isStartOfExceptionHandler() {
return startOfExceptionHandler;
@@ -374,8 +372,8 @@
}
/**
- * @param pc
- * @return
+ * @param pc a PC value
+ * @return {@code true} if the basic block contains the given PC
*/
public boolean contains(int pc) {
return ((pc >= startPC) && (pc < endPC));
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRBasicBlockFinder.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -118,10 +118,6 @@
return null;
}
- /**
- * @param method
- * @see org.jnode.vm.bytecode.BytecodeVisitor#startMethod(org.jnode.vm.classmgr.VmMethod)
- */
public void startMethod(VmMethod method) {
final VmByteCode bc = method.getBytecode();
byteCode = bc;
@@ -141,9 +137,6 @@
}
}
- /* (non-Javadoc)
- * @see org.jnode.vm.bytecode.BytecodeVisitor#endMethod()
- */
public void endMethod() {
VmByteCode bc = byteCode;
// TODO add catch blocks to try successors
@@ -152,143 +145,72 @@
}
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifeq(int)
- */
public void visit_ifeq(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifne(int)
- */
public void visit_ifne(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iflt(int)
- */
public void visit_iflt(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifge(int)
- */
public void visit_ifge(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifgt(int)
- */
public void visit_ifgt(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifle(int)
- */
public void visit_ifle(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpeq(int)
- */
public void visit_if_icmpeq(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpne(int)
- */
public void visit_if_icmpne(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmplt(int)
- */
public void visit_if_icmplt(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpge(int)
- */
public void visit_if_icmpge(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpgt(int)
- */
public void visit_if_icmpgt(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmple(int)
- */
public void visit_if_icmple(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_acmpeq(int)
- */
public void visit_if_acmpeq(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_acmpne(int)
- */
public void visit_if_acmpne(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_goto(int)
- */
public void visit_goto(int address) {
addBranch(address, UNCONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_jsr(int)
- */
public void visit_jsr(int address) {
// TODO Not sure about this, the next block I believe it NOT a
// direct successor. This will have to be tested.
//addBranch(address);
}
- /**
- * @param defValue
- * @param lowValue
- * @param highValue
- * @param addresses
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_tableswitch(int, int, int, int[])
- */
public void visit_tableswitch(int defValue, int lowValue, int highValue, int[] addresses) {
for (int i = 0; i < addresses.length; i++) {
// Next block could be successor, e.g. switch could fall through
@@ -298,12 +220,6 @@
addBranch(defValue, CONDITIONAL_BRANCH);
}
- /**
- * @param defValue
- * @param matchValues
- * @param addresses
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lookupswitch(int, int[], int[])
- */
public void visit_lookupswitch(int defValue, int[] matchValues, int[] addresses) {
for (int i = 0; i < addresses.length; i++) {
// Next block could be successor, e.g. switch could fall through
@@ -313,76 +229,43 @@
addBranch(defValue, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifnull(int)
- */
public void visit_ifnull(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifnonnull(int)
- */
public void visit_ifnonnull(int address) {
addBranch(address, CONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_athrow()
- */
public void visit_athrow() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_areturn()
- */
public void visit_areturn() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dreturn()
- */
public void visit_dreturn() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_freturn()
- */
public void visit_freturn() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ireturn()
- */
public void visit_ireturn() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lreturn()
- */
public void visit_lreturn() {
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @param index
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ret(int)
- */
public void visit_ret(int index) {
// Not sure about this either, this needs testing
endBB(UNCONDITIONAL_BRANCH);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_return()
- */
public void visit_return() {
endBB(UNCONDITIONAL_BRANCH);
}
@@ -430,10 +313,6 @@
branchFlags[address] |= flags;
}
- /**
- * @param address
- * @see org.jnode.vm.bytecode.BytecodeVisitor#startInstruction(int)
- */
public void startInstruction(int address) {
super.startInstruction(address);
opcodeFlags[address] |= BytecodeFlags.F_START_OF_INSTRUCTION;
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRControlFlowGraph.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -80,7 +80,7 @@
* Gets the basic block that contains the given address.
*
* @param pc
- * @return
+ * @return the basic block or {@code null}.
*/
public IRBasicBlock getBasicBlock(int pc) {
final int max = bblocks.length;
Modified: trunk/core/src/core/org/jnode/vm/compiler/ir/IRGenerator.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/compiler/ir/IRGenerator.java 2009-03-22 13:39:29 UTC (rev 5142)
+++ trunk/core/src/core/org/jnode/vm/compiler/ir/IRGenerator.java 2009-03-22 14:45:17 UTC (rev 5143)
@@ -125,23 +125,14 @@
private Iterator<IRBasicBlock<T>> basicBlockIterator;
private IRBasicBlock<T> currentBlock;
- /**
- *
- */
public IRGenerator(IRControlFlowGraph<T> cfg) {
basicBlockIterator = cfg.iterator();
currentBlock = basicBlockIterator.next();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#setParser(org.jnode.vm.bytecode.BytecodeParser)
- */
public void setParser(BytecodeParser parser) {
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#startMethod(org.jnode.vm.classmgr.VmMethod)
- */
public void startMethod(VmMethod method) {
VmByteCode code = method.getBytecode();
nArgs = method.getArgSlotCount();
@@ -165,15 +156,9 @@
currentBlock.setVariables(variables);
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#endMethod()
- */
public void endMethod() {
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#startInstruction(int)
- */
public void startInstruction(int address) {
this.address = address;
if (address >= currentBlock.getEndPC()) {
@@ -208,30 +193,18 @@
}
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#endInstruction()
- */
public void endInstruction() {
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_nop()
- */
public void visit_nop() {
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_aconst_null()
- */
public void visit_aconst_null() {
currentBlock.add(new ConstantRefAssignQuad<T>(address, currentBlock, stackOffset,
NULL_CONSTANT));
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iconst(int)
- */
public void visit_iconst(int value) {
Constant<T> c = Constant.getInstance(value);
Quad<T> quad = new ConstantRefAssignQuad<T>(address, currentBlock, stackOffset,
@@ -240,9 +213,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lconst(long)
- */
public void visit_lconst(long value) {
Constant<T> c = Constant.getInstance(value);
currentBlock.add(new ConstantRefAssignQuad<T>(address, currentBlock, stackOffset,
@@ -250,9 +220,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fconst(float)
- */
public void visit_fconst(float value) {
Constant<T> c = Constant.getInstance(value);
currentBlock.add(new ConstantRefAssignQuad<T>(address, currentBlock, stackOffset,
@@ -260,9 +227,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dconst(double)
- */
public void visit_dconst(double value) {
Constant<T> c = Constant.getInstance(value);
currentBlock.add(new ConstantRefAssignQuad<T>(address, currentBlock, stackOffset,
@@ -270,24 +234,14 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ldc(VmConstString)
- */
public void visit_ldc(VmConstString value) {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @param value
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ldc(VmConstClass)
- */
public final void visit_ldc(VmConstClass value) {
throw new Error("Not implemented yet");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iload(int)
- */
public void visit_iload(int index) {
variables[index].setType(Operand.INT);
variables[stackOffset].setType(Operand.INT);
@@ -297,9 +251,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lload(int)
- */
public void visit_lload(int index) {
variables[index].setType(Operand.LONG);
variables[stackOffset].setType(Operand.LONG);
@@ -308,9 +259,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fload(int)
- */
public void visit_fload(int index) {
variables[index].setType(Operand.FLOAT);
variables[stackOffset].setType(Operand.FLOAT);
@@ -319,9 +267,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dload(int)
- */
public void visit_dload(int index) {
variables[index].setType(Operand.DOUBLE);
variables[stackOffset].setType(Operand.DOUBLE);
@@ -330,9 +275,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_aload(int)
- */
public void visit_aload(int index) {
variables[index].setType(Operand.REFERENCE);
variables[stackOffset].setType(Operand.REFERENCE);
@@ -340,65 +282,38 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iaload()
- */
public void visit_iaload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_laload()
- */
public void visit_laload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_faload()
- */
public void visit_faload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_daload()
- */
public void visit_daload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_aaload()
- */
public void visit_aaload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_baload()
- */
public void visit_baload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_caload()
- */
public void visit_caload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_saload()
- */
public void visit_saload() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_istore(int)
- */
public void visit_istore(int index) {
stackOffset -= 1;
variables[index].setType(Operand.INT);
@@ -406,9 +321,6 @@
currentBlock.add(new VariableRefAssignQuad<T>(address, currentBlock, index, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lstore(int)
- */
public void visit_lstore(int index) {
stackOffset -= 2;
variables[index].setType(Operand.LONG);
@@ -416,9 +328,6 @@
currentBlock.add(new VariableRefAssignQuad<T>(address, currentBlock, index, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fstore(int)
- */
public void visit_fstore(int index) {
stackOffset -= 1;
variables[index].setType(Operand.FLOAT);
@@ -426,9 +335,6 @@
currentBlock.add(new VariableRefAssignQuad<T>(address, currentBlock, index, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dstore(int)
- */
public void visit_dstore(int index) {
stackOffset -= 2;
variables[index].setType(Operand.DOUBLE);
@@ -436,9 +342,6 @@
currentBlock.add(new VariableRefAssignQuad<T>(address, currentBlock, index, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_astore(int)
- */
public void visit_astore(int index) {
stackOffset -= 1;
variables[index].setType(Operand.REFERENCE);
@@ -446,311 +349,182 @@
currentBlock.add(new VariableRefAssignQuad<T>(address, currentBlock, index, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iastore()
- */
public void visit_iastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lastore()
- */
public void visit_lastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fastore()
- */
public void visit_fastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dastore()
- */
public void visit_dastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_aastore()
- */
public void visit_aastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_bastore()
- */
public void visit_bastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_castore()
- */
public void visit_castore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_sastore()
- */
public void visit_sastore() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_pop()
- */
public void visit_pop() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_pop2()
- */
public void visit_pop2() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup()
- */
public void visit_dup() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup_x1()
- */
public void visit_dup_x1() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup_x2()
- */
public void visit_dup_x2() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup2()
- */
public void visit_dup2() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup2_x1()
- */
public void visit_dup2_x1() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dup2_x2()
- */
public void visit_dup2_x2() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_swap()
- */
public void visit_swap() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iadd()
- */
public void visit_iadd() {
currentBlock.add(doBinaryQuad(IADD, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ladd()
- */
public void visit_ladd() {
currentBlock.add(doBinaryQuad(LADD, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fadd()
- */
public void visit_fadd() {
currentBlock.add(doBinaryQuad(FADD, Operand.FLOAT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dadd()
- */
public void visit_dadd() {
currentBlock.add(doBinaryQuad(DADD, Operand.DOUBLE));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_isub()
- */
public void visit_isub() {
currentBlock.add(doBinaryQuad(ISUB, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lsub()
- */
public void visit_lsub() {
currentBlock.add(doBinaryQuad(LSUB, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fsub()
- */
public void visit_fsub() {
currentBlock.add(doBinaryQuad(FSUB, Operand.FLOAT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dsub()
- */
public void visit_dsub() {
currentBlock.add(doBinaryQuad(DSUB, Operand.DOUBLE));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_imul()
- */
public void visit_imul() {
currentBlock.add(doBinaryQuad(IMUL, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lmul()
- */
public void visit_lmul() {
currentBlock.add(doBinaryQuad(LMUL, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fmul()
- */
public void visit_fmul() {
currentBlock.add(doBinaryQuad(FMUL, Operand.FLOAT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dmul()
- */
public void visit_dmul() {
currentBlock.add(doBinaryQuad(DMUL, Operand.DOUBLE));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_idiv()
- */
public void visit_idiv() {
currentBlock.add(doBinaryQuad(IDIV, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ldiv()
- */
public void visit_ldiv() {
currentBlock.add(doBinaryQuad(LDIV, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fdiv()
- */
public void visit_fdiv() {
currentBlock.add(doBinaryQuad(FDIV, Operand.FLOAT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ddiv()
- */
public void visit_ddiv() {
currentBlock.add(doBinaryQuad(DDIV, Operand.DOUBLE));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_irem()
- */
public void visit_irem() {
currentBlock.add(doBinaryQuad(IREM, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lrem()
- */
public void visit_lrem() {
currentBlock.add(doBinaryQuad(LREM, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_frem()
- */
public void visit_frem() {
currentBlock.add(doBinaryQuad(FREM, Operand.FLOAT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_drem()
- */
public void visit_drem() {
currentBlock.add(doBinaryQuad(DREM, Operand.DOUBLE));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ineg()
- */
public void visit_ineg() {
int s1 = stackOffset - 1;
variables[s1].setType(Operand.INT);
currentBlock.add(new UnaryQuad<T>(address, currentBlock, s1, INEG, s1));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lneg()
- */
public void visit_lneg() {
int s1 = stackOffset - 2;
variables[s1].setType(Operand.LONG);
currentBlock.add(new UnaryQuad<T>(address, currentBlock, s1, LNEG, s1));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fneg()
- */
public void visit_fneg() {
int s1 = stackOffset - 1;
variables[s1].setType(Operand.FLOAT);
currentBlock.add(new UnaryQuad<T>(address, currentBlock, s1, FNEG, s1));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dneg()
- */
public void visit_dneg() {
int s1 = stackOffset - 2;
variables[s1].setType(Operand.DOUBLE);
currentBlock.add(new UnaryQuad<T>(address, currentBlock, s1, DNEG, s1));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ishl()
- */
public void visit_ishl() {
currentBlock.add(doBinaryQuad(ISHL, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lshl()
- */
public void visit_lshl() {
stackOffset -= 1;
int s1 = stackOffset - 2;
@@ -759,16 +533,10 @@
currentBlock.add(new BinaryQuad<T>(address, currentBlock, s1, s1, LSHL, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ishr()
- */
public void visit_ishr() {
currentBlock.add(doBinaryQuad(ISHR, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lshr()
- */
public void visit_lshr() {
stackOffset -= 1;
int s1 = stackOffset - 2;
@@ -777,16 +545,10 @@
currentBlock.add(new BinaryQuad<T>(address, currentBlock, s1, s1, LSHR, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iushr()
- */
public void visit_iushr() {
currentBlock.add(doBinaryQuad(IUSHR, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lushr()
- */
public void visit_lushr() {
stackOffset -= 2;
int s1 = stackOffset - 1;
@@ -795,51 +557,30 @@
currentBlock.add(new BinaryQuad<T>(address, currentBlock, s1, s1, LUSHR, stackOffset));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iand()
- */
public void visit_iand() {
currentBlock.add(doBinaryQuad(IAND, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_land()
- */
public void visit_land() {
currentBlock.add(doBinaryQuad(LAND, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ior()
- */
public void visit_ior() {
currentBlock.add(doBinaryQuad(IOR, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lor()
- */
public void visit_lor() {
currentBlock.add(doBinaryQuad(LOR, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ixor()
- */
public void visit_ixor() {
currentBlock.add(doBinaryQuad(IXOR, Operand.INT));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lxor()
- */
public void visit_lxor() {
currentBlock.add(doBinaryQuad(LXOR, Operand.LONG));
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iinc(int, int)
- */
public void visit_iinc(int index, int incValue) {
variables[index].setType(Operand.INT);
BinaryQuad<T> binaryQuad =
@@ -847,9 +588,6 @@
currentBlock.add(binaryQuad.foldConstants());
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2l()
- */
public void visit_i2l() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.LONG);
@@ -857,9 +595,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2f()
- */
public void visit_i2f() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.FLOAT);
@@ -867,9 +602,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2d()
- */
public void visit_i2d() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.DOUBLE);
@@ -877,9 +609,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_l2i()
- */
public void visit_l2i() {
stackOffset -= 2;
variables[stackOffset].setType(Operand.INT);
@@ -887,9 +616,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_l2f()
- */
public void visit_l2f() {
stackOffset -= 2;
variables[stackOffset].setType(Operand.FLOAT);
@@ -897,9 +623,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_l2d()
- */
public void visit_l2d() {
stackOffset -= 2;
variables[stackOffset].setType(Operand.DOUBLE);
@@ -907,9 +630,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_f2i()
- */
public void visit_f2i() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.INT);
@@ -917,9 +637,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_f2l()
- */
public void visit_f2l() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.LONG);
@@ -927,9 +644,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_f2d()
- */
public void visit_f2d() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.DOUBLE);
@@ -937,9 +651,6 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_d2i()
- */
public void visit_d2i() {
stackOffset -= 2;
variables[stackOffset].setType(Operand.INT);
@@ -947,9 +658,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_d2l()
- */
public void visit_d2l() {
stackOffset -= 2;
variables[stackOffset].setType(Operand.LONG);
@@ -957,16 +665,10 @@
stackOffset += 2;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_d2f()
- */
public void visit_d2f() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2b()
- */
public void visit_i2b() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.BYTE);
@@ -974,9 +676,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2c()
- */
public void visit_i2c() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.CHAR);
@@ -984,9 +683,6 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_i2s()
- */
public void visit_i2s() {
stackOffset -= 1;
variables[stackOffset].setType(Operand.SHORT);
@@ -994,44 +690,26 @@
stackOffset += 1;
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_lcmp()
- */
public void visit_lcmp() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fcmpl()
- */
public void visit_fcmpl() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_fcmpg()
- */
public void visit_fcmpg() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dcmpl()
- */
public void visit_dcmpl() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_dcmpg()
- */
public void visit_dcmpg() {
throw new IllegalArgumentException("byte code not yet supported");
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifeq(int)
- */
public void visit_ifeq(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1042,9 +720,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifne(int)
- */
public void visit_ifne(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1055,9 +730,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_iflt(int)
- */
public void visit_iflt(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1068,9 +740,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifge(int)
- */
public void visit_ifge(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1081,9 +750,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifgt(int)
- */
public void visit_ifgt(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1094,9 +760,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_ifle(int)
- */
public void visit_ifle(int address) {
int s1 = stackOffset - 1;
Variable[] variables = currentBlock.getVariables();
@@ -1107,9 +770,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpeq(int)
- */
public void visit_if_icmpeq(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1122,9 +782,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpne(int)
- */
public void visit_if_icmpne(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1137,9 +794,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmplt(int)
- */
public void visit_if_icmplt(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1152,9 +806,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpge(int)
- */
public void visit_if_icmpge(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1167,9 +818,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmpgt(int)
- */
public void visit_if_icmpgt(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1182,9 +830,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_icmple(int)
- */
public void visit_if_icmple(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1197,9 +842,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_acmpeq(int)
- */
public void visit_if_acmpeq(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1212,9 +854,6 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeVisitor#visit_if_acmpne(int)
- */
public void visit_if_acmpne(int address) {
int s1 = stackOffset - 2;
int s2 = stackOffset - 1;
@@ -1227,223 +866,133 @@
setSuccessorStackOffset();
}
- /**
- * @see org.jnode.vm.bytecode.BytecodeV...
[truncated message content] |
