ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java-decompiler: post-import cleanup (code style issues)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-08-29 14:31:45 +04:00
parent 076e4393f2
commit 84ea54eb1e
72 changed files with 567 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

584
src/org/jetbrains/java/decompiler/code/CodeConstants.java
View File

@@ -21,350 +21,350 @@ public interface CodeConstants {
// BYTECODE VERSIONS
// ----------------------------------------------------------------------
public final static int BYTECODE_JAVA_LE_4 = 1;
public final static int BYTECODE_JAVA_5 = 2;
public final static int BYTECODE_JAVA_6 = 3;
public final static int BYTECODE_JAVA_7 = 4;
public final static int BYTECODE_JAVA_8 = 5;
int BYTECODE_JAVA_LE_4 = 1;
int BYTECODE_JAVA_5 = 2;
int BYTECODE_JAVA_6 = 3;
int BYTECODE_JAVA_7 = 4;
int BYTECODE_JAVA_8 = 5;
// ----------------------------------------------------------------------
// VARIABLE TYPES
// ----------------------------------------------------------------------
public final static int TYPE_BYTE = 0;
public final static int TYPE_CHAR = 1;
public final static int TYPE_DOUBLE = 2;
public final static int TYPE_FLOAT = 3;
public final static int TYPE_INT = 4;
public final static int TYPE_LONG = 5;
public final static int TYPE_SHORT = 6;
public final static int TYPE_BOOLEAN = 7;
public final static int TYPE_OBJECT = 8;
public final static int TYPE_ADDRESS = 9;
public final static int TYPE_VOID = 10;
public final static int TYPE_ANY = 11;
public final static int TYPE_GROUP2EMPTY = 12;
public final static int TYPE_NULL = 13;
public final static int TYPE_NOTINITIALIZED = 14;
public final static int TYPE_BYTECHAR = 15;
public final static int TYPE_SHORTCHAR = 16;
public final static int TYPE_UNKNOWN = 17;
public final static int TYPE_GENVAR = 18;
int TYPE_BYTE = 0;
int TYPE_CHAR = 1;
int TYPE_DOUBLE = 2;
int TYPE_FLOAT = 3;
int TYPE_INT = 4;
int TYPE_LONG = 5;
int TYPE_SHORT = 6;
int TYPE_BOOLEAN = 7;
int TYPE_OBJECT = 8;
int TYPE_ADDRESS = 9;
int TYPE_VOID = 10;
int TYPE_ANY = 11;
int TYPE_GROUP2EMPTY = 12;
int TYPE_NULL = 13;
int TYPE_NOTINITIALIZED = 14;
int TYPE_BYTECHAR = 15;
int TYPE_SHORTCHAR = 16;
int TYPE_UNKNOWN = 17;
int TYPE_GENVAR = 18;
// ----------------------------------------------------------------------
// VARIABLE TYPE FAMILIES
// ----------------------------------------------------------------------
public final static int TYPE_FAMILY_UNKNOWN = 0;
public final static int TYPE_FAMILY_BOOLEAN = 1;
public final static int TYPE_FAMILY_INTEGER = 2;
public final static int TYPE_FAMILY_FLOAT = 3;
public final static int TYPE_FAMILY_LONG = 4;
public final static int TYPE_FAMILY_DOUBLE = 5;
public final static int TYPE_FAMILY_OBJECT = 6;
int TYPE_FAMILY_UNKNOWN = 0;
int TYPE_FAMILY_BOOLEAN = 1;
int TYPE_FAMILY_INTEGER = 2;
int TYPE_FAMILY_FLOAT = 3;
int TYPE_FAMILY_LONG = 4;
int TYPE_FAMILY_DOUBLE = 5;
int TYPE_FAMILY_OBJECT = 6;
// ----------------------------------------------------------------------
// MODULE CONSTANTS
// ----------------------------------------------------------------------
public final static int STACKSIZE_SIMPLE = 1;
public final static int STACKSIZE_DOUBLE = 2;
int STACKSIZE_SIMPLE = 1;
int STACKSIZE_DOUBLE = 2;
public final static int VAR_LOCAL = 0;
public final static int VAR_STACK = 1;
int VAR_LOCAL = 0;
int VAR_STACK = 1;
public final static int VAR_WRITE = 0;
public final static int VAR_READ = 1;
int VAR_WRITE = 0;
int VAR_READ = 1;
// ----------------------------------------------------------------------
// ACCESS FLAGS
// ----------------------------------------------------------------------
public final static int ACC_PUBLIC = 0x0001;
public final static int ACC_PRIVATE = 0x0002;
public final static int ACC_PROTECTED = 0x0004;
public final static int ACC_STATIC = 0x0008;
public final static int ACC_FINAL = 0x0010;
public final static int ACC_SYNCHRONIZED = 0x0020;
public final static int ACC_NATIVE = 0x0100;
public final static int ACC_ABSTRACT = 0x0400;
public final static int ACC_STRICT = 0x0800;
public final static int ACC_VOLATILE = 0x0040;
public final static int ACC_BRIDGE = 0x0040;
public final static int ACC_TRANSIENT = 0x0080;
public final static int ACC_VARARGS = 0x0080;
public final static int ACC_SYNTHETIC = 0x1000;
public final static int ACC_ANNOTATION = 0x2000;
public final static int ACC_ENUM = 0x4000;
int ACC_PUBLIC = 0x0001;
int ACC_PRIVATE = 0x0002;
int ACC_PROTECTED = 0x0004;
int ACC_STATIC = 0x0008;
int ACC_FINAL = 0x0010;
int ACC_SYNCHRONIZED = 0x0020;
int ACC_NATIVE = 0x0100;
int ACC_ABSTRACT = 0x0400;
int ACC_STRICT = 0x0800;
int ACC_VOLATILE = 0x0040;
int ACC_BRIDGE = 0x0040;
int ACC_TRANSIENT = 0x0080;
int ACC_VARARGS = 0x0080;
int ACC_SYNTHETIC = 0x1000;
int ACC_ANNOTATION = 0x2000;
int ACC_ENUM = 0x4000;
// ----------------------------------------------------------------------
// CLASS FLAGS
// ----------------------------------------------------------------------
public final static int ACC_SUPER = 0x0020;
public final static int ACC_INTERFACE = 0x0200;
int ACC_SUPER = 0x0020;
int ACC_INTERFACE = 0x0200;
// ----------------------------------------------------------------------
// DEPENDENCY CONSTANTS
// ----------------------------------------------------------------------
public final static int DEP_CONSTANT = 0;
public final static int DEP_UNKNOWN = 1;
public final static int DEP_GENERAL = 2;
public final static int DEP_PARAMS = 4;
public final static int DEP_STATIC = 8;
int DEP_CONSTANT = 0;
int DEP_UNKNOWN = 1;
int DEP_GENERAL = 2;
int DEP_PARAMS = 4;
int DEP_STATIC = 8;
// ----------------------------------------------------------------------
// INSTRUCTION GROUPS
// ----------------------------------------------------------------------
public final static int GROUP_GENERAL = 1;
public final static int GROUP_JUMP = 2;
public final static int GROUP_SWITCH = 3;
public final static int GROUP_INVOCATION = 4;
public final static int GROUP_FIELDACCESS = 5;
public final static int GROUP_RETURN = 6;
int GROUP_GENERAL = 1;
int GROUP_JUMP = 2;
int GROUP_SWITCH = 3;
int GROUP_INVOCATION = 4;
int GROUP_FIELDACCESS = 5;
int GROUP_RETURN = 6;
// ----------------------------------------------------------------------
// POOL CONSTANTS
// ----------------------------------------------------------------------
public final static int CONSTANT_Utf8 = 1;
public final static int CONSTANT_Integer = 3;
public final static int CONSTANT_Float = 4;
public final static int CONSTANT_Long = 5;
public final static int CONSTANT_Double = 6;
public final static int CONSTANT_Class = 7;
public final static int CONSTANT_String = 8;
public final static int CONSTANT_Fieldref = 9;
public final static int CONSTANT_Methodref = 10;
public final static int CONSTANT_InterfaceMethodref = 11;
public final static int CONSTANT_NameAndType = 12;
public final static int CONSTANT_MethodHandle = 15;
public final static int CONSTANT_MethodType = 16;
public final static int CONSTANT_InvokeDynamic = 18;
int CONSTANT_Utf8 = 1;
int CONSTANT_Integer = 3;
int CONSTANT_Float = 4;
int CONSTANT_Long = 5;
int CONSTANT_Double = 6;
int CONSTANT_Class = 7;
int CONSTANT_String = 8;
int CONSTANT_Fieldref = 9;
int CONSTANT_Methodref = 10;
int CONSTANT_InterfaceMethodref = 11;
int CONSTANT_NameAndType = 12;
int CONSTANT_MethodHandle = 15;
int CONSTANT_MethodType = 16;
int CONSTANT_InvokeDynamic = 18;
// ----------------------------------------------------------------------
// MethodHandle reference_kind values
// ----------------------------------------------------------------------
public final static int CONSTANT_MethodHandle_REF_getField = 1;
public final static int CONSTANT_MethodHandle_REF_getStatic = 2;
public final static int CONSTANT_MethodHandle_REF_putField = 3;
public final static int CONSTANT_MethodHandle_REF_putStatic = 4;
public final static int CONSTANT_MethodHandle_REF_invokeVirtual = 5;
public final static int CONSTANT_MethodHandle_REF_invokeStatic = 6;
public final static int CONSTANT_MethodHandle_REF_invokeSpecial = 7;
public final static int CONSTANT_MethodHandle_REF_newInvokeSpecial = 8;
public final static int CONSTANT_MethodHandle_REF_invokeInterface = 9;
int CONSTANT_MethodHandle_REF_getField = 1;
int CONSTANT_MethodHandle_REF_getStatic = 2;
int CONSTANT_MethodHandle_REF_putField = 3;
int CONSTANT_MethodHandle_REF_putStatic = 4;
int CONSTANT_MethodHandle_REF_invokeVirtual = 5;
int CONSTANT_MethodHandle_REF_invokeStatic = 6;
int CONSTANT_MethodHandle_REF_invokeSpecial = 7;
int CONSTANT_MethodHandle_REF_newInvokeSpecial = 8;
int CONSTANT_MethodHandle_REF_invokeInterface = 9;
// ----------------------------------------------------------------------
// VM OPCODES
// ----------------------------------------------------------------------
public final static int opc_nop = 0;
public final static int opc_aconst_null = 1;
public final static int opc_iconst_m1 = 2;
public final static int opc_iconst_0 = 3;
public final static int opc_iconst_1 = 4;
public final static int opc_iconst_2 = 5;
public final static int opc_iconst_3 = 6;
public final static int opc_iconst_4 = 7;
public final static int opc_iconst_5 = 8;
public final static int opc_lconst_0 = 9;
public final static int opc_lconst_1 = 10;
public final static int opc_fconst_0 = 11;
public final static int opc_fconst_1 = 12;
public final static int opc_fconst_2 = 13;
public final static int opc_dconst_0 = 14;
public final static int opc_dconst_1 = 15;
public final static int opc_bipush = 16;
public final static int opc_sipush = 17;
public final static int opc_ldc = 18;
public final static int opc_ldc_w = 19;
public final static int opc_ldc2_w = 20;
public final static int opc_iload = 21;
public final static int opc_lload = 22;
public final static int opc_fload = 23;
public final static int opc_dload = 24;
public final static int opc_aload = 25;
public final static int opc_iload_0 = 26;
public final static int opc_iload_1 = 27;
public final static int opc_iload_2 = 28;
public final static int opc_iload_3 = 29;
public final static int opc_lload_0 = 30;
public final static int opc_lload_1 = 31;
public final static int opc_lload_2 = 32;
public final static int opc_lload_3 = 33;
public final static int opc_fload_0 = 34;
public final static int opc_fload_1 = 35;
public final static int opc_fload_2 = 36;
public final static int opc_fload_3 = 37;
public final static int opc_dload_0 = 38;
public final static int opc_dload_1 = 39;
public final static int opc_dload_2 = 40;
public final static int opc_dload_3 = 41;
public final static int opc_aload_0 = 42;
public final static int opc_aload_1 = 43;
public final static int opc_aload_2 = 44;
public final static int opc_aload_3 = 45;
public final static int opc_iaload = 46;
public final static int opc_laload = 47;
public final static int opc_faload = 48;
public final static int opc_daload = 49;
public final static int opc_aaload = 50;
public final static int opc_baload = 51;
public final static int opc_caload = 52;
public final static int opc_saload = 53;
public final static int opc_istore = 54;
public final static int opc_lstore = 55;
public final static int opc_fstore = 56;
public final static int opc_dstore = 57;
public final static int opc_astore = 58;
public final static int opc_istore_0 = 59;
public final static int opc_istore_1 = 60;
public final static int opc_istore_2 = 61;
public final static int opc_istore_3 = 62;
public final static int opc_lstore_0 = 63;
public final static int opc_lstore_1 = 64;
public final static int opc_lstore_2 = 65;
public final static int opc_lstore_3 = 66;
public final static int opc_fstore_0 = 67;
public final static int opc_fstore_1 = 68;
public final static int opc_fstore_2 = 69;
public final static int opc_fstore_3 = 70;
public final static int opc_dstore_0 = 71;
public final static int opc_dstore_1 = 72;
public final static int opc_dstore_2 = 73;
public final static int opc_dstore_3 = 74;
public final static int opc_astore_0 = 75;
public final static int opc_astore_1 = 76;
public final static int opc_astore_2 = 77;
public final static int opc_astore_3 = 78;
public final static int opc_iastore = 79;
public final static int opc_lastore = 80;
public final static int opc_fastore = 81;
public final static int opc_dastore = 82;
public final static int opc_aastore = 83;
public final static int opc_bastore = 84;
public final static int opc_castore = 85;
public final static int opc_sastore = 86;
public final static int opc_pop = 87;
public final static int opc_pop2 = 88;
public final static int opc_dup = 89;
public final static int opc_dup_x1 = 90;
public final static int opc_dup_x2 = 91;
public final static int opc_dup2 = 92;
public final static int opc_dup2_x1 = 93;
public final static int opc_dup2_x2 = 94;
public final static int opc_swap = 95;
public final static int opc_iadd = 96;
public final static int opc_ladd = 97;
public final static int opc_fadd = 98;
public final static int opc_dadd = 99;
public final static int opc_isub = 100;
public final static int opc_lsub = 101;
public final static int opc_fsub = 102;
public final static int opc_dsub = 103;
public final static int opc_imul = 104;
public final static int opc_lmul = 105;
public final static int opc_fmul = 106;
public final static int opc_dmul = 107;
public final static int opc_idiv = 108;
public final static int opc_ldiv = 109;
public final static int opc_fdiv = 110;
public final static int opc_ddiv = 111;
public final static int opc_irem = 112;
public final static int opc_lrem = 113;
public final static int opc_frem = 114;
public final static int opc_drem = 115;
public final static int opc_ineg = 116;
public final static int opc_lneg = 117;
public final static int opc_fneg = 118;
public final static int opc_dneg = 119;
public final static int opc_ishl = 120;
public final static int opc_lshl = 121;
public final static int opc_ishr = 122;
public final static int opc_lshr = 123;
public final static int opc_iushr = 124;
public final static int opc_lushr = 125;
public final static int opc_iand = 126;
public final static int opc_land = 127;
public final static int opc_ior = 128;
public final static int opc_lor = 129;
public final static int opc_ixor = 130;
public final static int opc_lxor = 131;
public final static int opc_iinc = 132;
public final static int opc_i2l = 133;
public final static int opc_i2f = 134;
public final static int opc_i2d = 135;
public final static int opc_l2i = 136;
public final static int opc_l2f = 137;
public final static int opc_l2d = 138;
public final static int opc_f2i = 139;
public final static int opc_f2l = 140;
public final static int opc_f2d = 141;
public final static int opc_d2i = 142;
public final static int opc_d2l = 143;
public final static int opc_d2f = 144;
public final static int opc_i2b = 145;
public final static int opc_i2c = 146;
public final static int opc_i2s = 147;
public final static int opc_lcmp = 148;
public final static int opc_fcmpl = 149;
public final static int opc_fcmpg = 150;
public final static int opc_dcmpl = 151;
public final static int opc_dcmpg = 152;
public final static int opc_ifeq = 153;
public final static int opc_ifne = 154;
public final static int opc_iflt = 155;
public final static int opc_ifge = 156;
public final static int opc_ifgt = 157;
public final static int opc_ifle = 158;
public final static int opc_if_icmpeq = 159;
public final static int opc_if_icmpne = 160;
public final static int opc_if_icmplt = 161;
public final static int opc_if_icmpge = 162;
public final static int opc_if_icmpgt = 163;
public final static int opc_if_icmple = 164;
public final static int opc_if_acmpeq = 165;
public final static int opc_if_acmpne = 166;
public final static int opc_goto = 167;
public final static int opc_jsr = 168;
public final static int opc_ret = 169;
public final static int opc_tableswitch = 170;
public final static int opc_lookupswitch = 171;
public final static int opc_ireturn = 172;
public final static int opc_lreturn = 173;
public final static int opc_freturn = 174;
public final static int opc_dreturn = 175;
public final static int opc_areturn = 176;
public final static int opc_return = 177;
public final static int opc_getstatic = 178;
public final static int opc_putstatic = 179;
public final static int opc_getfield = 180;
public final static int opc_putfield = 181;
public final static int opc_invokevirtual = 182;
public final static int opc_invokespecial = 183;
public final static int opc_invokestatic = 184;
public final static int opc_invokeinterface = 185;
public final static int opc_invokedynamic = 186;
public final static int opc_xxxunusedxxx = 186;
public final static int opc_new = 187;
public final static int opc_newarray = 188;
public final static int opc_anewarray = 189;
public final static int opc_arraylength = 190;
public final static int opc_athrow = 191;
public final static int opc_checkcast = 192;
public final static int opc_instanceof = 193;
public final static int opc_monitorenter = 194;
public final static int opc_monitorexit = 195;
public final static int opc_wide = 196;
public final static int opc_multianewarray = 197;
public final static int opc_ifnull = 198;
public final static int opc_ifnonnull = 199;
public final static int opc_goto_w = 200;
public final static int opc_jsr_w = 201;
int opc_nop = 0;
int opc_aconst_null = 1;
int opc_iconst_m1 = 2;
int opc_iconst_0 = 3;
int opc_iconst_1 = 4;
int opc_iconst_2 = 5;
int opc_iconst_3 = 6;
int opc_iconst_4 = 7;
int opc_iconst_5 = 8;
int opc_lconst_0 = 9;
int opc_lconst_1 = 10;
int opc_fconst_0 = 11;
int opc_fconst_1 = 12;
int opc_fconst_2 = 13;
int opc_dconst_0 = 14;
int opc_dconst_1 = 15;
int opc_bipush = 16;
int opc_sipush = 17;
int opc_ldc = 18;
int opc_ldc_w = 19;
int opc_ldc2_w = 20;
int opc_iload = 21;
int opc_lload = 22;
int opc_fload = 23;
int opc_dload = 24;
int opc_aload = 25;
int opc_iload_0 = 26;
int opc_iload_1 = 27;
int opc_iload_2 = 28;
int opc_iload_3 = 29;
int opc_lload_0 = 30;
int opc_lload_1 = 31;
int opc_lload_2 = 32;
int opc_lload_3 = 33;
int opc_fload_0 = 34;
int opc_fload_1 = 35;
int opc_fload_2 = 36;
int opc_fload_3 = 37;
int opc_dload_0 = 38;
int opc_dload_1 = 39;
int opc_dload_2 = 40;
int opc_dload_3 = 41;
int opc_aload_0 = 42;
int opc_aload_1 = 43;
int opc_aload_2 = 44;
int opc_aload_3 = 45;
int opc_iaload = 46;
int opc_laload = 47;
int opc_faload = 48;
int opc_daload = 49;
int opc_aaload = 50;
int opc_baload = 51;
int opc_caload = 52;
int opc_saload = 53;
int opc_istore = 54;
int opc_lstore = 55;
int opc_fstore = 56;
int opc_dstore = 57;
int opc_astore = 58;
int opc_istore_0 = 59;
int opc_istore_1 = 60;
int opc_istore_2 = 61;
int opc_istore_3 = 62;
int opc_lstore_0 = 63;
int opc_lstore_1 = 64;
int opc_lstore_2 = 65;
int opc_lstore_3 = 66;
int opc_fstore_0 = 67;
int opc_fstore_1 = 68;
int opc_fstore_2 = 69;
int opc_fstore_3 = 70;
int opc_dstore_0 = 71;
int opc_dstore_1 = 72;
int opc_dstore_2 = 73;
int opc_dstore_3 = 74;
int opc_astore_0 = 75;
int opc_astore_1 = 76;
int opc_astore_2 = 77;
int opc_astore_3 = 78;
int opc_iastore = 79;
int opc_lastore = 80;
int opc_fastore = 81;
int opc_dastore = 82;
int opc_aastore = 83;
int opc_bastore = 84;
int opc_castore = 85;
int opc_sastore = 86;
int opc_pop = 87;
int opc_pop2 = 88;
int opc_dup = 89;
int opc_dup_x1 = 90;
int opc_dup_x2 = 91;
int opc_dup2 = 92;
int opc_dup2_x1 = 93;
int opc_dup2_x2 = 94;
int opc_swap = 95;
int opc_iadd = 96;
int opc_ladd = 97;
int opc_fadd = 98;
int opc_dadd = 99;
int opc_isub = 100;
int opc_lsub = 101;
int opc_fsub = 102;
int opc_dsub = 103;
int opc_imul = 104;
int opc_lmul = 105;
int opc_fmul = 106;
int opc_dmul = 107;
int opc_idiv = 108;
int opc_ldiv = 109;
int opc_fdiv = 110;
int opc_ddiv = 111;
int opc_irem = 112;
int opc_lrem = 113;
int opc_frem = 114;
int opc_drem = 115;
int opc_ineg = 116;
int opc_lneg = 117;
int opc_fneg = 118;
int opc_dneg = 119;
int opc_ishl = 120;
int opc_lshl = 121;
int opc_ishr = 122;
int opc_lshr = 123;
int opc_iushr = 124;
int opc_lushr = 125;
int opc_iand = 126;
int opc_land = 127;
int opc_ior = 128;
int opc_lor = 129;
int opc_ixor = 130;
int opc_lxor = 131;
int opc_iinc = 132;
int opc_i2l = 133;
int opc_i2f = 134;
int opc_i2d = 135;
int opc_l2i = 136;
int opc_l2f = 137;
int opc_l2d = 138;
int opc_f2i = 139;
int opc_f2l = 140;
int opc_f2d = 141;
int opc_d2i = 142;
int opc_d2l = 143;
int opc_d2f = 144;
int opc_i2b = 145;
int opc_i2c = 146;
int opc_i2s = 147;
int opc_lcmp = 148;
int opc_fcmpl = 149;
int opc_fcmpg = 150;
int opc_dcmpl = 151;
int opc_dcmpg = 152;
int opc_ifeq = 153;
int opc_ifne = 154;
int opc_iflt = 155;
int opc_ifge = 156;
int opc_ifgt = 157;
int opc_ifle = 158;
int opc_if_icmpeq = 159;
int opc_if_icmpne = 160;
int opc_if_icmplt = 161;
int opc_if_icmpge = 162;
int opc_if_icmpgt = 163;
int opc_if_icmple = 164;
int opc_if_acmpeq = 165;
int opc_if_acmpne = 166;
int opc_goto = 167;
int opc_jsr = 168;
int opc_ret = 169;
int opc_tableswitch = 170;
int opc_lookupswitch = 171;
int opc_ireturn = 172;
int opc_lreturn = 173;
int opc_freturn = 174;
int opc_dreturn = 175;
int opc_areturn = 176;
int opc_return = 177;
int opc_getstatic = 178;
int opc_putstatic = 179;
int opc_getfield = 180;
int opc_putfield = 181;
int opc_invokevirtual = 182;
int opc_invokespecial = 183;
int opc_invokestatic = 184;
int opc_invokeinterface = 185;
int opc_invokedynamic = 186;
int opc_xxxunusedxxx = 186;
int opc_new = 187;
int opc_newarray = 188;
int opc_anewarray = 189;
int opc_arraylength = 190;
int opc_athrow = 191;
int opc_checkcast = 192;
int opc_instanceof = 193;
int opc_monitorenter = 194;
int opc_monitorexit = 195;
int opc_wide = 196;
int opc_multianewarray = 197;
int opc_ifnull = 198;
int opc_ifnonnull = 199;
int opc_goto_w = 200;
int opc_jsr_w = 201;
}

2
src/org/jetbrains/java/decompiler/code/Instruction.java
View File

@@ -58,7 +58,7 @@ public class Instruction implements CodeConstants {
}
public Instruction clone() {
return ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, operands == null ? null : (int[])operands.clone());
return ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, operands == null ? null : operands.clone());
}
public String toString() {

26
src/org/jetbrains/java/decompiler/code/InstructionSequence.java
View File

@@ -74,23 +74,23 @@ public abstract class InstructionSequence {
}
public Instruction getCurrentInstr() {
return (Instruction)collinstr.get(pointer);
return collinstr.get(pointer);
}
public Instruction getInstr(int index) {
return (Instruction)collinstr.get(index);
return collinstr.get(index);
}
public Instruction getLastInstr() {
return (Instruction)collinstr.getLast();
return collinstr.getLast();
}
public int getCurrentOffset() {
return ((Integer)collinstr.getKey(pointer)).intValue();
return collinstr.getKey(pointer).intValue();
}
public int getOffset(int index) {
return ((Integer)collinstr.getKey(index)).intValue();
public int getOffset(int index) {
return collinstr.getKey(index).intValue();
}
public int getPointerByAbsOffset(int offset) {
@@ -104,7 +104,7 @@ public abstract class InstructionSequence {
}
public int getPointerByRelOffset(int offset) {
Integer absoffset = new Integer(((Integer)collinstr.getKey(pointer)).intValue() + offset);
Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
if (collinstr.containsKey(absoffset)) {
return collinstr.getIndexByKey(absoffset);
}
@@ -114,7 +114,7 @@ public abstract class InstructionSequence {
}
public void setPointerByAbsOffset(int offset) {
Integer absoffset = new Integer(((Integer)collinstr.getKey(pointer)).intValue() + offset);
Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
if (collinstr.containsKey(absoffset)) {
pointer = collinstr.getIndexByKey(absoffset);
}
@@ -143,10 +143,10 @@ public abstract class InstructionSequence {
StringBuffer buf = new StringBuffer();
for (int i = 0; i < collinstr.size(); i++) {
buf.append(InterpreterUtil.getIndentString(indent));
buf.append(((Integer)collinstr.getKey(i)).intValue());
buf.append(InterpreterUtil.getIndentString(indent));
buf.append(collinstr.getKey(i).intValue());
buf.append(": ");
buf.append(((Instruction)collinstr.get(i)).toString());
buf.append(collinstr.get(i).toString());
buf.append(new_line_separator);
}
@@ -156,7 +156,7 @@ public abstract class InstructionSequence {
public void writeCodeToStream(DataOutputStream out) throws IOException {
for (int i = 0; i < collinstr.size(); i++) {
((Instruction)collinstr.get(i)).writeToStream(out, ((Integer)collinstr.getKey(i)).intValue());
collinstr.get(i).writeToStream(out, collinstr.getKey(i).intValue());
}
}
@@ -166,7 +166,7 @@ public abstract class InstructionSequence {
out.writeShort(handlers.size());
for (int i = 0; i < handlers.size(); i++) {
((ExceptionHandler)handlers.get(i)).writeToStream(out);
handlers.get(i).writeToStream(out);
}
}

36
src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
View File

@@ -94,11 +94,11 @@ public class ControlFlowGraph implements CodeConstants {
List<BasicBlock> suc = block.getSuccs();
for (int j = 0; j < suc.size(); j++) {
buf.append(">>>>>>>>(regular) Block " + ((BasicBlock)suc.get(j)).id + new_line_separator);
buf.append(">>>>>>>>(regular) Block " + suc.get(j).id + new_line_separator);
}
suc = block.getSuccExceptions();
for (int j = 0; j < suc.size(); j++) {
BasicBlock handler = (BasicBlock)suc.get(j);
BasicBlock handler = suc.get(j);
ExceptionRangeCFG range = getExceptionRange(handler, block);
if (range == null) {
@@ -134,19 +134,19 @@ public class ControlFlowGraph implements CodeConstants {
public void removeBlock(BasicBlock block) {
while (block.getSuccs().size() > 0) {
block.removeSuccessor((BasicBlock)block.getSuccs().get(0));
block.removeSuccessor(block.getSuccs().get(0));
}
while (block.getSuccExceptions().size() > 0) {
block.removeSuccessorException((BasicBlock)block.getSuccExceptions().get(0));
block.removeSuccessorException(block.getSuccExceptions().get(0));
}
while (block.getPreds().size() > 0) {
((BasicBlock)block.getPreds().get(0)).removeSuccessor(block);
block.getPreds().get(0).removeSuccessor(block);
}
while (block.getPredExceptions().size() > 0) {
((BasicBlock)block.getPredExceptions().get(0)).removeSuccessorException(block);
block.getPredExceptions().get(0).removeSuccessorException(block);
}
last.removePredecessor(block);
@@ -154,7 +154,7 @@ public class ControlFlowGraph implements CodeConstants {
blocks.removeWithKey(block.id);
for (int i = exceptions.size() - 1; i >= 0; i--) {
ExceptionRangeCFG range = (ExceptionRangeCFG)exceptions.get(i);
ExceptionRangeCFG range = exceptions.get(i);
if (range.getHandler() == block) {
exceptions.remove(i);
}
@@ -394,7 +394,7 @@ public class ControlFlowGraph implements CodeConstants {
ExceptionRangeCFG range = new ExceptionRangeCFG(protectedRange, handle, handler.exceptionClass == null
? null
: Arrays.asList(new String[]{handler.exceptionClass}));
: Arrays.asList(handler.exceptionClass));
mapRanges.put(key, range);
exceptions.add(range);
@@ -495,11 +495,11 @@ public class ControlFlowGraph implements CodeConstants {
// find the first intersection
for (int i = 0; i < lstJsr.size(); i++) {
Object[] arr = (Object[])lstJsr.get(i);
Object[] arr = lstJsr.get(i);
HashSet<BasicBlock> set = (HashSet<BasicBlock>)arr[1];
for (int j = i + 1; j < lstJsr.size(); j++) {
Object[] arr1 = (Object[])lstJsr.get(j);
Object[] arr1 = lstJsr.get(j);
HashSet<BasicBlock> set1 = (HashSet<BasicBlock>)arr1[1];
if (!set.contains(arr1[0]) && !set1.contains(arr[0])) { // rang 0 doesn't contain entry 1 and vice versa
@@ -613,11 +613,11 @@ public class ControlFlowGraph implements CodeConstants {
for (int i = lst.size() - 1; i >= 0; i--) {
BasicBlock child = (BasicBlock)lst.get(i);
BasicBlock child = lst.get(i);
Integer childid = child.id;
if (mapNewNodes.containsKey(childid)) {
node.replaceSuccessor(child, (BasicBlock)mapNewNodes.get(childid));
node.replaceSuccessor(child, mapNewNodes.get(childid));
}
else if (common_blocks.contains(child)) {
@@ -632,11 +632,11 @@ public class ControlFlowGraph implements CodeConstants {
}
else {
for (int k = 0; k < child.getSuccs().size(); k++) {
copy.addSuccessor((BasicBlock)child.getSuccs().get(k));
copy.addSuccessor(child.getSuccs().get(k));
}
}
for (int k = 0; k < child.getSuccExceptions().size(); k++) {
copy.addSuccessorException((BasicBlock)child.getSuccExceptions().get(k));
copy.addSuccessorException(child.getSuccExceptions().get(k));
}
lstNodes.add(copy);
@@ -666,7 +666,7 @@ public class ControlFlowGraph implements CodeConstants {
for (int i = exceptions.size() - 1; i >= 0; i--) {
ExceptionRangeCFG range = (ExceptionRangeCFG)exceptions.get(i);
ExceptionRangeCFG range = exceptions.get(i);
List<BasicBlock> lstRange = range.getProtectedRange();
HashSet<BasicBlock> setBoth = new HashSet<BasicBlock>(common_blocks);
@@ -678,7 +678,7 @@ public class ControlFlowGraph implements CodeConstants {
if (setBoth.size() == lstRange.size()) {
lstNewRange = new ArrayList<BasicBlock>();
ExceptionRangeCFG newRange = new ExceptionRangeCFG(lstNewRange,
(BasicBlock)mapNewNodes.get(range.getHandler().id), range.getExceptionTypes());
mapNewNodes.get(range.getHandler().id), range.getExceptionTypes());
exceptions.add(newRange);
}
else {
@@ -729,14 +729,14 @@ public class ControlFlowGraph implements CodeConstants {
block.mark = 1;
for (int i = 0; i < block.getSuccs().size(); i++) {
BasicBlock suc = (BasicBlock)block.getSuccs().get(i);
BasicBlock suc = block.getSuccs().get(i);
if (suc.mark != 1) {
removeJsrInstructions(pool, suc, data.copy());
}
}
for (int i = 0; i < block.getSuccExceptions().size(); i++) {
BasicBlock suc = (BasicBlock)block.getSuccExceptions().get(i);
BasicBlock suc = block.getSuccExceptions().get(i);
if (suc.mark != 1) {
DataPoint point = new DataPoint();

2
src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
View File

@@ -432,7 +432,7 @@ public class InstructionImpact {
stack.push(new VarType(var1.type, var1.arraydim - 1, var1.value));
break;
case CodeConstants.opc_astore:
data.setVariable(instr.getOperand(0), (VarType)stack.pop());
data.setVariable(instr.getOperand(0), stack.pop());
break;
case CodeConstants.opc_dup:
case CodeConstants.opc_dup_x1: