Skip to content

Fixed NullReferenceException on missing opcode arguments (i.e. "IFE [foo], ") #1

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
THplusplus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed NullReferenceException on missing opcode arguments (i.e. "IFE [foo], ") #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions Organic/Assembler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,16 +591,21 @@ public List<ListEntry> Assemble(string code, string FileName)
}
else
{
if (opcode.valueA == null || (!nonBasic && opcode.valueB == null))
{
listEntry.ErrorCode = ErrorCode.InsufficientParamters;
output.Add(listEntry);
continue;
}

listEntry.Opcode = opcode;
StringMatch valueA = null, valueB = null;
listEntry.Output = new ushort[1];
if (!nonBasic)
{
listEntry.CodeType = CodeType.BasicInstruction;
if (opcode.valueA != null)
valueA = MatchString(opcode.valueA, ValueTable);
if (opcode.valueB != null)
valueB = MatchString(opcode.valueB, ValueTable);
valueA = MatchString(opcode.valueA, ValueTable);
valueB = MatchString(opcode.valueB, ValueTable);
if (valueA.value == valueB.value && valueA.value != 0x1E && valueB.value != 0x1E)
listEntry.WarningCode = WarningCode.RedundantStatement;
if (valueB.value == 0x1F && !opcode.match.Contains("IF"))
Expand Down Expand Up @@ -634,8 +639,7 @@ public List<ListEntry> Assemble(string code, string FileName)
else
{
listEntry.CodeType = CodeType.NonBasicInstruction;
if (opcode.valueA != null)
valueA = MatchString(opcode.valueA, ValueTable);
valueA = MatchString(opcode.valueA, ValueTable);
listEntry.ValueA = valueA;
// De-localize labels
if (listEntry.ValueA.isLiteral)
Expand Down
2 changes: 1 addition & 1 deletion Organic/Directives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ private void ParseDirectives(List<ListEntry> output, string line)
currentAddress += (ushort)padding.Length;
}
}
else if (parameters.Length == 1)
else if (parameters.Length < 3)
output.Add(new ListEntry(line, FileNames.Peek(), LineNumbers.Peek(), currentAddress, ErrorCode.InsufficientParamters));
else
output.Add(new ListEntry(line, FileNames.Peek(), LineNumbers.Peek(), currentAddress, ErrorCode.TooManyParamters));
Expand Down