Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java?rev=1746378&r1=1746377&r2=1746378&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ExecutionVisitor.java Wed Jun 1 04:25:27 2016 @@ -96,7 +96,7 @@ public class ExecutionVisitor extends Em /** * Sets the ConstantPoolGen needed for symbolic execution. */ - public void setConstantPoolGen(ConstantPoolGen cpg){ // TODO could be package-protected? + public void setConstantPoolGen(final ConstantPoolGen cpg){ // TODO could be package-protected? this.cpg = cpg; } @@ -106,7 +106,7 @@ public class ExecutionVisitor extends Em * instance, <B>SET THE ConstantPoolGen FIRST</B>. * @see #setConstantPoolGen(ConstantPoolGen) */ - public void setFrame(Frame f){ // TODO could be package-protected? + public void setFrame(final Frame f){ // TODO could be package-protected? this.frame = f; } @@ -122,7 +122,7 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitAALOAD(AALOAD o){ + public void visitAALOAD(final AALOAD o){ stack().pop(); // pop the index int //System.out.print(stack().peek()); Type t = stack().pop(); // Pop Array type @@ -136,49 +136,49 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitAASTORE(AASTORE o){ + public void visitAASTORE(final AASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitACONST_NULL(ACONST_NULL o){ + public void visitACONST_NULL(final ACONST_NULL o){ stack().push(Type.NULL); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitALOAD(ALOAD o){ + public void visitALOAD(final ALOAD o){ stack().push(locals().get(o.getIndex())); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitANEWARRAY(ANEWARRAY o){ + public void visitANEWARRAY(final ANEWARRAY o){ stack().pop(); //count stack().push( new ArrayType(o.getType(cpg), 1) ); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitARETURN(ARETURN o){ + public void visitARETURN(final ARETURN o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitARRAYLENGTH(ARRAYLENGTH o){ + public void visitARRAYLENGTH(final ARRAYLENGTH o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitASTORE(ASTORE o){ + public void visitASTORE(final ASTORE o){ locals().set(o.getIndex(), stack().pop()); //System.err.println("TODO-DEBUG: set LV '"+o.getIndex()+"' to '"+locals().get(o.getIndex())+"'."); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitATHROW(ATHROW o){ + public void visitATHROW(final ATHROW o){ Type t = stack().pop(); stack().clear(); if (t.equals(Type.NULL)) { @@ -190,7 +190,7 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitBALOAD(BALOAD o){ + public void visitBALOAD(final BALOAD o){ stack().pop(); stack().pop(); stack().push(Type.INT); @@ -198,7 +198,7 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitBASTORE(BASTORE o){ + public void visitBASTORE(final BASTORE o){ stack().pop(); stack().pop(); stack().pop(); @@ -206,27 +206,27 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitBIPUSH(BIPUSH o){ + public void visitBIPUSH(final BIPUSH o){ stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitCALOAD(CALOAD o){ + public void visitCALOAD(final CALOAD o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitCASTORE(CASTORE o){ + public void visitCASTORE(final CASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitCHECKCAST(CHECKCAST o){ + public void visitCHECKCAST(final CHECKCAST o){ // It's possibly wrong to do so, but SUN's // ByteCode verifier seems to do (only) this, too. // TODO: One could use a sophisticated analysis here to check @@ -238,122 +238,122 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitD2F(D2F o){ + public void visitD2F(final D2F o){ stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitD2I(D2I o){ + public void visitD2I(final D2I o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitD2L(D2L o){ + public void visitD2L(final D2L o){ stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDADD(DADD o){ + public void visitDADD(final DADD o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDALOAD(DALOAD o){ + public void visitDALOAD(final DALOAD o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDASTORE(DASTORE o){ + public void visitDASTORE(final DASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDCMPG(DCMPG o){ + public void visitDCMPG(final DCMPG o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDCMPL(DCMPL o){ + public void visitDCMPL(final DCMPL o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDCONST(DCONST o){ + public void visitDCONST(final DCONST o){ stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDDIV(DDIV o){ + public void visitDDIV(final DDIV o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDLOAD(DLOAD o){ + public void visitDLOAD(final DLOAD o){ stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDMUL(DMUL o){ + public void visitDMUL(final DMUL o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDNEG(DNEG o){ + public void visitDNEG(final DNEG o){ stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDREM(DREM o){ + public void visitDREM(final DREM o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDRETURN(DRETURN o){ + public void visitDRETURN(final DRETURN o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDSTORE(DSTORE o){ + public void visitDSTORE(final DSTORE o){ locals().set(o.getIndex(), stack().pop()); locals().set(o.getIndex()+1, Type.UNKNOWN); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDSUB(DSUB o){ + public void visitDSUB(final DSUB o){ stack().pop(); stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP(DUP o){ + public void visitDUP(final DUP o){ Type t = stack().pop(); stack().push(t); stack().push(t); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP_X1(DUP_X1 o){ + public void visitDUP_X1(final DUP_X1 o){ Type w1 = stack().pop(); Type w2 = stack().pop(); stack().push(w1); @@ -362,7 +362,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP_X2(DUP_X2 o){ + public void visitDUP_X2(final DUP_X2 o){ Type w1 = stack().pop(); Type w2 = stack().pop(); if (w2.getSize() == 2){ @@ -380,7 +380,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP2(DUP2 o){ + public void visitDUP2(final DUP2 o){ Type t = stack().pop(); if (t.getSize() == 2){ stack().push(t); @@ -396,7 +396,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP2_X1(DUP2_X1 o){ + public void visitDUP2_X1(final DUP2_X1 o){ Type t = stack().pop(); if (t.getSize() == 2){ Type u = stack().pop(); @@ -416,7 +416,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitDUP2_X2(DUP2_X2 o){ + public void visitDUP2_X2(final DUP2_X2 o){ Type t = stack().pop(); if (t.getSize() == 2){ Type u = stack().pop(); @@ -454,114 +454,114 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitF2D(F2D o){ + public void visitF2D(final F2D o){ stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitF2I(F2I o){ + public void visitF2I(final F2I o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitF2L(F2L o){ + public void visitF2L(final F2L o){ stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFADD(FADD o){ + public void visitFADD(final FADD o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFALOAD(FALOAD o){ + public void visitFALOAD(final FALOAD o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFASTORE(FASTORE o){ + public void visitFASTORE(final FASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFCMPG(FCMPG o){ + public void visitFCMPG(final FCMPG o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFCMPL(FCMPL o){ + public void visitFCMPL(final FCMPL o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFCONST(FCONST o){ + public void visitFCONST(final FCONST o){ stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFDIV(FDIV o){ + public void visitFDIV(final FDIV o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFLOAD(FLOAD o){ + public void visitFLOAD(final FLOAD o){ stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFMUL(FMUL o){ + public void visitFMUL(final FMUL o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFNEG(FNEG o){ + public void visitFNEG(final FNEG o){ stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFREM(FREM o){ + public void visitFREM(final FREM o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFRETURN(FRETURN o){ + public void visitFRETURN(final FRETURN o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFSTORE(FSTORE o){ + public void visitFSTORE(final FSTORE o){ locals().set(o.getIndex(), stack().pop()); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitFSUB(FSUB o){ + public void visitFSUB(final FSUB o){ stack().pop(); stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitGETFIELD(GETFIELD o){ + public void visitGETFIELD(final GETFIELD o){ stack().pop(); Type t = o.getFieldType(cpg); if ( t.equals(Type.BOOLEAN) || @@ -574,7 +574,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitGETSTATIC(GETSTATIC o){ + public void visitGETSTATIC(final GETSTATIC o){ Type t = o.getFieldType(cpg); if ( t.equals(Type.BOOLEAN) || t.equals(Type.CHAR) || @@ -586,204 +586,204 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitGOTO(GOTO o){ + public void visitGOTO(final GOTO o){ // no stack changes. } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitGOTO_W(GOTO_W o){ + public void visitGOTO_W(final GOTO_W o){ // no stack changes. } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2B(I2B o){ + public void visitI2B(final I2B o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2C(I2C o){ + public void visitI2C(final I2C o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2D(I2D o){ + public void visitI2D(final I2D o){ stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2F(I2F o){ + public void visitI2F(final I2F o){ stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2L(I2L o){ + public void visitI2L(final I2L o){ stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitI2S(I2S o){ + public void visitI2S(final I2S o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIADD(IADD o){ + public void visitIADD(final IADD o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIALOAD(IALOAD o){ + public void visitIALOAD(final IALOAD o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIAND(IAND o){ + public void visitIAND(final IAND o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIASTORE(IASTORE o){ + public void visitIASTORE(final IASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitICONST(ICONST o){ + public void visitICONST(final ICONST o){ stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIDIV(IDIV o){ + public void visitIDIV(final IDIV o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ACMPEQ(IF_ACMPEQ o){ + public void visitIF_ACMPEQ(final IF_ACMPEQ o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ACMPNE(IF_ACMPNE o){ + public void visitIF_ACMPNE(final IF_ACMPNE o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPEQ(IF_ICMPEQ o){ + public void visitIF_ICMPEQ(final IF_ICMPEQ o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPGE(IF_ICMPGE o){ + public void visitIF_ICMPGE(final IF_ICMPGE o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPGT(IF_ICMPGT o){ + public void visitIF_ICMPGT(final IF_ICMPGT o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPLE(IF_ICMPLE o){ + public void visitIF_ICMPLE(final IF_ICMPLE o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPLT(IF_ICMPLT o){ + public void visitIF_ICMPLT(final IF_ICMPLT o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIF_ICMPNE(IF_ICMPNE o){ + public void visitIF_ICMPNE(final IF_ICMPNE o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFEQ(IFEQ o){ + public void visitIFEQ(final IFEQ o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFGE(IFGE o){ + public void visitIFGE(final IFGE o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFGT(IFGT o){ + public void visitIFGT(final IFGT o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFLE(IFLE o){ + public void visitIFLE(final IFLE o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFLT(IFLT o){ + public void visitIFLT(final IFLT o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFNE(IFNE o){ + public void visitIFNE(final IFNE o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFNONNULL(IFNONNULL o){ + public void visitIFNONNULL(final IFNONNULL o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIFNULL(IFNULL o){ + public void visitIFNULL(final IFNULL o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIINC(IINC o){ + public void visitIINC(final IINC o){ // stack is not changed. } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitILOAD(ILOAD o){ + public void visitILOAD(final ILOAD o){ stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIMUL(IMUL o){ + public void visitIMUL(final IMUL o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINEG(INEG o){ + public void visitINEG(final INEG o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINSTANCEOF(INSTANCEOF o){ + public void visitINSTANCEOF(final INSTANCEOF o){ stack().pop(); stack().push(Type.INT); } @@ -792,7 +792,7 @@ public class ExecutionVisitor extends Em * @since 6.0 */ @Override - public void visitINVOKEDYNAMIC(INVOKEDYNAMIC o){ + public void visitINVOKEDYNAMIC(final INVOKEDYNAMIC o){ for (int i=0; i<o.getArgumentTypes(cpg).length; i++){ stack().pop(); } @@ -813,7 +813,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINVOKEINTERFACE(INVOKEINTERFACE o){ + public void visitINVOKEINTERFACE(final INVOKEINTERFACE o){ stack().pop(); //objectref for (int i=0; i<o.getArgumentTypes(cpg).length; i++){ stack().pop(); @@ -835,7 +835,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINVOKESPECIAL(INVOKESPECIAL o){ + public void visitINVOKESPECIAL(final INVOKESPECIAL o){ if (o.getMethodName(cpg).equals(Const.CONSTRUCTOR_NAME)){ UninitializedObjectType t = (UninitializedObjectType) stack().peek(o.getArgumentTypes(cpg).length); if (t == Frame.getThis()){ @@ -865,7 +865,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINVOKESTATIC(INVOKESTATIC o){ + public void visitINVOKESTATIC(final INVOKESTATIC o){ for (int i=0; i<o.getArgumentTypes(cpg).length; i++){ stack().pop(); } @@ -886,7 +886,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitINVOKEVIRTUAL(INVOKEVIRTUAL o){ + public void visitINVOKEVIRTUAL(final INVOKEVIRTUAL o){ stack().pop(); //objectref for (int i=0; i<o.getArgumentTypes(cpg).length; i++){ stack().pop(); @@ -908,59 +908,59 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIOR(IOR o){ + public void visitIOR(final IOR o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIREM(IREM o){ + public void visitIREM(final IREM o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIRETURN(IRETURN o){ + public void visitIRETURN(final IRETURN o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitISHL(ISHL o){ + public void visitISHL(final ISHL o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitISHR(ISHR o){ + public void visitISHR(final ISHR o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitISTORE(ISTORE o){ + public void visitISTORE(final ISTORE o){ locals().set(o.getIndex(), stack().pop()); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitISUB(ISUB o){ + public void visitISUB(final ISUB o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIUSHR(IUSHR o){ + public void visitIUSHR(final IUSHR o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitIXOR(IXOR o){ + public void visitIXOR(final IXOR o){ stack().pop(); stack().pop(); stack().push(Type.INT); @@ -968,78 +968,78 @@ public class ExecutionVisitor extends Em /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitJSR(JSR o){ + public void visitJSR(final JSR o){ stack().push(new ReturnaddressType(o.physicalSuccessor())); //System.err.println("TODO-----------:"+o.physicalSuccessor()); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitJSR_W(JSR_W o){ + public void visitJSR_W(final JSR_W o){ stack().push(new ReturnaddressType(o.physicalSuccessor())); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitL2D(L2D o){ + public void visitL2D(final L2D o){ stack().pop(); stack().push(Type.DOUBLE); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitL2F(L2F o){ + public void visitL2F(final L2F o){ stack().pop(); stack().push(Type.FLOAT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitL2I(L2I o){ + public void visitL2I(final L2I o){ stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLADD(LADD o){ + public void visitLADD(final LADD o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLALOAD(LALOAD o){ + public void visitLALOAD(final LALOAD o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLAND(LAND o){ + public void visitLAND(final LAND o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLASTORE(LASTORE o){ + public void visitLASTORE(final LASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLCMP(LCMP o){ + public void visitLCMP(final LCMP o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLCONST(LCONST o){ + public void visitLCONST(final LCONST o){ stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLDC(LDC o){ + public void visitLDC(final LDC o){ Constant c = cpg.getConstant(o.getIndex()); if (c instanceof ConstantInteger){ stack().push(Type.INT); @@ -1055,7 +1055,7 @@ public class ExecutionVisitor extends Em } } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ - public void visitLDC_W(LDC_W o){ + public void visitLDC_W(final LDC_W o){ Constant c = cpg.getConstant(o.getIndex()); if (c instanceof ConstantInteger){ stack().push(Type.INT); @@ -1072,7 +1072,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLDC2_W(LDC2_W o){ + public void visitLDC2_W(final LDC2_W o){ Constant c = cpg.getConstant(o.getIndex()); if (c instanceof ConstantLong){ stack().push(Type.LONG); @@ -1083,107 +1083,107 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLDIV(LDIV o){ + public void visitLDIV(final LDIV o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLLOAD(LLOAD o){ + public void visitLLOAD(final LLOAD o){ stack().push(locals().get(o.getIndex())); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLMUL(LMUL o){ + public void visitLMUL(final LMUL o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLNEG(LNEG o){ + public void visitLNEG(final LNEG o){ stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLOOKUPSWITCH(LOOKUPSWITCH o){ + public void visitLOOKUPSWITCH(final LOOKUPSWITCH o){ stack().pop(); //key } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLOR(LOR o){ + public void visitLOR(final LOR o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLREM(LREM o){ + public void visitLREM(final LREM o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLRETURN(LRETURN o){ + public void visitLRETURN(final LRETURN o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLSHL(LSHL o){ + public void visitLSHL(final LSHL o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLSHR(LSHR o){ + public void visitLSHR(final LSHR o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLSTORE(LSTORE o){ + public void visitLSTORE(final LSTORE o){ locals().set(o.getIndex(), stack().pop()); locals().set(o.getIndex()+1, Type.UNKNOWN); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLSUB(LSUB o){ + public void visitLSUB(final LSUB o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLUSHR(LUSHR o){ + public void visitLUSHR(final LUSHR o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitLXOR(LXOR o){ + public void visitLXOR(final LXOR o){ stack().pop(); stack().pop(); stack().push(Type.LONG); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitMONITORENTER(MONITORENTER o){ + public void visitMONITORENTER(final MONITORENTER o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitMONITOREXIT(MONITOREXIT o){ + public void visitMONITOREXIT(final MONITOREXIT o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitMULTIANEWARRAY(MULTIANEWARRAY o){ + public void visitMULTIANEWARRAY(final MULTIANEWARRAY o){ for (int i=0; i<o.getDimensions(); i++){ stack().pop(); } @@ -1191,27 +1191,27 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitNEW(NEW o){ + public void visitNEW(final NEW o){ stack().push(new UninitializedObjectType((ObjectType) (o.getType(cpg)))); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitNEWARRAY(NEWARRAY o){ + public void visitNEWARRAY(final NEWARRAY o){ stack().pop(); stack().push(o.getType()); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitNOP(NOP o){ + public void visitNOP(final NOP o){ } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitPOP(POP o){ + public void visitPOP(final POP o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitPOP2(POP2 o){ + public void visitPOP2(final POP2 o){ Type t = stack().pop(); if (t.getSize() == 1){ stack().pop(); @@ -1219,48 +1219,48 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitPUTFIELD(PUTFIELD o){ + public void visitPUTFIELD(final PUTFIELD o){ stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitPUTSTATIC(PUTSTATIC o){ + public void visitPUTSTATIC(final PUTSTATIC o){ stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitRET(RET o){ + public void visitRET(final RET o){ // do nothing, return address // is in in the local variables. } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitRETURN(RETURN o){ + public void visitRETURN(final RETURN o){ // do nothing. } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitSALOAD(SALOAD o){ + public void visitSALOAD(final SALOAD o){ stack().pop(); stack().pop(); stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitSASTORE(SASTORE o){ + public void visitSASTORE(final SASTORE o){ stack().pop(); stack().pop(); stack().pop(); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitSIPUSH(SIPUSH o){ + public void visitSIPUSH(final SIPUSH o){ stack().push(Type.INT); } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitSWAP(SWAP o){ + public void visitSWAP(final SWAP o){ Type t = stack().pop(); Type u = stack().pop(); stack().push(t); @@ -1268,7 +1268,7 @@ public class ExecutionVisitor extends Em } /** Symbolically executes the corresponding Java Virtual Machine instruction. */ @Override - public void visitTABLESWITCH(TABLESWITCH o){ + public void visitTABLESWITCH(final TABLESWITCH o){ stack().pop(); } }
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java?rev=1746378&r1=1746377&r2=1746378&view=diff ============================================================================== --- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java (original) +++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Frame.java Wed Jun 1 04:25:27 2016 @@ -52,7 +52,7 @@ public class Frame{ /** * */ - public Frame(int maxLocals, int maxStack){ + public Frame(final int maxLocals, final int maxStack){ locals = new LocalVariables(maxLocals); stack = new OperandStack(maxStack); } @@ -60,7 +60,7 @@ public class Frame{ /** * */ - public Frame(LocalVariables locals, OperandStack stack){ + public Frame(final LocalVariables locals, final OperandStack stack){ this.locals = locals; this.stack = stack; } @@ -104,7 +104,7 @@ public class Frame{ * */ @Override - public boolean equals(Object o){ + public boolean equals(final Object o){ if (!(o instanceof Frame)) { return false; // implies "null" is non-equal. } @@ -136,7 +136,7 @@ public class Frame{ * @param _this the _this to set * @since 6.0 */ - public static void setThis(UninitializedObjectType _this) { + public static void setThis(final UninitializedObjectType _this) { Frame._this = _this; } }
