romdevtools 0.14.0 → 0.15.0

package/src/platforms/sms/lib/c/vdp_init.c

@@ -3,15 +3,17 @@
  * Writes the 11 mode-4 registers to a sane baseline:
  *   display OFF, vblank IRQ off, 192-line mode 4, name table at $3800,
  *   BG tile data at $0000, sprite attr table at $3F00, sprite tile data
- *   at $0000 (R6=0xFB → SA13 clear → tiles read from $0000-$1FFF). Call
+ *   at $2000 (R6=0xFF → SA13 set → tiles read from $2000-$3FFF). Call
  *   once after reset before uploading palette/tiles/map.
  *
- * Footgun: many SMS references say "R6=0xFB → sprite tiles at $2000"
- * which is BACKWARDS. R6 bit 2 (the SA13 select) is CLEAR in 0xFB, so
- * sprite tiles read from $0000 (sharing the bank with BG tiles). To
- * separate sprite tiles to $2000, set R6 = 0xFF instead. The
- * sprites({op:'inspect'}) tool's spriteTileDataBase field will show you the
- * real address the VDP is reading from.
+ * Sprite-tile base: R6 bit 2 (SA13) selects $0000 (clear) vs $2000 (set).
+ * We default to R6=0xFF ($2000) because EVERY bundled scaffold uploads its
+ * sprite tiles to $2000 (sms_load_tiles(0x2000, ...)) — so the baseline must
+ * match what consumers do, or sprites read from the empty/BG bank and render
+ * invisible. (Many SMS references say "R6=0xFB → $2000", which is backwards:
+ * 0xFB has SA13 CLEAR = $0000.) If you instead keep sprite tiles in the BG
+ * bank at $0000, set R6=0xFB. sprites({op:'inspect'}) → spriteTileDataBase
+ * shows the address the VDP is actually reading from.
  *
  * After loading assets, enable display by re-writing R1 with bit 6 set:
  *   sms_vdp_display_on();
@@ -33,7 +35,7 @@ void sms_vdp_init(void) {
     0xFF,  /* R3:  color table (ignored in M4) */
     0xFF,  /* R4:  BG tile data at $0000 */
     0xFF,  /* R5:  sprite attr table at $3F00 */
-    0xFB,  /* R6:  sprite tile data at $0000 (set 0xFF for $2000) */
+    0xFF,  /* R6:  sprite tile data at $2000 (SA13 set; scaffolds upload here) */
     0x00,  /* R7:  border = sprite palette entry 0 */
     0x00,  /* R8:  BG X scroll */
     0x00,  /* R9:  BG Y scroll */

package/src/platforms/sms/lib/vdp_init.s

@@ -40,7 +40,7 @@ _vdp_init_regs:
         .db $FF                  ; R3: color table — M4 ignores
         .db $FF                  ; R4: BG tile data — M4: bit 2 selects $0000 vs $2000
         .db $FF                  ; R5: sprite attr table base ($3F00 = $7E << 7)
-        .db $FB                  ; R6: sprite tile data — bit 2 selects bank ($2000 here)
+        .db $FF                  ; R6: sprite tile data at $2000 (SA13 set; scaffolds upload here)
         .db $00                  ; R7: border color = sprite palette entry 0
         .db $00                  ; R8: BG X scroll
         .db $00                  ; R9: BG Y scroll

package/src/toolchains/cc65/presets/nes/chr-ram-runtime.cfg

@@ -12,7 +12,7 @@
 #     runtime. There is no CHARS segment.
 #
 # To use this preset:
-#   1. linkerConfig: "chr-ram" on buildSource
+#   1. linkerConfig: "chr-ram" on build({output:'rom'})
 #   2. Supply your own crt0/header source that writes the 16-byte iNES
 #      header with byte 5 = 0. Easiest: paste the snippet
 #      getStarterSnippet({platform:"nes", name:"chr_ram_header", language:"asm"}).

package/src/toolchains/cc65/presets/nes/chr-ram.cfg

@@ -12,7 +12,7 @@
 #     runtime. There is no CHARS segment.
 #
 # To use this preset:
-#   1. linkerConfig: "chr-ram" on buildSource
+#   1. linkerConfig: "chr-ram" on build({output:'rom'})
 #   2. Supply your own crt0/header source that writes the 16-byte iNES
 #      header with byte 5 = 0. Easiest: paste the snippet
 #      getStarterSnippet({platform:"nes", name:"chr_ram_header", language:"asm"}).

package/src/toolchains/cc65/presets/nes/chr-ram.crt0.s

@@ -91,7 +91,7 @@ _exit:  jsr     donelib
 ;       rti
 ;
 ;   ; then DELETE the `nmi: rti` line below from this crt0 (or load a
-;   ; modified crt0 via your own buildSource sources entry).
+;   ; modified crt0 via your own build({output:'rom'}) sources entry).
 
 .segment "STARTUP"
 

package/src/toolchains/genesis-c/README.md

@@ -23,7 +23,7 @@ once the WASM artifacts ship. Pipeline shape:
 - **WASM port of cc1/as/ld (stage 2)**: pending.
 - **SGDK native build against the cross-toolchain (stage 3)**: pending.
 - **JS driver `buildGenesisC()`**: pending.
-- **buildSource wiring**: pending.
+- **build({output:'rom'}) wiring**: pending.
 
 ## Why a 3-stage build
 

package/src/toolchains/sdcc/preflight-lint.js

@@ -68,13 +68,53 @@ export function lintSdccSource(source, file = "main.c", opts = {}) {
   // CONSERVATIVE: only flag when we can SEE the counter declared u8 and
   // the bound is a constant we can evaluate — never guess.
   {
-    // Collect names declared as 8-bit ints anywhere in the file.
-    const u8re = /\b(?:unsigned\s+char|char|u8|uint8_t|uint8|int8_t|int8|signed\s+char)\s+([A-Za-z_]\w*(?:\s*,\s*[A-Za-z_]\w*)*)\s*;/g;
-    const u8names = new Set();
-    let dm;
-    while ((dm = u8re.exec(source))) {
-      for (const n of dm[1].split(",")) u8names.add(n.trim());
+    // Build a SCOPE-AWARE map of where each name is declared and at what
+    // width. A name like `i` is commonly re-declared in several functions
+    // — some as uint8_t, some as uint16_t. A flat "is this name ever u8"
+    // set wrongly flags the uint16_t loop just because a DIFFERENT
+    // function declared its own `i` as uint8_t (the SMS/GG default
+    // scaffold false-positive). Instead we record EVERY declaration's
+    // line + width, then for each loop consult the nearest declaration of
+    // the counter that appears ABOVE the loop — i.e. the one actually in
+    // scope — and only flag it when that declaration is 8-bit.
+    //
+    // decls: Map<name, Array<{line:number, u8:boolean}>>  (line is 1-based)
+    const decls = new Map();
+    const addDecl = (names, line, u8) => {
+      for (const raw of names.split(",")) {
+        const n = raw.trim();
+        if (!n) continue;
+        if (!decls.has(n)) decls.set(n, []);
+        decls.get(n).push({ line, u8 });
+      }
+    };
+    const u8re   = /\b(?:unsigned\s+char|char|u8|uint8_t|uint8|int8_t|int8|signed\s+char)\s+([A-Za-z_]\w*(?:\s*,\s*[A-Za-z_]\w*)*)\s*;/;
+    // 16-bit-or-wider integer declarations (and float/double, which also
+    // can't overflow at 255). Anything not 8-bit is "wide" for our purpose.
+    const wideRe = /\b(?:unsigned\s+(?:short|int|long)|signed\s+(?:short|int|long)|short|int|long|u16|u32|u64|uint16_t|uint16|int16_t|int16|uint32_t|uint32|int32_t|int32|uint64_t|uint64|int64_t|int64|size_t|ptrdiff_t)\s+([A-Za-z_]\w*(?:\s*,\s*[A-Za-z_]\w*)*)\s*;/;
+    for (let i = 0; i < lines.length; i++) {
+      const code = lines[i].replace(/\/\/.*$/, "").replace(/\/\*.*?\*\//g, "");
+      const m8 = code.match(u8re);
+      if (m8) { addDecl(m8[1], i + 1, true); continue; }
+      const mw = code.match(wideRe);
+      if (mw) addDecl(mw[1], i + 1, false);
     }
+    // Is the counter declared 8-bit in the scope visible at `loopLine`?
+    // Use the NEAREST declaration above the loop. If the nearest visible
+    // declaration is wide (uint16_t etc.), the loop is fine.
+    const counterIsU8AtLine = (counter, loopLine) => {
+      const ds = decls.get(counter);
+      if (!ds) return false;
+      let best = null;
+      for (const d of ds) {
+        if (d.line <= loopLine && (best === null || d.line > best.line)) best = d;
+      }
+      // No declaration above the loop (e.g. param/global declared after, or
+      // out-of-order) — fall back to "flag only if EVERY decl is u8" so we
+      // never wolf-cry on a name that is also declared wide somewhere.
+      if (best === null) return ds.every((d) => d.u8);
+      return best.u8;
+    };
     const evalConst = (expr) => {
       // Only literals and pure `A * B [* C]` products of decimal/hex ints.
       const t = expr.trim();
@@ -91,7 +131,7 @@ export function lintSdccSource(source, file = "main.c", opts = {}) {
       const m = code.match(/\bfor\s*\([^;]*;\s*([A-Za-z_]\w*)\s*<\s*([^;]+?)\s*;/);
       if (!m) continue;
       const [, counter, boundExpr] = m;
-      if (!u8names.has(counter)) continue;
+      if (!counterIsU8AtLine(counter, i + 1)) continue;
       const bound = evalConst(boundExpr);
       if (bound !== null && bound > 255) {
         issues.push({

package/src/toolchains/snes-c/snes-c.js

@@ -148,13 +148,9 @@ function normalizeSnesSources(args) {
     if (cFiles.length === 0) {
       throw new Error("buildSnesC: `sources` must include at least one .c file.");
     }
-    if (cFiles.length > 1) {
-      throw new Error(
-        `buildSnesC: multiple .c files in sources (${cFiles.join(", ")}). ` +
-        `Today only one .c file is supported per build — combine via #include or wait for ` +
-        `multi-TU support. .asm/.s siblings work fine.`,
-      );
-    }
+    // Multiple .c files ARE supported: buildWithPvSnesLib compiles each to its
+    // own .obj (tcc→wla) and links them all (Stage 1 + Stage 3). The genre
+    // scaffolds ship main.c + snes_sfx.c and rely on this.
     return args.sources;
   }
   if (typeof args.source === "string") {