Author: markt
Date: Fri Sep 12 12:09:34 2014
New Revision: 1624510
URL: http://svn.apache.org/r1624510
Log:
Back-port of more cleanup from trunk
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1397973-1397974,1397976-1397978
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/
------------------------------------------------------------------------------
Merged
/tomcat/trunk/java/org/apache/tomcat/util/bcel:r1397973-1397974,1397976-1397978
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/Constants.java Fri
Sep 12 12:09:34 2014
@@ -40,26 +40,6 @@ public interface Constants {
*/
public static final short ACC_ANNOTATION = 0x2000;
- /** One of the access flags for fields, methods, or classes.
- */
- public static final short ACC_ENUM = 0x4000;
-
- // Applies to classes compiled by new compilers only
- /** One of the access flags for fields, methods, or classes.
- */
- public static final short ACC_SUPER = 0x0020;
-
- /** One of the access flags for fields, methods, or classes.
- */
- public static final short MAX_ACC_FLAG = ACC_ENUM;
-
- /** The names of the access flags. */
- public static final String[] ACCESS_NAMES = {
- "public", "private", "protected", "static", "final", "synchronized",
- "volatile", "transient", "native", "interface", "abstract", "strictfp",
- "synthetic", "annotation", "enum"
- };
-
/** Marks a constant pool entry as type UTF-8. */
public static final byte CONSTANT_Utf8 = 1;
@@ -111,388 +91,6 @@ public interface Constants {
"CONSTANT_NameAndType", "", "", "CONSTANT_MethodHandle",
"CONSTANT_MethodType", "", "CONSTANT_InvokeDynamic" };
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LDC = 18;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LDC_W = 19;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LDC2_W = 20;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short ILOAD = 21;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LLOAD = 22;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short FLOAD = 23;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short DLOAD = 24;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short ALOAD = 25;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short ISTORE = 54;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LSTORE = 55;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short FSTORE = 56;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short DSTORE = 57;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short ASTORE = 58;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IINC = 132;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFEQ = 153;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFNE = 154;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFLT = 155;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFGE = 156;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFGT = 157;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFLE = 158;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPEQ = 159;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPNE = 160;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPLT = 161;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPGE = 162;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPGT = 163;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ICMPLE = 164;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ACMPEQ = 165;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IF_ACMPNE = 166;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short GOTO = 167;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short JSR = 168;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short RET = 169;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short TABLESWITCH = 170;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short LOOKUPSWITCH = 171;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short GETSTATIC = 178;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short PUTSTATIC = 179;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short GETFIELD = 180;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short PUTFIELD = 181;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKEVIRTUAL = 182;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKESPECIAL = 183;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKESTATIC = 184;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short INVOKEINTERFACE = 185;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short NEW = 187;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short NEWARRAY = 188;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short ANEWARRAY = 189;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short CHECKCAST = 192;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short INSTANCEOF = 193;
-
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short WIDE = 196;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short MULTIANEWARRAY = 197;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFNULL = 198;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short IFNONNULL = 199;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short GOTO_W = 200;
- /** Java VM opcode.
- * @see <a
href="http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc.html";>Opcode
definitions in The Java Virtual Machine Specification</a> */
- public static final short JSR_W = 201;
-
- /** Illegal opcode. */
- public static final short UNDEFINED = -1;
- /** Illegal opcode. */
- public static final short UNPREDICTABLE = -2;
- /** Illegal opcode. */
- public static final short RESERVED = -3;
- /** Mnemonic for an illegal opcode. */
- public static final String ILLEGAL_OPCODE = "<illegal opcode>";
- /** Mnemonic for an illegal type. */
- public static final String ILLEGAL_TYPE = "<illegal type>";
-
- /** Byte data type. */
- public static final byte T_BYTE = 8;
- /** Short data type. */
- public static final byte T_SHORT = 9;
- /** Int data type. */
- public static final byte T_INT = 10;
-
-
- /** Unknown data type. */
- public static final byte T_UNKNOWN = 15;
-
- /** The primitive type names corresponding to the T_XX constants,
- * e.g., TYPE_NAMES[T_INT] = "int"
- */
- public static final String[] TYPE_NAMES = {
- ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE, ILLEGAL_TYPE,
- "boolean", "char", "float", "double", "byte", "short", "int", "long",
- "void", "array", "object", "unknown", "address"
- };
-
-
- /**
- * Number of byte code operands for each opcode, i.e., number of bytes after
the tag byte
- * itself. Indexed by opcode, so NO_OF_OPERANDS[BIPUSH] = the number of
operands for a bipush
- * instruction.
- */
- public static final short[] NO_OF_OPERANDS = {
- 0/*nop*/, 0/*aconst_null*/, 0/*iconst_m1*/, 0/*iconst_0*/,
- 0/*iconst_1*/, 0/*iconst_2*/, 0/*iconst_3*/, 0/*iconst_4*/,
- 0/*iconst_5*/, 0/*lconst_0*/, 0/*lconst_1*/, 0/*fconst_0*/,
- 0/*fconst_1*/, 0/*fconst_2*/, 0/*dconst_0*/, 0/*dconst_1*/,
- 1/*bipush*/, 2/*sipush*/, 1/*ldc*/, 2/*ldc_w*/, 2/*ldc2_w*/,
- 1/*iload*/, 1/*lload*/, 1/*fload*/, 1/*dload*/, 1/*aload*/,
- 0/*iload_0*/, 0/*iload_1*/, 0/*iload_2*/, 0/*iload_3*/,
- 0/*lload_0*/, 0/*lload_1*/, 0/*lload_2*/, 0/*lload_3*/,
- 0/*fload_0*/, 0/*fload_1*/, 0/*fload_2*/, 0/*fload_3*/,
- 0/*dload_0*/, 0/*dload_1*/, 0/*dload_2*/, 0/*dload_3*/,
- 0/*aload_0*/, 0/*aload_1*/, 0/*aload_2*/, 0/*aload_3*/,
- 0/*iaload*/, 0/*laload*/, 0/*faload*/, 0/*daload*/,
- 0/*aaload*/, 0/*baload*/, 0/*caload*/, 0/*saload*/,
- 1/*istore*/, 1/*lstore*/, 1/*fstore*/, 1/*dstore*/,
- 1/*astore*/, 0/*istore_0*/, 0/*istore_1*/, 0/*istore_2*/,
- 0/*istore_3*/, 0/*lstore_0*/, 0/*lstore_1*/, 0/*lstore_2*/,
- 0/*lstore_3*/, 0/*fstore_0*/, 0/*fstore_1*/, 0/*fstore_2*/,
- 0/*fstore_3*/, 0/*dstore_0*/, 0/*dstore_1*/, 0/*dstore_2*/,
- 0/*dstore_3*/, 0/*astore_0*/, 0/*astore_1*/, 0/*astore_2*/,
- 0/*astore_3*/, 0/*iastore*/, 0/*lastore*/, 0/*fastore*/,
- 0/*dastore*/, 0/*aastore*/, 0/*bastore*/, 0/*castore*/,
- 0/*sastore*/, 0/*pop*/, 0/*pop2*/, 0/*dup*/, 0/*dup_x1*/,
- 0/*dup_x2*/, 0/*dup2*/, 0/*dup2_x1*/, 0/*dup2_x2*/, 0/*swap*/,
- 0/*iadd*/, 0/*ladd*/, 0/*fadd*/, 0/*dadd*/, 0/*isub*/,
- 0/*lsub*/, 0/*fsub*/, 0/*dsub*/, 0/*imul*/, 0/*lmul*/,
- 0/*fmul*/, 0/*dmul*/, 0/*idiv*/, 0/*ldiv*/, 0/*fdiv*/,
- 0/*ddiv*/, 0/*irem*/, 0/*lrem*/, 0/*frem*/, 0/*drem*/,
- 0/*ineg*/, 0/*lneg*/, 0/*fneg*/, 0/*dneg*/, 0/*ishl*/,
- 0/*lshl*/, 0/*ishr*/, 0/*lshr*/, 0/*iushr*/, 0/*lushr*/,
- 0/*iand*/, 0/*land*/, 0/*ior*/, 0/*lor*/, 0/*ixor*/, 0/*lxor*/,
- 2/*iinc*/, 0/*i2l*/, 0/*i2f*/, 0/*i2d*/, 0/*l2i*/, 0/*l2f*/,
- 0/*l2d*/, 0/*f2i*/, 0/*f2l*/, 0/*f2d*/, 0/*d2i*/, 0/*d2l*/,
- 0/*d2f*/, 0/*i2b*/, 0/*i2c*/, 0/*i2s*/, 0/*lcmp*/, 0/*fcmpl*/,
- 0/*fcmpg*/, 0/*dcmpl*/, 0/*dcmpg*/, 2/*ifeq*/, 2/*ifne*/,
- 2/*iflt*/, 2/*ifge*/, 2/*ifgt*/, 2/*ifle*/, 2/*if_icmpeq*/,
- 2/*if_icmpne*/, 2/*if_icmplt*/, 2/*if_icmpge*/, 2/*if_icmpgt*/,
- 2/*if_icmple*/, 2/*if_acmpeq*/, 2/*if_acmpne*/, 2/*goto*/,
- 2/*jsr*/, 1/*ret*/, UNPREDICTABLE/*tableswitch*/,
UNPREDICTABLE/*lookupswitch*/,
- 0/*ireturn*/, 0/*lreturn*/, 0/*freturn*/,
- 0/*dreturn*/, 0/*areturn*/, 0/*return*/,
- 2/*getstatic*/, 2/*putstatic*/, 2/*getfield*/,
- 2/*putfield*/, 2/*invokevirtual*/, 2/*invokespecial*/, 2/*invokestatic*/,
- 4/*invokeinterface*/, UNDEFINED, 2/*new*/,
- 1/*newarray*/, 2/*anewarray*/,
- 0/*arraylength*/, 0/*athrow*/, 2/*checkcast*/,
- 2/*instanceof*/, 0/*monitorenter*/,
- 0/*monitorexit*/, UNPREDICTABLE/*wide*/, 3/*multianewarray*/,
- 2/*ifnull*/, 2/*ifnonnull*/, 4/*goto_w*/,
- 4/*jsr_w*/, 0/*breakpoint*/, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED, UNDEFINED,
- UNDEFINED, UNDEFINED, RESERVED/*impdep1*/, RESERVED/*impdep2*/
- };
-
- /**
- * How the byte code operands are to be interpreted for each opcode.
- * Indexed by opcode. TYPE_OF_OPERANDS[ILOAD] = an array of shorts
- * describing the data types for the instruction.
- */
- public static final short[][] TYPE_OF_OPERANDS = {
- {}/*nop*/, {}/*aconst_null*/, {}/*iconst_m1*/, {}/*iconst_0*/,
- {}/*iconst_1*/, {}/*iconst_2*/, {}/*iconst_3*/, {}/*iconst_4*/,
- {}/*iconst_5*/, {}/*lconst_0*/, {}/*lconst_1*/, {}/*fconst_0*/,
- {}/*fconst_1*/, {}/*fconst_2*/, {}/*dconst_0*/, {}/*dconst_1*/,
- {T_BYTE}/*bipush*/, {T_SHORT}/*sipush*/, {T_BYTE}/*ldc*/,
- {T_SHORT}/*ldc_w*/, {T_SHORT}/*ldc2_w*/,
- {T_BYTE}/*iload*/, {T_BYTE}/*lload*/, {T_BYTE}/*fload*/,
- {T_BYTE}/*dload*/, {T_BYTE}/*aload*/, {}/*iload_0*/,
- {}/*iload_1*/, {}/*iload_2*/, {}/*iload_3*/, {}/*lload_0*/,
- {}/*lload_1*/, {}/*lload_2*/, {}/*lload_3*/, {}/*fload_0*/,
- {}/*fload_1*/, {}/*fload_2*/, {}/*fload_3*/, {}/*dload_0*/,
- {}/*dload_1*/, {}/*dload_2*/, {}/*dload_3*/, {}/*aload_0*/,
- {}/*aload_1*/, {}/*aload_2*/, {}/*aload_3*/, {}/*iaload*/,
- {}/*laload*/, {}/*faload*/, {}/*daload*/, {}/*aaload*/,
- {}/*baload*/, {}/*caload*/, {}/*saload*/, {T_BYTE}/*istore*/,
- {T_BYTE}/*lstore*/, {T_BYTE}/*fstore*/, {T_BYTE}/*dstore*/,
- {T_BYTE}/*astore*/, {}/*istore_0*/, {}/*istore_1*/,
- {}/*istore_2*/, {}/*istore_3*/, {}/*lstore_0*/, {}/*lstore_1*/,
- {}/*lstore_2*/, {}/*lstore_3*/, {}/*fstore_0*/, {}/*fstore_1*/,
- {}/*fstore_2*/, {}/*fstore_3*/, {}/*dstore_0*/, {}/*dstore_1*/,
- {}/*dstore_2*/, {}/*dstore_3*/, {}/*astore_0*/, {}/*astore_1*/,
- {}/*astore_2*/, {}/*astore_3*/, {}/*iastore*/, {}/*lastore*/,
- {}/*fastore*/, {}/*dastore*/, {}/*aastore*/, {}/*bastore*/,
- {}/*castore*/, {}/*sastore*/, {}/*pop*/, {}/*pop2*/, {}/*dup*/,
- {}/*dup_x1*/, {}/*dup_x2*/, {}/*dup2*/, {}/*dup2_x1*/,
- {}/*dup2_x2*/, {}/*swap*/, {}/*iadd*/, {}/*ladd*/, {}/*fadd*/,
- {}/*dadd*/, {}/*isub*/, {}/*lsub*/, {}/*fsub*/, {}/*dsub*/,
- {}/*imul*/, {}/*lmul*/, {}/*fmul*/, {}/*dmul*/, {}/*idiv*/,
- {}/*ldiv*/, {}/*fdiv*/, {}/*ddiv*/, {}/*irem*/, {}/*lrem*/,
- {}/*frem*/, {}/*drem*/, {}/*ineg*/, {}/*lneg*/, {}/*fneg*/,
- {}/*dneg*/, {}/*ishl*/, {}/*lshl*/, {}/*ishr*/, {}/*lshr*/,
- {}/*iushr*/, {}/*lushr*/, {}/*iand*/, {}/*land*/, {}/*ior*/,
- {}/*lor*/, {}/*ixor*/, {}/*lxor*/, {T_BYTE, T_BYTE}/*iinc*/,
- {}/*i2l*/, {}/*i2f*/, {}/*i2d*/, {}/*l2i*/, {}/*l2f*/, {}/*l2d*/,
- {}/*f2i*/, {}/*f2l*/, {}/*f2d*/, {}/*d2i*/, {}/*d2l*/, {}/*d2f*/,
- {}/*i2b*/, {}/*i2c*/,{}/*i2s*/, {}/*lcmp*/, {}/*fcmpl*/,
- {}/*fcmpg*/, {}/*dcmpl*/, {}/*dcmpg*/, {T_SHORT}/*ifeq*/,
- {T_SHORT}/*ifne*/, {T_SHORT}/*iflt*/, {T_SHORT}/*ifge*/,
- {T_SHORT}/*ifgt*/, {T_SHORT}/*ifle*/, {T_SHORT}/*if_icmpeq*/,
- {T_SHORT}/*if_icmpne*/, {T_SHORT}/*if_icmplt*/,
- {T_SHORT}/*if_icmpge*/, {T_SHORT}/*if_icmpgt*/,
- {T_SHORT}/*if_icmple*/, {T_SHORT}/*if_acmpeq*/,
- {T_SHORT}/*if_acmpne*/, {T_SHORT}/*goto*/, {T_SHORT}/*jsr*/,
- {T_BYTE}/*ret*/, {}/*tableswitch*/, {}/*lookupswitch*/,
- {}/*ireturn*/, {}/*lreturn*/, {}/*freturn*/, {}/*dreturn*/,
- {}/*areturn*/, {}/*return*/, {T_SHORT}/*getstatic*/,
- {T_SHORT}/*putstatic*/, {T_SHORT}/*getfield*/,
- {T_SHORT}/*putfield*/, {T_SHORT}/*invokevirtual*/,
- {T_SHORT}/*invokespecial*/, {T_SHORT}/*invokestatic*/,
- {T_SHORT, T_BYTE, T_BYTE}/*invokeinterface*/, {},
- {T_SHORT}/*new*/, {T_BYTE}/*newarray*/,
- {T_SHORT}/*anewarray*/, {}/*arraylength*/, {}/*athrow*/,
- {T_SHORT}/*checkcast*/, {T_SHORT}/*instanceof*/,
- {}/*monitorenter*/, {}/*monitorexit*/, {T_BYTE}/*wide*/,
- {T_SHORT, T_BYTE}/*multianewarray*/, {T_SHORT}/*ifnull*/,
- {T_SHORT}/*ifnonnull*/, {T_INT}/*goto_w*/, {T_INT}/*jsr_w*/,
- {}/*breakpoint*/, {}, {}, {}, {}, {}, {}, {},
- {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
- {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
- {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {},
- {}/*impdep1*/, {}/*impdep2*/
- };
-
- /**
- * Names of opcodes. Indexed by opcode. OPCODE_NAMES[ALOAD] = "aload".
- */
- public static final String[] OPCODE_NAMES = {
- "nop", "aconst_null", "iconst_m1", "iconst_0", "iconst_1",
- "iconst_2", "iconst_3", "iconst_4", "iconst_5", "lconst_0",
- "lconst_1", "fconst_0", "fconst_1", "fconst_2", "dconst_0",
- "dconst_1", "bipush", "sipush", "ldc", "ldc_w", "ldc2_w", "iload",
- "lload", "fload", "dload", "aload", "iload_0", "iload_1", "iload_2",
- "iload_3", "lload_0", "lload_1", "lload_2", "lload_3", "fload_0",
- "fload_1", "fload_2", "fload_3", "dload_0", "dload_1", "dload_2",
- "dload_3", "aload_0", "aload_1", "aload_2", "aload_3", "iaload",
- "laload", "faload", "daload", "aaload", "baload", "caload", "saload",
- "istore", "lstore", "fstore", "dstore", "astore", "istore_0",
- "istore_1", "istore_2", "istore_3", "lstore_0", "lstore_1",
- "lstore_2", "lstore_3", "fstore_0", "fstore_1", "fstore_2",
- "fstore_3", "dstore_0", "dstore_1", "dstore_2", "dstore_3",
- "astore_0", "astore_1", "astore_2", "astore_3", "iastore", "lastore",
- "fastore", "dastore", "aastore", "bastore", "castore", "sastore",
- "pop", "pop2", "dup", "dup_x1", "dup_x2", "dup2", "dup2_x1",
- "dup2_x2", "swap", "iadd", "ladd", "fadd", "dadd", "isub", "lsub",
- "fsub", "dsub", "imul", "lmul", "fmul", "dmul", "idiv", "ldiv",
- "fdiv", "ddiv", "irem", "lrem", "frem", "drem", "ineg", "lneg",
- "fneg", "dneg", "ishl", "lshl", "ishr", "lshr", "iushr", "lushr",
- "iand", "land", "ior", "lor", "ixor", "lxor", "iinc", "i2l", "i2f",
- "i2d", "l2i", "l2f", "l2d", "f2i", "f2l", "f2d", "d2i", "d2l", "d2f",
- "i2b", "i2c", "i2s", "lcmp", "fcmpl", "fcmpg",
- "dcmpl", "dcmpg", "ifeq", "ifne", "iflt", "ifge", "ifgt", "ifle",
- "if_icmpeq", "if_icmpne", "if_icmplt", "if_icmpge", "if_icmpgt",
- "if_icmple", "if_acmpeq", "if_acmpne", "goto", "jsr", "ret",
- "tableswitch", "lookupswitch", "ireturn", "lreturn", "freturn",
- "dreturn", "areturn", "return", "getstatic", "putstatic", "getfield",
- "putfield", "invokevirtual", "invokespecial", "invokestatic",
- "invokeinterface", ILLEGAL_OPCODE, "new", "newarray", "anewarray",
- "arraylength", "athrow", "checkcast", "instanceof", "monitorenter",
- "monitorexit", "wide", "multianewarray", "ifnull", "ifnonnull",
- "goto_w", "jsr_w", "breakpoint", ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE, ILLEGAL_OPCODE,
- ILLEGAL_OPCODE, "impdep1", "impdep2"
- };
/** Attributes and their corresponding names.
@@ -542,23 +140,23 @@ public interface Constants {
public static final byte ITEM_NewObject = 8;
/** Constants used to identify StackMapEntry types.
- *
- * For those types which can specify a range, the
- * constant names the lowest value.
- */
- public static final int SAME_FRAME = 0;
- public static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64;
- public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247;
- public static final int CHOP_FRAME = 248;
- public static final int SAME_FRAME_EXTENDED = 251;
- public static final int APPEND_FRAME = 252;
- public static final int FULL_FRAME = 255;
-
- /** Constants that define the maximum value of
- * those constants which store ranges. */
-
- public static final int SAME_FRAME_MAX = 63;
- public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_MAX = 127;
- public static final int CHOP_FRAME_MAX = 250;
- public static final int APPEND_FRAME_MAX = 254;
+ *
+ * For those types which can specify a range, the
+ * constant names the lowest value.
+ */
+ public static final int SAME_FRAME = 0;
+ public static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64;
+ public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247;
+ public static final int CHOP_FRAME = 248;
+ public static final int SAME_FRAME_EXTENDED = 251;
+ public static final int APPEND_FRAME = 252;
+ public static final int FULL_FRAME = 255;
+
+ /** Constants that define the maximum value of
+ * those constants which store ranges. */
+
+ public static final int SAME_FRAME_MAX = 63;
+ public static final int SAME_LOCALS_1_STACK_ITEM_FRAME_MAX = 127;
+ public static final int CHOP_FRAME_MAX = 250;
+ public static final int APPEND_FRAME_MAX = 254;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantInvokeDynamic.java
Fri Sep 12 12:09:34 2014
@@ -41,13 +41,8 @@ public final class ConstantInvokeDynamic
* @throws IOException
*/
ConstantInvokeDynamic(DataInput file) throws IOException {
- this();
+ super(Constants.CONSTANT_InvokeDynamic);
file.readUnsignedShort(); // Unused bootstrap_method_attr_index
file.readUnsignedShort(); // Unused name_and_type_index
}
-
-
- public ConstantInvokeDynamic() {
- super(Constants.CONSTANT_InvokeDynamic);
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodHandle.java
Fri Sep 12 12:09:34 2014
@@ -41,13 +41,8 @@ public final class ConstantMethodHandle
* @throws IOException
*/
ConstantMethodHandle(DataInput file) throws IOException {
- this();
+ super(Constants.CONSTANT_MethodHandle);
file.readUnsignedByte(); // Unused reference_kind
file.readUnsignedShort(); // Unused reference_index
}
-
-
- public ConstantMethodHandle() {
- super(Constants.CONSTANT_MethodHandle);
- }
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantMethodType.java
Fri Sep 12 12:09:34 2014
@@ -41,12 +41,7 @@ public final class ConstantMethodType ex
* @throws IOException
*/
ConstantMethodType(DataInput file) throws IOException {
- this();
- file.readUnsignedShort(); // Unused descriptor_index
- }
-
-
- public ConstantMethodType() {
super(Constants.CONSTANT_MethodType);
+ file.readUnsignedShort(); // Unused descriptor_index
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantValue.java
Fri Sep 12 12:09:34 2014
@@ -42,18 +42,8 @@ public final class ConstantValue extends
*/
ConstantValue(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- }
-
-
- /**
- * @param name_index Name index in constant pool
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public ConstantValue(int name_index, int length,
- ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused constantvalue_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/PMGClass.java
Fri Sep 12 12:09:34 2014
@@ -42,23 +42,13 @@ public final class PMGClass extends Attr
*/
PMGClass(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
+ super(name_index, length, constant_pool);
file.readUnsignedShort(); // Unused pmg_index
file.readUnsignedShort(); // Unused pmg_class_index
}
/**
- * @param name_index Index in constant pool to CONSTANT_Utf8
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public PMGClass(int name_index, int length, ConstantPool constant_pool) {
- super(name_index, length, constant_pool);
- }
-
-
- /**
* @return deep copy of this attribute
*/
@Override
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
Fri Sep 12 12:09:34 2014
@@ -45,8 +45,7 @@ public class RuntimeInvisibleAnnotations
DataInputStream file, ConstantPool constant_pool)
throws IOException
{
- super(name_index, length,
- file, constant_pool);
+ super(name_index, length, file, constant_pool);
}
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
Fri Sep 12 12:09:34 2014
@@ -40,8 +40,7 @@ public class RuntimeInvisibleParameterAn
*/
RuntimeInvisibleParameterAnnotations(int name_index, int length,
DataInputStream file,
ConstantPool constant_pool) throws IOException {
- super(name_index, length, file,
- constant_pool);
+ super(name_index, length, file, constant_pool);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
Fri Sep 12 12:09:34 2014
@@ -45,8 +45,7 @@ public class RuntimeVisibleAnnotations e
DataInputStream file, ConstantPool constant_pool)
throws IOException
{
- super(name_index, length,
- file, constant_pool);
+ super(name_index, length, file, constant_pool);
}
/**
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/Signature.java
Fri Sep 12 12:09:34 2014
@@ -42,18 +42,8 @@ public final class Signature extends Att
*/
Signature(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- file.readUnsignedShort(); // Unused signature_index
- }
-
-
- /**
- * @param name_index Index in constant pool to CONSTANT_Utf8
- * @param length Content length in bytes
- * @param constant_pool Array of constants
- */
- public Signature(int name_index, int length, ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused signature_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/SourceFile.java
Fri Sep 12 12:09:34 2014
@@ -44,20 +44,8 @@ public final class SourceFile extends At
*/
SourceFile(int name_index, int length, DataInput file, ConstantPool
constant_pool)
throws IOException {
- this(name_index, length, constant_pool);
- file.readUnsignedShort(); // Unused sourcefile_index
- }
-
-
- /**
- * @param name_index Index in constant pool to CONSTANT_Utf8, which
- * should represent the string "SourceFile".
- * @param length Content length in bytes, the value should be 2.
- * @param constant_pool The constant pool that this attribute is
- * associated with.
- */
- public SourceFile(int name_index, int length, ConstantPool constant_pool) {
super(name_index, length, constant_pool);
+ file.readUnsignedShort(); // Unused sourcefile_index
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java?rev=1624510&r1=1624509&r2=1624510&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapType.java
Fri Sep 12 12:09:34 2014
@@ -18,7 +18,6 @@
package org.apache.tomcat.util.bcel.classfile;
import java.io.DataInput;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -38,7 +37,6 @@ public final class StackMapType implemen
private static final long serialVersionUID = 1L;
private byte type;
- private int index = -1; // Index to CONSTANT_Class or offset
/**
@@ -47,23 +45,13 @@ public final class StackMapType implemen
* @throws IOException
*/
StackMapType(DataInput file) throws IOException {
- this(file.readByte(), -1);
+ setType(file.readByte());
if (hasIndex()) {
- setIndex(file.readShort());
+ file.readShort(); // Unused index
}
}
- /**
- * @param type type tag as defined in the Constants interface
- * @param index index to constant pool, or byte code offset
- */
- public StackMapType(byte type, int index) {
- setType(type);
- setIndex(index);
- }
-
-
public void setType( byte t ) {
if ((t < Constants.ITEM_Bogus) || (t > Constants.ITEM_NewObject)) {
throw new RuntimeException("Illegal type for StackMapType: " + t);
@@ -72,33 +60,6 @@ public final class StackMapType implemen
}
- public void setIndex( int t ) {
- index = t;
- }
-
-
- /** @return index to constant pool if type == ITEM_Object, or offset
- * in byte code, if type == ITEM_NewObject, and -1 otherwise
- */
- public int getIndex() {
- return index;
- }
-
-
- /**
- * Dump type entries to file.
- *
- * @param file Output file stream
- * @throws IOException
- */
- public final void dump( DataOutputStream file ) throws IOException {
- file.writeByte(type);
- if (hasIndex()) {
- file.writeShort(getIndex());
- }
- }
-
-
/** @return true, if type is either ITEM_Object or ITEM_NewObject
*/
public final boolean hasIndex() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
