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
---
 .../cuchaz/enigma/bytecode/ClassProtectifier.java  | 54 +++++++++++-----------
 1 file changed, 26 insertions(+), 28 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/bytecode/ClassProtectifier.java')

diff --git a/src/main/java/cuchaz/enigma/bytecode/ClassProtectifier.java b/src/main/java/cuchaz/enigma/bytecode/ClassProtectifier.java
index 6ec576e..9ed6db9 100644
--- a/src/main/java/cuchaz/enigma/bytecode/ClassProtectifier.java
+++ b/src/main/java/cuchaz/enigma/bytecode/ClassProtectifier.java
@@ -11,41 +11,39 @@
 
 package cuchaz.enigma.bytecode;
 
-import javassist.CtBehavior;
-import javassist.CtClass;
-import javassist.CtField;
-import javassist.bytecode.AccessFlag;
-import javassist.bytecode.InnerClassesAttribute;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
 
-public class ClassProtectifier {
+public class ClassProtectifier extends ClassVisitor {
 
-	public static CtClass protectify(CtClass c) {
-
-		// protectify all the fields
-		for (CtField field : c.getDeclaredFields()) {
-			field.setModifiers(protectify(field.getModifiers()));
-		}
+	public ClassProtectifier(int api, ClassVisitor cv) {
+		super(api, cv);
+	}
 
-		// protectify all the methods and constructors
-		for (CtBehavior behavior : c.getDeclaredBehaviors()) {
-			behavior.setModifiers(protectify(behavior.getModifiers()));
-		}
+	@Override
+	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+		access = protectify(access);
+		return super.visitMethod(access, name, desc, signature, exceptions);
+	}
 
-		// protectify all the inner classes
-		InnerClassesAttribute attr = (InnerClassesAttribute) c.getClassFile().getAttribute(InnerClassesAttribute.tag);
-		if (attr != null) {
-			for (int i = 0; i < attr.tableLength(); i++) {
-				attr.setAccessFlags(i, protectify(attr.accessFlags(i)));
-			}
-		}
+	@Override
+	public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+		access = protectify(access);
+		return super.visitField(access, name, desc, signature, value);
+	}
 
-		return c;
+	@Override
+	public void visitInnerClass(String name, String outerName, String innerName, int access) {
+		access = protectify(access);
+		super.visitInnerClass(name, outerName, innerName, access);
 	}
 
-	private static int protectify(int flags) {
-		if (AccessFlag.isPrivate(flags)) {
-			flags = AccessFlag.setProtected(flags);
+	private static int protectify(int access) {
+		AccessFlags accessFlags = new AccessFlags(access);
+		if (accessFlags.isPrivate()) {
+			accessFlags.setProtected();
 		}
-		return flags;
+		return accessFlags.getFlags();
 	}
 }
-- 
cgit v1.2.3