ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-30 20:40:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up how the annotation directory items are written

Browse Source
This commit is contained in:
Ben Gruver 2013-04-28 12:58:29 -07:00
parent 816e793f81
commit fbdc6cb9cb
4 changed files with 27 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dexlib2/src/main/java/org/jf/dexlib2/writer/ClassSection.java
View File

@ -57,8 +57,10 @@ public interface ClassSection<StringKey extends CharSequence, TypeKey extends Ch
@Nonnull Collection<? extends FieldKey> getSortedStaticFields(@Nonnull ClassKey key); @Nonnull Collection<? extends FieldKey> getSortedStaticFields(@Nonnull ClassKey key);
@Nonnull Collection<? extends FieldKey> getSortedInstanceFields(@Nonnull ClassKey key); @Nonnull Collection<? extends FieldKey> getSortedInstanceFields(@Nonnull ClassKey key);
@Nonnull Collection<? extends FieldKey> getSortedFields(@Nonnull ClassKey key);
@Nonnull Collection<? extends MethodKey> getSortedDirectMethods(@Nonnull ClassKey key); @Nonnull Collection<? extends MethodKey> getSortedDirectMethods(@Nonnull ClassKey key);
@Nonnull Collection<? extends MethodKey> getSortedVirtualMethods(@Nonnull ClassKey key); @Nonnull Collection<? extends MethodKey> getSortedVirtualMethods(@Nonnull ClassKey key);
@Nonnull Collection<? extends MethodKey> getSortedMethods(@Nonnull ClassKey key);
int getFieldAccessFlags(@Nonnull FieldKey key); int getFieldAccessFlags(@Nonnull FieldKey key);
int getMethodAccessFlags(@Nonnull MethodKey key); int getMethodAccessFlags(@Nonnull MethodKey key);

274
dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
View File

@ -634,272 +634,30 @@ public abstract class DexWriter<
int methodAnnotations = 0; int methodAnnotations = 0;
int parameterAnnotations = 0; int parameterAnnotations = 0;
// the following logic for merging fields/methods is rather verbose and repetitive, but it's intentionally for (FieldKey field: classSection.getSortedFields(key)) {
// so, for efficiency (rather than adding yet another layer of indirection, to simplify it) AnnotationSetKey fieldAnnotationsKey = classSection.getFieldAnnotations(field);
{ if (fieldAnnotationsKey != null) {
Iterator<? extends FieldKey> staticIterator = staticFields.iterator();
Iterator<? extends FieldKey> instanceIterator = instanceFields.iterator();
FieldKey nextStaticField;
int nextStaticFieldIndex = 0;
AnnotationSetKey nextStaticFieldAnnotationSetKey = null;
FieldKey nextInstanceField;
int nextInstanceFieldIndex = 0;
AnnotationSetKey nextInstanceFieldAnnotationSetKey = null;
try {
do {
nextStaticField = staticIterator.next();
nextStaticFieldIndex = fieldSection.getItemIndex(nextStaticField);
nextStaticFieldAnnotationSetKey = classSection.getFieldAnnotations(nextStaticField);
} while (nextStaticFieldAnnotationSetKey == null);
} catch (NoSuchElementException ex) {
nextStaticField = null;
}
try {
do {
nextInstanceField = instanceIterator.next();
nextInstanceFieldIndex = fieldSection.getItemIndex(nextInstanceField);
nextInstanceFieldAnnotationSetKey =
classSection.getFieldAnnotations(nextInstanceField);
} while (nextInstanceFieldAnnotationSetKey == null);
} catch (NoSuchElementException ex) {
nextInstanceField = null;
}
while (true) {
int nextFieldIndex;
AnnotationSetKey nextFieldAnnotationSetKey;
if (nextStaticField == null) {
if (nextInstanceField == null) {
break;
}
nextFieldIndex = nextInstanceFieldIndex;
nextFieldAnnotationSetKey = nextInstanceFieldAnnotationSetKey;
try {
do {
nextInstanceField = instanceIterator.next();
nextInstanceFieldIndex = fieldSection.getItemIndex(nextInstanceField);
nextInstanceFieldAnnotationSetKey =
classSection.getFieldAnnotations(nextInstanceField);
} while (nextInstanceFieldAnnotationSetKey == null);
} catch (NoSuchElementException ex) {
nextInstanceField = null;
}
} else {
if (nextInstanceField == null || nextStaticFieldIndex < nextInstanceFieldIndex) {
nextFieldIndex = nextStaticFieldIndex;
nextFieldAnnotationSetKey = nextStaticFieldAnnotationSetKey;
try {
do {
nextStaticField = staticIterator.next();
nextStaticFieldIndex = fieldSection.getItemIndex(nextStaticField);
nextStaticFieldAnnotationSetKey =
classSection.getFieldAnnotations(nextStaticField);
} while (nextStaticFieldAnnotationSetKey == null);
} catch (NoSuchElementException ex) {
nextStaticField = null;
}
} else {
nextFieldIndex = nextInstanceFieldIndex;
nextFieldAnnotationSetKey = nextInstanceFieldAnnotationSetKey;
try {
do {
nextInstanceField = instanceIterator.next();
nextInstanceFieldIndex = fieldSection.getItemIndex(nextInstanceField);
nextInstanceFieldAnnotationSetKey =
classSection.getFieldAnnotations(nextInstanceField);
} while (nextInstanceFieldAnnotationSetKey == null);
} catch (NoSuchElementException ex) {
nextInstanceField = null;
}
}
}
fieldAnnotations++; fieldAnnotations++;
tempBuffer.putInt(nextFieldIndex); tempBuffer.putInt(fieldSection.getItemIndex(field));
tempBuffer.putInt(annotationSetSection.getItemOffset(nextFieldAnnotationSetKey)); tempBuffer.putInt(annotationSetSection.getItemOffset(fieldAnnotationsKey));
} }
} }
{ for (MethodKey method: classSection.getSortedMethods(key)) {
// weeee! now do it all again, except for methods this time AnnotationSetKey methodAnnotationsKey = classSection.getMethodAnnotations(method);
Iterator<? extends MethodKey> directIterator = classSection.getSortedDirectMethods(key).iterator(); if (methodAnnotationsKey != null) {
Iterator<? extends MethodKey> virtualIterator = classSection.getSortedVirtualMethods(key).iterator();
MethodKey nextDirectMethod;
int nextDirectMethodIndex = 0;
AnnotationSetKey nextDirectMethodAnnotationKey = null;
MethodKey nextVirtualMethod;
int nextVirtualMethodIndex = 0;
AnnotationSetKey nextVirtualMethodAnnotationKey = null;
try {
do {
nextDirectMethod = directIterator.next();
nextDirectMethodIndex = methodSection.getItemIndex(nextDirectMethod);
nextDirectMethodAnnotationKey = classSection.getMethodAnnotations(nextDirectMethod);
} while (nextDirectMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextDirectMethod = null;
}
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getMethodAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
while (true) {
int nextMethodIndex;
AnnotationSetKey nextAnnotationKey;
if (nextDirectMethod == null) {
if (nextVirtualMethod == null) {
break;
}
nextMethodIndex = nextVirtualMethodIndex;
nextAnnotationKey = nextVirtualMethodAnnotationKey;
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getMethodAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
} else {
if (nextVirtualMethod == null || nextDirectMethodIndex < nextVirtualMethodIndex) {
nextMethodIndex = nextDirectMethodIndex;
nextAnnotationKey = nextDirectMethodAnnotationKey;
try {
do {
nextDirectMethod = directIterator.next();
nextDirectMethodIndex = methodSection.getItemIndex(nextDirectMethod);
nextDirectMethodAnnotationKey =
classSection.getMethodAnnotations(nextDirectMethod);
} while (nextDirectMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextDirectMethod = null;
}
} else {
nextMethodIndex = nextVirtualMethodIndex;
nextAnnotationKey = nextVirtualMethodAnnotationKey;
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getMethodAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
}
}
methodAnnotations++; methodAnnotations++;
tempBuffer.putInt(nextMethodIndex); tempBuffer.putInt(methodSection.getItemIndex(method));
tempBuffer.putInt(annotationSetSection.getItemOffset(nextAnnotationKey)); tempBuffer.putInt(annotationSetSection.getItemOffset(methodAnnotationsKey));
} }
} }
{ for (MethodKey method: classSection.getSortedMethods(key)) {
// AAAAAAAAAAAnd one final time, for parameter annotations AnnotationSetRefKey parameterAnnotationsKey = classSection.getParameterAnnotations(method);
Iterator<? extends MethodKey> directIterator = classSection.getSortedDirectMethods(key).iterator(); if (parameterAnnotationsKey != null) {
Iterator<? extends MethodKey> virtualIterator = classSection.getSortedVirtualMethods(key).iterator(); methodAnnotations++;
tempBuffer.putInt(methodSection.getItemIndex(method));
MethodKey nextDirectMethod; tempBuffer.putInt(annotationSetRefSection.getItemOffset(parameterAnnotationsKey));
int nextDirectMethodIndex = 0;
AnnotationSetRefKey nextDirectMethodAnnotationKey = null;
MethodKey nextVirtualMethod;
int nextVirtualMethodIndex = 0;
AnnotationSetRefKey nextVirtualMethodAnnotationKey = null;
try {
do {
nextDirectMethod = directIterator.next();
nextDirectMethodIndex = methodSection.getItemIndex(nextDirectMethod);
nextDirectMethodAnnotationKey =
classSection.getParameterAnnotations(nextDirectMethod);
} while (nextDirectMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextDirectMethod = null;
}
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getParameterAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
while (true) {
int nextMethodIndex;
AnnotationSetRefKey nextAnnotationKey;
if (nextDirectMethod == null) {
if (nextVirtualMethod == null) {
break;
}
nextMethodIndex = nextVirtualMethodIndex;
nextAnnotationKey = nextVirtualMethodAnnotationKey;
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getParameterAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
} else {
if (nextVirtualMethod == null || nextDirectMethodIndex < nextVirtualMethodIndex) {
nextMethodIndex = nextDirectMethodIndex;
nextAnnotationKey = nextDirectMethodAnnotationKey;
try {
do {
nextDirectMethod = directIterator.next();
nextDirectMethodIndex = methodSection.getItemIndex(nextDirectMethod);
nextDirectMethodAnnotationKey =
classSection.getParameterAnnotations(nextDirectMethod);
} while (nextDirectMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextDirectMethod = null;
}
} else {
nextMethodIndex = nextVirtualMethodIndex;
nextAnnotationKey = nextVirtualMethodAnnotationKey;
try {
do {
nextVirtualMethod = virtualIterator.next();
nextVirtualMethodIndex = methodSection.getItemIndex(nextVirtualMethod);
nextVirtualMethodAnnotationKey =
classSection.getParameterAnnotations(nextVirtualMethod);
} while (nextVirtualMethodAnnotationKey == null);
} catch (NoSuchElementException ex) {
nextVirtualMethod = null;
}
}
}
parameterAnnotations++;
tempBuffer.putInt(nextMethodIndex);
tempBuffer.putInt(annotationSetRefSection.getItemOffset(nextAnnotationKey));
} }
} }

8
dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
View File

@ -305,6 +305,10 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
return classDef.getInstanceFields(); return classDef.getInstanceFields();
} }
@Nonnull @Override public Collection<? extends Field> getSortedFields(@Nonnull PoolClassDef classDef) {
return classDef.getFields();
}
@Nonnull @Override public Collection<PoolMethod> getSortedDirectMethods(@Nonnull PoolClassDef classDef) { @Nonnull @Override public Collection<PoolMethod> getSortedDirectMethods(@Nonnull PoolClassDef classDef) {
return classDef.getDirectMethods(); return classDef.getDirectMethods();
} }
@ -313,6 +317,10 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
return classDef.getVirtualMethods(); return classDef.getVirtualMethods();
} }
@Nonnull @Override public Collection<? extends PoolMethod> getSortedMethods(@Nonnull PoolClassDef classDef) {
return classDef.getMethods();
}
@Override public int getFieldAccessFlags(@Nonnull Field field) { @Override public int getFieldAccessFlags(@Nonnull Field field) {
return field.getAccessFlags(); return field.getAccessFlags();
} }

2
dexlib2/src/main/java/org/jf/dexlib2/writer/pool/PoolClassDef.java
View File

@ -119,7 +119,7 @@ class PoolClassDef extends BaseTypeReference implements ClassDef {
return virtualMethods; return virtualMethods;
} }
@Nonnull @Override public Iterable<PoolMethod> getMethods() { @Nonnull @Override public Collection<PoolMethod> getMethods() {
return new AbstractCollection<PoolMethod>() { return new AbstractCollection<PoolMethod>() {
@Nonnull @Override public Iterator<PoolMethod> iterator() { @Nonnull @Override public Iterator<PoolMethod> iterator() {
return Iterators.mergeSorted( return Iterators.mergeSorted(