mirrors/OpenTS2
1
0
Fork 0
mirror of https://github.com/LazyDuchess/OpenTS2.git synced 2025-01-22 16:21:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement non blocking stack, return exitcodes from stack.

Browse source
This commit is contained in:
Nahuel Rocchetti 2023-08-21 20:49:12 -03:00
parent a4d4dacf5c
commit 5f8513d320
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Assets/Scripts/OpenTS2/SimAntics/VMReturnValue.cs
View file

@ -10,14 +10,14 @@ namespace OpenTS2.SimAntics
{
public enum ExitCode : byte
{
GoToTrue,
GoToFalse,
True,
False,
Continue
}
public ExitCode Code;
public Func<ExitCode> ContinueCallback = null;
public static VMReturnValue ReturnTrue = new VMReturnValue { Code = ExitCode.GoToTrue };
public static VMReturnValue ReturnFalse = new VMReturnValue { Code = ExitCode.GoToFalse };
public static VMReturnValue ReturnTrue = new VMReturnValue { Code = ExitCode.True };
public static VMReturnValue ReturnFalse = new VMReturnValue { Code = ExitCode.False };
// TODO: would probably be a good idea to implement a scheduler for this.
public static VMReturnValue Sleep(VM vm, uint ticks)
{
@ -27,7 +27,7 @@ namespace OpenTS2.SimAntics
returnValue.ContinueCallback = () => {
{
if (vm.CurrentTick >= targetTick)
return ExitCode.GoToTrue;
return ExitCode.True;
return ExitCode.Continue;
}
};

12
Assets/Scripts/OpenTS2/SimAntics/VMStack.cs
View file

@ -8,33 +8,37 @@ namespace OpenTS2.SimAntics
{
public class VMStack
{
public bool CanYield = true;
public VMEntity Entity;
public Stack<VMStackFrame> Frames = new Stack<VMStackFrame>();
public VMStack(VMEntity entity)
{
Entity = entity;
}
public void Tick()
public VMReturnValue.ExitCode Tick()
{
if (Frames.Count == 0)
return;
return VMReturnValue.ExitCode.False;
var currentFrame = Frames.Peek();
var returnValue = currentFrame.Tick();
if (returnValue.Code == VMReturnValue.ExitCode.Continue && !CanYield)
throw new Exception("Attempted to yield in a non-yielding VMStack.");
while (returnValue.Code != VMReturnValue.ExitCode.Continue)
{
Frames.Pop();
if (Frames.Count == 0)
return;
return returnValue.Code;
currentFrame = Frames.Peek();
var currentNode = currentFrame.GetCurrentNode();
if (returnValue.Code == VMReturnValue.ExitCode.GoToTrue)
if (returnValue.Code == VMReturnValue.ExitCode.True)
currentFrame.CurrentNode = currentNode.TrueTarget;
else
currentFrame.CurrentNode = currentNode.FalseTarget;
returnValue = currentFrame.Tick();
}
return returnValue.Code;
}
}
}

4
Assets/Scripts/OpenTS2/SimAntics/VMStackFrame.cs
View file

@ -42,7 +42,7 @@ namespace OpenTS2.SimAntics
{
var currentNode = GetCurrentNode();
ushort returnTarget = 0;
if (returnValue.Code == VMReturnValue.ExitCode.GoToTrue)
if (returnValue.Code == VMReturnValue.ExitCode.True)
returnTarget = currentNode.TrueTarget;
else
returnTarget = currentNode.FalseTarget;
@ -88,7 +88,7 @@ namespace OpenTS2.SimAntics
{
CurrentContinueCallback = null;
ushort returnTarget = 0;
if (primReturn.Code == VMReturnValue.ExitCode.GoToTrue)
if (primReturn.Code == VMReturnValue.ExitCode.True)
returnTarget = currentNode.TrueTarget;
else
returnTarget = currentNode.FalseTarget;