Skip to content
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

Jump to bottom

Backport useful fixes from lols branch #23

Merged
merged 8 commits into from
May 20, 2024
Merged

Backport useful fixes from lols branch #23

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e23bf3e
scroll() and split() should take `int` values
jonathanpeppers May 2, 2024
c12e983
Fixed `SeekBack()` if at beginning of stream
jonathanpeppers May 2, 2024
e31f74c
Implement NTADR_B, NTADR_C, NTADR_D
jonathanpeppers May 2, 2024
8ec15e1
Apply several Roslyn code fixes
jonathanpeppers May 2, 2024
d0bb00e
Use switch expression
jonathanpeppers May 2, 2024
91c7ec1
Implement `ppu_wait_frame`
jonathanpeppers May 2, 2024
c865917
Implement `Add`
jonathanpeppers May 2, 2024
a0aecbb
Implement `scroll`
jonathanpeppers May 2, 2024
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
Prev Previous commit
Next Next commit
Implement NTADR_B, NTADR_C, NTADR_D
  • Loading branch information
@jonathanpeppers
jonathanpeppers committed May 20, 2024
commit e31f74c67d8e3166c3b64e3b186dfb2ea5b2be96
25 changes: 24 additions & 1 deletion src/dotnes.tasks/Utilities/IL2NESWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,31 @@ public void Write(ILOpCode code, string operand, ushort sizeOfMain)
switch (operand)
{
case nameof(NTADR_A):
case nameof(NTADR_B):
case nameof(NTADR_C):
case nameof(NTADR_D):
if (Stack.Count < 2)
{
throw new InvalidOperationException($"{operand} was called with less than 2 on the stack.");
}
ushort address = NTADR_A(checked((byte)Stack.Pop()), checked((byte)Stack.Pop()));
ushort address;
switch (operand)
{
case nameof(NTADR_A):
address = NTADR_A(checked((byte)Stack.Pop()), checked((byte)Stack.Pop()));
break;
case nameof(NTADR_B):
address = NTADR_B(checked((byte)Stack.Pop()), checked((byte)Stack.Pop()));
break;
case nameof(NTADR_C):
address = NTADR_C(checked((byte)Stack.Pop()), checked((byte)Stack.Pop()));
break;
case nameof(NTADR_D):
address = NTADR_D(checked((byte)Stack.Pop()), checked((byte)Stack.Pop()));
break;
default:
throw new InvalidOperationException($"Address lookup of {operand} not implemented!");
}
SeekBack(7);
//TODO: these are hardcoded until I figure this out
Write(NESInstruction.LDX, 0x20);
Expand Down Expand Up @@ -316,6 +336,9 @@ static int GetNumberOfArguments(string name)
case nameof(pal_col):
case nameof(vram_fill):
case nameof(NTADR_A):
case nameof(NTADR_B):
case nameof(NTADR_C):
case nameof(NTADR_D):
return 2;
default:
throw new NotImplementedException($"{nameof(GetNumberOfArguments)} for {name} is not implemented!");
Expand Down