@henols/c64-re-tools 2.0.0-rc.15 → 2.0.0-rc.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@henols/c64-re-tools",
-  "version": "2.0.0-rc.15",
+  "version": "2.0.0-rc.16",
   "description": "Agent-friendly Commodore 64 engineering toolkit for reverse engineering, debugging, development and testing.",
   "license": "MIT",
   "author": "Henrik Olsson",

package/skills/c64-source/SKILL.md

@@ -136,7 +136,7 @@ One JSON object:
 - `patchesNotWritten`: the patches that the source does not have, each with its range, `switch` and `reason`.
 - `check`: `identical`, and the result for each segment. A different segment gives its first different address.
 - `switches`: the build of each switch. Each item has the `define` for the c64-assembler skill, the patches and the `result` of the build with the switch on. `fits` tells that the build is good, and `changedBytes` counts the changed bytes. `overflow` tells that the code of a patch is longer than its range. `changes outside` gives the first byte outside the ranges that changed. `does not assemble` gives the diagnostics of ACME. `insideNames` lists the labels inside a patch. Code that writes to one of these labels changes the patch when the switch is on.
-- `loader`: the program, the copies in their order, the copier page, `stackByte`, `verified` and `differences`. `limits` lists the CIA values that the loader cannot set. When the script cannot make the loader, `loader` has `verified: false` and a `reason`. The loader includes the source. Thus a source that does not assemble to the image also stops the loader.
+- `loader`: the program, the copies in their order, the copier page, `stackByte`, `verified` and `differences`. `limits` lists the CIA values that the loader cannot set. An entry state from an old capture has no CIA values. Then `limits` tells you to capture the program again. When the script cannot make the loader, `loader` has `verified: false` and a `reason`. The loader includes the source. Thus a source that does not assemble to the image also stops the loader.
 
 The exit status is 0 when the source is identical and the emulator check of the loader passes. The exit status is 1 for a failed check, for an entry in no segment, and for an error. A patch that the source does not have, or a switch that does not fit, also gives 1. The exit status is 2 for a wrong argument.
 

package/skills/c64-source/scripts/generate.ts

@@ -30,7 +30,7 @@ import { GHIDRA_LIMITS, type AssembledSymbol, type Diagnostic } from "#src/nativ
 import { describeAddress, platformNames } from "#src/platform.ts";
 import { resolveProjectPath } from "#src/project.ts";
 import { runScript, UsageError } from "#src/script.ts";
-import { LOADER_JUMP, planLoader, rasterLine, readEntryState, simulate, VIC_DISPLAY_REGISTERS, type EntryState, type LoaderPlan } from "./lib/loader.ts";
+import { LOADER_JUMP, loaderLimits, planLoader, rasterLine, readEntryState, simulate, VIC_DISPLAY_REGISTERS, type EntryState, type LoaderPlan } from "./lib/loader.ts";
 import { OPCODES } from "./lib/opcodes.ts";
 import { entriesInData, entryOutsideImage, instructionText, layout, literalOperand, probeForms, render, switchesOf, type Layout, type PatchBlock, type Range, type Rendered } from "./lib/source.ts";
 
@@ -672,7 +672,7 @@ async function run(argv: string[]): Promise<{ output: Record<string, unknown>; f
     stackByte: formatC64Address(loader.stackByte),
     ...ran,
     // What the loader cannot set as it was at the entry (D63).
-    ...(loader.cia === undefined || loader.cia.limits.length === 0 ? {} : { limits: loader.cia.limits }),
+    ...(loaderLimits(loader).length === 0 ? {} : { limits: loaderLimits(loader) }),
   };
   return { output, failed: !ran.verified || sourceFailed };
 }

package/skills/c64-source/scripts/lib/loader.ts

@@ -129,6 +129,17 @@ export interface LoaderPlan {
   cia?: CiaPlan;
 }
 
+/**
+ * What the loader cannot set as it was at the entry (D63). An entry state
+ * without CIA values (from a capture before D63) gives no timers at all.
+ */
+export function loaderLimits(plan: { cia?: CiaPlan }): string[] {
+  if (plan.cia === undefined) {
+    return ["The entry state has no CIA values, so the loader does not set the CIA timers. Capture the program again with c64-unpacker to get them."];
+  }
+  return plan.cia.limits;
+}
+
 /** The label of the loader's jump to the entry, in ACME's symbol list. */
 export const LOADER_JUMP = "c64_source_loader_jump";