ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-25 10:42:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweak how empty item references are formatted in the annotated dump

Browse Source
This commit is contained in:
Ben Gruver 2013-03-05 21:33:02 -08:00
parent 93ff1cab5b
commit a2b3cfe5f2
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDataItem.java
View File

@ -152,7 +152,7 @@ public class ClassDataItem {
int codeOffset = reader.readSmallUleb128(); int codeOffset = reader.readSmallUleb128();
if (codeOffset == 0) { if (codeOffset == 0) {
out.annotateTo(reader.getOffset(), "code_off = 0"); out.annotateTo(reader.getOffset(), "code_off = code_item[NO_OFFSET]");
} else { } else {
out.annotateTo(reader.getOffset(), "code_off = code_item[0x%x]", codeOffset); out.annotateTo(reader.getOffset(), "code_off = code_item[0x%x]", codeOffset);
addCodeItemIdentity(codeOffset, MethodIdItem.asString(dexFile, methodIndex)); addCodeItemIdentity(codeOffset, MethodIdItem.asString(dexFile, methodIndex));

15
dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/ClassDefItem.java
View File

@ -75,29 +75,26 @@ public class ClassDefItem {
Joiner.on('|').join(AccessFlags.getAccessFlagsForClass(accessFlags))); Joiner.on('|').join(AccessFlags.getAccessFlagsForClass(accessFlags)));
int superclassIndex = dexFile.readSmallUint(out.getCursor()); int superclassIndex = dexFile.readSmallUint(out.getCursor());
out.annotate(4, "superclass_idx = %s", TypeIdItem.getReferenceAnnotation(dexFile, superclassIndex)); out.annotate(4, "superclass_idx = %s",
TypeIdItem.getOptionalReferenceAnnotation(dexFile, superclassIndex));
int interfacesOffset = dexFile.readSmallUint(out.getCursor()); int interfacesOffset = dexFile.readSmallUint(out.getCursor());
out.annotate(4, "interfaces_off = %s", TypeListItem.getReferenceAnnotation(dexFile, interfacesOffset)); out.annotate(4, "interfaces_off = %s", TypeListItem.getReferenceAnnotation(dexFile, interfacesOffset));
int sourceFileIdx = dexFile.readOptionalUint(out.getCursor()); int sourceFileIdx = dexFile.readOptionalUint(out.getCursor());
if (sourceFileIdx == -1) { out.annotate(4, "source_file_idx = %s", StringIdItem.getOptionalReferenceAnnotation(dexFile,
out.annotate(4, "source_file_idx = -1");
} else {
out.annotate(4, "source_file_idx = %s", StringIdItem.getReferenceAnnotation(dexFile,
sourceFileIdx)); sourceFileIdx));
}
int annotationsOffset = dexFile.readSmallUint(out.getCursor()); int annotationsOffset = dexFile.readSmallUint(out.getCursor());
if (annotationsOffset == 0) { if (annotationsOffset == 0) {
out.annotate(4, "annotations_off = 0"); out.annotate(4, "annotations_off = annotations_directory_item[NO_OFFSET]");
} else { } else {
out.annotate(4, "annotations_off = annotations_directory_item[0x%x]", annotationsOffset); out.annotate(4, "annotations_off = annotations_directory_item[0x%x]", annotationsOffset);
} }
int classDataOffset = dexFile.readSmallUint(out.getCursor()); int classDataOffset = dexFile.readSmallUint(out.getCursor());
if (classDataOffset == 0) { if (classDataOffset == 0) {
out.annotate(4, "class_data_off = 0"); out.annotate(4, "class_data_off = class_data_item[NO_OFFSET]");
} else { } else {
out.annotate(4, "class_data_off = class_data_item[0x%x]", classDataOffset); out.annotate(4, "class_data_off = class_data_item[0x%x]", classDataOffset);
addClassDataIdentity(classDataOffset, dexFile.getType(classIndex)); addClassDataIdentity(classDataOffset, dexFile.getType(classIndex));
@ -105,7 +102,7 @@ public class ClassDefItem {
int staticValuesOffset = dexFile.readSmallUint(out.getCursor()); int staticValuesOffset = dexFile.readSmallUint(out.getCursor());
if (staticValuesOffset == 0) { if (staticValuesOffset == 0) {
out.annotate(4, "static_values_off = 0"); out.annotate(4, "static_values_off = encoded_array_item[NO_OFFSET]");
} else { } else {
out.annotate(4, "static_values_off = encoded_array_item[0x%x]", staticValuesOffset); out.annotate(4, "static_values_off = encoded_array_item[0x%x]", staticValuesOffset);
} }

15
dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/StringIdItem.java
View File

@ -86,4 +86,19 @@ public class StringIdItem {
} }
return String.format("string_id_item[%d]", stringIndex); return String.format("string_id_item[%d]", stringIndex);
} }
@Nonnull
public static String getOptionalReferenceAnnotation(@Nonnull DexBackedDexFile dexFile, int stringIndex) {
return getOptionalReferenceAnnotation(dexFile, stringIndex, false);
}
public static String getOptionalReferenceAnnotation(@Nonnull DexBackedDexFile dexFile, int stringIndex,
boolean quote) {
if (stringIndex == -1) {
return "string_id_item[NO_INDEX]";
}
return getReferenceAnnotation(dexFile, stringIndex, quote);
}
} }

8
dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeIdItem.java
View File

@ -66,4 +66,12 @@ public class TypeIdItem {
} }
return String.format("type_id_item[%d]", typeIndex); return String.format("type_id_item[%d]", typeIndex);
} }
@Nonnull
public static String getOptionalReferenceAnnotation(@Nonnull DexBackedDexFile dexFile, int typeIndex) {
if (typeIndex == -1) {
return "type_id_item[NO_INDEX]";
}
return getReferenceAnnotation(dexFile, typeIndex);
}
} }

2
dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/TypeListItem.java
View File

@ -69,7 +69,7 @@ public class TypeListItem {
@Nonnull @Nonnull
public static String getReferenceAnnotation(@Nonnull DexBackedDexFile dexFile, int typeListOffset) { public static String getReferenceAnnotation(@Nonnull DexBackedDexFile dexFile, int typeListOffset) {
if (typeListOffset == 0) { if (typeListOffset == 0) {
return "0"; return "type_list_item[NO_OFFSET]";
} }
try { try {