Fix keyboard issues

Author: Timendus

docs/silicon8.wasm

@@ -112,7 +112,7 @@ func (cpu *CPU) Reset(interpreter int) {
 		cpu.Keyboard[i] = false
 	}
 
-	cpu.waitForKey = false
+	cpu.waitForKey = 0
 	cpu.WaitForInt = 0
 	cpu.playing = false
 	cpu.SD = true

src/silicon8/cpu.go

@@ -132,23 +132,32 @@ func (cpu *CPU) Cycle() {
 			cpu.v[x] = cpu.dt
 		case 0x0A:
 			// Wait for keypress and return key in vX
-			if cpu.waitForKey {
+			switch cpu.waitForKey {
+			case 0:
+				cpu.pc -= 2
+				for _, p := range cpu.Keyboard {
+					if p {
+						return
+					}
+				}
+				cpu.waitForKey = 1
+			case 1:
+				cpu.pc -= 2
 				for i, p := range cpu.Keyboard {
 					if p {
 						cpu.v[x] = uint8(i)
-						cpu.waitForKey = false
+						cpu.waitForKey = 2
 						return
 					}
 				}
-				cpu.pc -= 2
-			} else {
-				cpu.pc -= 2
+			case 2:
 				for _, p := range cpu.Keyboard {
 					if p {
+						cpu.pc -= 2
 						return
 					}
 				}
-				cpu.waitForKey = true
+				cpu.waitForKey = 0
 			}
 		case 0x15:
 			// Set delay timer to value in vX

src/silicon8/cycle.go

@@ -44,7 +44,7 @@ type CPU struct {
 
 	// Interpreter internal state
 	Keyboard       [16]bool
-	waitForKey     bool  // Waiting for key press?
+	waitForKey     uint8 // Waiting for key press?
 	WaitForInt     uint8 // Waiting for display refresh "interrupt"?
 	playing        bool  // Playing sound?
 	SD             bool  // Screen dirty?

src/silicon8/types.go

@@ -52,13 +52,13 @@ module.exports = instance => {
         cyclesPerFrame /= 2;
         return instance.setCyclesPerFrame(cyclesPerFrame);
       default:
-        if ( Object.keys(keys).includes(e.keyCode.toString()) )
+        if ( instance && Object.keys(keys).includes(e.keyCode.toString()) )
           instance.pressKey(keys[e.keyCode]);
     }
   });
 
   window.addEventListener('keyup', e => {
-    if ( instance && keys[e.keyCode] )
+    if ( instance && Object.keys(keys).includes(e.keyCode.toString()) )
       instance.releaseKey(keys[e.keyCode]);
   });