Merge pull request #21 from dbent/version/0.3.0

Version/0.3.0

Author: dbent

Ketchup/Dcpu16Computer.cs

@@ -42,8 +42,12 @@ public class Dcpu16Computer : PartModule
         #region Emulation
 
         private bool _isPowerOn;
+        private bool _isHalted;
         private bool _isKeyboardAttached;
 
+        private ushort? _pcAtHalt;
+        private int? _warpIndexBeforeWake;
+
         private string _program = String.Empty;
 
         private readonly List<double> _clockRates = new List<double>(60);
@@ -102,29 +106,57 @@ public override void OnUpdate()
         {
             if (_isPowerOn)
             {
-                var maxPhysicsWarpIndex = _timeWarp.physicsWarpRates.Length - 1;
-
-                if (_timeWarp.physicsWarpRates[maxPhysicsWarpIndex] < TimeWarp.CurrentRate)
+                if (_isHalted)
                 {
-                    TimeWarp.SetRate(TimeWarp.WarpMode == TimeWarp.Modes.LOW ? maxPhysicsWarpIndex : 0, true);
-                }
-
-                var cyclesToExecute = (int)Math.Round(Time.deltaTime * _dcpu.ClockSpeed * TimeWarp.CurrentRate);
-
-                _dcpu.Execute(cyclesToExecute);
+                    if (_dcpu.PC != _pcAtHalt)
+                    {
+                        _warpIndexBeforeWake = TimeWarp.CurrentRateIndex;
 
-                var clockRate = _cyclesExecuted / Time.deltaTime;
-                if (_clockRates.Count < 60)
-                {
-                    _clockRates.Add(clockRate);
+                        _pcAtHalt = null;
+                        _isHalted = false;
+                    }
                 }
                 else
                 {
-                    _clockRates[_clockRateIndex] = clockRate;
-                    _clockRateIndex = ((_clockRateIndex + 1) % 60);
-                }
+                    if (_dcpu.IsHalted())
+                    {
+                        _pcAtHalt = _dcpu.PC;
+                        _isHalted = true;
+
+                        if (_warpIndexBeforeWake != null)
+                        {
+                            var index = _warpIndexBeforeWake.Value;
+                            _warpIndexBeforeWake = null;
+                            TimeWarp.SetRate(index, true);
+                        }
+                    }
+                    else
+                    {
+                        var maxPhysicsWarpIndex = _timeWarp.physicsWarpRates.Length - 1;
+
+                        if (_timeWarp.physicsWarpRates[maxPhysicsWarpIndex] < TimeWarp.CurrentRate)
+                        {
+                            TimeWarp.SetRate(TimeWarp.WarpMode == TimeWarp.Modes.LOW ? maxPhysicsWarpIndex : 0, true);
+                        }
+
+                        var cyclesToExecute = (int)Math.Round(Time.deltaTime * _dcpu.ClockSpeed * TimeWarp.CurrentRate);
+
+                        _dcpu.Execute(cyclesToExecute);
 
-                _cyclesExecuted = cyclesToExecute;
+                        var clockRate = _cyclesExecuted / Time.deltaTime;
+                        if (_clockRates.Count < 60)
+                        {
+                            _clockRates.Add(clockRate);
+                        }
+                        else
+                        {
+                            _clockRates[_clockRateIndex] = clockRate;
+                            _clockRateIndex = ((_clockRateIndex + 1) % 60);
+                        }
+
+                        _cyclesExecuted = cyclesToExecute;
+                    }
+                }
             }
         }
 
@@ -216,7 +248,21 @@ private void OnWindow(int windowId)
             if (GUILayout.Button("4x", _styleButton)) { SetMonitorScale(4); }
             GUILayout.EndHorizontal();
             GUILayout.BeginHorizontal();
-            GUILayout.Label(actualClockSpeedFormatted, _styleLabel);
+            if (_isPowerOn)
+            {
+                if (_isHalted)
+                {
+                    GUILayout.Label("Halted", new GUIStyle(_styleLabel) { normal = { textColor = Color.yellow } });
+                }
+                else
+                {
+                    GUILayout.Label(actualClockSpeedFormatted, _styleLabel);
+                }
+            }
+            else
+            {
+                GUILayout.Label("Powered Off", new GUIStyle(_styleLabel) { normal = { textColor = Color.red } });
+            }
             GUILayout.EndHorizontal();
 
             GUI.SetNextControlName(KeyboardInputName);
@@ -266,6 +312,9 @@ private void OnPowerButtonPressed()
             {
                 _isPowerOn = false;
 
+                _isHalted = false;
+                _pcAtHalt = 0;
+
                 _dcpu.Reset();
                 _dcpu.FlashMemory(new ushort[_dcpu.Memory.Length]);
                 _clockRates.RemoveAll(i => true);

Ketchup/Extensions/MiscExtensions.cs

@@ -1,10 +1,16 @@
 using System.Linq;
+using Tomato;
 using UnityEngine;
 
 namespace Ketchup.Extensions
 {
     public static class MiscExtensions
     {
+        public static bool IsHalted(this DCPU dcpu)
+        {
+            return dcpu.Memory[dcpu.PC] == 0x8382; // ADD PC, -1
+        }
+
         public static bool IsPrimary(this PartModule partModule)
         {
             return partModule.vessel.parts.FirstOrDefault(i => i.Modules.Contains(partModule.ClassID)) == partModule.part;