some cleanup

nikals99 · Jan 27, 2022 · 5551af5 · 5551af5
1 parent 033134c
commit 5551af5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/example_binaries/Dockerfile b/example_binaries/Dockerfile
@@ -9,3 +9,4 @@ RUN apt-get install -y build-essential
 
 RUN apt-get install -y gcc-9-aarch64-linux-gnu
 
+WORKDIR /work
diff --git a/ghidra_plugin/src/main/java/de/nikals99/ghidrafaultinjector/model/Instruction.java b/ghidra_plugin/src/main/java/de/nikals99/ghidrafaultinjector/model/Instruction.java
@@ -2,11 +2,9 @@
 
 public class Instruction {
     private String address;
-    private boolean thumb;
 
-    public Instruction(String address, boolean thumb) {
+    public Instruction(String address) {
         this.address = address;
-        this.thumb = thumb;
     }
 
     public String getAddress() {
@@ -16,12 +14,4 @@ public String getAddress() {
     public void setAddress(String address) {
         this.address = address;
     }
-
-    public boolean isThumb() {
-        return thumb;
-    }
-
-    public void setThumb(boolean thumb) {
-        this.thumb = thumb;
-    }
 }
diff --git a/ghidra_plugin/src/main/java/de/nikals99/ghidrafaultinjector/panels/GlitchOptionsPanel.java b/ghidra_plugin/src/main/java/de/nikals99/ghidrafaultinjector/panels/GlitchOptionsPanel.java
@@ -44,7 +44,7 @@ public GlitchOptions getGlitchOptions() {
         ArrayList<Instruction> instructions = new ArrayList<>();
 
         for (String instructionAddr : instructionAddrs) {
-            instructions.add(new Instruction(instructionAddr, false));
+            instructions.add(new Instruction(instructionAddr));
         }
 
         GlitchOptions glitchOptions = new GlitchOptions(instructions);

diff --git a/py_scripts/analyzer.py b/py_scripts/analyzer.py
@@ -30,7 +30,7 @@ def __init__(self, options):
     def glitch(self):
         working_glitches = []
         print("starting to find path without glitch")
-        found: List[SimState] = self.find_path_with_glitch({"address": "0xFFFFFFFF", "thumb": False})
+        found: List[SimState] = self.find_path_with_glitch({"address": "0xFFFFFFFF"})
         if len(found) > 0:
             print(f"found {len(found)} path(s) without glitching")
             working_glitches.append({"glitchAddress": "0x0", "paths": common.extract_paths(self.proj, found)})
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@ RUN apt-get install -y build-essential

		RUN apt-get install -y gcc-9-aarch64-linux-gnu

		WORKDIR /work