add jvm_3 and InfixExpr of week 8

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/AttributeInfo.java

@@ -0,0 +1,19 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+public abstract class AttributeInfo {
+    public static final String CODE = "Code";
+    public static final String CONST_VALUE = "ConstantValue";
+    public static final String EXCEPTIONS = "Exceptions";
+    public static final String LINE_NUM_TABLE = "LineNumberTable";
+    public static final String LOCAL_VAR_TABLE = "LocalVariableTable";
+    public static final String STACK_MAP_TABLE = "StackMapTable";
+    int attrNameIndex;
+    int attrLen;
+
+    public AttributeInfo(int attrNameIndex, int attrLen) {
+
+	this.attrNameIndex = attrNameIndex;
+	this.attrLen = attrLen;
+    }
+
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/CodeAttr.java

@@ -0,0 +1,100 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+import com.github.HarryHook.coding2017.jvm.clz.ClassFile;
+import com.github.HarryHook.coding2017.jvm.constant.ConstantPool;
+import com.github.HarryHook.coding2017.jvm.loader.ByteCodeIterator;
+import com.sun.org.apache.bcel.internal.generic.NEW;
+
+public class CodeAttr extends AttributeInfo {
+    private int maxStack;
+    private int maxLocals;
+    private int codeLen;
+    private String code;
+
+    public String getCode() {
+	return code;
+    }
+
+    // private ByteCodeCommand[] cmds ;
+    // public ByteCodeCommand[] getCmds() {
+    // return cmds;
+    // }
+    private LineNumberTable lineNumTable;
+    private LocalVariableTable localVarTable;
+    private StackMapTable stackMapTable;
+
+    public CodeAttr(int attrNameIndex, int attrLen, int maxStack, int maxLocals, int codeLen,
+	    String code /* ByteCodeCommand[] cmds */) {
+	super(attrNameIndex, attrLen);
+	this.maxStack = maxStack;
+	this.maxLocals = maxLocals;
+	this.codeLen = codeLen;
+	this.code = code;
+	// this.cmds = cmds;
+    }
+
+    public void setLineNumberTable(LineNumberTable t) {
+	this.lineNumTable = t;
+    }
+
+    public void setLocalVariableTable(LocalVariableTable t) {
+	this.localVarTable = t;
+    }
+
+    public static CodeAttr parse(ClassFile clzFile, ByteCodeIterator iter) {
+
+	int attrNameIndex = iter.nextU2ToInt();
+	int attrLen = iter.nextU4ToInt();
+	int maxStack = iter.nextU2ToInt();
+	int maxLocals = iter.nextU2ToInt();
+	int codeLen = iter.nextU4ToInt();
+
+	String code = iter.nextUxToHexString(codeLen);
+	System.out.println(code);
+
+	CodeAttr codeAttr = new CodeAttr(attrNameIndex, attrLen, maxStack, maxLocals, codeLen, code);
+
+	int exceptionLength = iter.nextU2ToInt();
+	if(exceptionLength > 0) {
+	    String exceptionTable = iter.nextUxToHexString(exceptionLength);
+	    System.out.println("exception Table has not complemented" + exceptionTable);
+	}
+	//解析子属性
+	int subAttrCount = iter.nextU2ToInt();
+
+	for(int j=1; j<=subAttrCount; j++) {
+
+	    int subAttrIndex = iter.nextU2ToInt();
+	    String subAttrName = clzFile.getConstantPool().getUTF8String(subAttrIndex);
+	    iter.back(2);
+
+	    if(AttributeInfo.LINE_NUM_TABLE.equalsIgnoreCase(subAttrName)) {	
+		LineNumberTable t = LineNumberTable.parse(iter);
+		codeAttr.setLineNumberTable(t);
+
+	    } else if(AttributeInfo.LOCAL_VAR_TABLE.equals(subAttrName)) {
+		LocalVariableTable t = LocalVariableTable.parse(iter);
+		codeAttr.setLocalVariableTable(t);
+
+	    } else {
+		throw new RuntimeException("Need implement" + subAttrName);
+	    }
+	}
+	return codeAttr;
+    }
+
+    private void setStackMapTable(StackMapTable t) {
+	this.stackMapTable = t;
+
+    }
+    public String toString(ConstantPool pool) {
+	StringBuffer buffer = new StringBuffer();
+	buffer.append("Code:").append(code).append("\n");
+	buffer.append("\n");
+	buffer.append(this.lineNumTable.toString());
+	//buffer.append(this.localVarTable.toString(pool));
+	return buffer.toString();
+    }
+
+
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/LineNumberTable.java

@@ -0,0 +1,57 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.github.HarryHook.coding2017.jvm.loader.ByteCodeIterator;
+
+public class LineNumberTable extends AttributeInfo {
+    List<LineNumberItem> items = new ArrayList<LineNumberItem>();
+
+    private static class LineNumberItem {
+	int startPC;
+	int lineNum;
+
+	public int getStartPC() {
+	    return startPC;
+	}
+
+	public void setStartPC(int startPC) {
+	    this.startPC = startPC;
+	}
+
+	public int getLineNum() {
+	    return lineNum;
+	}
+
+	public void setLineNum(int lineNum) {
+	    this.lineNum = lineNum;
+	}
+    }
+
+    public void addLineNumberItem(LineNumberItem item) {
+	this.items.add(item);
+    }
+
+    public LineNumberTable(int attrNameIndex, int attrLen) {
+	super(attrNameIndex, attrLen);
+
+    }
+
+    public static LineNumberTable parse(ByteCodeIterator iter) {
+	int attrNameIndex = iter.nextU2ToInt();
+	int attrLength = iter.nextU4ToInt();
+	LineNumberTable table = new LineNumberTable(attrNameIndex, attrLength);
+	int itemLength = iter.nextU2ToInt();
+
+	for(int i=1; i<=itemLength; i++) {
+	    LineNumberItem item = new LineNumberItem();
+	    item.setStartPC(iter.nextU2ToInt());
+	    item.setLineNum(iter.nextU2ToInt());
+	    table.addLineNumberItem(item);
+	}
+
+	return table;
+    }
+
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/LocalVariableItem.java

@@ -0,0 +1,49 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+public class LocalVariableItem {
+    private int startPC;
+    private int length;
+    private int nameIndex;
+    private int descIndex;
+    private int index;
+
+    public int getStartPC() {
+	return startPC;
+    }
+
+    public void setStartPC(int startPC) {
+	this.startPC = startPC;
+    }
+
+    public int getLength() {
+	return length;
+    }
+
+    public void setLength(int length) {
+	this.length = length;
+    }
+
+    public int getNameIndex() {
+	return nameIndex;
+    }
+
+    public void setNameIndex(int nameIndex) {
+	this.nameIndex = nameIndex;
+    }
+
+    public int getDescIndex() {
+	return descIndex;
+    }
+
+    public void setDescIndex(int descIndex) {
+	this.descIndex = descIndex;
+    }
+
+    public int getIndex() {
+	return index;
+    }
+
+    public void setIndex(int index) {
+	this.index = index;
+    }
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/LocalVariableTable.java

@@ -0,0 +1,40 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+import java.util.ArrayList;
+import java.util.List;
+import com.github.HarryHook.coding2017.jvm.constant.ConstantPool;
+import com.github.HarryHook.coding2017.jvm.loader.ByteCodeIterator;
+
+import sun.util.logging.resources.logging;
+
+public class LocalVariableTable extends AttributeInfo {
+
+    List<LocalVariableItem> items = new ArrayList<LocalVariableItem>();
+
+    public LocalVariableTable(int attrNameIndex, int attrLen) {
+	super(attrNameIndex, attrLen);
+    }
+
+    public static LocalVariableTable parse(ByteCodeIterator iter) {
+	int attrNameIndex = iter.nextU2ToInt();
+	int attrlength = iter.nextU4ToInt();
+
+	LocalVariableTable table = new LocalVariableTable(attrNameIndex, attrlength);
+	int itemLength = iter.nextU2ToInt();
+	for (int i = 1; i <= itemLength; i++) {
+	    LocalVariableItem item = new LocalVariableItem();
+	    item.setStartPC(iter.nextU2ToInt());
+	    item.setLength(iter.nextU2ToInt());
+	    item.setNameIndex(iter.nextU2ToInt());
+	    item.setDescIndex(iter.nextU2ToInt());
+	    item.setIndex(iter.nextU2ToInt());
+	    table.addLocalVariableItem(item);
+	}
+	return table;
+    }
+
+    private void addLocalVariableItem(LocalVariableItem item) {
+	this.items.add(item);
+    }
+
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/attr/StackMapTable.java

@@ -0,0 +1,29 @@
+package com.github.HarryHook.coding2017.jvm.attr;
+
+import com.github.HarryHook.coding2017.jvm.loader.ByteCodeIterator;
+
+public class StackMapTable extends AttributeInfo {
+
+    private String originalCode;
+
+    public StackMapTable(int attrNameIndex, int attrLen) {
+	super(attrNameIndex, attrLen);
+    }
+
+    public static StackMapTable parse(ByteCodeIterator iter) {
+	int index = iter.nextU2ToInt();
+	int len = iter.nextU4ToInt();
+	StackMapTable t = new StackMapTable(index, len);
+
+	// 后面的StackMapTable太过复杂， 不再处理， 只把原始的代码读进来保存
+	String code = iter.nextUxToHexString(len);
+	t.setOriginalCode(code);
+
+	return t;
+    }
+
+    private void setOriginalCode(String code) {
+	this.originalCode = code;
+
+    }
+}

group02/727171008/src/com/github/HarryHook/coding2017/jvm/clz/ClassFile.java

@@ -1,7 +1,13 @@
 package com.github.HarryHook.coding2017.jvm.clz;
 
+
+import java.util.ArrayList;
+import java.util.List;
+
 import com.github.HarryHook.coding2017.jvm.constant.ClassInfo;
 import com.github.HarryHook.coding2017.jvm.constant.ConstantPool;
+import com.github.HarryHook.coding2017.jvm.field.Field;
+import com.github.HarryHook.coding2017.jvm.method.Method;
 
 public class ClassFile {
 
@@ -11,6 +17,8 @@ public class ClassFile {
     private AccessFlag accessFlag;
     private ClassIndex clzIndex;
     private ConstantPool pool;
+    private List<Field> fields = new ArrayList<Field>();
+    private List<Method> methods  = new ArrayList<Method>();;
 
     public ClassIndex getClzIndex() {
 	return clzIndex;
@@ -48,7 +56,6 @@ public void setMajorVersion(int majorVersion) {
 
     public void setConstantPool(ConstantPool pool) {
 	this.pool = pool;
-
     }
 
     public void setClassIndex(ClassIndex clzIndex) {
@@ -75,5 +82,22 @@ private String getSuperClassName() {
 	ClassInfo superClass = (ClassInfo) this.getConstantPool().getConstantInfo(this.clzIndex.getSuperClassIndex());
 	return superClass.getClassName();
     }
+
+    public void addField(Field f) {
+	fields.add(f);
+    }
+
+    public List<Field> getFields() {
+	return fields;
+    }
+
+    public void addMethod(Method m) {
+	methods.add(m);
+
+    }
+    public List<Method> getMethods() {
+	return methods;
+    }
+
 
 }

group02/727171008/src/com/github/HarryHook/coding2017/jvm/constant/ConstantInfo.java

@@ -27,5 +27,8 @@ public ConstantPool getConstantPool() {
     public ConstantInfo getConstantInfo(int index) {
 	return this.constantPool.getConstantInfo(index);
     }
+
+
+
 
 }

group02/727171008/src/com/github/HarryHook/coding2017/jvm/constant/UTF8Info.java

@@ -26,12 +26,11 @@ public String toString() {
 	return "UTF8Info [type=" + type + ", length=" + length + ", value=" + value + ")]";
     }
 
-    public String getValue() {
-	return value;
-    }
-
     public void setValue(String value) {
 	this.value = value;
     }
+    public String getValue(){
+	return value;
+    }
 
 }