From 00fcd0550fcdda621c2e4662f6ddd55ce673b931 Mon Sep 17 00:00:00 2001 From: Gegy Date: Thu, 24 Jan 2019 14:48:32 +0200 Subject: [WIP] Mapping rework (#91) * Move packages * Mapping & entry refactor: first pass * Fix deobf -> obf tree remapping * Resolve various issues * Give all entries the potential for parents and treat inner classes as children * Deobf UI tree elements * Tests pass * Sort mapping output * Fix delta tracking * Index separation and first pass for #97 * Keep track of remapped jar index * Fix child entries not being remapped * Drop non-root entries * Track dropped mappings * Fix enigma mapping ordering * EntryTreeNode interface * Small tweaks * Naive full index remap on rename * Entries can resolve to more than one root entry * Support alternative resolution strategies * Bridge method resolution * Tests pass * Fix mappings being used where there are none * Fix methods with different descriptors being considered unique. closes #89 --- .../enigma/analysis/MethodReferenceTreeNode.java | 67 +++++++++++++--------- 1 file changed, 40 insertions(+), 27 deletions(-) (limited to 'src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java') diff --git a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java b/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java index ac05acd..8995eb5 100644 --- a/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java +++ b/src/main/java/cuchaz/enigma/analysis/MethodReferenceTreeNode.java @@ -12,36 +12,36 @@ package cuchaz.enigma.analysis; import com.google.common.collect.Sets; -import cuchaz.enigma.bytecode.AccessFlags; -import cuchaz.enigma.mapping.*; -import cuchaz.enigma.mapping.entry.Entry; -import cuchaz.enigma.mapping.entry.MethodDefEntry; -import cuchaz.enigma.mapping.entry.MethodEntry; +import cuchaz.enigma.analysis.index.JarIndex; +import cuchaz.enigma.analysis.index.ReferenceIndex; +import cuchaz.enigma.translation.Translator; +import cuchaz.enigma.translation.mapping.EntryResolver; +import cuchaz.enigma.translation.representation.entry.Entry; +import cuchaz.enigma.translation.representation.entry.MethodDefEntry; +import cuchaz.enigma.translation.representation.entry.MethodEntry; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; +import java.util.ArrayList; +import java.util.Collection; import java.util.Set; -public class MethodReferenceTreeNode extends DefaultMutableTreeNode - implements ReferenceTreeNode { +public class MethodReferenceTreeNode extends DefaultMutableTreeNode implements ReferenceTreeNode { - private Translator deobfuscatingTranslator; + private final Translator translator; private MethodEntry entry; private EntryReference reference; - private AccessFlags access; - public MethodReferenceTreeNode(Translator deobfuscatingTranslator, MethodEntry entry) { - this.deobfuscatingTranslator = deobfuscatingTranslator; + public MethodReferenceTreeNode(Translator translator, MethodEntry entry) { + this.translator = translator; this.entry = entry; this.reference = null; } - public MethodReferenceTreeNode(Translator deobfuscatingTranslator, - EntryReference reference, AccessFlags access) { - this.deobfuscatingTranslator = deobfuscatingTranslator; + public MethodReferenceTreeNode(Translator translator, EntryReference reference) { + this.translator = translator; this.entry = reference.entry; this.reference = reference; - this.access = access; } @Override @@ -57,21 +57,17 @@ public class MethodReferenceTreeNode extends DefaultMutableTreeNode @Override public String toString() { if (this.reference != null) { - return String.format("%s (%s)", this.deobfuscatingTranslator.getTranslatedMethodDef(this.reference.context), - this.access); + return String.format("%s", translator.translate(this.reference.context)); } - return this.deobfuscatingTranslator.getTranslatedMethod(this.entry).getName(); - } - - @Deprecated - public void load(JarIndex index, boolean recurse) { - load(index, recurse, false); + return translator.translate(this.entry).getName(); } public void load(JarIndex index, boolean recurse, boolean recurseMethod) { // get all the child nodes - for (EntryReference reference : index.getMethodsReferencing(this.entry, recurseMethod)) { - add(new MethodReferenceTreeNode(this.deobfuscatingTranslator, reference, index.getAccessFlags(this.entry))); + Collection> references = getReferences(index, recurseMethod); + + for (EntryReference reference : references) { + add(new MethodReferenceTreeNode(translator, reference)); } if (recurse && this.children != null) { @@ -80,7 +76,7 @@ public class MethodReferenceTreeNode extends DefaultMutableTreeNode MethodReferenceTreeNode node = (MethodReferenceTreeNode) child; // don't recurse into ancestor - Set ancestors = Sets.newHashSet(); + Set> ancestors = Sets.newHashSet(); TreeNode n = node; while (n.getParent() != null) { n = n.getParent(); @@ -92,9 +88,26 @@ public class MethodReferenceTreeNode extends DefaultMutableTreeNode continue; } - node.load(index, true); + node.load(index, true, false); } } } } + + private Collection> getReferences(JarIndex index, boolean recurseMethod) { + ReferenceIndex referenceIndex = index.getReferenceIndex(); + + if (recurseMethod) { + Collection> references = new ArrayList<>(); + + EntryResolver entryResolver = index.getEntryResolver(); + for (MethodEntry methodEntry : entryResolver.resolveEquivalentMethods(entry)) { + references.addAll(referenceIndex.getReferencesToMethod(methodEntry)); + } + + return references; + } else { + return referenceIndex.getReferencesToMethod(entry); + } + } } -- cgit v1.2.3