EaZyCode/ByteEdit
1
0 Fork 0
mirror of https://github.com/SuspiciousActivity/ByteEdit.git synced 2026-08-13 17:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a "switch" bug

Browse Source
This commit is contained in:
SuspiciousActivity committed 2018-09-22 23:05:26 +02:00
1 parent 6995318302
commit 49337245f0
4 files changed
+67 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/me/ByteEdit/edit/Assembler.java
+46 -23
View File
@@ -2,12 +2,14 @@ package me.ByteEdit.edit;
import java.io.StringReader; import java.io.StringReader;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.math.BigInteger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.function.BiFunction;
import javax.swing.text.BadLocationException; import javax.swing.text.BadLocationException;
@@ -44,6 +46,7 @@ import org.objectweb.asm.tree.VarInsnNode;
import me.ByteEdit.main.Main; import me.ByteEdit.main.Main;
import me.ByteEdit.utils.ClassUtil; import me.ByteEdit.utils.ClassUtil;
import me.ByteEdit.utils.CustomBufferedReader; import me.ByteEdit.utils.CustomBufferedReader;
import me.ByteEdit.utils.SwitchIntContainer;
public class Assembler { public class Assembler {
@@ -185,7 +188,7 @@ public class Assembler {
if (cons.contains("bridge")) { if (cons.contains("bridge")) {
access ^= ClassUtil.ACC_BRIDGE; access ^= ClassUtil.ACC_BRIDGE;
} }
if (cons.contains("varargs")) { if (cons.contains("transient")) {
access ^= ClassUtil.ACC_VARARGS; access ^= ClassUtil.ACC_VARARGS;
} }
if (cons.contains("native")) { if (cons.contains("native")) {
@@ -1168,12 +1171,13 @@ public class Assembler {
case "tableswitch": { case "tableswitch": {
String str = s.substring(14, s.length() - 2).replace("\t", ""); String str = s.substring(14, s.length() - 2).replace("\t", "");
String split2[] = str.split("\n"); String split2[] = str.split("\n");
LinkedHashMap<Integer, LabelNode> labelMap = new LinkedHashMap<>(); LinkedHashMap<SwitchIntContainer, LabelNode> labelMap = new LinkedHashMap<>();
HashMap<BigInteger, LabelNode> labelIDs = new HashMap<>();
for (int i = 4; i < split2.length - 1; i++) { for (int i = 4; i < split2.length - 1; i++) {
if (split2[i].equals("null")) { if (split2[i].equals("null")) {
labelMap.put(-1 - labelMap.size(), null); labelMap.put(new SwitchIntContainer(-1 - labelMap.size()), null);
} else { } else {
labelMap.put(Integer.parseInt(split2[i]), null); labelMap.put(new SwitchIntContainer(Integer.parseInt(split2[i])), null);
} }
} }
LabelNode dflt = null; LabelNode dflt = null;
@@ -1182,29 +1186,38 @@ public class Assembler {
for (Entry<Label, Integer> entry : labels.entrySet()) { for (Entry<Label, Integer> entry : labels.entrySet()) {
if (entry.getValue() == dfltLabelNr) { if (entry.getValue() == dfltLabelNr) {
dflt = new LabelNode(entry.getKey()); dflt = new LabelNode(entry.getKey());
labelIDs.put(BigInteger.valueOf(dfltLabelNr), dflt);
} }
if (labelMap.containsKey(entry.getValue())) { labelMap.replaceAll(new BiFunction<SwitchIntContainer, LabelNode, LabelNode>() {
labelMap.replace(entry.getValue(), new LabelNode(entry.getKey()));
} @Override
public LabelNode apply(SwitchIntContainer t, LabelNode u) {
if (entry.getValue().intValue() == t.getId()) {
return new LabelNode(entry.getKey());
}
return u;
}
});
} }
if (dflt == null) { if (dflt == null) {
Label l = new Label(); Label l = new Label();
labels.put(l, dfltLabelNr); labels.put(l, dfltLabelNr);
dflt = new LabelNode(l); dflt = new LabelNode(l);
labelIDs.put(BigInteger.valueOf(dfltLabelNr), dflt);
} }
} else { } else {
dflt = new LabelNode(new Label()); dflt = new LabelNode(new Label());
} }
LabelNode[] arr = new LabelNode[labelMap.size()]; LabelNode[] arr = new LabelNode[labelMap.size()];
int counter = 0; int counter = 0;
for (Entry<Integer, LabelNode> entry : labelMap.entrySet()) { for (Entry<SwitchIntContainer, LabelNode> entry : labelMap.entrySet()) {
LabelNode ln; LabelNode ln;
if (entry.getValue() == null) { if (((ln = labelIDs.get(BigInteger.valueOf(entry.getKey().getId()))) == null)) {
Label l = new Label(); Label l = new Label();
labels.put(l, entry.getKey()); labels.put(l, entry.getKey().getId());
ln = new LabelNode(l); ln = new LabelNode(l);
} else { labelIDs.put(BigInteger.valueOf(entry.getKey().getId()), ln);
ln = entry.getValue();
} }
arr[counter] = ln; arr[counter] = ln;
counter++; counter++;
@@ -1216,7 +1229,8 @@ public class Assembler {
String str = s.substring(15, s.length() - 2).replace("\t", ""); String str = s.substring(15, s.length() - 2).replace("\t", "");
String split2[] = str.split("\n"); String split2[] = str.split("\n");
ArrayList<Integer> keys = new ArrayList<>(); ArrayList<Integer> keys = new ArrayList<>();
LinkedHashMap<Integer, LabelNode> labelMap = new LinkedHashMap<>(); LinkedHashMap<SwitchIntContainer, LabelNode> labelMap = new LinkedHashMap<>();
HashMap<BigInteger, LabelNode> labelIDs = new HashMap<>();
int stage = 0; int stage = 0;
for (int i = 2; i < split2.length; i++) { for (int i = 2; i < split2.length; i++) {
String spl = split2[i]; String spl = split2[i];
@@ -1228,9 +1242,9 @@ public class Assembler {
keys.add(Integer.parseInt(spl)); keys.add(Integer.parseInt(spl));
} else if (stage == 2) { } else if (stage == 2) {
if (spl.equals("null")) { if (spl.equals("null")) {
labelMap.put(-1 - labelMap.size(), null); labelMap.put(new SwitchIntContainer(-1 - labelMap.size()), null);
} else { } else {
labelMap.put(Integer.parseInt(spl), null); labelMap.put(new SwitchIntContainer(Integer.parseInt(spl)), null);
} }
} }
} }
@@ -1239,26 +1253,35 @@ public class Assembler {
for (Entry<Label, Integer> entry : labels.entrySet()) { for (Entry<Label, Integer> entry : labels.entrySet()) {
if (entry.getValue() == labelNr) { if (entry.getValue() == labelNr) {
dflt = new LabelNode(entry.getKey()); dflt = new LabelNode(entry.getKey());
labelIDs.put(BigInteger.valueOf(labelNr), dflt);
} }
if (labelMap.containsKey(entry.getValue())) { labelMap.replaceAll(new BiFunction<SwitchIntContainer, LabelNode, LabelNode>() {
labelMap.replace(entry.getValue(), new LabelNode(entry.getKey()));
} @Override
public LabelNode apply(SwitchIntContainer t, LabelNode u) {
if (entry.getValue().intValue() == t.getId()) {
return new LabelNode(entry.getKey());
}
return u;
}
});
} }
if (dflt == null) { if (dflt == null) {
Label l = new Label(); Label l = new Label();
labels.put(l, labelNr); labels.put(l, labelNr);
dflt = new LabelNode(l); dflt = new LabelNode(l);
labelIDs.put(BigInteger.valueOf(labelNr), dflt);
} }
LabelNode[] arr = new LabelNode[labelMap.size()]; LabelNode[] arr = new LabelNode[labelMap.size()];
int counter = 0; int counter = 0;
for (Entry<Integer, LabelNode> entry : labelMap.entrySet()) { for (Entry<SwitchIntContainer, LabelNode> entry : labelMap.entrySet()) {
LabelNode ln; LabelNode ln;
if (entry.getValue() == null) { if (((ln = labelIDs.get(BigInteger.valueOf(entry.getKey().getId()))) == null)) {
Label l = new Label(); Label l = new Label();
labels.put(l, entry.getKey()); labels.put(l, entry.getKey().getId());
ln = new LabelNode(l); ln = new LabelNode(l);
} else { labelIDs.put(BigInteger.valueOf(entry.getKey().getId()), ln);
ln = entry.getValue();
} }
arr[counter] = ln; arr[counter] = ln;
counter++; counter++;
src/me/ByteEdit/edit/Disassembler.java
+2 -1
View File
@@ -224,7 +224,7 @@ public class Disassembler {
s += "\n"; s += "\n";
} }
} }
s += "\t" + ClassUtil.getAccessFlagsFull(fn.access) + fn.desc + " " + fn.name; s += "\t" + ClassUtil.getAccessFlagsFull(fn.access).replace("varargs", "transient") + fn.desc + " " + fn.name;
if (fn.value != null) { if (fn.value != null) {
s += " = " + ClassUtil.getDecompiledValue(fn.value, fn.desc); s += " = " + ClassUtil.getDecompiledValue(fn.value, fn.desc);
} }
@@ -535,6 +535,7 @@ public class Disassembler {
String s = "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " [\n\t\t\tmin: " + node.min + "\n\t\t\tmax: " + node.max String s = "\t\t" + OpcodesReverse.reverseOpcode(n.getOpcode()) + " [\n\t\t\tmin: " + node.min + "\n\t\t\tmax: " + node.max
+ "\n\t\t\tdefault: " + labels.get(node.dflt.getLabel()) + "\n\t\t\tlabels: [\n"; + "\n\t\t\tdefault: " + labels.get(node.dflt.getLabel()) + "\n\t\t\tlabels: [\n";
for (LabelNode l : node.labels) { for (LabelNode l : node.labels) {
// System.out.println(l + ", " + l.getLabel());
s += "\t\t\t\t" + labels.get(l.getLabel()) + "\n"; s += "\t\t\t\t" + labels.get(l.getLabel()) + "\n";
} }
s += "\t\t\t]\n\t\t]\n"; s += "\t\t\t]\n\t\t]\n";
src/me/ByteEdit/main/Main.java
+4 -1
View File
@@ -478,8 +478,10 @@ public class Main extends JFrame {
return selectFileWithSearch(s, null); return selectFileWithSearch(s, null);
} }
public static File saveFolder = null;
public void save() { public void save() {
final JFileChooser fileChooser = new JFileChooser() { final JFileChooser fileChooser = new JFileChooser(saveFolder) {
@Override @Override
protected JDialog createDialog(final Component parent) throws HeadlessException { protected JDialog createDialog(final Component parent) throws HeadlessException {
@@ -495,6 +497,7 @@ public class Main extends JFrame {
final int action = fileChooser.showSaveDialog(Main.this); final int action = fileChooser.showSaveDialog(Main.this);
if (action == 0) { if (action == 0) {
final File file = fileChooser.getSelectedFile(); final File file = fileChooser.getSelectedFile();
saveFolder = file.getParentFile();
if (file.exists()) { if (file.exists()) {
int dialogResult = JOptionPane.showConfirmDialog(null, "This file already exists! Overwrite it?", "Warning", int dialogResult = JOptionPane.showConfirmDialog(null, "This file already exists! Overwrite it?", "Warning",
JOptionPane.YES_NO_OPTION); JOptionPane.YES_NO_OPTION);
src/me/ByteEdit/utils/SwitchIntContainer.java
+15
View File
@@ -0,0 +1,15 @@
package me.ByteEdit.utils;
public class SwitchIntContainer {
private final int id;
public SwitchIntContainer(final int id) {
this.id = id;
}
public int getId() {
return id;
}
}