Skip to content

Commit 975c98e

Browse files
committed
Removed duplicated argument from InteractiveDebugger
the config already contains the symbolic wdcli path
1 parent 6b56a89 commit 975c98e

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

src/main/kotlin/be/ugent/topl/mio/Main.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ fun main(args: Array<String>) {
8888
else
8989
FlatDarkLaf.setup()
9090
if (args.size == 2)
91-
InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, config = config)
91+
InteractiveDebugger(connection, sourceMapping, config = config)
9292
else
93-
InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, args[2], config = config)
93+
InteractiveDebugger(connection, sourceMapping, args[2], config = config)
9494
}
9595
"repl" -> {
9696
val connection =

src/main/kotlin/be/ugent/topl/mio/ui/InteractiveDebugger.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@ import kotlin.concurrent.thread
3636

3737
class InteractiveDebugger(
3838
connection: Connection,
39-
symbolicWdcliPath: String,
4039
private val sourceMapping: SourceMap? = null,
4140
private val wasmFile: String = "/home/maarten/Documents/School/Thesis/thesis-git/wardbg/simple-sym-test.wasm",
4241
private val config: DebuggerConfig
4342
) : JFrame("WARDuino Debugger") {
44-
private val binaryInfo = getBinaryInfo(symbolicWdcliPath, File(wasmFile).absolutePath)
43+
private val binaryInfo = getBinaryInfo(config.wdcliPath, File(wasmFile).absolutePath)
4544
private val debugger = MultiverseDebugger(
4645
connection,
4746
WasmBinary(File(wasmFile), binaryInfo),
48-
symbolicWdcliPath,
47+
config.symbolicWdcliPath,
4948
false,
5049
this::onGraphUpdate,
5150
this::onMockingUpdate,

src/main/kotlin/be/ugent/topl/mio/ui/StartScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ open class StartScreen(config: DebuggerConfig) : AboutScreen(config) {
9090
return false
9191
}
9292
val sourceMapping = AsSourceMapping(File(binary.path + ".map").readText())
93-
InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, binary.path, config = config)
93+
InteractiveDebugger(connection, sourceMapping, binary.path, config = config)
9494
return true
9595
}
9696
}

0 commit comments

Comments
 (0)