init

Author: kirjavascript

.cargo/config.toml

@@ -0,0 +1,12 @@
+[build]
+target = "mos-nes-cnrom-none"
+
+[target.mos-nes-cnrom-none]
+rustflags = [
+    "-C", "link-arg=-Tsrc/link.ld",
+    "-C", "link-arg=-Wl,--verbose",
+    # export RUSTC_LOG=rustc_codegen_ssa::back::link=info
+]
+
+[unstable]
+build-std = ["core", "alloc"]

.gitignore

@@ -0,0 +1,2 @@
+/target
+/Cargo.lock

Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "brickgame"
+version = "0.2.0"
+edition = "2021"
+
+[profile.release]
+opt-level = 3
+lto = true
+debug = false
+debug-assertions = false
+panic = "abort"
+codegen-units = 1
+
+[build-dependencies]
+cc = { version = "1.0"}
+
+[dependencies]
+numtoa = "0.2.4"
+
+[features]
+skip-legal = []
+stress = []
+debug = []
+tas-compat = []

README.md

@@ -0,0 +1,25 @@
+## goals
+
+* leaderboard compat [x]
+* sfx [x]
+* doesn't crash [x]
+* ctm compat [ ]
+* gym compat [ ]
+
+## building
+
+```bash
+node src/chr/convert.js src/chr
+docker pull mrkits/rust-mos
+docker run -it --name rustmos --entrypoint bash -v ${HOME}/tetris/rust:/hostfiles mrkits/rust-mos
+docker container exec -it rustmos /bin/bash
+cargo build --release
+```
+
+## attribution
+
+* original engine remake & implementation help https://github.com/negative-seven/meta_nestris
+* linker help https://github.com/jgouly
+* original disassembly https://github.com/ejona86/taus
+* public domain font https://opengameart.org/content/intrepid-monochrome-8-bit-font
+* toolchain https://llvm-mos.org/wiki/Rust

build.rs

@@ -0,0 +1,7 @@
+fn main() {
+    cc::Build::new()
+        .compiler("clang")
+        .target("mos-nes")
+        .file("src/nmi.c")
+        .compile("nmi");
+}

scripts/call_log.lua

@@ -0,0 +1,75 @@
+if tastudio then -- bizhawk
+    shift_right = bit.rshift
+    bitwise_and = bit.band
+    bitwise_xor = bit.bxor
+    read_byte = memory.read_u8
+    read_word = memory.read_u16_le
+    get_cycles = emu.totalexecutedcycles
+    function get_program_counter()
+        return emu.getregister('PC')
+    end
+    function get_stack_pointer()
+        return emu.getregister('S')
+    end
+    function register_callback_execute(function_)
+        event.onmemoryexecuteany(function_)
+    end
+    function script_suffix()
+        event.onexit(function() io.close(log_file) end)
+        while true do
+            emu.frameadvance()
+        end
+    end
+else -- mesen (assumed)
+    function read_byte(address)
+        return emu.read(address, emu.memType.cpuDebug)
+    end
+    function read_word(address)
+        return emu.readWord(address, emu.memType.cpuDebug)
+    end
+    function get_cycles()
+        return emu.getState().cpu.cycleCount
+    end
+    function get_program_counter()
+        return emu.getState().cpu.pc
+    end
+    function get_stack_pointer()
+        return emu.getState().cpu.sp
+    end
+    print = emu.log
+    function register_callback_execute(function_)
+        emu.addMemoryCallback(function_, emu.memCallbackType.cpuExec, 0x0, 0xffff)
+    end
+    function script_suffix() end
+end
+
+log_file = io.open('call_log.txt', 'w')
+
+returns = {}
+last_cycles = 0
+
+register_callback_execute(function()
+    pc = get_program_counter()
+    opcode = read_byte(pc)
+    new_cycles = get_cycles() - last_cycles
+
+    if opcode == 0x20 then -- JSR
+        operand = read_word(pc + 1)
+
+        log_file:write(string.format('jsr to %04x (pc: %04x, cycles: +%d)\n', operand, pc, new_cycles))
+        returns[pc + 2] = operand
+        last_cycles = get_cycles()
+    elseif opcode == 0x60 then -- RTS
+        return_address = read_word(0x100 + get_stack_pointer() + 1)
+
+        return_string = returns[return_address] and
+                            string.format('%04x', returns[return_address]) or
+                            'unknown'
+
+        log_file:write(string.format('rts from %s (pc: %04x, cycles: +%d)\n', return_string, pc, new_cycles))
+        returns[return_address] = nil
+        last_cycles = get_cycles()
+    end
+end)
+
+script_suffix()

scripts/cycles.lua

@@ -0,0 +1,46 @@
+waitForVBlankTrigger = false
+lastCycles = nil
+highestShort = 0
+highCountShort = 0
+highestLong = 0
+highCountLong = 0
+
+function startFrame(address, value)
+    state = emu.getState()
+    waitForVBlankTrigger = false
+    lastCycles = state.cpu.cycleCount
+    highCountShort = highCountShort + 1
+    highCountLong = highCountLong + 1
+    if highCountShort > 30 then
+        highCountShort = 0
+        highestShort = 0
+    end
+    if highCountLong > 60*2 then
+        highCountLong = 0
+        highestLong = 0
+    end
+end
+
+function cyclePCT(cycles)
+    return string.format(" (%d%%)", math.floor((cycles / 29780.5)*100))
+end
+
+function vblankCheck(address, value)
+    if waitForVBlankTrigger == false then
+        waitForVBlankTrigger = true
+        state = emu.getState()
+        diff = state.cpu.cycleCount - lastCycles
+        if diff > highestShort then
+            highestShort = diff
+        end
+        if diff > highestLong then
+            highestLong = diff
+        end
+        emu.drawRectangle(8, 8, 150, 36, 0x000000, true, 1)
+        emu.drawString(12, 9, "used cycles - " .. diff .. cyclePCT(diff), 0xFFFFFF, 0xFF000000, 1)
+        emu.drawString(12, 21, "highest/sec/2 - " .. highestShort .. cyclePCT(highestShort), 0xFFFFFF, 0xFF000000, 1)
+        emu.drawString(12, 33, "highest/2sec - " .. highestLong .. cyclePCT(highestLong), 0xFFFFFF, 0xFF000000, 1)
+    end
+end
+emu.addMemoryCallback(vblankCheck, emu.memCallbackType.cpuRead, 0x80)
+emu.addEventCallback(startFrame, emu.eventType.startFrame)

scripts/disasm.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+tail -c +17 ./target/mos-nes-cnrom-none/release/rust-nes | head -c 32768 > target/PRG.bin
+
+cp scripts/symbols.info target/symbols.info
+node scripts/get-symbols.js >> target/symbols.info
+
+da65 -i target/symbols.info --comments 3 target/PRG.bin > target/PRG.s

scripts/get-symbols.js

@@ -0,0 +1,13 @@
+const symbols = require('child_process').execSync('nm -anC ./target/mos-nes-cnrom-none/release/deps/*.elf').toString();
+const lines = [];
+const usedAddr = {};
+symbols.toString().trim().split('\n').forEach(line => {
+    const [addr, type, name] = line.split(' ');
+    if (true || 'at'.includes(type.toLowerCase())) {
+        if (parseInt(addr, 16) < 0x10000 && !usedAddr[addr]) {
+            usedAddr[addr] = true;
+            lines.push(`LABEL { ADDR $${addr}; NAME ${JSON.stringify(name)}; };`);
+        }
+    }
+});
+console.log(lines.join('\n'));

scripts/symbols.info

@@ -0,0 +1,45 @@
+# https://www.cc65.org/doc/da65-4.html
+GLOBAL {
+  STARTADDR $8000;
+};
+
+SEGMENT { START $FFFA; END $FFFF; NAME "VECTORS"; };
+LABEL { ADDR $2000; NAME "PPUCTRL"; };
+LABEL { ADDR $2001; NAME "PPUMASK"; };
+LABEL { ADDR $2002; NAME "PPUSTATUS"; };
+LABEL { ADDR $2003; NAME "OAMADDR"; };
+LABEL { ADDR $2004; NAME "OAMDATA"; };
+LABEL { ADDR $2005; NAME "PPUSCROLL"; };
+LABEL { ADDR $2006; NAME "PPUADDR"; };
+LABEL { ADDR $2007; NAME "PPUDATA"; };
+
+LABEL { ADDR $4000; NAME "SQ1_VOL"; };
+LABEL { ADDR $4001; NAME "SQ1_SWEEP"; };
+LABEL { ADDR $4002; NAME "SQ1_LO"; };
+LABEL { ADDR $4003; NAME "SQ1_HI"; };
+LABEL { ADDR $4004; NAME "SQ2_VOL"; };
+LABEL { ADDR $4005; NAME "SQ2_SWEEP"; };
+LABEL { ADDR $4006; NAME "SQ2_LO"; };
+LABEL { ADDR $4007; NAME "SQ2_HI"; };
+LABEL { ADDR $4008; NAME "TRI_LINEAR"; };
+# $4009 is unused
+LABEL { ADDR $400A; NAME "TRI_LO"; };
+LABEL { ADDR $400B; NAME "TRI_HI"; };
+LABEL { ADDR $400C; NAME "NOISE_VOL"; };
+# $400D is unused
+LABEL { ADDR $400E; NAME "NOISE_LO"; };
+LABEL { ADDR $400F; NAME "NOISE_HI"; };
+LABEL { ADDR $4010; NAME "DMC_FREQ"; };
+LABEL { ADDR $4011; NAME "DMC_RAW"; };
+LABEL { ADDR $4012; NAME "DMC_START"; COMMENT "start << 6 + $C000"; };
+LABEL { ADDR $4013; NAME "DMC_LEN"; COMMENT "len << 4 + 1 "; };
+LABEL { ADDR $4014; NAME "OAMDMA"; };
+LABEL { ADDR $4015; NAME "SND_CHN"; };
+LABEL { ADDR $4016; NAME "JOY1"; };
+LABEL { ADDR $4017; NAME "JOY2_APUFC"; COMMENT "read: bits 0-4 joy data lines (bit 0 being normal controller), bits 6-7 are FC inhibit and mode"; };
+# $4018-$401F normally disabled
+
+# Code and tables
+# BYTETABLE
+LABEL { ADDR $FF00; NAME "reset"; COMMENT "incremented to reset MMC1 reg"; };
+RANGE { START $FFFA; END $FFFF; TYPE ADDRTABLE; }; # interrupts