romdevtools 0.71.0 → 0.84.0

package/src/mcp/tools/toolchain.js

@@ -977,16 +977,33 @@ export async function readProjectDir(projPath, platform, opts = {}) {
   const subAssets = await walkSubdirAssets(projPath);
 
   // Entry override: an existing project whose top file isn't main.* (e.g.
-  // smw.asm). Accept a project-relative or bare name; it becomes the single
-  // entry source. Without it, auto-detect main.c / main.s / main.asm.
-  const entryName = opts.entry ? path.normalize(opts.entry).replace(/^[./]+/, "") : null;
+  // smw.asm) OR is nested (e.g. src/main.c — common for decomps/SDK projects).
+  // Accept a project-relative path or a bare name; it becomes the single entry
+  // source. Resolve against BOTH the top-level files AND the recursively staged
+  // subdir set, with POSIX slashes (`path.normalize` may emit `\` on Windows).
+  const entryName = opts.entry
+    ? path.normalize(opts.entry).replace(/\\/g, "/").replace(/^[./]+/, "")
+    : null;
+  // The resolved {rel, abs} for the entry when it's nested in a subdirectory.
+  let entrySubAsset = null;
   if (entryName) {
-    const exists = files.some((f) => f.name === entryName) ||
-      subAssets.some((a) => a.rel === entryName);
-    if (!exists) {
+    const topMatch = files.some((f) => f.name === entryName);
+    entrySubAsset = subAssets.find((a) => a.rel === entryName) || null;
+    // Bare-filename fallback: `entry:'main.c'` matches `src/main.c` if unique.
+    if (!topMatch && !entrySubAsset && !entryName.includes("/")) {
+      const byBase = subAssets.filter((a) => a.rel.split("/").pop() === entryName);
+      if (byBase.length === 1) entrySubAsset = byBase[0];
+    }
+    if (!topMatch && !entrySubAsset) {
+      const nearby = subAssets
+        .filter((a) => a.rel.split("/").pop() === entryName.split("/").pop())
+        .map((a) => a.rel).slice(0, 8);
       throw new Error(
-        `entry '${entryName}' not found in ${projPath}. Found top-level: ` +
-        `${files.map((f) => f.name).join(", ") || "(none)"}.`
+        `entry '${entryName}' not found in ${projPath}. ` +
+        (nearby.length
+          ? `Did you mean: ${nearby.join(", ")}? (entry is project-relative — e.g. 'src/main.c'.)`
+          : `Top-level: ${files.map((f) => f.name).join(", ") || "(none)"}. ` +
+            `entry is project-relative — pass the path under the repo root (e.g. 'src/main.c').`)
       );
     }
   }
@@ -1006,7 +1023,7 @@ export async function readProjectDir(projPath, platform, opts = {}) {
   // the dir build matches the hand-written build({output:'run'}) call.
   const recipe = projectBuildRecipe(platform, files.map((f) => f.name));
 
-  // With a custom entry, the entry is the ONE source; every OTHER top-level
+  // With a custom ASM entry, the entry is the ONE source; every OTHER top-level
   // .asm/.s/.c routes as an include (asar/wla resolve `.include`/`#include`
   // from the includes mount), matching the single-source asm model.
   if (entryName && /\.(asm|s)$/i.test(entryName)) {
@@ -1040,7 +1057,7 @@ export async function readProjectDir(projPath, platform, opts = {}) {
   // the mount. Text-ish includes (.asm/.s/.h/.inc) found in subdirs go to includes
   // (so `incsrc "lib/foo.asm"` works); everything else is a binary asset.
   for (const a of subAssets) {
-    if (recipe.skip.has(a.rel) || a.rel === entryName) continue;
+    if (recipe.skip.has(a.rel) || a.rel === entrySubAsset?.rel) continue;
     if (/\.(h|inc|asm|s)$/i.test(a.rel)) {
       includes[a.rel] = (await readFile(a.abs)).toString("utf-8");
     } else {
@@ -1048,6 +1065,14 @@ export async function readProjectDir(projPath, platform, opts = {}) {
     }
   }
 
+  // A NESTED entry (e.g. src/main.c) is read here as the entry SOURCE — the
+  // top-level loop above only sees root files, so a subdir entry would otherwise
+  // never compile. Keyed by its relative path so #include/.include resolution
+  // from the same subdir works.
+  if (entrySubAsset) {
+    sources[entrySubAsset.rel] = (await readFile(entrySubAsset.abs)).toString("utf-8");
+  }
+
   // SMS/GG with no crt0 file in the dir → fall back to the bundled crt0,
   // exactly like the output:'rom'/'run' handlers do. Without this the link
   // silently uses SDCC's stock z80 crt0, which never calls main() (black

package/src/platforms/gametank/lib/gt/audio/audio_coprocessor.c

@@ -0,0 +1,55 @@
+#include <zlib.h>
+#include "audio_coprocessor.h"
+#include "gametank.h"
+#include "banking.h"
+#include "bank_nums.h"
+
+char pitch_table[216] = {
+    0x00, 0x4D, 0x00, 0x51, 0x00, 0x56, 0x00, 0x5B, 0x00, 0x61, 0x00, 0x66, 0x00, 0x6C, 0x00, 0x73, 0x00, 0x7A, 0x00, 0x81, 0x00, 0x89, 0x00, 0x91,
+    0x00, 0x99, 0x00, 0xA2, 0x00, 0xAC, 0x00, 0xB6, 0x00, 0xC1, 0x00, 0xCD, 0x00, 0xD9, 0x00, 0xE6, 0x00, 0xF3, 0x01, 0x02, 0x01, 0x11, 0x01, 0x21,
+    0x01, 0x33, 0x01, 0x45, 0x01, 0x58, 0x01, 0x6D, 0x01, 0x82, 0x01, 0x99, 0x01, 0xB2, 0x01, 0xCB, 0x01, 0xE7, 0x02, 0x04, 0x02, 0x22, 0x02, 0x43,
+    0x02, 0x65, 0x02, 0x8A, 0x02, 0xB0, 0x02, 0xD9, 0x03, 0x04, 0x03, 0x32, 0x03, 0x63, 0x03, 0x97, 0x03, 0xCD, 0x04, 0x07, 0x04, 0x44, 0x04, 0x85,
+    0x04, 0xCA, 0x05, 0x13, 0x05, 0x60, 0x05, 0xB2, 0x06, 0x09, 0x06, 0x65, 0x06, 0xC6, 0x07, 0x2D, 0x07, 0x9A, 0x08, 0x0E, 0x08, 0x89, 0x09, 0x0B,
+    0x09, 0x94, 0x0A, 0x26, 0x0A, 0xC1, 0x0B, 0x64, 0x0C, 0x12, 0x0C, 0xCA, 0x0D, 0x8C, 0x0E, 0x5B, 0x0F, 0x35, 0x10, 0x1D, 0x11, 0x12, 0x12, 0x16,
+    0x13, 0x29, 0x14, 0x4D, 0x15, 0x82, 0x16, 0xC9, 0x18, 0x24, 0x19, 0x93, 0x1B, 0x19, 0x1C, 0xB5, 0x1E, 0x6A, 0x20, 0x39, 0x22, 0x24, 0x24, 0x2B,
+    0x26, 0x52, 0x28, 0x99, 0x2B, 0x03, 0x2D, 0x92, 0x30, 0x48, 0x33, 0x27, 0x36, 0x31, 0x39, 0x6A, 0x3C, 0xD4, 0x40, 0x72, 0x44, 0x47, 0x48, 0x57,
+    0x4C, 0xA4, 0x51, 0x32, 0x56, 0x06, 0x5B, 0x24, 0x60, 0x8F, 0x66, 0x4D, 0x6C, 0x62, 0x72, 0xD4, 0x79, 0xA8, 0x80, 0xE4, 0x88, 0x8E, 0x90, 0xAD};
+
+extern const unsigned char AudioFWPkg;
+
+char audio_params_index = 0;
+char *wavetable_page;
+char sine_offset = 0;
+
+void wait();
+
+void init_audio_coprocessor()
+{
+    *audio_rate = 0x7F;
+
+    push_rom_bank();
+    change_rom_bank(BANK_COMMON);
+    { unsigned int _i; const unsigned char *_s = &AudioFWPkg; for(_i=0;_i<4096;_i++) aram[_i]=_s[_i]; } /* raw copy (uncompressed FW, no zopfli on the bare path) */
+
+    audio_params_index = 0;
+    AUDIO_PARAM_INPUT_BUFFER[0] = 0;
+    *audio_reset = 0;
+    *audio_rate = 255;
+    while(*WAVE_TABLE_LOCATION == 0) {
+        
+    }
+    wavetable_page = ((char*) 0x3000) + *WAVE_TABLE_LOCATION;
+    sine_offset = *((char*)0x3003);
+    pop_rom_bank();
+}
+
+void push_audio_param(char param, char value) {
+    AUDIO_PARAM_INPUT_BUFFER[audio_params_index++] = param;
+    AUDIO_PARAM_INPUT_BUFFER[audio_params_index++] = value;
+}
+
+void flush_audio_params() {
+    AUDIO_PARAM_INPUT_BUFFER[audio_params_index] = 0;
+    *audio_nmi = 1;
+    audio_params_index = 0;
+}

package/src/platforms/gametank/lib/gt/audio/audio_coprocessor.h

@@ -0,0 +1,34 @@
+#ifndef AUDIO_COPROCESSOR_H
+
+#define AUDIO_COPROCESSOR_H
+
+#define FEEDBACK_AMT 0x04
+
+#define PITCH_MSB 0x10
+
+#define PITCH_LSB 0x20
+
+#define AMPLITUDE 0x30
+
+#define AUDIO_PARAM_INPUT_BUFFER ((volatile char *) 0x3070)
+#define WAVE_TABLE_LOCATION ((volatile unsigned int *) 0x3002)
+
+#define NUM_FM_CHANNELS 4
+#define OPS_PER_CHANNEL 4
+#define NUM_FM_OPS 16
+
+extern char pitch_table[216];
+
+void init_audio_coprocessor();
+
+void push_audio_param(char param, char value);
+
+#define set_audio_param(param,value) aram[param]=value
+
+void flush_audio_params();
+
+extern char* wavetable_page;
+
+extern char sine_offset;
+
+#endif

package/src/platforms/gametank/lib/gt/audio/audio_fw.asm

@@ -0,0 +1,223 @@
+DAC = $8000
+AccBuf = $00
+WavePTR = $02
+WavePTR_MSB = $03
+FeedbackAmount = $04
+;reserve $05
+;reserve $06
+;reserve $07
+LastSample = $08
+;reserve $09
+;reserve $0A
+;reserve $0B
+FreqsH = $10
+FreqsL = $20
+BufferedAmplitudes = $30
+WaveStatesH = $50
+WaveStatesL = $60
+Inputs = $70
+	.zeropage
+	;AccBuf
+	.byte 0, 0
+	;WavePTR
+	.byte 0, 0
+	;Feedback
+	.byte $80, $80, $80, $80
+	;UNUSED
+	.repeat 8
+	.byte 0
+	.endrep
+	;Frequencies
+    .repeat $20
+    .byte 0
+    .endrep
+	;Amplitudes
+	.repeat $10
+	.byte $80
+	.endrep
+	;Wave States
+	.repeat $80
+	.byte 0
+	.endrep
+
+	.code
+RESET:
+	CLI
+    LDA #<Sine
+    STA WavePTR
+    LDA #>Sine
+    STA WavePTR+1
+Forever:
+    WAI
+	JMP Forever
+
+.macro tickWave op, out
+	CLC
+	LDA WaveStatesL+op
+	ADC FreqsL+op
+	STA WaveStatesL+op
+	LDA out
+	ADC FreqsH+op
+	STA out
+.endmacro
+
+.macro doChannel ch
+.local Op1
+.local Op1State
+.local Op1Param
+.local Op2
+.local Op2Param
+.local Op3
+.local Op3Param
+.local Op4
+.local Op4Param
+.local SaveFeedback
+.local SampleFeedback
+.local LastSample
+
+	LDA BufferedAmplitudes+(ch*4)+0
+	STA Op1+1
+	LDA BufferedAmplitudes+(ch*4)+1
+	STA Op2+1
+	LDA BufferedAmplitudes+(ch*4)+2
+	STA Op3+1
+	LDA BufferedAmplitudes+(ch*4)+3
+	STA Op4+1
+
+	tickWave (ch*4)+1, Op2Param+1
+	tickWave (ch*4)+2, Op3Param+1
+	tickWave (ch*4)+3, Op4Param+1
+
+	tickWave (ch * 4), Op1State+1
+Op1State:
+	LDA #0
+LastSample:
+	ADC #0
+	
+	TAY
+	CLC
+SampleFeedback:
+	ADC FeedbackAmount+ch
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+
+SaveFeedback:
+	STA LastSample+1
+	TYA
+
+	CLC
+Op1:
+	ADC #0
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+
+	CLC
+Op2Param:
+	ADC #0
+	TAY
+	CLC
+Op2:
+	ADC #0
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+
+	CLC
+Op3Param:
+	ADC #0
+	TAY
+	CLC
+Op3:
+	ADC #0
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+
+	CLC
+Op4Param:
+	ADC #0
+	TAY
+	CLC
+Op4:
+	ADC #0
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+
+	CMP #$80
+	ROR
+	CMP #$80
+	ROR
+
+	CLC
+	ADC AccBuf
+	STA AccBuf
+.endmacro
+
+.macro GetSine
+.local ScaleConstant
+	; Returns sin(Acc + X) + sin(Acc - X)
+	TAY
+	STX ScaleConstant+1
+	CLC
+ScaleConstant:
+	ADC #0
+	TAX
+	CLC
+	LDA Sine, y
+	ADC Sine, x 
+.endmacro
+
+
+IRQ:
+	;Clear sum buffer
+	STZ AccBuf
+
+	doChannel 0
+	doChannel 1
+	doChannel 2
+	doChannel 3
+
+	LDA AccBuf
+	CLC
+	ADC #$80
+	STA DAC
+
+	RTI ;6
+
+;Read inputs addr, val until addr=0
+NMI_handler:
+    PHY
+    PHX
+    PHA
+    LDY #0
+NMI_Loop:
+    LDX Inputs, y
+    BEQ NMI_Done
+    INY
+    LDA Inputs, y
+    STA $00, x
+    INY
+    JMP NMI_Loop
+    
+NMI_Done:
+    PLA
+    PLX
+    PLY
+	RTI
+
+	.segment "WAVES"
+Sine:
+	.incbin "sine_256_-63_63.bin"
+
+	.segment "VECTORS"
+	.addr NMI_handler
+	.addr RESET
+	.addr IRQ

package/src/platforms/gametank/lib/gt/audio/audio_fw_blob.s

@@ -0,0 +1,8 @@
+; romdev single-bank GameTank: the ACP firmware embedded UNCOMPRESSED (the SDK
+; deflate-compresses it + inflatemem()s it; the bare path has no zopfli, so we
+; assemble audio_fw.asm to a raw 4 KB ACP image and memcpy it in). The build
+; stages the assembled image next to this file as acp_image.bin.
+.export _AudioFWPkg
+.segment "COMMON"
+_AudioFWPkg:
+    .incbin "acp_image.bin"

package/src/platforms/gametank/lib/gt/audio/instruments.c

@@ -0,0 +1,79 @@
+#include "instruments.h"
+
+const Instrument piano = {
+  0x30, 0x40, 0x40, 0x5f,
+  0x04, 0x02, 0x10, 0x02,
+  0x04, 0x02, 0x10, 0x30,
+  0, 0, 0, 0, 
+  0,
+  0
+};
+
+const Instrument guitar = {
+  0x6f, 0x40, 0x68, 0x5f, //initial amplitudes
+  0x00, 0xFF, 0x02, 0x08, //decay rates
+  0x00, 0x00, 0x40, 0x08, //sustain values
+  12, 36, 0, 24, //per operator note offsets
+  8, //feedback amount
+  -12 //channel note offset
+};
+
+const Instrument guitar2 = {
+  0x60, 0x40, 0x88, 0x4f,
+  0x00, 0xFF, 0x02, 0x01,
+  0x00, 0x00, 0x40, 0x30,
+  12, 36, 0, 24,
+  8,
+  -12
+};
+
+const Instrument slapbass = {
+  0x58, 0x88, 0x58, 0x5f,
+  0x18, 0x08, 0x04, 0x02,
+  0x18, 0x08, 0x04, 0x02,
+  28, 12, 0, 12,
+  0,
+  -24
+};
+
+const Instrument snare = {
+  0x88, 0x8f, 0x8f, 0x38,
+  0x18, 0x02, 0x04, 0x04,
+  0x18, 0x08, 0x08, 0x04,
+  36, 0, 0, 0,
+  8,
+  -8
+};
+
+const Instrument sitar = {
+  0x60, 0x40, 0x01, 0x10,
+  0x00, 0xFF, 0xF8, 0xFF,
+  0x00, 0x60, 0x60, 0x30,
+  12, 36, 12, 24,
+  4,
+  -24
+};
+
+const Instrument horn = {
+  0x00, 0x00, 0x01, 0x10,
+  0x00, 0x00, 0xFC, 0xFC,
+  0x00, 0x00, 0x30, 0x50,
+  12, 36, 12, 24,
+  0,
+  -12
+};
+
+Instrument* instrument_table[] = {
+    (Instrument*) 0xFFFF,
+    &piano,
+    &guitar,
+    &guitar2,
+    &slapbass,
+    &snare,
+    &sitar,
+    &horn
+};
+
+Instrument* get_instrument_ptr(char idx) {
+    return instrument_table[idx];
+}

package/src/platforms/gametank/lib/gt/audio/instruments.h

@@ -0,0 +1,25 @@
+#ifndef INSTRUMENTS_H
+#define INSTRUMENTS_H
+
+#include "audio_coprocessor.h"
+
+typedef struct {
+    unsigned char env_initial[OPS_PER_CHANNEL];
+    unsigned char env_decay[OPS_PER_CHANNEL];
+    unsigned char env_sustain[OPS_PER_CHANNEL];
+    unsigned char op_transpose[OPS_PER_CHANNEL];
+    unsigned char feedback;
+    signed char transpose;
+} Instrument;
+
+#define INSTR_IDX_PIANO 1
+#define INSTR_IDX_GUITAR 2
+#define INSTR_IDX_DISTGUITAR 3
+#define INSTR_IDX_SLAPBASS 4
+#define INSTR_IDX_SNARE 5
+#define INSTR_IDX_SITAR 6
+#define INSTR_IDX_HORN 7
+
+Instrument* get_instrument_ptr(char idx);
+
+#endif