Slide now resets the execution instead of stepping back

It also warns the user if it does that.

Author: MaartenS11

src/main/kotlin/be/ugent/topl/mio/debugger/Debugger.kt

@@ -392,7 +392,13 @@ open class Debugger(private val connection: Connection, start: Boolean = true, p
     fun dumpVMState() = send(10)
     fun dumpLocals() = send(11)
     fun dumpStateAndLocals() = send(12)
-    fun reset() = send(13)
+    open fun reset() {
+        val firstState = checkpoints.first()
+        checkpoints.clear()
+        checkpoints.add(firstState)
+        send(13)
+        checkpointsUpdated()
+    }
 
     fun snapshot(): String {
         send(60)

src/main/kotlin/be/ugent/topl/mio/debugger/MultiverseDebugger.kt

@@ -75,7 +75,7 @@ open class MultiverseNode(val children: MutableList<MultiverseNode> = mutableLis
 
     fun findPath(n: MultiverseNode): MutableList<MultiverseNode> {
         val path = mutableListOf(this)
-        findPath(n, path)
+        if (!findPath(n, path)) return mutableListOf()
         return path
     }
 
@@ -230,6 +230,12 @@ class MultiverseDebugger(
         super.run()
     }
 
+    override fun reset() {
+        super.reset()
+        graph.currentNode = graph.rootNode
+        graphUpdated()
+    }
+
     override fun addPrimitiveOverride(primName: String, arg: Int, returnValue: Int) {
         super.addPrimitiveOverride(primName, arg, returnValue)
         if (!overrides.containsKey(primName))

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

@@ -186,6 +186,7 @@ class GraphPanel(private val graph: MultiverseGraph) : JPanel(),
 
     var selectedNodes = mutableSetOf<MultiverseNode>()
     var selectedPath: Pair<List<MultiverseNode>, List<MultiverseNode>>? = null
+    var reset = true
     var completedPath = mutableSetOf<MultiverseNode>()
     override fun mouseClicked(e: MouseEvent) {
         if (!allowSelection) {
@@ -199,8 +200,15 @@ class GraphPanel(private val graph: MultiverseGraph) : JPanel(),
         }
         if (selectedNode == null) return
 
-        println(graph.rootNode.findPath(graph.currentNode, selectedValue!!))
-        selectedPath = graph.rootNode.findPath(graph.currentNode, selectedValue!!)
+        //selectedPath = graph.rootNode.findPath(graph.currentNode, selectedValue!!)
+        if (graph.currentNode.findPath(selectedValue!!).isEmpty()) {
+            selectedPath = Pair(listOf(), graph.rootNode.findPath(selectedValue!!))
+            reset = true
+        }
+        else {
+            selectedPath = Pair(listOf(), graph.currentNode.findPath(selectedValue!!))
+            reset = false
+        }
         selectedNodes = selectedPath!!.first.toMutableSet()
         selectedNodes.addAll(selectedPath!!.second.toSet())
 

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

@@ -28,6 +28,8 @@ import java.awt.event.WindowEvent
 import java.io.File
 import java.io.IOException
 import javax.swing.*
+import javax.swing.JOptionPane.ERROR_MESSAGE
+import javax.swing.JOptionPane.YES_NO_OPTION
 import javax.swing.event.DocumentEvent
 import javax.swing.event.DocumentListener
 import javax.swing.table.DefaultTableModel
@@ -68,14 +70,20 @@ class InteractiveDebugger(
     private val stepBackLineButton = JButton().apply {
         toolTipText = "Step to the previous line"
     }
+    private val restartButton = JButton(FlatSVGIcon(javaClass.getResource("/debug-restart.svg"))).apply {
+        addActionListener {
+            debugger.reset()
+            updatePcLabel()
+        }
+    }
     private val flashButton = JButton().apply {
         toolTipText = "Upload module to microcontroller"
     }
     private val progressBar = JProgressBar().apply {
         isVisible = false
     }
-    private val allButtons = listOf(pauseButton, stepBackButton, stepOverButton, stepIntoButton, stepLineButton, stepBackLineButton, flashButton)
-    private val pausedOnlyButtons = listOf(stepBackButton, stepOverButton, stepIntoButton, stepLineButton, stepBackLineButton)
+    private val allButtons = listOf(pauseButton, stepBackButton, stepOverButton, stepIntoButton, stepLineButton, stepBackLineButton, restartButton, flashButton)
+    private val pausedOnlyButtons = listOf(stepBackButton, stepOverButton, stepIntoButton, stepLineButton, stepBackLineButton, restartButton)
     private var paused = false
 
     init {
@@ -240,6 +248,8 @@ class InteractiveDebugger(
         //toolBar.add(stepBackLineButton)
         toolBar.add(stepLineButton)
         toolBar.addSeparator()
+        toolBar.add(restartButton)
+        toolBar.addSeparator()
         toolBar.add(flashButton)
         //toolBar.addSeparator()
         if (config.checkpointHistory) {
@@ -471,7 +481,7 @@ class ContinueForAction(val debugger: Debugger, var n: Int) : MultiverseAction {
 class MultiversePanel(private val multiverseDebugger: MultiverseDebugger, config: DebuggerConfig, stateChanged: (c: Checkpoint?, b: Double) -> Unit) : JPanel() {
     private val graphPanel = GraphPanel(multiverseDebugger.graph)
     private val mockPanel = OverridesPanel()
-    private val concolicButton = JButton("Suggest interesting paths")
+    private val concolicButton = JButton("Suggest paths")
     private var maxInstructions = 50
     private val concolicOptionsButton = JButton().apply {
         val gearIcon = FlatSVGIcon(MultiverseDebugger::javaClass.javaClass.getResource("/settings-gear.svg"))
@@ -528,6 +538,7 @@ class MultiversePanel(private val multiverseDebugger: MultiverseDebugger, config
             stateChanged(null, 0.0)
             followButton.isEnabled = false
             customButton.isEnabled = false
+            concolicButton.isEnabled = false
             thread {
                 // Disable breakpoints
                 val breakpointsStart = multiverseDebugger.checkpoints.last()!!.snapshot.breakpoints!!
@@ -565,6 +576,17 @@ class MultiversePanel(private val multiverseDebugger: MultiverseDebugger, config
                     val lastAction = actionPath.last() as ContinueForAction
                     lastAction.n++
                 }
+                if (graphPanel.reset) {
+                    if (JOptionPane.showConfirmDialog(this, "This operation will restart the execution, continue?", "Restart program", YES_NO_OPTION, ERROR_MESSAGE) == JOptionPane.NO_OPTION) {
+                        customButton.isEnabled = true
+                        followButton.isEnabled = true
+                        graphPanel.allowSelection = true
+                        concolicButton.isEnabled = true
+                        stateChanged(null, 1.0)
+                        return@thread
+                    }
+                    multiverseDebugger.reset()
+                }
                 for (action in actionPath) {
                     action.doAction()
                     if (action is ContinueForAction) {
@@ -597,6 +619,7 @@ class MultiversePanel(private val multiverseDebugger: MultiverseDebugger, config
                 graphPanel.clearSelection()
                 customButton.isEnabled = true
                 graphPanel.allowSelection = true
+                concolicButton.isEnabled = true
             }
         }