You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by mo...@apache.org on 2009/05/29 09:48:37 UTC
svn commit: r779908 -
/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java
Author: monteith
Date: Fri May 29 09:48:36 2009
New Revision: 779908
URL: http://svn.apache.org/viewvc?rev=779908&view=rev
Log:
Add local variable table support.
Modified:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java?rev=779908&r1=779907&r2=779908&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.jdi/src/main/java/org/apache/kato/tools/jdi/DTFJReader.java Fri May 29 09:48:36 2009
@@ -19,6 +19,7 @@
import java.net.InetAddress;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import org.apache.kato.image.CorruptData;
@@ -40,6 +41,7 @@
import org.apache.kato.java.JavaRuntime;
import org.apache.kato.java.JavaStackFrame;
import org.apache.kato.java.JavaThread;
+import org.apache.kato.java.JavaVariable;
/**
@@ -1822,43 +1824,44 @@
JavaLocation jLocation = jStackFrame.getLocation();
JavaMethod jMethod = jLocation.getMethod();
JavaClass jClass = jMethod.getDeclaringClass();
-
+
+
if (getMethodId(refType, jMethod) == methodID && jClass.getID().getAddress() == refType){
- if (!Modifier.isStatic(jMethod.getModifiers())){
- int line = -1;
- try{
- line = jLocation.getLineNumber();
- }
- catch(Exception exxy){}
- Vector<Byte> vctr = new Vector<Byte>();
- if (line > 0){
- addIntToVector(vctr, 1);
- addIntToVector(vctr, 1);
-
- addLongToVector(vctr, 0);
- addStringToVector(vctr, "this"); //$NON-NLS-1$
-
- addStringToVector(vctr, "L" + jClass.getName() + ";"); //$NON-NLS-1$ //$NON-NLS-2$
- int highest = findHighestLineRef(refType, methodID);
- addIntToVector(vctr, highest + 5);
- addIntToVector(vctr, slotsUsed++);
- logr.log(JDILogger.LEVEL_VERYVERBOSE, " L" + jClass.getName() + ";"); //$NON-NLS-1$ //$NON-NLS-2$
- }else{
- addIntToVector(vctr, 0);
- addIntToVector(vctr, 0);
- logr.log(JDILogger.LEVEL_VERYVERBOSE, " Line information not available"); //$NON-NLS-1$
+ Vector<Byte> vctr = new Vector<Byte>();
+
+ List vars = jMethod.getVariables();
+ String sig = jMethod.getSignature();
+
+ addIntToVector(vctr, methodSignatureSize(sig));
+ addIntToVector(vctr, vars.size());
+
+ logr.log(JDILogger.LEVEL_VERYVERBOSE, " "+jLocation+
+ " vars.size="+vars.size());
+
+ for (Object nextVar : vars) {
+ if (nextVar instanceof CorruptData) {
+ continue;
}
- ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
- rpckt.setData(vectorToByte(vctr));
- return rpckt;
+ JavaVariable var = (JavaVariable) nextVar;
+ addLongToVector(vctr, var.getStart());
+ addStringToVector(vctr, var.getName());
+ addStringToVector(vctr, var.getSignature());
+ addIntToVector(vctr, var.getLength());
+ addIntToVector(vctr, var.getSlot());
+ logr.log(JDILogger.LEVEL_VERYVERBOSE, " start:"+var.getStart()+
+ " name:`"+var.getName()+ "'"+
+ " signature:`"+var.getSignature()+"'"+
+ " length: "+var.getLength()+
+ " slot: "+var.getSlot()); //$NON-NLS-1$ //$NON-NLS-2$
}
- ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_ABSENT_INFORMATION);
- return rpckt;
+ ReplyPacket rpckt = new ReplyPacket(cpckt.getSequence(), FLAG_REPLY_PACKET, ERROR_NONE);
+ rpckt.setData(vectorToByte(vctr));
- }
+ return rpckt;
+ }
}
}
}
@@ -1873,6 +1876,103 @@
}
+
+ /**
+ * Works out and returns the size of a method's arguments from it's signature.
+ * doubles and longs and object references are regarded as
+ *
+ * @param signature JNI signature of method.
+ * e.g. "(Ljava/lang/String;LB)I"
+ * which would be:
+ * int method(String arg0, long arg1, byte arg2);
+ *
+ *
+ * @return size of arguments
+ */
+ public static int methodSignatureSize(String signature) {
+ int state = 0;
+ int size = 0;
+
+LOOP: for (int i=0; i < signature.length(); i++) {
+ char c = signature.charAt(i);
+
+ switch(state) {
+ case 0: // First character must be a "("
+ switch(c) {
+ case '(':
+ state = 1;
+ break;
+ default:
+ throw new IllegalArgumentException("Bad character `"+c+"' in signature `"+signature+"' in state "+state);
+ }
+ break;
+ case 1: // parse characters
+ switch(c) {
+ case 'Z':
+ case 'B':
+ case 'S':
+ case 'C':
+ case 'I':
+ case 'F':
+ size++;
+ break;
+ case 'D':
+ case 'J':
+ size +=2;
+ break;
+ case '[':
+ size++;
+ state = 2; // go to parse array state
+ break;
+ case 'L':
+ size++;
+ state = 3; // go to parse object state
+ break;
+ case ')':
+ state = 4; // go to end state.
+ break;
+ default:
+ throw new IllegalArgumentException("Bad character `"+c+"' in signature `"+signature+"' in state "+state);
+ }
+ break;
+ case 2: // Parse array
+ switch(c) {
+ case 'L':
+ state = 3;
+ case '[':
+ // remain in this state
+ break;
+ case 'Z':
+ case 'B':
+ case 'S':
+ case 'C':
+ case 'I':
+ case 'F':
+ case 'D':
+ case 'J':
+ state = 1; // go back to character parsing state
+ break;
+ default:
+ throw new IllegalArgumentException("Bad character `"+c+"' in signature `"+signature+"' in state "+state);
+ }
+ case 3: // Parse object
+ switch (c) {
+ case ';':
+ state = 1; // reached end of object descriptor. stop.
+ break;
+ default:
+ // anything else is fair game.
+ }
+ case 4: // end state - return value remains - just ignore characters.
+ break LOOP; // Exit the loop, we won't parse the return type.
+ default:
+ throw new IllegalStateException("In unexpected state "+state+ "in signature `"+signature+"'");
+ }
+ }
+
+ return size;
+ }
+
/**
* Create a hash map that stores objects for quick retrieval later
* @return A hashmap of objects
@@ -2978,19 +3078,17 @@
if ((jFrame.getLocation().getMethod().getModifiers() & Modifier.STATIC) !=0) {
addLongToVector(vctr, 0); // Return null as static method.
- }
-
- Object value = jFrame.getVariable(0);
- long objectAddress = -1;
- if (value instanceof JavaObject) {
- JavaObject obj = (JavaObject) value;
- if (obj.isArray()) {
+ } else {
+ Object value = jFrame.getVariable(0);
+ long objectAddress = 0;
+ if (value instanceof JavaObject) {
+ JavaObject obj = (JavaObject) value;
objectAddress = obj.getID().getAddress();
}
+
+ logr.log(JDILogger.LEVEL_VERBOSE, " " +jFrame.getLocation() + " return this object value="+objectAddress);
+ addLongToVector(vctr, objectAddress );
}
- logr.log(JDILogger.LEVEL_VERBOSE, " " +jFrame.getLocation() + " return this object value="+objectAddress);
- addLongToVector(vctr, objectAddress );
-
rpckt.setData(vectorToByte(vctr));
return rpckt;
}