Invert reset/power switch behaviour

Author: object-Object

mod/src/main/kotlin/gay/object/mlogv32/ProcessorAccess.kt

@@ -34,7 +34,7 @@ class ProcessorAccess(
     val registers: MemoryBuild,
     val csrs: LogicBuild,
     val errorOutput: MessageBuild,
-    val resetSwitch: SwitchBuild,
+    val powerSwitch: SwitchBuild,
     val pauseSwitch: SwitchBuild,
     val singleStepSwitch: SwitchBuild,
     uartFifoModulo: Int,
@@ -255,7 +255,7 @@ class ProcessorAccess(
                 registers = buildVar<MemoryBuild>(build, "cell1") ?: return null,
                 csrs = buildVar<LogicBuild>(build, "processor17") ?: return null,
                 errorOutput = buildVar<MessageBuild>(build, "message1") ?: return null,
-                resetSwitch = buildVar<SwitchBuild>(build, "switch1") ?: return null,
+                powerSwitch = buildVar<SwitchBuild>(build, "switch1") ?: return null,
                 pauseSwitch = buildVar<SwitchBuild>(build, "switch2") ?: return null,
                 singleStepSwitch = buildVar<SwitchBuild>(build, "switch3") ?: return null,
                 uartFifoModulo = positiveIntVar(build, "UART_FIFO_MODULO") ?: return null,
@@ -352,7 +352,7 @@ data class StartRequest(
 ) : Request() {
     override suspend fun handle(processor: ProcessorAccess, rx: ByteReadChannel, tx: ByteWriteChannel) = runOnMainThread {
         processor.singleStepSwitch.configure(singleStep)
-        processor.resetSwitch.configure(false)
+        processor.powerSwitch.configure(true)
         SuccessResponse("Processor started.")
     }
 }
@@ -366,10 +366,10 @@ data class WaitRequest(
     override suspend fun handle(processor: ProcessorAccess, rx: ByteReadChannel, tx: ByteWriteChannel): Response {
         while (true) {
             delay(1000/60) // 1 tick
-            val (stopped, paused) = runOnMainThread {
-                processor.resetSwitch.enabled to processor.pauseSwitch.enabled
+            val (running, paused) = runOnMainThread {
+                processor.powerSwitch.enabled to processor.pauseSwitch.enabled
             }
-            if (this.stopped && stopped) {
+            if (this.stopped && !running) {
                 return SuccessResponse("Processor has stopped.")
             }
             if (this.paused && paused) {
@@ -405,7 +405,7 @@ data class SerialRequest(
             var overflowCount = 0
 
             val fromUart = runOnMainThread {
-                if (stopOnHalt && processor.resetSwitch.enabled) {
+                if (stopOnHalt && !processor.powerSwitch.enabled) {
                     throw RuntimeException("Processor stopped!")
                 }
 
@@ -443,7 +443,7 @@ data class SerialRequest(
 @SerialName("unpause")
 data object UnpauseRequest : Request() {
     override suspend fun handle(processor: ProcessorAccess, rx: ByteReadChannel, tx: ByteWriteChannel) = runOnMainThread {
-        require(!processor.resetSwitch.enabled) { "Processor is not running!" }
+        require(processor.powerSwitch.enabled) { "Processor is not running!" }
         processor.pauseSwitch.configure(false)
         SuccessResponse("Processor unpaused.")
     }
@@ -453,7 +453,7 @@ data object UnpauseRequest : Request() {
 @SerialName("stop")
 data object StopRequest : Request() {
     override suspend fun handle(processor: ProcessorAccess, rx: ByteReadChannel, tx: ByteWriteChannel) = runOnMainThread {
-        processor.resetSwitch.configure(true)
+        processor.powerSwitch.configure(false)
         processor.pauseSwitch.configure(false)
         processor.singleStepSwitch.configure(false)
         SuccessResponse("Processor stopped.")
@@ -465,7 +465,7 @@ data object StopRequest : Request() {
 data object StatusRequest : Request() {
     override suspend fun handle(processor: ProcessorAccess, rx: ByteReadChannel, tx: ByteWriteChannel) = runOnMainThread {
         StatusResponse(
-            running = !processor.resetSwitch.enabled,
+            running = processor.powerSwitch.enabled,
             paused = processor.pauseSwitch.enabled,
             errorOutput = processor.errorOutput.message?.toString() ?: "",
             pc = processor.build.executor.optionalVar("pc")?.numu(),

src/debugger.mlog.jinja

@@ -33,16 +33,13 @@ reset:
     set UART0 bank1
     set UART1 bank2
 
-    set DEBUGGER_RESET_SWITCH switch1
-
     # wait until everything is properly initialized
     jump reset strictEqual CPU null
     jump reset strictEqual REGISTERS null
     jump reset strictEqual CSRS null
     jump reset strictEqual DISPLAY null
     jump reset strictEqual UART0 null
     jump reset strictEqual UART1 null
-    jump reset strictEqual DEBUGGER_RESET_SWITCH null
 
     set i -1
 reset__find_lookup_start:
@@ -55,7 +52,7 @@ reset__find_lookup_start:
 
     set LOOKUP_START i
 
-    control enabled DEBUGGER_RESET_SWITCH false
+    control enabled switch1 true
 
     draw clear 0 0 0
     drawflush DISPLAY
@@ -99,8 +96,8 @@ reset__find_lookup_start:
     #{{'\n'}} {{ print(35, 0) }}
 
 loop:
-    sensor enabled DEBUGGER_RESET_SWITCH @enabled
-    jump reset equal enabled true
+    sensor enabled switch1 @enabled
+    jump reset equal enabled false
 
     set mark_memory_id 0
 

src/main.constants.jinja

@@ -9,7 +9,7 @@
 {% set CONFIG = 'processor19' %}
 
 {% set ERROR_OUTPUT = 'message1' %}
-{% set RESET_SWITCH = 'switch1' %}
+{% set POWER_SWITCH = 'switch1' %}
 {% set PAUSE_SWITCH = 'switch2' %}
 {% set SINGLE_STEP_SWITCH = 'switch3' %}
 

src/main.mlog.jinja

@@ -2,6 +2,11 @@
 #% extends 'main.constants.jinja'
 #% block contents
 
+# disable the power switch, then reset
+halt:
+    control enabled {{POWER_SWITCH}} false
+
+# wait until the power switch is enabled, then reset/start
 reset:
     set STATE "reset" # for debug output
 
@@ -20,10 +25,9 @@ reset:
 
     op idiv ICACHE_START_VAR RAM_SIZE 4
 
-    # loop until the reset switch is linked and disabled
-    jump reset strictEqual {{RESET_SWITCH}} null
-    sensor enabled {{RESET_SWITCH}} @enabled
-    jump reset equal enabled true
+    # loop until the power switch is linked and enabled
+    sensor enabled {{POWER_SWITCH}} @enabled
+    jump reset equal enabled false
 
     # load reloadable config options
     op add ret @counter 1
@@ -309,15 +313,10 @@ end_instruction__no_overflow:
     op add pc pc 4
 
 end_instruction_trap:
-    # halt if the reset switch was manually enabled
-    sensor enabled {{RESET_SWITCH}} @enabled
-    jump main notEqual enabled true
-
-# enable the reset switch, wait until it's disabled, then reset the processor
-# this must stay directly after end_instruction
-halt:
-    control enabled {{RESET_SWITCH}} true
-    jump reset always
+    # halt if the power switch was manually disabled
+    sensor enabled {{POWER_SWITCH}} @enabled
+    jump main equal enabled true
+    jump halt always
 
 # exceptions
 
@@ -2060,7 +2059,7 @@ set {{CSRS}} null
 set {{INCR}} null
 set {{CONFIG}} null
 set {{ERROR_OUTPUT}} null
-set {{RESET_SWITCH}} null
+set {{POWER_SWITCH}} null
 set {{PAUSE_SWITCH}} null
 set {{SINGLE_STEP_SWITCH}} null
 set {{DISPLAY}} null