diff options
Diffstat (limited to 'src/org/jetbrains/java/decompiler/modules/decompiler/exps')
13 files changed, 28 insertions, 0 deletions
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java index c0cb525..2e81f15 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java @@ -96,6 +96,8 @@ public class ArrayExprent extends Exprent { res = "((" + ExprProcessor.getCastTypeName(objarr) + ")" + res + ")"; } + tracer.addMapping(bytecode); + return res + "[" + index.toJava(indent, tracer) + "]"; } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java index c1c2017..f4f24ef 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java @@ -38,12 +38,15 @@ public class AssertExprent extends Exprent { buffer.append("assert "); + tracer.addMapping(bytecode); + if (parameters.get(0) == null) { buffer.append("false"); } else { buffer.append(parameters.get(0).toJava(indent, tracer)); } + if (parameters.size() > 1) { buffer.append(" : "); buffer.append(parameters.get(1).toJava(indent, tracer)); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java index 8f39565..9553f3f 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java @@ -153,6 +153,8 @@ public class AssignmentExprent extends Exprent { buffer.append(condtype == CONDITION_NONE ? " = " : funceq[condtype]).append(res); + tracer.addMapping(bytecode); + return buffer.toString(); } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java index 1ec0f33..46e8938 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java @@ -112,6 +112,8 @@ public class ConstExprent extends Exprent { boolean literal = DecompilerContext.getOption(IFernflowerPreferences.LITERALS_AS_IS); boolean ascii = DecompilerContext.getOption(IFernflowerPreferences.ASCII_STRING_CHARACTERS); + tracer.addMapping(bytecode); + if (consttype.type != CodeConstants.TYPE_NULL && value == null) { return ExprProcessor.getCastTypeName(consttype); } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java index b130c61..e03bc8d 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java @@ -77,6 +77,9 @@ public class ExitExprent extends Exprent { @Override public String toJava(int indent, BytecodeMappingTracer tracer) { + + tracer.addMapping(bytecode); + if (exittype == EXIT_RETURN) { StringBuilder buffer = new StringBuilder(); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java index 1b0168b..5c8d6be 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java @@ -54,6 +54,9 @@ public class Exprent { public int id; + //offsets of bytecode instructions decompiled to this exprent + public Set<Integer> bytecode = new HashSet<Integer>(); + { // set exprent id id = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.EXPRENT_COUNTER); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java index 7ca5399..ce7d72f 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java @@ -159,6 +159,8 @@ public class FieldExprent extends Exprent { buf.append(name); + tracer.addMapping(bytecode); + return buf.toString(); } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java index 8c8862b..a527918 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java @@ -450,6 +450,8 @@ public class FunctionExprent extends Exprent { @Override public String toJava(int indent, BytecodeMappingTracer tracer) { + tracer.addMapping(bytecode); + if (functype <= FUNCTION_USHR) { return wrapOperandString(lstOperands.get(0), false, indent, tracer) + operators[functype] + wrapOperandString(lstOperands.get(1), true, indent, tracer); diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java index 452bc36..32cc19d 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java @@ -114,6 +114,7 @@ public class IfExprent extends Exprent { @Override public String toJava(int indent, BytecodeMappingTracer tracer) { + tracer.addMapping(bytecode); return "if(" + condition.toJava(indent, tracer) + ")"; } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java index a1f6d11..e782b23 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java @@ -194,6 +194,8 @@ public class InvocationExprent extends Exprent { String super_qualifier = null; boolean isInstanceThis = false; + tracer.addMapping(bytecode); + if (invocationTyp == INVOKE_DYNAMIC) { // ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASSNODE); // diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java index fd8a9f0..091d424 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java @@ -52,6 +52,9 @@ public class MonitorExprent extends Exprent { @Override public String toJava(int indent, BytecodeMappingTracer tracer) { + + tracer.addMapping(bytecode); + if (montype == MONITOR_ENTER) { return "synchronized(" + value.toJava(indent, tracer) + ")"; } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java index 70c5d22..4784eb1 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java @@ -84,6 +84,7 @@ public class SwitchExprent extends Exprent { @Override public String toJava(int indent, BytecodeMappingTracer tracer) { + tracer.addMapping(bytecode); return "switch(" + value.toJava(indent, tracer) + ")"; } diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java index 49ffe4d..16eba3a 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java @@ -85,6 +85,8 @@ public class VarExprent extends Exprent { public String toJava(int indent, BytecodeMappingTracer tracer) { StringBuilder buffer = new StringBuilder(); + tracer.addMapping(bytecode); + if (classdef) { ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(vartype.value); new ClassWriter().classToJava(child, buffer, indent); |