diff options
Diffstat (limited to 'src/org/jetbrains/java/decompiler/main')
6 files changed, 149 insertions, 15 deletions
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java index 856ad22..9c9c9c7 100644 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java @@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.main; import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode; +import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer; import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences; import org.jetbrains.java.decompiler.main.rels.ClassWrapper; @@ -90,6 +91,8 @@ public class ClassWriter { ClassNode outerNode = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE); DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_NODE, node); + BytecodeMappingTracer tracer = new BytecodeMappingTracer(); + try { ClassWrapper wrapper = classNode.wrapper; StructClass cl = wrapper.getClassStruct(); @@ -99,7 +102,7 @@ public class ClassWriter { if (node.lambda_information.is_method_reference) { if (!node.lambda_information.is_content_method_static && method_object != null) { // reference to a virtual method - buffer.append(method_object.toJava(indent)); + buffer.append(method_object.toJava(indent, tracer)); } else { // reference to a static method @@ -144,7 +147,7 @@ public class ClassWriter { buffer.append(" {"); buffer.append(DecompilerContext.getNewLineSeparator()); - methodLambdaToJava(node, classNode, mt, buffer, indent + 1, !lambdaToAnonymous); + methodLambdaToJava(node, classNode, mt, buffer, indent + 1, !lambdaToAnonymous, tracer); InterpreterUtil.appendIndent(buffer, indent); buffer.append("}"); @@ -161,6 +164,8 @@ public class ClassWriter { ClassNode outerNode = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE); DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_NODE, node); + BytecodeMappingTracer tracer = new BytecodeMappingTracer(); + try { // last minute processing invokeProcessors(node); @@ -199,7 +204,7 @@ public class ClassWriter { enumFields = false; } - fieldToJava(wrapper, cl, fd, buffer, indent + 1); + fieldToJava(wrapper, cl, fd, buffer, indent + 1, tracer); hasContent = true; } @@ -220,7 +225,7 @@ public class ClassWriter { if (hasContent) { buffer.append(lineSeparator); } - boolean methodSkipped = !methodToJava(node, mt, buffer, indent + 1); + boolean methodSkipped = !methodToJava(node, mt, buffer, indent + 1, tracer); if (!methodSkipped) { hasContent = true; } @@ -372,7 +377,7 @@ public class ClassWriter { buffer.append(lineSeparator); } - private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, StringBuilder buffer, int indent) { + private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, StringBuilder buffer, int indent, BytecodeMappingTracer tracer) { String indentString = InterpreterUtil.getIndentString(indent); String lineSeparator = DecompilerContext.getNewLineSeparator(); @@ -434,11 +439,12 @@ public class ClassWriter { if (isEnum && initializer.type == Exprent.EXPRENT_NEW) { NewExprent nexpr = (NewExprent)initializer; nexpr.setEnumconst(true); - buffer.append(nexpr.toJava(indent)); + buffer.append(nexpr.toJava(indent, tracer)); } else { buffer.append(" = "); - buffer.append(initializer.toJava(indent)); + // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction. + buffer.append(initializer.toJava(indent, tracer)); } } else if (fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_STATIC)) { @@ -447,7 +453,7 @@ public class ClassWriter { if (attr != null) { PrimitiveConstant constant = cl.getPool().getPrimitiveConstant(attr.getIndex()); buffer.append(" = "); - buffer.append(new ConstExprent(fieldType, constant.value).toJava(indent)); + buffer.append(new ConstExprent(fieldType, constant.value).toJava(indent, tracer)); } } @@ -462,7 +468,7 @@ public class ClassWriter { StructMethod mt, StringBuilder buffer, int indent, - boolean codeOnly) { + boolean codeOnly, BytecodeMappingTracer tracer) { ClassWrapper classWrapper = classNode.wrapper; MethodWrapper methodWrapper = classWrapper.getMethodWrapper(mt.getName(), mt.getDescriptor()); @@ -518,7 +524,7 @@ public class ClassWriter { RootStatement root = classWrapper.getMethodWrapper(mt.getName(), mt.getDescriptor()).root; if (root != null) { // check for existence try { - buffer.append(root.toJava(indent)); + buffer.append(root.toJava(indent, tracer)); } catch (Throwable ex) { DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.", ex); @@ -546,7 +552,7 @@ public class ClassWriter { } } - private boolean methodToJava(ClassNode node, StructMethod mt, StringBuilder buffer, int indent) { + private boolean methodToJava(ClassNode node, StructMethod mt, StringBuilder buffer, int indent, BytecodeMappingTracer tracer) { ClassWrapper wrapper = node.wrapper; StructClass cl = wrapper.getClassStruct(); MethodWrapper methodWrapper = wrapper.getMethodWrapper(mt.getName(), mt.getDescriptor()); @@ -768,7 +774,7 @@ public class ClassWriter { StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttributes().getWithKey("AnnotationDefault"); if (attr != null) { buffer.append(" default "); - buffer.append(attr.getDefaultValue().toJava(indent + 1)); + buffer.append(attr.getDefaultValue().toJava(indent + 1, new BytecodeMappingTracer())); // dummy tracer } } @@ -787,7 +793,7 @@ public class ClassWriter { if (root != null && !methodWrapper.decompiledWithErrors) { // check for existence try { - String code = root.toJava(indent + 1); + String code = root.toJava(indent + 1, tracer); hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0; @@ -896,11 +902,14 @@ public class ClassWriter { StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS}; private static void appendAnnotations(StringBuilder buffer, StructMember mb, int indent, String lineSeparator) { + + BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one + for (String name : ANNOTATION_ATTRIBUTES) { StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttributes().getWithKey(name); if (attribute != null) { for (AnnotationExprent annotation : attribute.getAnnotations()) { - buffer.append(annotation.toJava(indent)).append(lineSeparator); + buffer.append(annotation.toJava(indent, tracer_dummy)).append(lineSeparator); } } } @@ -910,13 +919,16 @@ public class ClassWriter { StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS}; private static void appendParameterAnnotations(StringBuilder buffer, StructMethod mt, int param) { + + BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one + for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) { StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttributes().getWithKey(name); if (attribute != null) { List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations(); if (param < annotations.size()) { for (AnnotationExprent annotation : annotations.get(param)) { - buffer.append(annotation.toJava(0)).append(' '); + buffer.append(annotation.toJava(0, tracer_dummy)).append(' '); } } } diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java index 6faad08..61807b7 100644 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java @@ -16,6 +16,7 @@ package org.jetbrains.java.decompiler.main; import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper; import org.jetbrains.java.decompiler.main.collectors.CounterContainer; import org.jetbrains.java.decompiler.main.collectors.ImportCollector; import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger; @@ -243,6 +244,7 @@ public class ClassesProcessor { ImportCollector importCollector = new ImportCollector(root); DecompilerContext.setImportCollector(importCollector); DecompilerContext.setCounterContainer(new CounterContainer()); + DecompilerContext.setBytecodeSourceMapper(new BytecodeSourceMapper()); new LambdaProcessor().processClass(root); @@ -276,6 +278,11 @@ public class ClassesProcessor { } buffer.append(classBuffer); + + if(DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) { + buffer.append(lineSeparator); + DecompilerContext.getBytecodeSourceMapper().dumpMapping(classBuffer); + } } finally { destroyWrappers(root); diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java index b600250..f1fddac 100644 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java @@ -15,6 +15,7 @@ */ package org.jetbrains.java.decompiler.main; +import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper; import org.jetbrains.java.decompiler.main.collectors.CounterContainer; import org.jetbrains.java.decompiler.main.collectors.ImportCollector; import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector; @@ -45,6 +46,7 @@ public class DecompilerContext { private ClassesProcessor classProcessor; private PoolInterceptor poolInterceptor; private IFernflowerLogger logger; + private BytecodeSourceMapper bytecodeSourceMapper; private DecompilerContext(Map<String, Object> properties) { this.properties = properties; @@ -126,6 +128,14 @@ public class DecompilerContext { getCurrentContext().poolInterceptor = poolinterceptor; } + public static BytecodeSourceMapper getBytecodeSourceMapper() { + return getCurrentContext().bytecodeSourceMapper; + } + + public static void setBytecodeSourceMapper(BytecodeSourceMapper bytecodeSourceMapper) { + getCurrentContext().bytecodeSourceMapper = bytecodeSourceMapper; + } + public static IFernflowerLogger getLogger() { return getCurrentContext().logger; } diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java new file mode 100644 index 0000000..2b60f7e --- /dev/null +++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java @@ -0,0 +1,26 @@ +package org.jetbrains.java.decompiler.main.collectors; + +import java.util.HashMap; + +public class BytecodeMappingTracer { + + private int current_sourceline; + + // bytecode offset, source line + private HashMap<Integer, Integer> mapping; + + public void incrementSourceLine() { + current_sourceline++; + } + + public void addMapping(int bytecode_offset) { + if(!mapping.containsKey(bytecode_offset)) { + mapping.put(bytecode_offset, current_sourceline); + } + } + + public HashMap<Integer, Integer> getMapping() { + return mapping; + } + +} diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java new file mode 100644 index 0000000..f94a85f --- /dev/null +++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java @@ -0,0 +1,75 @@ +package org.jetbrains.java.decompiler.main.collectors; + +import java.util.HashMap; +import java.util.Map.Entry; + +import org.jetbrains.java.decompiler.main.DecompilerContext; +import org.jetbrains.java.decompiler.util.InterpreterUtil; + +public class BytecodeSourceMapper { + + private int offset_total; + + // class, method, bytecode offset, source line + private HashMap<String, HashMap<String, HashMap<Integer, Integer>>> mapping; + + public void addMapping(String classname, String methodname, int bytecode_offset, int source_line) { + + HashMap<String, HashMap<Integer, Integer>> class_mapping = mapping.get(classname); + if(class_mapping == null) { + mapping.put(classname, class_mapping = new HashMap<String, HashMap<Integer, Integer>>()); + } + + HashMap<Integer, Integer> method_mapping = class_mapping.get(methodname); + if(method_mapping == null) { + class_mapping.put(methodname, method_mapping = new HashMap<Integer, Integer>()); + } + + // don't overwrite + if(!method_mapping.containsKey(bytecode_offset)) { + method_mapping.put(bytecode_offset, source_line); + } + } + + public void dumpMapping(StringBuilder buffer) { + + String lineSeparator = DecompilerContext.getNewLineSeparator(); + String indentstr1 = InterpreterUtil.getIndentString(1); + String indentstr2 = InterpreterUtil.getIndentString(2); + + + for(Entry<String, HashMap<String, HashMap<Integer, Integer>>> class_entry : mapping.entrySet()) { + HashMap<String, HashMap<Integer, Integer>> class_mapping = class_entry.getValue(); + buffer.append("class " + class_entry.getKey() + "{" + lineSeparator); + + boolean is_first_method = true; + + for(Entry<String, HashMap<Integer, Integer>> method_entry : class_mapping.entrySet()) { + HashMap<Integer, Integer> method_mapping = method_entry.getValue(); + + if(!is_first_method) { + buffer.append(lineSeparator); + } + buffer.append(indentstr1 + "method " + method_entry.getKey() + "{" + lineSeparator); + + for(Entry<Integer, Integer> line : method_mapping.entrySet()) { + buffer.append(indentstr2 + line.getKey() + indentstr2 + line.getValue() + lineSeparator); + } + buffer.append(indentstr1 + "}" + lineSeparator); + is_first_method = false; + } + buffer.append("}" + lineSeparator); + } + } + + public int getTotalOffset() { + return offset_total; + } + + public void setTotalOffset(int offset_total) { + this.offset_total = offset_total; + } + + + +} diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java index 69dd218..ce81e3c 100644 --- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java +++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java @@ -44,6 +44,8 @@ public interface IFernflowerPreferences { String IDEA_NOT_NULL_ANNOTATION = "inn"; String LAMBDA_TO_ANONYMOUS_CLASS = "lac"; + String BYTECODE_SOURCE_MAPPING = "bsm"; + String LOG_LEVEL = "log"; String MAX_PROCESSING_METHOD = "mpm"; String RENAME_ENTITIES = "ren"; @@ -77,6 +79,8 @@ public interface IFernflowerPreferences { put(IDEA_NOT_NULL_ANNOTATION, "1"); put(LAMBDA_TO_ANONYMOUS_CLASS, "0"); + put(BYTECODE_SOURCE_MAPPING, "0"); + put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name()); put(MAX_PROCESSING_METHOD, "0"); put(RENAME_ENTITIES, "0"); |