Skip to content

Remove redundant OpCode in UNTIL loop #3164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DBooots wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Remove redundant OpCode in UNTIL loop #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51a339
Implement try-catch for conditional branch
DBooots Feb 19, 2026
cd50bb0
Remove redundant not -> branch if false in favor of branch if true
DBooots Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/kOS.Safe/Compilation/KS/Compiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2386,8 +2386,7 @@ private void VisitUntilStatement(ParseNode node)
string conditionLabel = GetNextLabel(false);
PushBreakList(braceNestLevel);
VisitNode(node.Nodes[1]);
AddOpcode(new OpcodeLogicNot());
Opcode branch = AddOpcode(new OpcodeBranchIfFalse());
Opcode branch = AddOpcode(new OpcodeBranchIfTrue());
AddToBreakList(branch);
VisitNode(node.Nodes[2]);
Opcode jump = AddOpcode(new OpcodeBranchJump());
Expand Down
23 changes: 18 additions & 5 deletions src/kOS.Safe/Compilation/Opcode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,9 +1058,15 @@ public class OpcodeBranchIfFalse : BranchOpcode

public override void Execute(ICpu cpu)
{
bool condition = Convert.ToBoolean(cpu.PopValueArgument());

DeltaInstructionPointer = !condition ? Distance : 1;
try
{
bool condition = Convert.ToBoolean(cpu.PopValueArgument());
DeltaInstructionPointer = !condition ? Distance : 1;
}
catch
{
throw new KOSCastException(value.GetType(), typeof(BooleanValue));
}
}
}

Expand All @@ -1079,8 +1085,15 @@ public class OpcodeBranchIfTrue : BranchOpcode

public override void Execute(ICpu cpu)
{
bool condition = Convert.ToBoolean(cpu.PopValueArgument());
DeltaInstructionPointer = condition ? Distance : 1;
try
{
bool condition = Convert.ToBoolean(cpu.PopValueArgument());
DeltaInstructionPointer = condition ? Distance : 1;
}
catch
{
throw new KOSCastException(value.GetType(), typeof(BooleanValue));
}
}
}

Expand Down