Skip to content

New sample: game2048 - port of 2048-NES to C# with dotnes #440

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

Merged
jonathanpeppers merged 9 commits into from
Apr 17, 2026
Merged

New sample: game2048 - port of 2048-NES to C# with dotnes #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
356ca6b
New sample: game2048 - port of 2048-NES to C# with dotnes
jonathanpeppers Apr 3, 2026
61a67dd
Fix NTADR handler scanning consumed pusha from unrelated computations
jonathanpeppers Apr 4, 2026
831639d
Fix spurious pushax in ushort add/sub codegen
jonathanpeppers Apr 13, 2026
d233cdf
Update game2048 test artifacts and workarounds
jonathanpeppers Apr 13, 2026
71b97c9
Merge remote-tracking branch 'origin/main' into samples/game2048
jonathanpeppers Apr 14, 2026
9dfc5a0
Remove workarounds now that transpiler bugs #452, #453, #454 are fixed
jonathanpeppers Apr 14, 2026
cb1de5e
Fix stelem_i1 same-array copy with different indices
jonathanpeppers Apr 14, 2026
faf3fe2
Merge remote-tracking branch 'origin/main' into samples/game2048
jonathanpeppers Apr 17, 2026
19dcd9b
Merge main: pick up OR fix (#466) and other improvements
jonathanpeppers Apr 17, 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
638 changes: 638 additions & 0 deletions samples/game2048/Program.cs
View file
Open in desktop

Large diffs are not rendered by default.

1,026 changes: 1,026 additions & 0 deletions samples/game2048/chr_game2048.s
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions samples/game2048/game2048.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk" >

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

</PropertyGroup>

<ItemGroup>
<PackageReference Include="dotnes" Version="$(PackageVersion)" />
<PackageReference Include="dotnes.mesen" Version="2.1.1" />
</ItemGroup>

</Project>
6 changes: 4 additions & 2 deletions src/dotnes.tasks/Utilities/IL2NESWriter.Arithmetic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,10 @@ void HandleAddSub(bool isAdd)

if (loadedLocal.IsWord)
{
// 16-bit local: remove LDA $lo, LDX $hi, JSR pushax, LDA #1 (4 instructions)
RemoveLastInstructions(4);
// When _ushortInAX is true, WriteLdc returned early (no pushax/LDA emitted)
// so only LDA $lo + LDX $hi (2 instructions) need removal.
// When false, pushax was emitted: LDA $lo + LDX $hi + JSR pushax + LDA #1 (4).
RemoveLastInstructions(_ushortInAX ? 2 : 4);
if (isAdd)
{
// INC lo; BNE +3; INC hi
Expand Down
19 changes: 18 additions & 1 deletion src/dotnes.tasks/Utilities/IL2NESWriter.ILDispatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,6 +1955,22 @@ public void Write(ILInstruction instruction, string operand)
}
}

// If we found a pusha, check it wasn't consumed by a popa
// (e.g. from an unrelated add expression like p1 = 4 + i * 6).
if (pushaIdx2 >= 0)
{
for (int bi = pushaIdx2 + 1; bi < block.Count; bi++)
{
if (block[bi].Opcode == Opcode.JSR
&& block[bi].Operand is LabelOperand popaLbl
&& popaLbl.Label == "popa")
{
pushaIdx2 = -1; // consumed — ignore it
break;
}
}
}

if (pushaIdx2 >= 0 && pushaIdx2 > 0)
{
// Found pusha with intervening stloc instructions
Expand Down Expand Up @@ -3032,7 +3048,8 @@ or ILOpCode.Ldc_i4_3 or ILOpCode.Ldc_i4_4 or ILOpCode.Ldc_i4_5
// Fastcall functions (pal_bg, pal_spr, pal_all, vram_unrle) expect
// pointer in A:X, not on cc65 stack. Replace pushax+size with just LDA/LDX.
if (_ldlocByteArrayLabel != null && operand is nameof(NESLib.pal_bg)
or nameof(NESLib.pal_spr) or nameof(NESLib.pal_all) or nameof(NESLib.vram_unrle))
or nameof(NESLib.pal_spr) or nameof(NESLib.pal_all) or nameof(NESLib.vram_unrle)
or nameof(NESLib.set_vram_update))
{
// WriteLdloc emitted: LDA #lo, LDX #hi, JSR pushax, LDX #$00, LDA #size
RemoveLastInstructions(5);
Expand Down
7 changes: 5 additions & 2 deletions src/dotnes.tasks/Utilities/IL2NESWriter.LocalVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,12 @@ void WriteLdc(byte operand)
// Check if the next instruction can handle A:X directly
bool nextIsShift = Instructions is not null && Index + 1 < Instructions.Length &&
Instructions[Index + 1].OpCode is ILOpCode.Shr or ILOpCode.Shr_un or ILOpCode.Shl;
bool nextIsAddSub = _runtimeValueInA && Instructions is not null && Index + 1 < Instructions.Length &&
// When A:X holds a ushort, the next Add/Sub/Div/Rem should operate on
// A:X directly — no need to push to the C stack first. This matches the
// behavior of WriteLdc(ushort) which also skips pushax for Add/Sub.
bool nextIsAddSub = Instructions is not null && Index + 1 < Instructions.Length &&
Instructions[Index + 1].OpCode is ILOpCode.Add or ILOpCode.Sub;
bool nextIsDivRem = _runtimeValueInA && Instructions is not null && Index + 1 < Instructions.Length &&
bool nextIsDivRem = Instructions is not null && Index + 1 < Instructions.Length &&
Instructions[Index + 1].OpCode is ILOpCode.Div or ILOpCode.Rem;
bool nextIsBitwise = Instructions is not null && Index + 1 < Instructions.Length &&
Instructions[Index + 1].OpCode is ILOpCode.And or ILOpCode.Or or ILOpCode.Xor;
Expand Down
Loading