diff options
Diffstat (limited to 'ARMeilleure/State')
| -rw-r--r-- | ARMeilleure/State/ExecutionContext.cs | 8 | ||||
| -rw-r--r-- | ARMeilleure/State/NativeContext.cs | 15 |
2 files changed, 18 insertions, 5 deletions
diff --git a/ARMeilleure/State/ExecutionContext.cs b/ARMeilleure/State/ExecutionContext.cs index a964f6ba..9a221569 100644 --- a/ARMeilleure/State/ExecutionContext.cs +++ b/ARMeilleure/State/ExecutionContext.cs @@ -66,7 +66,11 @@ namespace ARMeilleure.State } } - public bool Running { get; private set; } + public bool Running + { + get => _nativeContext.GetRunning(); + private set => _nativeContext.SetRunning(value); + } public event EventHandler<EventArgs> Interrupt; public event EventHandler<InstExceptionEventArgs> Break; @@ -78,7 +82,6 @@ namespace ARMeilleure.State _hostTickFreq = 1.0 / Stopwatch.Frequency; _tickCounter = new Stopwatch(); - _tickCounter.Start(); } @@ -138,6 +141,7 @@ namespace ARMeilleure.State public void StopRunning() { Running = false; + _nativeContext.SetCounter(0); } diff --git a/ARMeilleure/State/NativeContext.cs b/ARMeilleure/State/NativeContext.cs index 09ec6cde..962783f5 100644 --- a/ARMeilleure/State/NativeContext.cs +++ b/ARMeilleure/State/NativeContext.cs @@ -14,10 +14,11 @@ namespace ARMeilleure.State public fixed uint Flags[RegisterConsts.FlagsCount]; public fixed uint FpFlags[RegisterConsts.FpFlagsCount]; public int Counter; - public ulong CallAddress; + public ulong DispatchAddress; public ulong ExclusiveAddress; public ulong ExclusiveValueLow; public ulong ExclusiveValueHigh; + public int Running; } private static NativeCtxStorage _dummyStorage = new NativeCtxStorage(); @@ -117,6 +118,9 @@ namespace ARMeilleure.State public int GetCounter() => GetStorage().Counter; public void SetCounter(int value) => GetStorage().Counter = value; + public bool GetRunning() => GetStorage().Running != 0; + public void SetRunning(bool value) => GetStorage().Running = value ? 1 : 0; + public unsafe static int GetRegisterOffset(Register reg) { if (reg.Type == RegisterType.Integer) @@ -162,9 +166,9 @@ namespace ARMeilleure.State return StorageOffset(ref _dummyStorage, ref _dummyStorage.Counter); } - public static int GetCallAddressOffset() + public static int GetDispatchAddressOffset() { - return StorageOffset(ref _dummyStorage, ref _dummyStorage.CallAddress); + return StorageOffset(ref _dummyStorage, ref _dummyStorage.DispatchAddress); } public static int GetExclusiveAddressOffset() @@ -177,6 +181,11 @@ namespace ARMeilleure.State return StorageOffset(ref _dummyStorage, ref _dummyStorage.ExclusiveValueLow); } + public static int GetRunningOffset() + { + return StorageOffset(ref _dummyStorage, ref _dummyStorage.Running); + } + private static int StorageOffset<T>(ref NativeCtxStorage storage, ref T target) { return (int)Unsafe.ByteOffset(ref Unsafe.As<NativeCtxStorage, T>(ref storage), ref target); |