Improve dwarf support (#14)

* Removed duplicated argument from InteractiveDebugger

the config already contains the symbolic wdcli path

* Dwarf sourcemaps use syntax highlighting based on the file extension

* Try to load dwarf info if there is no .map in the start screen

Also added macos build for dwarf-line-mapping.

* Update dwarf-line-mapping-mac

* Better error handling when MIO fails to get debug info

Author: MaartenS11

dwarf-line-mapping-mac

@@ -88,9 +88,9 @@ fun main(args: Array<String>) {
             else
                 FlatDarkLaf.setup()
             if (args.size == 2)
-                InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, config = config)
+                InteractiveDebugger(connection, sourceMapping, config = config)
             else
-                InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, args[2], config = config)
+                InteractiveDebugger(connection, sourceMapping, args[2], config = config)
         }
         "repl" -> {
             val connection =

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

@@ -2,6 +2,7 @@ package be.ugent.topl.mio.sourcemap
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import com.formdev.flatlaf.util.SystemInfo
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants
 import java.io.BufferedReader
 import java.io.File
@@ -13,6 +14,8 @@ class DwarfSourceMap(
     private val pcToSource: Map<Int, DwarfLineMapping>,
     private val sourceToPc: Map<Pair<String, Int>, DwarfLineMapping>
 ): SourceMap {
+    private var mostRecentFile = getSourceFile(0)
+
     override fun getLineForPc(pc: Int): Int {
         return pcToSource[pc]?.row ?: throw RuntimeException("No mapping for this pc")
     }
@@ -29,17 +32,24 @@ class DwarfSourceMap(
     }
 
     override fun getSourceFileName(pc: Int): String {
-        return pcToSource[pc]!!.file
+        mostRecentFile = pcToSource[pc]!!.file
+        return mostRecentFile
     }
 
     override fun getStyle(): String {
-        return SyntaxConstants.SYNTAX_STYLE_RUST
+        return when {
+            mostRecentFile.endsWith(".c") -> SyntaxConstants.SYNTAX_STYLE_C
+            mostRecentFile.endsWith(".cpp") -> SyntaxConstants.SYNTAX_STYLE_CPLUSPLUS
+            mostRecentFile.endsWith(".go") -> SyntaxConstants.SYNTAX_STYLE_GO
+            mostRecentFile.endsWith(".rs") -> SyntaxConstants.SYNTAX_STYLE_RUST
+            else -> SyntaxConstants.SYNTAX_STYLE_RUST
+        }
     }
 }
 
 fun getDwarfSourcemap(wasmFilename: String): SourceMap {
     val process = ProcessBuilder(
-        "./dwarf-line-mapping",
+        if (SystemInfo.isMacOS) "./dwarf-line-mapping-mac" else "./dwarf-line-mapping",
         wasmFilename
     ).redirectErrorStream(true).start()
 

src/main/kotlin/be/ugent/topl/mio/sourcemap/DwarfSourceMap.kt

@@ -36,16 +36,15 @@ import kotlin.concurrent.thread
 
 class InteractiveDebugger(
     connection: Connection,
-    symbolicWdcliPath: String,
     private val sourceMapping: SourceMap? = null,
     private val wasmFile: String = "/home/maarten/Documents/School/Thesis/thesis-git/wardbg/simple-sym-test.wasm",
     private val config: DebuggerConfig
 ) : JFrame("WARDuino Debugger") {
-    private val binaryInfo = getBinaryInfo(symbolicWdcliPath, File(wasmFile).absolutePath)
+    private val binaryInfo = getBinaryInfo(config.wdcliPath, File(wasmFile).absolutePath)
     private val debugger = MultiverseDebugger(
         connection,
         WasmBinary(File(wasmFile), binaryInfo),
-        symbolicWdcliPath,
+        config.symbolicWdcliPath,
         false,
         this::onGraphUpdate,
         this::onMockingUpdate,

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

@@ -4,13 +4,15 @@ import be.ugent.topl.mio.DebuggerConfig
 import be.ugent.topl.mio.connections.ProcessConnection
 import be.ugent.topl.mio.connections.SerialConnection
 import be.ugent.topl.mio.sourcemap.AsSourceMapping
+import be.ugent.topl.mio.sourcemap.getDwarfSourcemap
 import com.fazecast.jSerialComm.SerialPort
 import com.formdev.flatlaf.extras.FlatSVGIcon
 import com.formdev.flatlaf.util.SystemFileChooser
 import java.awt.Dimension
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileWriter
+import java.io.IOException
 import java.util.*
 import javax.swing.*
 
@@ -87,11 +89,17 @@ open class StartScreen(config: DebuggerConfig) : AboutScreen(config) {
         }
         val sourceMapFile = File(binary.path + ".map")
         if (!sourceMapFile.exists()) {
-            JOptionPane.showMessageDialog(this, "File does not have an associated sourcemap (.map) file!", "Missing sourcemaps", JOptionPane.ERROR_MESSAGE)
-            return false
+            try {
+                val sourceMapping = getDwarfSourcemap(binary.path)
+                InteractiveDebugger(connection, sourceMapping, binary.path, config = config)
+                return true
+            } catch(e: IOException) {
+                JOptionPane.showMessageDialog(this, "Could not obtain DWARF debug info from \"${binary}\". Sourcemaps (.map) are also supported but no valid sourcemap was found for this binary.\n\nDetails:\n${e.message}\n", "Failed to get debug info", JOptionPane.ERROR_MESSAGE)
+                return false
+            }
         }
         val sourceMapping = AsSourceMapping(File(binary.path + ".map").readText())
-        InteractiveDebugger(connection, config.symbolicWdcliPath, sourceMapping, binary.path, config = config)
+        InteractiveDebugger(connection, sourceMapping, binary.path, config = config)
         return true
     }
 }