LLVM-but-worse · xxDark · Jan 4, 2022
diff --git a/org.mapleir.app-services/src/main/java/org/mapleir/app/service/ClassTree.java b/org.mapleir.app-services/src/main/java/org/mapleir/app/service/ClassTree.java
@@ -3,7 +3,6 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.log4j.Logger;
 import org.mapleir.app.service.ClassTree.InheritanceEdge;
 import org.mapleir.stdlib.collections.graph.FastDirectedGraph;
 import org.mapleir.stdlib.collections.graph.FastGraphEdge;
@@ -12,6 +11,8 @@
 import org.mapleir.stdlib.collections.graph.algorithms.SimpleDfs;
 import org.mapleir.stdlib.util.TabbedStringWriter;
 import org.mapleir.asm.ClassNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A graph to represent the inheritance tree.
@@ -22,7 +23,7 @@
 // edge = (c, super)
 // so a dfs goes through edges towards the root
 public class ClassTree extends FastDirectedGraph<ClassNode, InheritanceEdge> {
-	private static final Logger LOGGER = Logger.getLogger(ClassTree.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ClassTree.class);
 	private static final boolean ALLOW_PHANTOM_CLASSES = true;
 
 	private final ApplicationClassSource source;

diff --git a/...pleir.app-services/src/main/java/org/mapleir/app/service/InstalledRuntimeClassSource.java b/...pleir.app-services/src/main/java/org/mapleir/app/service/InstalledRuntimeClassSource.java
@@ -3,13 +3,14 @@
 import java.io.IOException;
 import java.util.HashSet;
 
-import org.apache.log4j.Logger;
 import org.mapleir.asm.ClassHelper;
 import org.objectweb.asm.ClassReader;
 import org.mapleir.asm.ClassNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InstalledRuntimeClassSource extends LibraryClassSource {
-	protected final Logger LOGGER = Logger.getLogger(InstalledRuntimeClassSource.class);
+	protected final Logger LOGGER = LoggerFactory.getLogger(InstalledRuntimeClassSource.class);
 
 	private final HashSet<String> notContains;
 
@@ -77,8 +78,7 @@ private LocateableClassNode __resolve(String name) {
 			LocateableClassNode node = new LocateableClassNode(this, cn, true);
 			return node;
 		} catch(IOException e) {
-			LOGGER.error(String.format("Could not load class from calling classloader: %s", name));
-			LOGGER.error(e);
+			LOGGER.error(String.format("Could not load class from calling classloader: %s", name), e);
 			notContains.add(name);
 			return null;
 		}

diff --git a/org.mapleir.ir/src/main/java/org/mapleir/ir/cfg/builder/ControlFlowGraphBuilder.java b/org.mapleir.ir/src/main/java/org/mapleir/ir/cfg/builder/ControlFlowGraphBuilder.java
@@ -1,16 +1,10 @@
 package org.mapleir.ir.cfg.builder;
 
-import org.apache.log4j.Logger;
 import org.mapleir.ir.cfg.BasicBlock;
 import org.mapleir.ir.cfg.ControlFlowGraph;
-import org.mapleir.ir.code.CodeUnit;
-import org.mapleir.ir.code.Stmt;
-import org.mapleir.ir.code.expr.VarExpr;
-import org.mapleir.ir.code.stmt.copy.CopyVarStmt;
 import org.mapleir.ir.locals.Local;
 import org.mapleir.ir.locals.impl.StaticMethodLocalsPool;
 import org.mapleir.ir.locals.impl.VirtualMethodLocalsPool;
-import org.mapleir.ir.utils.CFGUtils;
 import org.mapleir.stdlib.collections.map.NullPermeableHashMap;
 import org.mapleir.asm.MethodNode;
 
@@ -20,8 +14,6 @@
 
 public class ControlFlowGraphBuilder {
 
-	private static final Logger LOGGER = Logger.getLogger(ControlFlowGraph.class);
-
 	protected final MethodNode method;
 	protected final ControlFlowGraph graph;
 	protected final Set<Local> locals;

diff --git a/org.mapleir.main/src/main/java/org/mapleir/Boot.java b/org.mapleir.main/src/main/java/org/mapleir/Boot.java
@@ -1,6 +1,5 @@
 package org.mapleir;
 
-import org.apache.log4j.Logger;
 import org.mapleir.app.client.SimpleApplicationContext;
 import org.mapleir.app.service.ApplicationClassSource;
 import org.mapleir.app.service.CompleteResolvingJarDumper;
@@ -22,6 +21,8 @@
 import org.mapleir.ir.codegen.ControlFlowGraphDumper;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.asm.MethodNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.topdank.byteengineer.commons.data.JarInfo;
 import org.topdank.byteio.in.SingleJarDownloader;
 
@@ -32,7 +33,7 @@
 
 public class Boot {
 
-	private static final Logger LOGGER = Logger.getLogger(Boot.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(Boot.class);
 
 	public static boolean logging = false;
 	private static long timer;

diff --git a/org.mapleir.main/src/main/java/org/mapleir/Boot2.java b/org.mapleir.main/src/main/java/org/mapleir/Boot2.java
@@ -1,6 +1,5 @@
 package org.mapleir;
 
-import org.apache.log4j.Logger;
 import org.mapleir.app.client.SimpleApplicationContext;
 import org.mapleir.app.service.ApplicationClassSource;
 import org.mapleir.app.service.CompleteResolvingJarDumper;
@@ -24,6 +23,8 @@
 import org.mapleir.ir.codegen.ControlFlowGraphDumper;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.asm.MethodNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.topdank.byteengineer.commons.data.JarInfo;
 import org.topdank.byteio.in.SingleJarDownloader;
 
@@ -34,7 +35,7 @@
 
 public class Boot2 {
 
-	private static final Logger LOGGER = Logger.getLogger(Boot2.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(Boot2.class);
 
 	public static boolean logging = false;
 

diff --git a/org.mapleir.main/src/main/java/org/mapleir/DataFlowDemoBoot.java b/org.mapleir.main/src/main/java/org/mapleir/DataFlowDemoBoot.java
@@ -1,6 +1,5 @@
 package org.mapleir;
 
-import org.apache.log4j.Logger;
 import org.mapleir.app.client.SimpleApplicationContext;
 import org.mapleir.app.service.ApplicationClassSource;
 import org.mapleir.app.service.LibraryClassSource;
@@ -21,6 +20,8 @@
 import org.mapleir.stdlib.util.JavaDescUse;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.asm.MethodNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.topdank.byteengineer.commons.data.JarInfo;
 import org.topdank.byteio.in.SingleJarDownloader;
 
@@ -31,7 +32,7 @@
 
 public class DataFlowDemoBoot {
 
-	private static final Logger LOGGER = Logger.getLogger(DataFlowDemoBoot.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(DataFlowDemoBoot.class);
 
 	public static boolean logging = false;
 	private static long timer;

diff --git a/org.mapleir.main/src/main/java/org/mapleir/DefaultInvocationResolver.java b/org.mapleir.main/src/main/java/org/mapleir/DefaultInvocationResolver.java
@@ -1,21 +1,22 @@
 package org.mapleir;
 
-import org.apache.log4j.Logger;
 import org.mapleir.app.service.ApplicationClassSource;
 import org.mapleir.app.service.InvocationResolver;
 import org.mapleir.stdlib.collections.map.NullPermeableHashMap;
 import org.objectweb.asm.Opcodes;
 import org.mapleir.asm.ClassNode;
 import org.mapleir.asm.FieldNode;
 import org.mapleir.asm.MethodNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.Map.Entry;
 
 public class DefaultInvocationResolver implements InvocationResolver {
 
-	private static final Logger LOGGER = Logger.getLogger(DefaultInvocationResolver.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInvocationResolver.class);
 
 	/* trick for no IDE warning */
 	private static int __debug_level() { return 0; }

diff --git a/org.mapleir.main/src/main/java/org/mapleir/deob/interproc/IRCallTracer.java b/org.mapleir.main/src/main/java/org/mapleir/deob/interproc/IRCallTracer.java
@@ -2,20 +2,21 @@
 
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.mapleir.context.AnalysisContext;
 import org.mapleir.ir.cfg.ControlFlowGraph;
 import org.mapleir.ir.code.Expr;
 import org.mapleir.ir.code.Stmt;
 import org.mapleir.ir.code.expr.invoke.Invocation;
 import org.mapleir.asm.MethodNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * CallTracer which implements a DFS on the callgraph based on IR instructions.
  */
 public class IRCallTracer extends CallTracer {
 
-	private static final Logger LOGGER = Logger.getLogger(IRCallTracer.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(IRCallTracer.class);
 
 	protected final AnalysisContext context;
 

diff --git a/org.mapleir.main/src/main/resources/log4j.properties b/org.mapleir.main/src/main/resources/log4j.properties
diff --git a/org.mapleir.parent/pom.xml b/org.mapleir.parent/pom.xml
@@ -23,9 +23,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.32</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/...e-framework.impl/src/main/java/org/mapleir/serviceframework/impl/ServiceRegistryImpl.java b/...e-framework.impl/src/main/java/org/mapleir/serviceframework/impl/ServiceRegistryImpl.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.mapleir.propertyframework.api.IPropertyDictionary;
 import org.mapleir.serviceframework.api.IServiceContext;
 import org.mapleir.serviceframework.api.IServiceFactory;
@@ -16,11 +15,13 @@
 import org.mapleir.serviceframework.api.IServiceReferenceHandlerFactory;
 import org.mapleir.serviceframework.api.IServiceRegistry;
 import org.mapleir.serviceframework.util.ClassServiceQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // FIXME: synchronise data structures
 public class ServiceRegistryImpl implements IServiceRegistry {
 
-	private static final Logger LOGGER = Logger.getLogger(ServiceRegistryImpl.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ServiceRegistryImpl.class);
 
 	private final ContextLookupHelper map = new ContextLookupHelper();
 	private final IServiceReferenceHandlerFactory serviceReferenceFactoryHandler = new ServiceReferenceHandlerFactoryImpl();