Skip to content

Commit b04929c

Browse files
ThexXTURBOXxThexXTURBOXx
committed
Cleanup
1 parent 8496704 commit b04929c

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

‎dex-reader-api/src/main/java/com/googlecode/d2j/reader/InstructionIndexType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
kIndexFieldOffset, // field offset (for static linked fields)
2424

25-
kIndexMethodAndProtoRef, // 038,
25+
kIndexMethodAndProtoRef, // 038
2626

27-
kIndexCallSiteRef, // 038,
27+
kIndexCallSiteRef, // 038
2828

2929
}

‎dex-reader-api/src/main/java/com/googlecode/d2j/reader/Op.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public enum Op implements CFG {
6363
CONST_WIDE(0x18, "const-wide", kFmt51l, kIndexNone, K_INSTR_CAN_CONTINUE, true), //
6464
CONST_WIDE_HIGH16(0x19, "const-wide/high16", kFmt21h, kIndexNone, K_INSTR_CAN_CONTINUE, true), //
6565
CONST_STRING(0x1a, "const-string", kFmt21c, kIndexStringRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW, true), //
66-
CONST_STRING_JUMBO(0x1b, "const-string/jumbo", kFmt31c, kIndexStringRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW,
67-
true), //
66+
CONST_STRING_JUMBO(0x1b, "const-string/jumbo", kFmt31c, kIndexStringRef,
67+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW, true), //
6868
CONST_CLASS(0x1c, "const-class", kFmt21c, kIndexTypeRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW, true), //
6969
MONITOR_ENTER(0x1d, "monitor-enter", kFmt11x, kIndexNone, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW, false), //
7070
MONITOR_EXIT(0x1e, "monitor-exit", kFmt11x, kIndexNone, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW, false), //
@@ -101,7 +101,7 @@ public enum Op implements CFG {
101101
IF_GEZ(0x3b, "if-gez", kFmt21t, kIndexNone, K_INSTR_CAN_BRANCH | K_INSTR_CAN_CONTINUE, false), //
102102
IF_GTZ(0x3c, "if-gtz", kFmt21t, kIndexNone, K_INSTR_CAN_BRANCH | K_INSTR_CAN_CONTINUE, false), //
103103
IF_LEZ(0x3d, "if-lez", kFmt21t, kIndexNone, K_INSTR_CAN_BRANCH | K_INSTR_CAN_CONTINUE, false), //
104-
// UNUSED_3E(0x3e, "unused-3e", null, kIndexUnknown, 0, false), //
104+
// UNUSED_3E(0x3e, "unused-3e", null, kIndexUnknown, 0, false), //
105105
// UNUSED_3F(0x3f, "unused-3f", null, kIndexUnknown, 0, false), //
106106
// UNUSED_40(0x40, "unused-40", null, kIndexUnknown, 0, false), //
107107
// UNUSED_41(0x41, "unused-41", null, kIndexUnknown, 0, false), //
@@ -161,20 +161,20 @@ public enum Op implements CFG {
161161
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
162162
INVOKE_STATIC(0x71, "invoke-static", kFmt35c, kIndexMethodRef,
163163
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
164-
INVOKE_INTERFACE(0x72, "invoke-interface", kFmt35c, kIndexMethodRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
165-
| K_INSTR_INVOKE, true), //
166-
// UNUSED_73(0x73, "unused-73", null, kIndexUnknown, 0, false), //
164+
INVOKE_INTERFACE(0x72, "invoke-interface", kFmt35c, kIndexMethodRef,
165+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
166+
// UNUSED_73(0x73, "unused-73", null, kIndexUnknown, 0, false), //
167167
INVOKE_VIRTUAL_RANGE(0x74, "invoke-virtual/range", kFmt3rc, kIndexMethodRef,
168168
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
169-
INVOKE_SUPER_RANGE(0x75, "invoke-super/range", kFmt3rc, kIndexMethodRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
170-
| K_INSTR_INVOKE, true), //
171-
INVOKE_DIRECT_RANGE(0x76, "invoke-direct/range", kFmt3rc, kIndexMethodRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
172-
| K_INSTR_INVOKE, true), //
173-
INVOKE_STATIC_RANGE(0x77, "invoke-static/range", kFmt3rc, kIndexMethodRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
174-
| K_INSTR_INVOKE, true), //
169+
INVOKE_SUPER_RANGE(0x75, "invoke-super/range", kFmt3rc, kIndexMethodRef,
170+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
171+
INVOKE_DIRECT_RANGE(0x76, "invoke-direct/range", kFmt3rc, kIndexMethodRef,
172+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
173+
INVOKE_STATIC_RANGE(0x77, "invoke-static/range", kFmt3rc, kIndexMethodRef,
174+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
175175
INVOKE_INTERFACE_RANGE(0x78, "invoke-interface/range", kFmt3rc, kIndexMethodRef,
176176
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
177-
// UNUSED_79(0x79, "unused-79", null, kIndexUnknown, 0, false), //
177+
// UNUSED_79(0x79, "unused-79", null, kIndexUnknown, 0, false), //
178178
// UNUSED_7A(0x7a, "unused-7a", null, kIndexUnknown, 0, false), //
179179
NEG_INT(0x7b, "neg-int", kFmt12x, kIndexNone, K_INSTR_CAN_CONTINUE, true), //
180180
NOT_INT(0x7c, "not-int", kFmt12x, kIndexNone, K_INSTR_CAN_CONTINUE, true), //
@@ -283,10 +283,9 @@ public enum Op implements CFG {
283283
INVOKE_POLYMORPHIC(0xfa, "invoke-polymorphic", kFmt45cc, kIndexMethodAndProtoRef,
284284
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
285285
INVOKE_POLYMORPHIC_RANGE(0xfb, "invoke-polymorphic/range", kFmt4rcc, kIndexMethodAndProtoRef,
286-
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
287-
| K_INSTR_INVOKE, true), //
288-
INVOKE_CUSTOM(0xfc, "invoke-custom", kFmt35c, kIndexCallSiteRef, K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW
289-
| K_INSTR_INVOKE, true), //
286+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
287+
INVOKE_CUSTOM(0xfc, "invoke-custom", kFmt35c, kIndexCallSiteRef,
288+
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
290289
INVOKE_CUSTOM_RANGE(0xfd, "invoke-custom/range", kFmt3rc, kIndexCallSiteRef,
291290
K_INSTR_CAN_CONTINUE | K_INSTR_CAN_THROW | K_INSTR_INVOKE, true), //
292291
BAD_OP(-1, "bad-opcode", null, kIndexNone, 0, false); //
@@ -295,9 +294,9 @@ public enum Op implements CFG {
295294

296295
public final InstructionFormat format;
297296

298-
/* package */ InstructionIndexType indexType;
297+
/* package */ final InstructionIndexType indexType;
299298

300-
/* package */ int flags;
299+
/* package */ final int flags;
301300

302301
public final String displayName;
303302

‎dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ public void convertClass(int dexVersion, DexClassNode classNode, ClassVisitorFac
562562
new HashSet<>(Arrays.asList("decode_J", "decode_I", "decode_S", "decode_B"));
563563

564564
private void addHexDecodeMethod(ClassVisitor outCV, String className, String hexDecodeMethodNameBase) {
565-
System.err.println(className);
566565
try (InputStream is = Dex2Asm.class.getResourceAsStream("/" + HEX_CLASS_LOCATION + ".class")) {
567566
ClassReader cr = new ClassReader(is);
568567
cr.accept(new ClassVisitor(Constants.ASM_VERSION) {

0 commit comments

Comments
 (0)