From a88175ffc95792b88a8724f66db6dda2b8cc32ee Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Tue, 17 Jul 2018 19:14:08 +0200
Subject: ASM Based Class Translator (#1)

* Initial port to ASM

* Package updates

* Annotation + inner class translation

* Fix inner class mapping

* More bytecode translation

* Signature refactoring

* Fix highlighting of mapped names

* Fix parameter name offset

* Fix anonymous class generation

* Fix issues with inner class signature transformation

* Fix bridged method detection

* Fix compile issues

* Resolve all failed tests

* Apply deobfuscated name to transformed classes

* Fix class signatures not being translated

* Fix frame array type translation

* Fix frame array type translation

* Fix array translation in method calls

* Fix method reference and bridge detection

* Fix handling of null deobf mappings

* Parameter translation in interfaces

* Fix enum parameter index offset

* Fix parsed local variable indexing

* Fix stackoverflow on rebuilding method names

* Ignore invalid decompiled variable indices

* basic source jar

* Output directly to file on source export

* Make decompile parallel

* fix incorrect super calls

* Use previous save state to delete old mapping files

* Fix old mappings not properly being removed

* Fix old mappings not properly being removed

* make isMethodProvider public

(cherry picked from commit ebad6a9)

* speed up Deobfuscator's getSources by using a single TranslatingTypeloader and caching the ClassLoaderTypeloader

* ignore .idea project folders

* move SynchronizedTypeLoader to a non-inner

* fix signature remap of inners for now

* index & resolve method/field references for usages view

* Allow reader/writer subclasses to provide the underlying file operations

* fix giving obf classes a name not removing them from the panel

* buffer the ParsedJar class entry inputstream, allow use with a jarinputstream

* make CachingClasspathTypeLoader public

* make CachingClasspathTypeLoader public

* support enum switches with obfuscated SwitchMaps
---
 src/main/java/cuchaz/enigma/mapping/MappingsChecker.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/mapping/MappingsChecker.java')

diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
index 172641b..a42f255 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java
@@ -14,6 +14,10 @@ package cuchaz.enigma.mapping;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import cuchaz.enigma.analysis.JarIndex;
+import cuchaz.enigma.mapping.entry.ClassEntry;
+import cuchaz.enigma.mapping.entry.EntryFactory;
+import cuchaz.enigma.mapping.entry.FieldEntry;
+import cuchaz.enigma.mapping.entry.MethodEntry;
 
 import java.util.Map;
 
@@ -23,7 +27,7 @@ public class MappingsChecker {
 	private Map<ClassEntry, ClassMapping> droppedClassMappings;
 	private Map<ClassEntry, ClassMapping> droppedInnerClassMappings;
 	private Map<FieldEntry, FieldMapping> droppedFieldMappings;
-	private Map<BehaviorEntry, MethodMapping> droppedMethodMappings;
+	private Map<MethodEntry, MethodMapping> droppedMethodMappings;
 
 	public MappingsChecker(JarIndex index) {
 		this.index = index;
@@ -45,7 +49,7 @@ public class MappingsChecker {
 		return this.droppedFieldMappings;
 	}
 
-	public Map<BehaviorEntry, MethodMapping> getDroppedMethodMappings() {
+	public Map<MethodEntry, MethodMapping> getDroppedMethodMappings() {
 		return this.droppedMethodMappings;
 	}
 
@@ -77,10 +81,10 @@ public class MappingsChecker {
 
 		// check methods
 		for (MethodMapping methodMapping : Lists.newArrayList(classMapping.methods())) {
-			BehaviorEntry obfBehaviorEntry = EntryFactory.getObfBehaviorEntry(classEntry, methodMapping);
-			if (!this.index.containsObfBehavior(obfBehaviorEntry)) {
+			MethodEntry obfMethodEntry = EntryFactory.getObfMethodEntry(classEntry, methodMapping);
+			if (!this.index.containsObfMethod(obfMethodEntry)) {
 				classMapping.removeMethodMapping(methodMapping);
-				this.droppedMethodMappings.put(obfBehaviorEntry, methodMapping);
+				this.droppedMethodMappings.put(obfMethodEntry, methodMapping);
 			}
 		}
 
-- 
cgit v1.2.3