From b6f186b1a45665a204b29f146354812f40bf439f Mon Sep 17 00:00:00 2001 From: iga Date: Tue, 1 Apr 2014 22:09:01 +0900 Subject: [PATCH] save --- .../src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java | 56 +---- .../output/jp/igapyon/jcfa/vo/JcfaClass.jcfa | 252 ++++++--------------- .../output/jp/igapyon/jcfa/vo/JcfaCode.jcfa | 119 +++------- .../output/jp/igapyon/jcfa/vo/JcfaComment.jcfa | 98 ++------ .../output/jp/igapyon/jcfa/vo/JcfaField.jcfa | 123 +++------- .../output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa | 157 ++++--------- .../output/jp/igapyon/jcfa/vo/JcfaNode.jcfa | 59 ++--- .../output/jp/igapyon/jcfa/vo/JcfaUnit.jcfa | 98 ++------ .../output/test/TestJavaClass001.jcfa | 25 +- .../output/test/TestJavaClass002.jcfa | 23 +- .../output/test/TestJavaClass003.jcfa | 95 ++------ 11 files changed, 275 insertions(+), 830 deletions(-) diff --git a/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java b/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java index c6ea266..0f1477c 100644 --- a/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java +++ b/jcfa/src/jp/igapyon/jcfa/JavaClassFileAnalyzer.java @@ -195,41 +195,16 @@ public class JavaClassFileAnalyzer { } switch (jcfaCode.getOpcode()) { - case Constants.RETURN: { - jcfaCode.getComment().getCommentList() - .add(Constants.OPCODE_NAMES[jcfaCode.getOpcode()]); + case Constants.RETURN: break; - } - case Constants.GETSTATIC: { - jcfaCode.getComment() - .getCommentList() - .add(Constants.OPCODE_NAMES[jcfaCode.getOpcode()] - + ": " - + JcfaUtil.getConstantFieldrefString(jc, - codes[pc + 1], codes[pc + 2])); + case Constants.GETSTATIC: break; - } - case Constants.LDC: { - jcfaCode.getComment() - .getCommentList() - .add(Constants.OPCODE_NAMES[jcfaCode.getOpcode()] - + ": " - + JcfaUtil.getConstantString(jc, codes[pc + 1])); - } + case Constants.LDC: break; case Constants.INVOKEVIRTUAL: - case Constants.INVOKESPECIAL: { - final int operand = JcfaUtil.byte2UnsignedShort(codes[pc + 1], - codes[pc + 2]); - jcfaCode.getComment() - .getCommentList() - .add(Constants.OPCODE_NAMES[jcfaCode.getOpcode()] - + ": " - + JcfaUtil.getConstantMethodRefString(jc, - operand)); - } + case Constants.INVOKESPECIAL: break; - case Constants.LOOKUPSWITCH: + case Constants.LOOKUPSWITCH: { int result = JcfaUtil.byte2Int(codes[pc + 1], codes[pc + 2], codes[pc + 3], codes[pc + 4]); System.out.println(" TODO skipping bytes: " + (result)); @@ -242,33 +217,16 @@ public class JavaClassFileAnalyzer { int loopCount = JcfaUtil .byte2Int(codes[lookupOp++], codes[lookupOp++], codes[lookupOp++], codes[lookupOp++]); - for (int index = 0; index < loopCount; index++) { - jcfaCode.getComment() - .getCommentList() - .add(JcfaUtil.byte2Int(codes[lookupOp++], - codes[lookupOp++], codes[lookupOp++], - codes[lookupOp++]) - + ":" - + (JcfaUtil.byte2Int(codes[lookupOp++], - codes[lookupOp++], - codes[lookupOp++], - codes[lookupOp++]) + pc)); - } short diff2 = JcfaUtil.byte2UnsignedByte(codes[lookupOp++]); jcfaCode.getComment().getCommentList() .add(" TODO skipping bytes: " + (diff2)); operands += (lookupOp - pc); - - break; - default: { - jcfaCode.getComment() - .getCommentList() - .add(Constants.OPCODE_NAMES[jcfaCode.getOpcode()] - + " (" + operands + ")"); } break; + default: + break; } { diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaClass.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaClass.jcfa index b9aaa1e..25772ca 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaClass.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaClass.jcfa @@ -17,310 +17,188 @@ public class JcfaClass extends jp.igapyon.jcfa.vo.JcfaNode { /** Default constructor. */ public JcfaClass() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: jp/igapyon/jcfa/vo/JcfaNode#()V - * jp/igapyon/jcfa/vo/JcfaNode#()V + * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ /* - * 5: ldc ldc: public public + * 5: ldc public */ - /* - * 7: putfield putfield (2) - */ + /* 7: putfield */ - /* - * 10: aload_0 aload_0 (0) - */ + /* 10: aload_0 */ - /* - * 11: iconst_1 iconst_1 (0) - */ + /* 11: iconst_1 */ - /* - * 12: putfield putfield (2) - */ + /* 12: putfield */ - /* - * 15: aload_0 aload_0 (0) - */ + /* 15: aload_0 */ - /* - * 16: new new (2) - */ + /* 16: new */ - /* - * 19: dup dup (0) - */ + /* 19: dup */ /* - * 20: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 20: invokespecial java/util/ArrayList#()V */ - /* - * 23: putfield putfield (2) - */ + /* 23: putfield */ - /* - * 26: aload_0 aload_0 (0) - */ + /* 26: aload_0 */ - /* - * 27: new new (2) - */ + /* 27: new */ - /* - * 30: dup dup (0) - */ + /* 30: dup */ /* - * 31: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 31: invokespecial java/util/ArrayList#()V */ - /* - * 34: putfield putfield (2) - */ + /* 34: putfield */ - /* - * 37: return return - */ + /* 37: return */ } /** Method. */ public java.lang.String getAccess() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getExtendsName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.util.List getFieldList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getLocalName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ /* - * 4: ldc ldc: \. \. + * 4: ldc \. */ /* - * 6: invokevirtual invokevirtual: - * java/lang/String#split(Ljava/lang/String;)[Ljava/lang/String; + * 6: invokevirtual * java/lang/String#split(Ljava/lang/String;)[Ljava/lang/String; */ - /* - * 9: astore_1 astore_1 (0) - */ + /* 9: astore_1 */ - /* - * 10: aload_1 aload_1 (0) - */ + /* 10: aload_1 */ - /* - * 11: aload_1 aload_1 (0) - */ + /* 11: aload_1 */ - /* - * 12: arraylength arraylength (0) - */ + /* 12: arraylength */ - /* - * 13: iconst_1 iconst_1 (0) - */ + /* 13: iconst_1 */ - /* - * 14: isub isub (0) - */ + /* 14: isub */ - /* - * 15: aaload aaload (0) - */ + /* 15: aaload */ - /* - * 16: areturn areturn (0) - */ + /* 16: areturn */ } /** Method. */ public java.util.List getMethodList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public boolean isMainClass() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: ireturn ireturn (0) - */ + /* 4: ireturn */ } /** * Method. java.lang.String */ public void setAccess(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setExtendsName(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. boolean */ public void setMainClass(boolean arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: iload_1 iload_1 (0) - */ + /* 1: iload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setName(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaCode.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaCode.jcfa index 68003cf..3dfe17d 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaCode.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaCode.jcfa @@ -11,149 +11,90 @@ public class JcfaCode extends jp.igapyon.jcfa.vo.JcfaNode { /** Default constructor. */ public JcfaCode() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: jp/igapyon/jcfa/vo/JcfaNode#()V - * jp/igapyon/jcfa/vo/JcfaNode#()V + * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: aconst_null aconst_null (0) - */ + /* 5: aconst_null */ - /* - * 6: putfield putfield (2) - */ + /* 6: putfield */ - /* - * 9: aload_0 aload_0 (0) - */ + /* 9: aload_0 */ - /* - * 10: aconst_null aconst_null (0) - */ + /* 10: aconst_null */ - /* - * 11: putfield putfield (2) - */ + /* 11: putfield */ - /* - * 14: return return - */ + /* 14: return */ } /** Method. */ public byte[] getCodes() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public org.apache.bcel.classfile.JavaClass getJavaClass() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public short getOpcode() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: ireturn ireturn (0) - */ + /* 4: ireturn */ } /** * Method. byte[] */ public void setCodes(byte[] arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. org.apache.bcel.classfile.JavaClass */ public void setJavaClass(org.apache.bcel.classfile.JavaClass arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. short */ public void setOpcode(short arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: iload_1 iload_1 (0) - */ + /* 1: iload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaComment.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaComment.jcfa index ce3b764..3f15450 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaComment.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaComment.jcfa @@ -9,122 +9,74 @@ public class JcfaComment { /** Default constructor. */ public JcfaComment() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: java/lang/Object#()V - * java/lang/Object#()V + * 1: invokespecial java/lang/Object#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: iconst_0 iconst_0 (0) - */ + /* 5: iconst_0 */ - /* - * 6: putfield putfield (2) - */ + /* 6: putfield */ - /* - * 9: aload_0 aload_0 (0) - */ + /* 9: aload_0 */ - /* - * 10: new new (2) - */ + /* 10: new */ - /* - * 13: dup dup (0) - */ + /* 13: dup */ /* - * 14: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 14: invokespecial java/util/ArrayList#()V */ - /* - * 17: putfield putfield (2) - */ + /* 17: putfield */ - /* - * 20: return return - */ + /* 20: return */ } /** Method. */ public java.util.List getCommentList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public boolean isJavaDoc() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: ireturn ireturn (0) - */ + /* 4: ireturn */ } /** * Method. java.util.List */ public void setCommentList(java.util.List arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. boolean */ public void setJavaDoc(boolean arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: iload_1 iload_1 (0) - */ + /* 1: iload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaField.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaField.jcfa index 207825c..7b65cf8 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaField.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaField.jcfa @@ -13,161 +13,100 @@ public class JcfaField extends jp.igapyon.jcfa.vo.JcfaNode { /** Default constructor. */ public JcfaField() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: jp/igapyon/jcfa/vo/JcfaNode#()V - * jp/igapyon/jcfa/vo/JcfaNode#()V + * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#()V */ - /* - * 4: return return - */ + /* 4: return */ } /** Method. */ public java.lang.String getAccess() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getConstantValue() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getType() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** * Method. java.lang.String */ public void setAccess(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setConstantValue(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setName(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setType(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa index aa31932..1ead43f 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaMethod.jcfa @@ -15,197 +15,120 @@ public class JcfaMethod extends jp.igapyon.jcfa.vo.JcfaNode { /** Default constructor. */ public JcfaMethod() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: jp/igapyon/jcfa/vo/JcfaNode#()V - * jp/igapyon/jcfa/vo/JcfaNode#()V + * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: new new (2) - */ + /* 5: new */ - /* - * 8: dup dup (0) - */ + /* 8: dup */ /* - * 9: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 9: invokespecial java/util/ArrayList#()V */ - /* - * 12: putfield putfield (2) - */ + /* 12: putfield */ - /* - * 15: aload_0 aload_0 (0) - */ + /* 15: aload_0 */ - /* - * 16: new new (2) - */ + /* 16: new */ - /* - * 19: dup dup (0) - */ + /* 19: dup */ /* - * 20: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 20: invokespecial java/util/ArrayList#()V */ - /* - * 23: putfield putfield (2) - */ + /* 23: putfield */ - /* - * 26: return return - */ + /* 26: return */ } /** Method. */ public java.lang.String getAccess() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.util.List getArugumentTypeList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.util.List getCodeList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getType() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** * Method. java.lang.String */ public void setAccess(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setName(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.lang.String */ public void setType(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaNode.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaNode.jcfa index 99c919a..0d0baad 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaNode.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaNode.jcfa @@ -7,75 +7,46 @@ public class JcfaNode { /** Default constructor. */ public JcfaNode() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: java/lang/Object#()V - * java/lang/Object#()V + * 1: invokespecial java/lang/Object#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: new new (2) - */ + /* 5: new */ - /* - * 8: dup dup (0) - */ + /* 8: dup */ /* - * 9: invokespecial invokespecial: - * jp/igapyon/jcfa/vo/JcfaComment#()V - * jp/igapyon/jcfa/vo/JcfaComment#()V + * 9: invokespecial jp/igapyon/jcfa/vo/JcfaComment#()V */ - /* - * 12: putfield putfield (2) - */ + /* 12: putfield */ - /* - * 15: return return - */ + /* 15: return */ } /** Method. */ public jp.igapyon.jcfa.vo.JcfaComment getComment() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** * Method. jp.igapyon.jcfa.vo.JcfaComment */ public void setComment(jp.igapyon.jcfa.vo.JcfaComment arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaUnit.jcfa b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaUnit.jcfa index 6b5d6dd..698a041 100644 --- a/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaUnit.jcfa +++ b/jcfa/testJavaClass/output/jp/igapyon/jcfa/vo/JcfaUnit.jcfa @@ -11,125 +11,77 @@ public class JcfaUnit extends jp.igapyon.jcfa.vo.JcfaNode { /** Default constructor. */ public JcfaUnit() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: jp/igapyon/jcfa/vo/JcfaNode#()V - * jp/igapyon/jcfa/vo/JcfaNode#()V + * 1: invokespecial jp/igapyon/jcfa/vo/JcfaNode#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: new new (2) - */ + /* 5: new */ - /* - * 8: dup dup (0) - */ + /* 8: dup */ /* - * 9: invokespecial invokespecial: java/util/ArrayList#()V - * java/util/ArrayList#()V + * 9: invokespecial java/util/ArrayList#()V */ - /* - * 12: putfield putfield (2) - */ + /* 12: putfield */ - /* - * 15: return return - */ + /* 15: return */ } /** Method. */ public java.util.List getClassList() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.lang.String getName() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** Method. */ public java.io.File getTargetFile() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: getfield getfield (2) - */ + /* 1: getfield */ - /* - * 4: areturn areturn (0) - */ + /* 4: areturn */ } /** * Method. java.lang.String */ public void setName(java.lang.String arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } /** * Method. java.io.File */ public void setTargetFile(java.io.File arg0) { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ - /* - * 1: aload_1 aload_1 (0) - */ + /* 1: aload_1 */ - /* - * 2: putfield putfield (2) - */ + /* 2: putfield */ - /* - * 5: return return - */ + /* 5: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa index f685b48..67590e9 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass001.jcfa @@ -4,18 +4,13 @@ package test; public class TestJavaClass001 { /** Default constructor. */ public TestJavaClass001() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: java/lang/Object#()V - * java/lang/Object#()V + * 1: invokespecial java/lang/Object#()V */ - /* - * 4: return return - */ + /* 4: return */ } /** @@ -23,23 +18,17 @@ public class TestJavaClass001 { */ public void main(java.lang.String[] arg0) { /* - * 0: getstatic getstatic: java.lang.System#out - * type:Ljava/io/PrintStream; java.lang.System#out - * type:Ljava/io/PrintStream; + * 0: getstatic java.lang.System#out type:Ljava/io/PrintStream; */ /* - * 3: ldc ldc: Hello jcfa world! Hello jcfa world! + * 3: ldc Hello jcfa world! */ /* - * 5: invokevirtual invokevirtual: - * java/io/PrintStream#println(Ljava/lang/String;)V - * java/io/PrintStream#println(Ljava/lang/String;)V + * 5: invokevirtual java/io/PrintStream#println(Ljava/lang/String;)V */ - /* - * 8: return return - */ + /* 8: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa index 38cad84..56f4291 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass002.jcfa @@ -14,29 +14,18 @@ public class TestJavaClass002 { /** Default constructor. */ public TestJavaClass002() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: java/lang/Object#()V - * java/lang/Object#()V + * 1: invokespecial java/lang/Object#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: iconst_3 iconst_3 (0) - */ + /* 5: iconst_3 */ - /* - * 6: putfield putfield (2) - */ + /* 6: putfield */ - /* - * 9: return return - */ + /* 9: return */ } } \ No newline at end of file diff --git a/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa b/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa index 2a6a097..dba9f59 100644 --- a/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa +++ b/jcfa/testJavaClass/output/test/TestJavaClass003.jcfa @@ -19,101 +19,54 @@ public class TestJavaClass003 { /** Default constructor. */ public TestJavaClass003() { - /* - * 0: aload_0 aload_0 (0) - */ + /* 0: aload_0 */ /* - * 1: invokespecial invokespecial: java/lang/Object#()V - * java/lang/Object#()V + * 1: invokespecial java/lang/Object#()V */ - /* - * 4: aload_0 aload_0 (0) - */ + /* 4: aload_0 */ - /* - * 5: iconst_1 iconst_1 (0) - */ + /* 5: iconst_1 */ - /* - * 6: putfield putfield (2) - */ + /* 6: putfield */ - /* - * 9: aload_0 aload_0 (0) - */ + /* 9: aload_0 */ - /* - * 10: iconst_2 iconst_2 (0) - */ + /* 10: iconst_2 */ - /* - * 11: putfield putfield (2) - */ + /* 11: putfield */ - /* - * 14: aload_0 aload_0 (0) - */ + /* 14: aload_0 */ - /* - * 15: iconst_3 iconst_3 (0) - */ + /* 15: iconst_3 */ - /* - * 16: putfield putfield (2) - */ + /* 16: putfield */ - /* - * 19: aload_0 aload_0 (0) - */ + /* 19: aload_0 */ - /* - * 20: iconst_4 iconst_4 (0) - */ + /* 20: iconst_4 */ - /* - * 21: putfield putfield (2) - */ + /* 21: putfield */ - /* - * 24: aload_0 aload_0 (0) - */ + /* 24: aload_0 */ - /* - * 25: iconst_5 iconst_5 (0) - */ + /* 25: iconst_5 */ - /* - * 26: putfield putfield (2) - */ + /* 26: putfield */ - /* - * 29: aload_0 aload_0 (0) - */ + /* 29: aload_0 */ - /* - * 30: bipush bipush (1) - */ + /* 30: bipush */ - /* - * 32: putfield putfield (2) - */ + /* 32: putfield */ - /* - * 35: aload_0 aload_0 (0) - */ + /* 35: aload_0 */ - /* - * 36: bipush bipush (1) - */ + /* 36: bipush */ - /* - * 38: putfield putfield (2) - */ + /* 38: putfield */ - /* - * 41: return return - */ + /* 41: return */ } } \ No newline at end of file -- 2.11.0