From cce13b092f3d2959218638f38f9796fa12367b9b Mon Sep 17 00:00:00 2001
From: macabeus <bruno.macabeus@gmail.com>
Date: Sun, 2 Aug 2026 15:30:05 +0100
Subject: [PATCH 1/3] feat(debug-info): report an array's RANK, not just its
 flat element count
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`variableShape()`'s array arm and `struct()`'s array members now carry `dims` — the
per-dimension extents, outermost first. `length` is unchanged (still the product).

Only `dims` answers the question a consumer spelling C has to answer: `g[i]` on a
rank-2 array is a ROW, not an element. Knowing just the flat count you write one
subscript, which against the project's own header is a type error — or, where the row
address flows into an integer context, silently the wrong address.

On a DW_AT_declaration a leading extent of 1 is GCC 2.95's unsized-outer-bound spelling
(`extern T x[]`, `extern T x[][4]`) and reports null, mirroring the rule `length` already
applies; the inner extents are written down and survive. A rank-1 array reports a
one-entry `dims`, so an absent key always means "not an array", never "rank unknown".

Fixtures: agbcc-min gains g_grid3 [2][3][4], the extern g_ext_grid[][4] idiom, and a
2-D struct member Grid.cells.
---
 packages/arm-emulator/CHANGELOG.md            |   2 +
 packages/arm-emulator/package.json            |   2 +-
 packages/debug-info/CHANGELOG.md              |  22 +++++
 packages/debug-info/package.json              |   2 +-
 .../src/__tests__/producer-quirks.spec.ts     |  44 +++++++++-
 .../src/__tests__/real-projects.spec.ts       |  19 ++++-
 packages/debug-info/src/types.ts              |  77 +++++++++++++++---
 .../test-projects/agbcc-min/build/min.elf     | Bin 9100 -> 9552 bytes
 .../test-projects/agbcc-min/build/oracle.json |  41 ++++++----
 .../debug-info/test-projects/agbcc-min/crt0.s |   8 ++
 .../debug-info/test-projects/agbcc-min/main.c |  23 ++++++
 packages/gba-browser/CHANGELOG.md             |   7 ++
 packages/gba-browser/package.json             |   2 +-
 packages/gba-emulator/CHANGELOG.md            |   8 ++
 packages/gba-emulator/package.json            |   2 +-
 packages/gba-node/CHANGELOG.md                |   7 ++
 packages/gba-node/package.json                |   2 +-
 packages/gba-react/CHANGELOG.md               |   6 ++
 packages/gba-react/package.json               |   2 +-
 19 files changed, 236 insertions(+), 40 deletions(-)

diff --git a/packages/arm-emulator/CHANGELOG.md b/packages/arm-emulator/CHANGELOG.md
index d82faa9..95e03f9 100644
--- a/packages/arm-emulator/CHANGELOG.md
+++ b/packages/arm-emulator/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @gba-kit/arm-emulator
 
+## 0.5.0
+
 ## 0.4.0
 
 ## 0.3.0
diff --git a/packages/arm-emulator/package.json b/packages/arm-emulator/package.json
index 4a8a49d..67f3b7f 100644
--- a/packages/arm-emulator/package.json
+++ b/packages/arm-emulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/arm-emulator",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "ARM7TDMI CPU emulator supporting Thumb and ARM instruction sets",
   "author": "macabeus",
   "type": "module",
diff --git a/packages/debug-info/CHANGELOG.md b/packages/debug-info/CHANGELOG.md
index 821e43a..cd51e08 100644
--- a/packages/debug-info/CHANGELOG.md
+++ b/packages/debug-info/CHANGELOG.md
@@ -1,5 +1,27 @@
 # @gba-kit/debug-info
 
+## 0.5.0
+
+### Minor Changes
+
+- Report an array's RANK, not just its flattened element count.
+
+  `variableShape()`'s array arm and `struct()`'s array members now carry `dims` — the
+  per-dimension extents, outermost first (`u16 g[4][0x400]` → `[4, 1024]`). `length` is
+  unchanged: it stays the product, which is what sizes the object.
+
+  The two readings answer different questions, and only `dims` answers the one a consumer
+  spelling C needs: `g[i]` on a rank-2 array is a **row**, not an element. A consumer that
+  knows only the flat count writes a single subscript, which against the project's own header
+  is either a type error or — where the row address flows into an integer context — silently
+  the wrong address.
+
+  `null` marks an unbounded dimension. On a `DW_AT_declaration` a leading extent of 1 is
+  GCC 2.95's spelling of an unsized outer bound (`extern T x[]`, `extern T x[][4]`) and is
+  reported as `null`, mirroring the rule `length` already applies; the inner extents are
+  written down and survive. A rank-1 array reports a one-entry `dims`, so an absent key
+  always means "not an array", never "rank unknown".
+
 ## 0.4.0
 
 ### Minor Changes
diff --git a/packages/debug-info/package.json b/packages/debug-info/package.json
index 119ea95..defd34a 100644
--- a/packages/debug-info/package.json
+++ b/packages/debug-info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/debug-info",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Parse ELF symbols and DWARF debug info (line tables) for GBA decomp debugging",
   "author": "macabeus",
   "type": "module",
diff --git a/packages/debug-info/src/__tests__/producer-quirks.spec.ts b/packages/debug-info/src/__tests__/producer-quirks.spec.ts
index 43866be..089ec78 100644
--- a/packages/debug-info/src/__tests__/producer-quirks.spec.ts
+++ b/packages/debug-info/src/__tests__/producer-quirks.spec.ts
@@ -88,6 +88,7 @@ describe('3. the 0xffffffff upper bound means zero-length, never 2^32 elements',
       elemSize: 1,
       elemSigned: false,
       length: null,
+      dims: [null], // rank 1, the single extent unbounded
       volatile: false,
       const: false,
     });
@@ -96,7 +97,15 @@ describe('3. the 0xffffffff upper bound means zero-length, never 2^32 elements',
   it('a zero-length trailing member reads exactly like modern flexible arrays', () => {
     // Mirrors the devkitarm-min `Blob.data` pin: stride reported, size and length not.
     const data = agbcc.struct('Flex')!.members.find((m) => m.name === 'data')!;
-    expect(data).toEqual({ name: 'data', offset: 4, size: null, signed: null, elemSize: 1, elemSigned: false });
+    expect(data).toEqual({
+      name: 'data',
+      offset: 4,
+      size: null,
+      signed: null,
+      elemSize: 1,
+      elemSigned: false,
+      dims: [null],
+    });
     expect(agbcc.resolveVariable('g_flex.data')).toBeNull();
   });
 
@@ -117,6 +126,7 @@ describe('4. an unsized extern array is not [1]', () => {
       elemSize: 2,
       elemSigned: true,
       length: null,
+      dims: [null], // the rank IS known (1); only its extent is not
       volatile: false,
       const: true,
     });
@@ -128,8 +138,40 @@ describe('4. an unsized extern array is not [1]', () => {
       elemSize: 2,
       elemSigned: true,
       length: 1,
+      dims: [1],
       volatile: false,
       const: false,
     });
   });
 });
+
+describe('5. an array RANK is not its element count', () => {
+  // `length` is the PRODUCT of the subranges, so it cannot say how many subscripts an
+  // element access takes — and `g[i]` on a `[2][3]` is a ROW, not an element. A consumer
+  // that only knows the flat count cannot spell an access that type-checks against the
+  // project's own header, which is exactly how a flattened rank surfaces: as a compile
+  // error in the world the header lives in, never as a wrong number.
+  it('reports every dimension of a fully-bounded array, outermost first', () => {
+    expect(agbcc.types.variableShape('g_grid3')).toMatchObject({ dims: [2, 3, 4], length: 24 });
+    expect(agbcc.types.variableShape('g_init_table')).toMatchObject({ dims: [2, 2], length: 4 });
+    expect(agbcc.types.variableShape('g_fwd_sized_table')).toMatchObject({ dims: [3, 2], length: 6 });
+  });
+
+  it('a DECLARATION keeps its INNER extents and loses only the unsized outer one', () => {
+    // `extern const short g_ext_grid[][4];` — agbcc spells the outer bound as upper_bound 0
+    // (indistinguishable from a real [1]), but the inner 4 IS written down, and the inner
+    // extents are the ones an element access needs.
+    expect(agbcc.types.variableShape('g_ext_grid')).toMatchObject({ dims: [null, 4] });
+  });
+
+  it('reports the rank of an array MEMBER too', () => {
+    const cells = agbcc.struct('Grid')!.members.find((m) => m.name === 'cells')!;
+    expect(cells).toMatchObject({ offset: 4, size: 12, elemSize: 2, length: 6, dims: [2, 3] });
+  });
+
+  it('control: a rank-1 array reports a one-entry rank, not none', () => {
+    // Absence of `dims` must mean "this is not an array", never "rank unknown" — a consumer
+    // gating on key presence would otherwise read every plain table as unranked.
+    expect(agbcc.types.variableShape('g_rom_table')).toMatchObject({ dims: [3] });
+  });
+});
diff --git a/packages/debug-info/src/__tests__/real-projects.spec.ts b/packages/debug-info/src/__tests__/real-projects.spec.ts
index 082c783..8fe2ccd 100644
--- a/packages/debug-info/src/__tests__/real-projects.spec.ts
+++ b/packages/debug-info/src/__tests__/real-projects.spec.ts
@@ -136,7 +136,7 @@ describe.each(ARM_PROJECTS)('DebugInfo vs binutils oracle on $label', (project)
         { name: 'flags', offset: 8, size: 2, signed: true },
         // char[6] → `size` is the WHOLE member (element size × length); the element facts are
         // what an indexed read into it needs, and `signed` stays null (an array is not a base type)
-        { name: 'name', offset: 10, size: 6, signed: null, elemSize: 1, elemSigned: false, length: 6 },
+        { name: 'name', offset: 10, size: 6, signed: null, elemSize: 1, elemSigned: false, length: 6, dims: [6] },
         // pointer → 4 bytes, and the pointee facts pointer arithmetic scales by
         { name: 'ptr', offset: 16, size: 4, signed: null, pointer: true, pointeeSize: 4, pointeeSigned: true },
         { name: 'inner', offset: 20, size: 8, signed: null }, // nested struct
@@ -221,6 +221,7 @@ describe.each(ARM_PROJECTS)('DebugInfo vs binutils oracle on $label', (project)
       elemSize: 2,
       elemSigned: true,
       length: 3,
+      dims: [3],
       volatile: false,
       const: true,
     });
@@ -385,7 +386,15 @@ describe('DebugInfo on devkitarm-min-only shapes', () => {
     // The member still declares an element STRIDE — what it has no bound. So `elemSize` is
     // reported and `length` is absent, the two facts being independent.
     const data = di.struct('Blob')!.members.find((m) => m.name === 'data')!;
-    expect(data).toEqual({ name: 'data', offset: 4, size: null, signed: null, elemSize: 1, elemSigned: false });
+    expect(data).toEqual({
+      name: 'data',
+      offset: 4,
+      size: null,
+      signed: null,
+      elemSize: 1,
+      elemSigned: false,
+      dims: [null],
+    });
   });
 
   it('names an UNNAMED pointee by the typedef that aliases it', () => {
@@ -517,7 +526,7 @@ describe.each(BE_PROJECTS)('DebugInfo vs binutils oracle on $label', (project) =
         { name: 'tag', offset: 0, size: 1, signed: false },
         { name: 'count', offset: 4, size: 4, signed: true },
         { name: 'flags', offset: 8, size: 2, signed: true },
-        { name: 'name', offset: 10, size: 6, signed: null, elemSize: 1, elemSigned: false, length: 6 },
+        { name: 'name', offset: 10, size: 6, signed: null, elemSize: 1, elemSigned: false, length: 6, dims: [6] },
         { name: 'ptr', offset: 16, size: 4, signed: null, pointer: true, pointeeSize: 4, pointeeSigned: true },
         { name: 'inner', offset: 20, size: 8, signed: null }, // nested struct
         { name: 'tail', offset: 28, size: 4, signed: true },
@@ -606,6 +615,7 @@ describe.each(BE_PROJECTS)('DebugInfo vs binutils oracle on $label', (project) =
       elemSize: 2,
       elemSigned: true,
       length: 4,
+      dims: [4],
       volatile: false,
       const: false,
     });
@@ -615,6 +625,7 @@ describe.each(BE_PROJECTS)('DebugInfo vs binutils oracle on $label', (project) =
       elemSize: 2,
       elemSigned: true,
       length: 3,
+      dims: [3],
       volatile: false,
       const: true,
     });
@@ -811,7 +822,7 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
     g_probe: { kind: 'struct', structName: 'Probe', size: 32, volatile: false, const: false },
     g_bits: { kind: 'struct', structName: 'Bits', size: 8, volatile: false, const: false },
     g_cv: { kind: 'struct', structName: 'Cv', size: 4, volatile: true, const: false },
-    g_rom_table: { kind: 'array', elemSize: 2, elemSigned: true, length: 3, volatile: false, const: true },
+    g_rom_table: { kind: 'array', elemSize: 2, elemSigned: true, length: 3, dims: [3], volatile: false, const: true },
     g_util_pair: { kind: 'struct', structName: 'UtilPair', size: 4, volatile: false, const: false },
   };
 
diff --git a/packages/debug-info/src/types.ts b/packages/debug-info/src/types.ts
index bf53125..45c3117 100644
--- a/packages/debug-info/src/types.ts
+++ b/packages/debug-info/src/types.ts
@@ -178,6 +178,17 @@ export interface StructMember {
    * array member, `char data[]`, which declares a stride but no length).
    */
   length?: number;
+  /**
+   * Array member only: the per-dimension extents, outermost first — the RANK that {@link length}
+   * multiplies away (`u16 x[4][8]` → `[4, 8]`, length 32). One entry per DW_TAG_subrange_type,
+   * `null` where that dimension has no bound (a flexible one). Absent when the member is not an
+   * array or the DWARF gave the array no subranges at all.
+   *
+   * The rank is not decoration: `x[i]` on a `[4][8]` member is a ROW, not an element, so a
+   * consumer that only knows the flat count cannot spell an element access that type-checks
+   * against the project's own header.
+   */
+  dims?: (number | null)[];
 }
 
 /** The width/signedness facts of one declared type — shared by a parameter and a return type. */
@@ -238,6 +249,11 @@ export type VariableShape =
       elemSize: number | null;
       elemSigned: boolean | null;
       length: number | null;
+      /** the per-dimension extents, outermost first — the RANK `length` multiplies away
+       *  (`u16 g[4][0x400]` → `[4, 1024]`, length 4096). `null` where a dimension is
+       *  unbounded, and null overall when the rank itself is unknown (an unsized 1-D
+       *  extern) or the type is not subranged. `g[i]` on a rank-2 array is a ROW. */
+      dims: (number | null)[] | null;
       volatile: boolean;
       const: boolean;
     }
@@ -549,6 +565,12 @@ export class TypeIndex {
           // near-information-free fact. A DEFINED [1] keeps its length — the definition
           // is the witness.
           length: isDeclaration(variable) && length === 1 ? null : length,
+          // The RANK, under the same declaration rule applied per-dimension: on a DECLARATION
+          // a LEADING extent of 1 is that same unsized spelling (`extern T x[]`, `extern T
+          // x[][4]`) and reports null, while the inner extents ARE written down and survive —
+          // they are exactly what an element access needs. Only the outermost dimension can be
+          // unsized in C, so only it is normalized.
+          dims: declaredDims(variable, die),
           ...cv,
         };
       }
@@ -828,16 +850,18 @@ export class TypeIndex {
   /** An array member's element facts. Each is omitted when the DWARF does not determine it — an
    *  unsized element type has no stride, a flexible array member no length — so a present key is
    *  always a fact, never a default. */
-  #arrayFacts(arrayDie: Die): Pick<StructMember, 'elemSize' | 'elemSigned' | 'length'> {
+  #arrayFacts(arrayDie: Die): Pick<StructMember, 'elemSize' | 'elemSigned' | 'length' | 'dims'> {
     const elemRef = arrayDie.attrs.get(DW_AT_type);
     const elem = this.#stripTypedefs(elemRef);
     const elemSize = this.#typeRefSize(elemRef);
     const elemSigned = elem ? baseTypeSignedness(elem) : null;
     const length = arrayLength(arrayDie);
+    const dims = arrayDims(arrayDie);
     return {
       ...(elemSize !== null ? { elemSize } : {}),
       ...(elemSigned !== null ? { elemSigned } : {}),
       ...(length !== null ? { length } : {}),
+      ...(dims !== null ? { dims } : {}),
     };
   }
 
@@ -936,30 +960,57 @@ function bitfieldAbsBitOffset(member: Die, typeSize: number | null, littleEndian
 }
 
 /**
- * Element count of an array DIE (product of its DW_TAG_subrange_type dimensions),
- * or null if any dimension is flexible (no bound) or zero-length — those have no
- * fixed read size, so the member's size should surface as null, not 0.
+ * Per-dimension extents of an array DIE, outermost first — one entry per
+ * DW_TAG_subrange_type, `null` where that dimension is flexible (no bound) or
+ * zero-length. Null overall when the DIE carries no subranges at all.
+ *
+ * This is the RANK, which {@link arrayLength} multiplies away. Both readings are needed:
+ * the flat count sizes the object, the rank says how many subscripts an element access
+ * takes — and `x[i]` on a `[4][8]` is a row, not an element.
  */
-function arrayLength(arrayDie: Die): number | null {
-  let count = 1;
-  let sawDimension = false;
+function arrayDims(arrayDie: Die): (number | null)[] | null {
+  const dims: (number | null)[] = [];
   for (const child of arrayDie.children) {
     if (child.tag !== DW_TAG_subrange_type) {
       continue;
     }
-    sawDimension = true;
     const explicit = numberAttr(child, DW_AT_count);
     const rawUpper = numberAttr(child, DW_AT_upper_bound);
     // GCC 2.95 stores a zero-length array's -1 upper bound in UNSIGNED DW_FORM_data4;
     // read raw, upper+1 would claim 2^32 elements. Normalize to the modern sdata reading.
     const upper = rawUpper === 0xffffffff ? -1 : rawUpper;
     const dim = explicit !== null ? explicit : upper !== null ? upper + 1 : null;
-    if (dim === null || dim <= 0) {
-      return null;
-    }
-    count *= dim;
+    dims.push(dim === null || dim <= 0 ? null : dim);
+  }
+  return dims.length > 0 ? dims : null;
+}
+
+/**
+ * {@link arrayDims} for a VARIABLE, with the declaration quirk normalized: GCC 2.95
+ * encodes an unsized extern's outermost bound as upper_bound 0, byte-identical to a
+ * real `[1]`, so on a DW_AT_declaration a leading extent of 1 is reported as unknown.
+ * The rare genuine `extern T x[1]` / `extern T x[1][4]` loses a near-information-free
+ * fact; a DEFINITION keeps its 1, since the definition is the witness.
+ */
+function declaredDims(variable: Die, arrayDie: Die): (number | null)[] | null {
+  const dims = arrayDims(arrayDie);
+  if (dims === null || !isDeclaration(variable) || dims[0] !== 1) {
+    return dims;
+  }
+  return [null, ...dims.slice(1)];
+}
+
+/**
+ * Element count of an array DIE (product of its DW_TAG_subrange_type dimensions),
+ * or null if any dimension is flexible (no bound) or zero-length — those have no
+ * fixed read size, so the member's size should surface as null, not 0.
+ */
+function arrayLength(arrayDie: Die): number | null {
+  const dims = arrayDims(arrayDie);
+  if (dims === null || dims.some((d) => d === null)) {
+    return null;
   }
-  return sawDimension ? count : null;
+  return dims.reduce<number>((a, d) => a * d!, 1);
 }
 
 /** Signedness of a base type from DW_AT_encoding (DW_ATE_signed/signed_char = signed;
diff --git a/packages/debug-info/test-projects/agbcc-min/build/min.elf b/packages/debug-info/test-projects/agbcc-min/build/min.elf
index f6facf10a34b40e50ee0c60baec99e50ad6029af..5effc18571665b263d1d639e207dc8bfcbe3d016 100755
GIT binary patch
delta 2182
zcmZ8ieQZ-z6hHU1uj}iWZMU~|quu&71}5_96bS=oM7M$=KsH18NK>}bz0kF_D<1=O
z!zeKk!<HLSqsApdO#BFwIm8%@iCJO@(fxsm2}a{TBt(q(hXE6@{?2_Zpk3}e=XcKU
zo_p@S=iD9dncp}O(F*a&Scf<@nF#8~1ktfiEU$0v5Rsz`!;LY45x!9_7a+SavVz>c
z+49X#%hVnTiD>!eblDjy-#mja-RPAwzW%X3aEcg*F`SsQ0^<=3J@L(ceWNS!6=^HG
zo9X5GqrRa+578F*#xZt*uO-~$kCD;r4i$Q)VDpekZM1|0Y2+X$>Exmsa#!&Gtp<5$
zs}S;NePCvv-!B&3Pr4RC*ha|qid<EZofWx3j@B<-vH=Jr7O{%tNxc=)=8Ei_`L_P7
z(004z3+AZUApbV!JG4<8ohYVq`;vwHzBGw1#4Hi<x*SgIc37~<xyDH1JeY}GE?tD#
zG!BtyWTqA;W0XV_d$qWeoFhZ|Vku(fN~G!T^%{<-nBS8|#1^BJ%8*#NUM_12FSGe>
zBbOS+s;y6gsKq@-p;RQ%woM_QVX5Urcv2o|3hQiLFW+qn)Xj0yy2FP<t~(*WZdx47
z!B>+>7E%`GKX3vFel7;@RjCIa(wq+26^O6AYSRYt**th%(>9L_29t;LgGgna)1fAF
z1-Vbli9q9;)37+THf*(iq?9U-kmyk+N03be#rz0Ny~<Q$vgx43krJonPl3+fwRXG-
zj`t_@#}ANG^cmUofpnHcKb!avGbt-a;%O(UPK#?eM=O&{4@L%tQpnWRU^wND=E$~H
zaARi$1Z%j6nVj~pl_#--C&JSWk7qk{9<>^oe9&MO^TWwfYEKq<?L25xxgX4@<fZ18
zhIees3QS($d=|icN#1G>-**Wr->T;dlq+&kOZ(V+HWgoo$Ey?Zs1>z>OanHoWaX?<
zb*YKv@FFX2DN{iAbmOB^BMM}a=|gv@C;OQy%uZ(Q#fKBGRT1;KbaF7gm&EHkblf@O
zb@J-RLGtSIhnCRThfs9~H?8?RRAg~DUBszO@dm)>7WRA(5AOrnYPAj~Ws26|gCx$*
z!2{M7X8i@-P7s_*ip(Q1Q|D3{{tAYB9rPYH`^2oVj@{>~?J$teW>FBIF-0BTCMbM3
zyl{0{5}(&|INdQW8y6l~#NEb^Pd|38eT>EurJ_~f>+%YQ$}eXZX2g_i4Q}$kfn3SU
zWH^aZE;$<P9J|}d+}D}pKz@I&gpS<~7P>=q;#;=Po#I0UF^RjOL+PpqW|g|fDveMW
zX@hZqRx3r-+HR%ZEvT0i-g|H`xr^KPx(&1GLuBHl{!<WqubE`^KBpB@H^p~Ty$?Pv
zTUT3KjjzTV90>J9y0ES4FH~`$Iq_#7(d0Aj^7l}k=##fYC-8l>b-BpO3$0@*E{+9Y
z@w<!OR!<xReuB%49)@2*U|zENbJ8E>MgYD5+h!~GVxGT6KG*iBctT!i+c|a-_yUS#
z5V9WeUV-G2<t+WUx7Q#I_!+bRO-O7^#b-PP%q3gpzYolhR282A?!E_~1LopwhD3Z9
zeF<eqz8VgW%|VMI<90|6{T*cCo~f6CxjT7nKaS=XNPZY_2MYfN$^YCS$Or!|$Z^a^
zAF8dCAt!+C`3`bnA2=@ei?Cz84ir5R7dEg85CG=ltxiC4gp!V&l;<N$o9vFPJmhz(
zSze1oz5G_FMzm`~)<iGL%TW`Td@UL_c!@qg(JJYWEf%Nbnpj*v2K<3cL0i#4^bxcM
z`F70b`q3nst&wMAF?|w6v{^Z>$9&q)t@58(M_r_iXc|4>LCURiWjv_QM~Rlot?{^i
LJ4Q4jMZDo(H9>=l

delta 1788
zcmYjRUrd`-6hHTCKWGbMZ7CGi(*H09Bk+L0;?$uT415rY80H?jLc3B|`jOHB)5K1v
zi3!HB+zg!w!x!HWooq3SSxlBJ^Km9D%tVdOm?cJ&#TWF!)Ze)u9cy#$`S-i$o_o%@
z-`(L42A4wGTKHn5MPx4y`SejiG<r3&*ZK4@BFkZr4Kxl4J}Q+)z>k3X1lgR|OWW5<
z6bt!9xU~Ic$?7j{e}R=A^~eq9SZ5b7&w>U(R_y8GeIRYfcCMf74L1MG;1qNRc_=`w
z^0dpR9T4&-w|8UJ<r4C~yRABey`*c*BJ!%c*4_rG4wkNsw%V_Rc1f2%d(MiG9Iv}8
z$Lbr!qBQE8+81#NEovp}?39r&gfh7TX}Zm&5sl=Hi4=uIqrH$wli25yU)KkVCf;Vx
zC8kp(ni>Jrq7M5^Ax|REtTd-Rlgp)`2a_te2LUo!5~1tFU_V(WrxI}69E|6qs&uNh
zvbQoFpHat(=*QSAbc++$-ZKG=O|;n)B*(k~Uq4hvCNhX}kevW>5BA=WA9|nCwlsO$
z8!g^2VUtGI0PgU46UTkR=4m5|{GZt}jodiff`#b$OkoyB9d%Eo5_yPXfUQ<7phd|&
zTS(+#8dN5Wk4=+#V-}`k%2erL(|m>_4=u=aLwB(TyOA6Zh3z}YFU*luykgI$=2EE0
z7@M%io=#+PBwpQ8s)lA{(z#SJWY(#o_D9%v8gwSN<5Qig#7!pWNF3KOHaLfeu66}z
zzTtGnK;K^Dpm6alI@$qas?x~AodhgzOvej}i7awHF>FTRk@W;2*A2`kM-pdA0C#FW
z8CP9?Z^lINkXBn?f?`{hZ#M>ORw42zIo2Vp%k{=san6KdwKyJNWvUWYf;@aBM9t(f
zh4S%BnyxbCm*Ck1(oqY8N|(r+j;9tLLzi0_Dm;~7jzd`ZGF2*~kxRvssZ%6A>d-Mf
zxOq399tY@wRVMcN!*4;<E&SFzFGEBYZ=~`DiBI_g!1u{RzBldskoaA8$eTW|t~B|B
zFD<5IzyC$oNyMZ-c%DH-mvy<~?=GSl#+h6Jv)>MTd6sjg%+vat63vPHSIKG)-$yah
z@d=*2zm<rdI*^RnMCwxFZllJPUT(;@rj|`D^wL8mKT%Y!O*&q#$$6!z+j7>uAdPch
zYZ`27Kn2S`|BeGwhd)tBIs^M<PoPG0$)kY_SnmZoMW57z#XVfdYG4FH^~zrZwN+dz
zGm?-Of_37c{5|-b2+QWsiQ*z0H!(3ua5wfWfpdTO6c<YR3Ai18*4cjr9EquTtbYcb
zzl>%48gzcqW&IlTBTwkxK<6(52SEHHy$<0r0>;2O;4N@|HRS+zpz{El8#LO4&hMcD
z+=VOt0<K=O(k=85ybkf+1?PBwg7esbkrViTz)wC-pwdDbt}`WXhnFog#%Xyx(rM-I
zn7k4R%kLw1<fW(=<^4Pwv~!d$7g0psi|!X$`Cl}uk3xS(HpimcrdtljS}M+Yi2kaO
zbFqj%?ISuMSKwRr%UiLQj{9ii2*$~Q6yQ^x#EaniqSCv+)(}yRtZR-o^n{6KcO6`L
G_4^;A&qM40

diff --git a/packages/debug-info/test-projects/agbcc-min/build/oracle.json b/packages/debug-info/test-projects/agbcc-min/build/oracle.json
index 95fb490..1b0efc7 100644
--- a/packages/debug-info/test-projects/agbcc-min/build/oracle.json
+++ b/packages/debug-info/test-projects/agbcc-min/build/oracle.json
@@ -1,45 +1,49 @@
 {
   "symbols": {
-    ".gcc2_compiled.": 134217736,
+    ".gcc2_compiled.": 134218052,
     "__gccmain": 134217734,
     "_start": 134217728,
     "add": 134217736,
     "bump": 134217748,
     "gAbsGlobal": 50336308,
-    "g_bits": 50331736,
+    "g_bits": 50331792,
     "g_color": 50331708,
     "g_counter": 50331648,
-    "g_cv": 50331728,
-    "g_ext_table": 134218032,
+    "g_cv": 50331760,
+    "g_ext_grid": 134218076,
+    "g_ext_table": 134218068,
     "g_flex": 50331652,
-    "g_fwd_pay": 50331744,
+    "g_fwd_pay": 50331800,
     "g_fwd_ptr": 50331696,
-    "g_fwd_sized_table": 134218054,
-    "g_init_table": 134218046,
+    "g_fwd_sized_table": 134218106,
+    "g_grid": 50331776,
+    "g_grid3": 50331728,
+    "g_init_table": 134218098,
     "g_mmio": 50331712,
     "g_mode": 50331656,
     "g_one_def": 50331700,
-    "g_pair": 50331720,
+    "g_pair": 50331752,
     "g_probe": 50331664,
-    "g_rom_table": 134218040,
-    "g_util_pair": 50331752,
+    "g_rom_table": 134218092,
+    "g_util_pair": 50331808,
     "g_zero": 50331704,
     "main": 134217880,
     "poke": 134217916,
+    "rank_poke": 134218016,
     "square": 134217740,
-    "triple": 134218016
+    "triple": 134218052
   },
   "lines": {
-    "0x8000120": {
-      "func": "triple",
-      "file": "util.c",
-      "line": 16
-    },
     "0x8000008": {
       "func": "add",
       "file": "main.c",
       "line": 94
     },
+    "0x8000144": {
+      "func": "triple",
+      "file": "util.c",
+      "line": 16
+    },
     "0x8000006": {
       "func": "__gccmain",
       "file": "??",
@@ -65,6 +69,11 @@
       "file": "main.c",
       "line": 162
     },
+    "0x8000120": {
+      "func": "rank_poke",
+      "file": "main.c",
+      "line": 188
+    },
     "0x800000c": {
       "func": "square",
       "file": "main.c",
diff --git a/packages/debug-info/test-projects/agbcc-min/crt0.s b/packages/debug-info/test-projects/agbcc-min/crt0.s
index a376a6c..d4561cb 100644
--- a/packages/debug-info/test-projects/agbcc-min/crt0.s
+++ b/packages/debug-info/test-projects/agbcc-min/crt0.s
@@ -26,3 +26,11 @@ __gccmain:
 	.align 1
 g_ext_table:
 	.hword 10, 20, 30, 40
+
+@ The same idiom with a RANK: main.c declares `extern const short g_ext_grid[][4];`,
+@ so only the inner extent is knowable from the DWARF.
+	.global g_ext_grid
+	.align 1
+g_ext_grid:
+	.hword 1, 2, 3, 4
+	.hword 5, 6, 7, 8
diff --git a/packages/debug-info/test-projects/agbcc-min/main.c b/packages/debug-info/test-projects/agbcc-min/main.c
index a1e20a9..b7a7c75 100644
--- a/packages/debug-info/test-projects/agbcc-min/main.c
+++ b/packages/debug-info/test-projects/agbcc-min/main.c
@@ -166,3 +166,26 @@ int poke(int i) { /* keeps every shape above live in the DWARF */
 }
 
 static const unsigned short g_fwd_sized_table[][2] = {{5, 6}, {7, 8}, {9, 10}};
+
+/* ---- RANK shapes. A flat element count cannot express how many subscripts an
+ * element access takes, and `g[i]` on a `[2][3]` is a ROW, not an element — so the
+ * per-dimension extents are their own fact (variableShape().dims / StructMember.dims).
+ *   g_grid3   — a fully-bounded rank 3, the ordinary case (dims [2,3,4], length 24);
+ *   g_ext_grid — the decomp `extern u8 tbl[][0x40]` idiom, defined outside C: its OUTER
+ *                bound is unknowable but the INNER one is written down and is exactly
+ *                what an element access needs, so the rank must survive as [null, 4];
+ *   Grid.cells — the same fact one level down, on a struct member. */
+unsigned char g_grid3[2][3][4];
+extern const short g_ext_grid[][4];
+
+struct Grid {
+    int id;
+    unsigned short cells[2][3];
+};
+struct Grid g_grid;
+
+int rank_poke(int i) { /* keeps the shapes above live in the DWARF */
+    g_grid3[1][2][3] = (unsigned char) i;
+    g_grid.cells[1][2] = (unsigned short) g_ext_grid[i][1];
+    return g_grid.id;
+}
diff --git a/packages/gba-browser/CHANGELOG.md b/packages/gba-browser/CHANGELOG.md
index c1815c9..79a7b72 100644
--- a/packages/gba-browser/CHANGELOG.md
+++ b/packages/gba-browser/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gba-kit/gba-browser
 
+## 0.5.0
+
+### Patch Changes
+
+- @gba-kit/gba-emulator@0.5.0
+- @gba-kit/arm-emulator@0.5.0
+
 ## 0.4.0
 
 ### Patch Changes
diff --git a/packages/gba-browser/package.json b/packages/gba-browser/package.json
index f5a16a4..5165f78 100644
--- a/packages/gba-browser/package.json
+++ b/packages/gba-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/gba-browser",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Browser runtime for GBA emulation",
   "author": "macabeus",
   "type": "module",
diff --git a/packages/gba-emulator/CHANGELOG.md b/packages/gba-emulator/CHANGELOG.md
index 5f353fb..3134261 100644
--- a/packages/gba-emulator/CHANGELOG.md
+++ b/packages/gba-emulator/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @gba-kit/gba-emulator
 
+## 0.5.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @gba-kit/debug-info@0.5.0
+  - @gba-kit/arm-emulator@0.5.0
+
 ## 0.4.0
 
 ### Patch Changes
diff --git a/packages/gba-emulator/package.json b/packages/gba-emulator/package.json
index 1aedc03..6b7f946 100644
--- a/packages/gba-emulator/package.json
+++ b/packages/gba-emulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/gba-emulator",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Full GBA hardware emulation",
   "author": "macabeus",
   "type": "module",
diff --git a/packages/gba-node/CHANGELOG.md b/packages/gba-node/CHANGELOG.md
index 5ec7b36..5b25638 100644
--- a/packages/gba-node/CHANGELOG.md
+++ b/packages/gba-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gba-kit/gba-node
 
+## 0.5.0
+
+### Patch Changes
+
+- @gba-kit/gba-emulator@0.5.0
+- @gba-kit/arm-emulator@0.5.0
+
 ## 0.4.0
 
 ### Patch Changes
diff --git a/packages/gba-node/package.json b/packages/gba-node/package.json
index 15472b1..efa47c5 100644
--- a/packages/gba-node/package.json
+++ b/packages/gba-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/gba-node",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Headless Node.js runtime for scripted GBA emulation",
   "author": "macabeus",
   "type": "module",
diff --git a/packages/gba-react/CHANGELOG.md b/packages/gba-react/CHANGELOG.md
index 6ec5987..c14ba15 100644
--- a/packages/gba-react/CHANGELOG.md
+++ b/packages/gba-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gba-kit/gba-react
 
+## 0.5.0
+
+### Patch Changes
+
+- @gba-kit/gba-browser@0.5.0
+
 ## 0.4.0
 
 ### Patch Changes
diff --git a/packages/gba-react/package.json b/packages/gba-react/package.json
index f65d585..0f66c75 100644
--- a/packages/gba-react/package.json
+++ b/packages/gba-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gba-kit/gba-react",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "React hooks for GBA emulation",
   "author": "macabeus",
   "type": "module",

From 35398f594b0db4fd63e414eb0a574969ec1d61e5 Mon Sep 17 00:00:00 2001
From: macabeus <bruno.macabeus@gmail.com>
Date: Sun, 2 Aug 2026 16:02:46 +0100
Subject: [PATCH 2/3] docs(debug-info): say who StructMember.dims is for

---
 packages/debug-info/src/types.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/debug-info/src/types.ts b/packages/debug-info/src/types.ts
index 45c3117..5fc75a9 100644
--- a/packages/debug-info/src/types.ts
+++ b/packages/debug-info/src/types.ts
@@ -187,6 +187,13 @@ export interface StructMember {
    * The rank is not decoration: `x[i]` on a `[4][8]` member is a ROW, not an element, so a
    * consumer that only knows the flat count cannot spell an element access that type-checks
    * against the project's own header.
+   *
+   * Reported for SYMMETRY with {@link VariableShape}'s array arm — a member and a global are the
+   * same DWARF array type, and a reader that answers the rank question for one should answer it
+   * for the other. It is the consumer that differs: a consumer synthesizing its OWN struct
+   * declaration may flatten the member, since its access and its declaration then agree by
+   * construction and no foreign header is involved. Rank only becomes load-bearing where the
+   * declaration belongs to someone else.
    */
   dims?: (number | null)[];
 }

From 12ebb4fd2cb26663c10624ceb1389a92e54f3d52 Mon Sep 17 00:00:00 2001
From: macabeus <bruno.macabeus@gmail.com>
Date: Sun, 2 Aug 2026 16:54:31 +0100
Subject: [PATCH 3/3] test(debug-info): verify array rank on all four test
 projects, not just agbcc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`dims` was only exercised by agbcc-min. The facts it reads are producer- and
byte-order-sensitive — the dimensions come from a DW_TAG_subrange chain whose bounds are
read through the endian-aware reader, and DWARF 2 spells them differently from DWARF 3+ —
so one toolchain is not evidence.

mips-min, ppc-min and devkitarm-min gain the same two shapes agbcc-min already had:
`unsigned char g_grid3[2][3][4]` (a fully-bounded rank 3) and `struct Grid { int id;
unsigned short cells[2][3]; }` (the same fact on a member). All four now report
`dims: [2,3,4]` / `[2,3]` identically across GCC 2.95 (DWARF 2), GCC 14 (DWARF 3+), and
both byte orders.

They are wired into the EXISTING cross-project machinery rather than tested separately:
`Grid` joins CANDIDATE_TYPES and `g_grid3`/`g_grid` join CANDIDATE_GLOBALS, so the layout,
declaration-fact and variableShape comparisons all pick them up, and the "shares exactly
this declaration set" pin records the new membership. Mutation-checked: flattening
arrayDims to a single product turns the shared-shape test red on all four.

`g_ext_grid` is NOT shared, and is now listed in CANDIDATE_GLOBALS so `skipped` says so out
loud rather than leaving the asymmetry invisible: the unsized-outer-bound spelling
(`extern T x[][4]` encoded as upper_bound 0) is a GCC 2.95 ENCODING quirk, so agbcc-min is
the only place it can be pinned.

devkitarm-min's block is APPENDED, not inserted — debug-macro.spec.ts pins the macro
fixtures by exact line number and the file says so; inserting mid-file moved REG_DISPSTAT
from 157 to 173 and broke three tests.

222 tests green (was 218), typecheck + lint clean, all four ELF/oracle artifacts rebuilt.
---
 .../src/__tests__/real-projects.spec.ts       |  33 +++++++++-
 .../devkitarm-min/build/macinfo.o             | Bin 19028 -> 19584 bytes
 .../test-projects/devkitarm-min/build/min.elf | Bin 9880 -> 10284 bytes
 .../devkitarm-min/build/oracle.json           |  60 ++++++++++--------
 .../test-projects/devkitarm-min/source/main.c |  20 ++++++
 .../test-projects/mips-min/build/min.elf      | Bin 5596 -> 5820 bytes
 .../test-projects/mips-min/build/oracle.json  |  44 +++++++------
 .../debug-info/test-projects/mips-min/main.c  |  16 +++++
 .../test-projects/ppc-min/build/main.o        | Bin 5748 -> 6028 bytes
 .../test-projects/ppc-min/build/min.elf       | Bin 8440 -> 8656 bytes
 .../ppc-min/build/oracle-obj.json             |   4 +-
 .../test-projects/ppc-min/build/oracle.json   |   8 ++-
 .../debug-info/test-projects/ppc-min/main.c   |  16 +++++
 13 files changed, 147 insertions(+), 54 deletions(-)

diff --git a/packages/debug-info/src/__tests__/real-projects.spec.ts b/packages/debug-info/src/__tests__/real-projects.spec.ts
index 8fe2ccd..7cae60b 100644
--- a/packages/debug-info/src/__tests__/real-projects.spec.ts
+++ b/packages/debug-info/src/__tests__/real-projects.spec.ts
@@ -696,7 +696,7 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
   // Every type/global any of the four declares. The ones not present in all four are
   // enumerated by name below, so a project that genuinely lacks a shape is skipped
   // EXPLICITLY rather than dropped silently.
-  const CANDIDATE_TYPES = ['Probe', 'Inner', 'Bits', 'Cv', 'UtilPair', 'Pair', 'Shape', 'Blob'];
+  const CANDIDATE_TYPES = ['Probe', 'Inner', 'Bits', 'Cv', 'UtilPair', 'Grid', 'Pair', 'Shape', 'Blob'];
   const CANDIDATE_GLOBALS = [
     'g_counter',
     'g_probe',
@@ -704,6 +704,9 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
     'g_cv',
     'g_rom_table',
     'g_util_pair',
+    'g_grid3',
+    'g_grid',
+    'g_ext_grid', // agbcc-min only — the unsized-outer-bound spelling is a GCC 2.95 quirk
     'g_pair', // little-endian sources only
     'g_color',
     'g_mode',
@@ -746,8 +749,17 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
   });
 
   it('shares exactly this declaration set — every other shape is skipped BY NAME', () => {
-    expect(sharedTypes).toEqual(['Probe', 'Inner', 'Bits', 'Cv', 'UtilPair']);
-    expect(sharedGlobals).toEqual(['g_counter', 'g_probe', 'g_bits', 'g_cv', 'g_rom_table', 'g_util_pair']);
+    expect(sharedTypes).toEqual(['Probe', 'Inner', 'Bits', 'Cv', 'UtilPair', 'Grid']);
+    expect(sharedGlobals).toEqual([
+      'g_counter',
+      'g_probe',
+      'g_bits',
+      'g_cv',
+      'g_rom_table',
+      'g_util_pair',
+      'g_grid3',
+      'g_grid',
+    ]);
     // The rest, and who lacks each. These are SOURCE facts (the big-endian projects
     // declare a different set of globals; agbcc/GCC 2.95 rejects anonymous unions and
     // flexible array members), not parser gaps — pinned so a shape silently vanishing
@@ -758,6 +770,7 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
       Blob: ['agbcc-min', 'mips-min', 'ppc-min'],
     });
     expect(skipped(CANDIDATE_GLOBALS, hasGlobal)).toEqual({
+      g_ext_grid: ['devkitarm-min', 'mips-min', 'ppc-min'],
       g_pair: ['mips-min', 'ppc-min'],
       g_color: ['mips-min', 'ppc-min'],
       g_mode: ['mips-min', 'ppc-min'],
@@ -784,6 +797,7 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
     Bits: { size: 8, members: 'hearts@0:1 stars@0:1 cross@0:2 wide@1:1 after@4:4' },
     Cv: { size: 4, members: 'level@0:1 gain@2:2' },
     UtilPair: { size: 4, members: 'lo@0:2 hi@2:2' },
+    Grid: { size: 16, members: 'id@0:4 cells@4:12' },
   };
 
   it.each(sharedTypes)('every project reports the same byte layout for %s', (type) => {
@@ -824,6 +838,19 @@ describe('cross-endian equivalence (same declarations, four toolchains, both byt
     g_cv: { kind: 'struct', structName: 'Cv', size: 4, volatile: true, const: false },
     g_rom_table: { kind: 'array', elemSize: 2, elemSigned: true, length: 3, dims: [3], volatile: false, const: true },
     g_util_pair: { kind: 'struct', structName: 'UtilPair', size: 4, volatile: false, const: false },
+    // RANK is byte-order- and producer-independent: the dimensions come from the
+    // DW_TAG_subrange chain, which every producer spells in declaration order. A reader that
+    // multiplied them away (or read them under the wrong endianness) shows up right here.
+    g_grid3: {
+      kind: 'array',
+      elemSize: 1,
+      elemSigned: false,
+      length: 24,
+      dims: [2, 3, 4],
+      volatile: false,
+      const: false,
+    },
+    g_grid: { kind: 'struct', structName: 'Grid', size: 16, volatile: false, const: false },
   };
 
   it.each(sharedGlobals)('every project classifies %s to the same shape — TypeIndex.variableShape', (name) => {
diff --git a/packages/debug-info/test-projects/devkitarm-min/build/macinfo.o b/packages/debug-info/test-projects/devkitarm-min/build/macinfo.o
index 9f00185d5f784e83110a38262b6d3e7a24468038..e0fd0e1dc73aae72baff969ff985ca1fa327d9d3 100644
GIT binary patch
delta 2953
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
b_)7vzu@^eR#>Ld$^Zc`yg-kcvon`e800~;F

delta 2383
zcmYk6du&uy5QpcSy?6KSF54&2#lDukbe9&WfQ8V~LJKW)x1h))Vr+o6qM}$D5Dm{&
z6cr^AI2BS&E20>bsKgS*2$4UG@evghjYd=wgGPx#g{VYL^fz~>*qhw*otZf^XXd=_
z?^B=ksy#7XGH-8u$KDf(2}dm=P5fDEP!Xw5(CzRPL_I==zS9I%nR>;HSC!#=Fw$bH
zU1-`>RbGTWi^HtZuH!5=`_;s053{m7SnnxID4?7;G{MV|L+FIKu_<5$2%WIyjoWVi
zRMTTGVu-5rRY9+lXjGN|dWP+Tf%GY}P)FxBvPMnzzX0YovLUwyjh(w2t)KFgnx1o#
zZO1*^MYM_{e=}-*?4*yHBf27IBFcAEv$F)u?=ok#TXBE~&ClTkt-wg_QvM&TY0YY^
zJZPM0#`RUJd1kS%qTm?}4CugE3@YqL7`?~r^3_ec32L=Gat@lI)W@*u=20OOBC4>p
zmpz^|zxoo%Lp)7qgqLDeKli(Gy*;oOz|T=DosDpG9ybkEk(y$bS;_czjI!I&SgPCk
z7*_w<)!n4l$+D9((+pT;nQu7QhRC7+=Z&gr#MG9pcs3QpIT*t|x<;L6#S>WrYf8Am
zHv?meJG#0^?eW6LSXrWeLaQ<{H3H;pSK=>K@3D4Exfk6U1A)zY8*N6AGGw@=if7B1
zkiRrs)<NpNB+L5-r~0?5BEKrcR5j#t>cTU_wc%8u_G2pZTVQl$X|<X?!k3dZBuAtQ
z^HqUr46#R<J>0`sPPJ)q-c&t<|2hLxRIwSTJF9ijJUg@B%&l)S`|9TeJJ+u3q`N!T
zbejwH`^{qwZ<&R&ip}k_I?R`|P7WTQU86FKkQb7se4N%PU@Lw{<QZV&Fq!*H@ehqp
zqrZHZyaavzPz~Za-db_pI09b$+dz&v<bM~@3YrYX(1h#JpM)QK=Q(TwCk~SzK%c*C
z03Y#X7>9qz--s;+azRg<-<xX9{5jh)bSqREeruUQG|cf?*HBS*14B`wJm^EkM5CG5
zS*}Ir$OdB<@>vE)33>B13M>_lWfl-sFfq7_S(wQdt|6s71<?lKHesLei0}>J=fd+s
zzO0-8ze>!gFu|-Ox<TYyglm`?RN5_yt;{6RBO><-pAsGv9uvMUJSBWz_ysdT^tH$r
zm?--fk^d3qV0AK_X$&3aRAIAlsj!oY?c5;p4q>10pztN(38qVQO5_ijaiZ@<zRVm;
zbVXCfo7j&BLdUR&Oe9jyEXUS}+$_9NxI%cZ@F8Xy(Jqk>FtPCiB0nd5TllT;XCL-o
z<Dt1EiZBi$Cs4!;;4u)EGjoZq6V@>?ZVnUG%oC=?zDVrtqF*K4DE3E1-kp(7zZh_a
zyon)t^qwyy!l$1TiV4RFCkU?<P8Ze*n}jXG1wwvZI9`UIO|GCzh^z0(>x5V!PkvCi
zPq<&`UBieZh&Z^ZUf>3?{~+>6CK}I<ab5u<DM`2h-UKx=fZrib$jcNC*-QsJ=f{=m
zF*{pbJBp(6%*(B=dft56n$+W)%wMeuo9}14sYto%h)JcAdUBIlpGv5AOkXPL{{Y5U
zE%R<F?q3A=Gum8C#q}oJ6r>aO9axCNrXlUxv1X!UW_8+C5wk0u)MuK_Yw3iZ=9sTA
z?sP4Vrm@>x{bRGKYD?JXu*|h)85Ge5vl)sSl)cIvZgcG`h}394f~mK`Txv^9It|k?
n)Wz=-o;B~O<Xz<_52x?y*VD+!v@CF=Gq7pjUDanFUl#uZ{1yfj

diff --git a/packages/debug-info/test-projects/devkitarm-min/build/min.elf b/packages/debug-info/test-projects/devkitarm-min/build/min.elf
index 05fe577c8d7d8db3621f5ab3f4a6d1e5b893e0f5..a29b82561b49e3813d3444f79ce976ba731e3d09 100755
GIT binary patch
delta 2683
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

delta 2374
zcmZ8iYitx%6h3!m@6K#z-`j1s?LNEgE^UJ-@)Q)1M=5A*)rg={wqQsFmO?A93QOdN
z0ZK$~OdvJ}5J(BtNKlDU3^CC}Lj)oc4ABtOfXWYu{s5!F@62{>btd;bzVo<e?&Hj0
z>)uEAB(;s{*Xrvt2Z@M>#2`PB06PSZVe)W5Uw*vvs838&A^+;k0I<Z(yLbDEOl?7A
z+boJix|&bVbp*&1q>&E)GwLJ%*w!vcc+6;t+mvOEUPMyPOVkHDCj0kU3s{n{jiLFd
zC8jr5>2wFuMm0GQkADKmlJgNDbuOjSAv+5_<g$@3RZk#geE}EOdiDsb{egOq4|<)&
zfT<l(X9MYpmw+VfkSOWGJOxw5RggOvo^c?O3{EJ{!Li=^G9&t+8XZg(y%CM5fm4c6
zAdSv3pi)1BQp6?rH5rR+fS1l-Th(L`Lu>~X_d1z57s8L63plIuZ5FwR_aRgd`Azg5
zX1}w5$f<E8c`LxC>@2c!3uLN$38>UB@Wj>do95&gsecPV8Yt47UBmQO*yivzX=E~+
z%S6}Acfp!jHl#TQY#z%Fw>A!0TI{uPkXQli5zl!$@g*dV6lbj`hiEe&Lu&0I;ExBM
zgh*Ne<cU}Z!(=sr>B9LTFkLeygIUi25?2xMR3*ns{R$TzhiPFAM@juB02NyR?1O6W
zf<~?#9Ci$0PkR`aMV-%`r~|SneA<p996W<_ifcd@hcDacU&v-~9o9vV8i&YBKAOJI
zFhPfhH`kYi`!XM&3zD-To9%IUXx~Fz>T6@T_6lOL3~sO$UXCwH{W=%k1nUdd3?Nd!
z2|zdH8=R*b#8FrY+_CEU0<EzZlC+b^*;Qe~rIWT99(BCp*iDdbPqUrsHc~~K;H)|9
zGkySQjEg1zZID-G(N<6^UnJ45<D$g#%a)PYW6u-;>c&Wbm@{C!h6Dl8s`Y@jiTlWn
z%VvgQa92Xu1*^Lj0_UOR-<-3U91UPOi~ar|!Fm%sXA+=E6b8z9g9YksWPB#ZgX+(4
z?c!jbHslyug0UE*zJtVudl(T|&BNe)v%^?RefVZKK-~yaxe@TC5~cwJzD5O@qf!;B
z($o1?%NV?cH!uaT)Vbq0d9j2)aR5j;h3IF^C;)F{=@pFa>ReT8F(h=aWj&A*Q>`f}
zQ-pB4Mw9N1T5$J~m2$KIGChEXe7r3okF^qJSC-gTAw)}v<E#m`?w&_mL=n0t1$`_W
zy;Z}}I*0g%(>W~${HnJ)77etJ7TJpZ3gTRvrRiYSs!u*#ed34eV?rd=&YH`b=2E+B
zH;F!F)a?l0#e*LElGp9Aw|ObPtWSMVw^@ykZgX|4TGK(R^PL6tRrG=yh|N}i#L`wb
zd}OKHs_F4P!SJw722PRLrLM+XR71iyldl%6IOkYqJlw;W>v;L$e#=}hr5mB!KMyk1
zro?X<ECQ7?+1&toITOdSeLx*eCW^daQ1A#F-TObCH@IY%ICw;S(HIEegZTV&J$!Ik
zFM^vx{(k6L=-dj$keyrHZn*HzCW!gQ<9yN}9Fjv0)4;ivloQT@I-ojJW5pr0FO?{A
zLn+&~!ZvcUozU$@Y^RX)Iykp8UPdl%A2|OZ%Ej-8US3Qtb`UxWwJ$XncN{wR$MSq=
zq{aVC_$eH?SCkz-ht6y61P@^M&VyecG2wU6hbPqO3iOd5@H2Go@8tq-K!=A-{rErq
zPHFu0fGh{Z72XCfZ>k@gDp9^exzb0%UHQ&+)ZX6F-QC{ZlV8_UI*}LClTK8QN(yy<
zCM^2Z+Du42n{i97xnHf$q+Og014-C62piWspiaSNORz0fzhn}^RIY537*G?kIdNJ&
zm(59h3B}cpY+7X1JJ7$uwdz&3av^mi>zA!)aNCr~rR6zDlT-sFBS!S5YJ+qTQjN-I
rL#i+5*FKJ^w{ls}b%5{T%m?w6QFT67C-<hXut=GfN9&2c=74_yc+WV=

diff --git a/packages/debug-info/test-projects/devkitarm-min/build/oracle.json b/packages/debug-info/test-projects/devkitarm-min/build/oracle.json
index b7f913a..3d8c9ce 100644
--- a/packages/debug-info/test-projects/devkitarm-min/build/oracle.json
+++ b/packages/debug-info/test-projects/devkitarm-min/build/oracle.json
@@ -1,36 +1,39 @@
 {
   "symbols": {
     "add": 134217756,
-    "__bss_end__": 134222088,
-    "_bss_end__": 134222088,
-    "__bss_start": 134221992,
-    "__bss_start__": 134221992,
+    "__bss_end__": 134222152,
+    "_bss_end__": 134222152,
+    "__bss_start": 134222016,
+    "__bss_start__": 134222016,
     "bump": 134217768,
-    "__data_start": 134221988,
-    "_edata": 134221992,
-    "__end__": 134222088,
-    "_end": 134222088,
+    "__data_start": 134222008,
+    "_edata": 134222012,
+    "__end__": 134222152,
+    "_end": 134222152,
     "gAbsGlobal": 50336308,
-    "g_bits": 134222040,
-    "g_blob": 134222072,
-    "g_color": 134222036,
-    "g_counter": 134221992,
-    "g_cv": 134222048,
-    "g_cv_ptr": 134222080,
-    "g_cv_vptr": 134222076,
-    "g_mmio": 134222052,
-    "g_mode": 134222037,
-    "g_pair": 134222028,
-    "g_pair_ptr": 134221988,
-    "g_probe": 134221996,
-    "g_rom_table": 134217884,
-    "g_shape": 134222056,
-    "g_util_pair": 134222084,
-    "g_wide": 134222064,
+    "g_bits": 134222064,
+    "g_blob": 134222096,
+    "g_color": 134222060,
+    "g_counter": 134222016,
+    "g_cv": 134222072,
+    "g_cv_ptr": 134222144,
+    "g_cv_vptr": 134222140,
+    "g_grid": 134222124,
+    "g_grid3": 134222100,
+    "g_mmio": 134222076,
+    "g_mode": 134222061,
+    "g_pair": 134222052,
+    "g_pair_ptr": 134222008,
+    "g_probe": 134222020,
+    "g_rom_table": 134217904,
+    "g_shape": 134222080,
+    "g_util_pair": 134222148,
+    "g_wide": 134222088,
     "main": 134217728,
+    "rank_poke": 134217868,
     "square": 134217760,
     "_stack": 524288,
-    "triple": 134217868
+    "triple": 134217888
   },
   "lines": {
     "0x800001c": {
@@ -48,12 +51,17 @@
       "file": "main.c",
       "line": 143
     },
+    "0x800008c": {
+      "func": "rank_poke",
+      "file": "main.c",
+      "line": 178
+    },
     "0x8000020": {
       "func": "square",
       "file": "main.c",
       "line": 124
     },
-    "0x800008c": {
+    "0x80000a0": {
       "func": "triple",
       "file": "util.c",
       "line": 17
diff --git a/packages/debug-info/test-projects/devkitarm-min/source/main.c b/packages/debug-info/test-projects/devkitarm-min/source/main.c
index c975fd4..5a7616d 100644
--- a/packages/debug-info/test-projects/devkitarm-min/source/main.c
+++ b/packages/debug-info/test-projects/devkitarm-min/source/main.c
@@ -159,3 +159,23 @@ int main(void) {
 #define EWRAM_BASE 0x02000000
 #define CLAMP(x, lo, hi) ((x) < (lo) ? (lo) : (x) > (hi) ? (hi) : (x))
 #define NO_BODY
+
+// ---- RANK. A flat element count cannot say how many subscripts reach an ELEMENT, and
+// `g[i]` on a `[2][3]` is a ROW. The per-dimension extents are their own fact
+// (variableShape().dims / StructMember.dims), and they are ABI- and byte-order-independent,
+// so all four toolchains must report them identically. (agbcc-min additionally carries the
+// `extern T x[][4]` idiom, whose unsized outer bound is a GCC 2.95 ENCODING quirk — modern
+// producers spell it differently, so it is pinned there rather than shared.)
+unsigned char g_grid3[2][3][4]; // fully-bounded rank 3: dims [2,3,4], length 24
+
+struct Grid { //   Grid: id @0 (4)  cells @4 (12: [2][3] of u16)        size 16
+    int id;
+    unsigned short cells[2][3]; // the same fact one level down, on a member
+};
+struct Grid g_grid;
+
+__attribute__((noinline)) int rank_poke(int i) { // keeps the two shapes above live
+    g_grid3[1][2][3] = (unsigned char) i;
+    g_grid.cells[1][2] = (unsigned short) g_grid.id;
+    return g_grid.id;
+}
diff --git a/packages/debug-info/test-projects/mips-min/build/min.elf b/packages/debug-info/test-projects/mips-min/build/min.elf
index 45b5a4c926fc31f3c0b9fae5eea5477789835ef9..cd3ce495a27eae5f4b4ece1232a677cb881799be 100755
GIT binary patch
delta 2503
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

delta 2265
zcmYjSeN2^A7=O-r-*dT_doNsgUoMc>yugKv8WaC8{2;wo1x3W5fwOdz4+&UIZh)rE
zg2**%G|+=Z#u}O{btG+0=N2w%ZkkcE^+$i?7F(_@|EaawY<<}8c`vs*cjuhv`8}WS
zbDneVOxc~~qeUWgJknO2Ad;A*NMI#i!N(USQ3zP#_|((gOa64^|6k%mY-wWJn8ubJ
zO|<Nf?_dAw)kBp-JFhi_J;UdJ>%VuBO)5jQF?#L6d~{+cG5s-xre`QH^44IUnMJE2
zCJA4FIw{s%JOY^*)GvzYfQMq02E~Vm<XrJm*&Jz;6P0Nck8C6{+(~wMHHoo%a*SN%
zu_@@3SCK)Vl^0ZcC{C(0cJy<i;u1M~WLtwt@0Aurevo5R&yX28D(B9gK}L$=Q=gJq
z>B4?S&Inmra75bSsq6CQR6B)AIrv!wm~54!#yq+CGg5<PWCmhq_sQFOkBsI|q$H_*
zkcpU#=?OV4Vp>?ay3GiQb9&IoAIRdGVZ>w%D;IBJ7=BX15oQ4SaWR$~n7x=jOlR;p
zeHT<%D-_a@bD5^<+TTwuMw~;;WwOx`-ej|iG%S2nUHlPU#sC>6LwSZ|H^qJ|3AX$o
zkKrdB%UK4x^Er?84lu*A=P)liUL>*EJFNBfA|@|FD<+#gAe-C;SnryLsF2wTG7nRc
z7gWL|03JFWE<vkpHua?W&;Y%?)RDO*G`?JBK~kG;Ci;76c{-5B0OOB8l8yDc4O)zr
zIbK6#2u>xA#KdOI-A-aoCyQe%IP<$s<`bOc<?>9Zyx;%{uF73F5hvYi2C&^i9mGp(
zfp$q;1yp+-)5-d*t7JM&G5*G5Oq)JV>HYOi8t7gyE8?hu7;@Z?1vVWdQ&b}zi67A?
zTe3hZhkkS`PE}fx&r5u32p8hhCPQ*{vw=w;yKAjQS0EKW;87UUh_E?+1<(y#i3&oU
zs6(_Q(U_<QyIP<R<tuheTN{a1Cp)0rU%niQiEapw1Vy7*Nx5MAS(ow(A%0CXxqwW9
z92XP$*mjEs$1{?Vm-KB{{($@@y@l%dq$|=}sgAu?&>|MYaul4~iT*pzQeGF0ynP{>
z_yLjQ&=^l@FnnG#f*~4CHoKVS8ga9WQy_Z(yB5N406cAqG&kwaw1<m|k(0O}d|Z(d
zr#QE{*GEJKCwq)7_4%~w#S!v)*Lw}Lfaxd0y|zHC^RDsMSgR3U>6LDKscRM0pn_>a
z)K~%pI=04I0kOvtMuyj$G%0Y4OEvCUAv`)gy=w7Mr7V@{5-R+J%C1(K)k&gOWmc((
zPNdrdxh_kE>s82jewzv(OYYfqDzrsq?@;0G%4;0nrXH?U-dY9NTeV$9k`x;#SFL5K
zZ1@MI0xnx+Z*@S>Nldsb=_VmmfRsd0>y3GW#KM41#xFY4yQv^%_!(0{7-iI|V2$H0
zWr{lKgm;4&*B^Q-HpIZ%9eeq*we=jpE7I5B(%VOUojtw%;RE~ox;pl^?+f$ul7yJ*
z*xTCG-$xxSUHkPFUxByp*#j-T?SR`3>ifQz^?mQS)!E+C%Q|}#y*;h%)Zfz8txx&u
z?LCM`K~l~eM`_$S=k(wHGF_Ijab+_LapHWIxYo}967zh-%n$Mgp05h?qk1yqL7X2p
z9*kN*=dj~%#d)w7r@RD`ULvX9!WH5amP0<F=QB49a03&x_z7v?%3@!=ptX}@flqne
z4KK~$U5LWDc0fLh-MtXC2mCO2_QzQr1V6}pmUQ@G@bk<s#5+#$RyhMc72r)MBo=u7
z_;<mNVNV6PfCMMOk1r%R4f##*Df`RdIpI`*kHFv7;jB7+AZy2^TUmRAj#|UT2><U$
z(c6LW1BCA4Z<Ng^>|Fhm<x|K<CQjHzY7oSrF13q12;qEZy>7IN#IQbON5xe=iFKF0
zX-Cy0PV2P(6|%U_%PDbr_^EwLZ_X){>34KzPE_pza7B;h6p0LdH76?8>-n4#>EET@
mL2RA6JXqrLcOuNsdQY&>6@Wh7&_{zsIZHtOg_#<hGyMbVd0D*x

diff --git a/packages/debug-info/test-projects/mips-min/build/oracle.json b/packages/debug-info/test-projects/mips-min/build/oracle.json
index a2a0f9a..03a03e0 100644
--- a/packages/debug-info/test-projects/mips-min/build/oracle.json
+++ b/packages/debug-info/test-projects/mips-min/build/oracle.json
@@ -1,34 +1,36 @@
 {
   "symbols": {
-    "_GLOBAL_OFFSET_TABLE_": 4260480,
-    "__bss_start": 4260496,
-    "_edata": 4260492,
-    "_end": 4260576,
-    "_fbss": 4260496,
-    "_fdata": 4260464,
+    "_GLOBAL_OFFSET_TABLE_": 4260496,
+    "__bss_start": 4260512,
+    "_edata": 4260508,
+    "_end": 4260640,
+    "_fbss": 4260512,
+    "_fdata": 4260480,
     "_ftext": 4194640,
-    "_gp": 4293232,
+    "_gp": 4293248,
     "add": 4194704,
     "bump": 4194720,
-    "g_bits": 4260500,
-    "g_counter": 4260556,
-    "g_cv": 4260496,
-    "g_probe": 4260508,
-    "g_probe_ptr": 4260464,
-    "g_ptr": 4260552,
-    "g_rom_table": 4194912,
-    "g_table": 4260544,
-    "g_util_pair": 4260560,
-    "g_vol": 4260540,
+    "g_bits": 4260556,
+    "g_counter": 4260612,
+    "g_cv": 4260552,
+    "g_grid": 4260512,
+    "g_grid3": 4260528,
+    "g_probe": 4260564,
+    "g_probe_ptr": 4260480,
+    "g_ptr": 4260608,
+    "g_rom_table": 4194928,
+    "g_table": 4260600,
+    "g_util_pair": 4260624,
+    "g_vol": 4260596,
     "main": 4194640,
     "square": 4194712,
-    "triple": 4194880
+    "triple": 4194896
   },
   "lines": {
     "0x400150": {
       "func": "main",
       "file": "main.c",
-      "line": 97
+      "line": 113
     },
     "0x400190": {
       "func": "add",
@@ -38,14 +40,14 @@
     "0x4001a0": {
       "func": "bump",
       "file": "main.c",
-      "line": 86
+      "line": 100
     },
     "0x400198": {
       "func": "square",
       "file": "main.c",
       "line": 83
     },
-    "0x400240": {
+    "0x400250": {
       "func": "triple",
       "file": "util.c",
       "line": 15
diff --git a/packages/debug-info/test-projects/mips-min/main.c b/packages/debug-info/test-projects/mips-min/main.c
index 6db4311..62f6f60 100644
--- a/packages/debug-info/test-projects/mips-min/main.c
+++ b/packages/debug-info/test-projects/mips-min/main.c
@@ -82,6 +82,20 @@ int square(int n) {
     return n * n;
 }
 
+/* ---- RANK. A flat element count cannot say how many subscripts reach an ELEMENT, and
+ * `g[i]` on a `[2][3]` is a ROW. The per-dimension extents are their own fact
+ * (variableShape().dims / StructMember.dims), and they are ABI- and byte-order-independent,
+ * so all four toolchains must report them identically. (agbcc-min additionally carries the
+ * `extern T x[][4]` idiom, whose unsized outer bound is a GCC 2.95 ENCODING quirk — modern
+ * producers spell it differently, so it is pinned there rather than shared.) */
+unsigned char g_grid3[2][3][4]; /* fully-bounded rank 3: dims [2,3,4], length 24 */
+
+struct Grid { /*   Grid: id @0 (4)  cells @4 (12: [2][3] of u16)        size 16 */
+    int id;
+    unsigned short cells[2][3]; /* the same fact one level down, on a member */
+};
+struct Grid g_grid;
+
 void bump(void) {
     g_counter += 1;
     g_ptr = &g_counter;                          /* keep the pointer global live */
@@ -92,6 +106,8 @@ void bump(void) {
     g_bits.after = g_counter;
     g_cv.level = (signed char) g_counter;        /* keep struct Cv + its quals live */
     g_probe.count = g_rom_table[g_counter & 1];  /* keep the const table live */
+    g_grid3[1][2][3] = (unsigned char) g_counter; /* keep the rank-3 array live */
+    g_grid.cells[1][2] = (unsigned short) g_grid.id; /* keep struct Grid + its 2-D member live */
 }
 
 int main(void) {
diff --git a/packages/debug-info/test-projects/ppc-min/build/main.o b/packages/debug-info/test-projects/ppc-min/build/main.o
index 44febdcc6e8a8747d57d50261a4a0db0ba335547..947c29945a44a70a8b6921239ff54c85eb864547 100644
GIT binary patch
delta 2413
zcmYjRYiv|S6h3qB&fVQ^yWQ^HZl9Fh?Xu<3(gFfoD6fQqZ2>_+Km%pF+w=jpux$Ym
z*pjFi(^Tpx1|gwFjl|Sf2tSNqVuB$iM!~-r1^pq08vBDkMk9VRJJ&GD-22UUzH{cx
z>pZ9*YdjM(Y}Z7*CD$@a)UuE0RGetlTHrfG&Fw_VG|}V@;CaMO6;P;U5}JNW?x-)m
znsgBzPj`Ksd>=leL=*7c5idSIQBQPYPVK^Ni8+T)c-lkFrx6c!=?k0d9CV)|<{6IO
zkMVpeSw2xf)t~j#hApEMA+(8^R(4)2V=<4*<CcU=>|-^|D{`!|1den>b`zfl6Sfao
zLxE&ZqF*t^T~=MMygX45_pPH8^8&Pz^*q)3fR4CG*&_)e)?tZxMkBMtZX;geVjkED
z!B_`+mnp`LhNgV5W)QcOc?Bd51}VH!V$)E#MPfJii2KHt9HwNyxR?cwT!sn(%CMOv
zIzoVME?3}8W^7XHVd`t>wJGtl#Sk~;#VSr<4~S8#FGG9t3o~S#P8oC5CF2=3<;Xbu
zXh2e-QbjQC$%iVDPAnuht`+RHpaQmH4{25oD9J7mnVwK8ohFve&!`MUrTM?{0RsFR
zW>2w2RF<dKnI0;akfqfY0FAK=6^hxWq9Y-5X~6((3xI5;%2XypZ1ex7-GaHo&E`_+
zf#y+3oI?KQhCD-5jlmOaJI%tsQj^e0%>uF2wdk2Bwb_k0aaWvtzSTa{kKJah&1P7o
zRfILIh_aQwW?!3~gvxC*)9>@;xu{2qJP`Rc;cv5xeEXsEE~U21w_Vp6n-Y^&v}lT{
zQ%NEN#>IEm#+(^w;oRoM7UPk*yx2S%;lX%xHjl)4a27AF;_*1IuHlt)d88(9hOF8=
z7U8}qFP_D@73I~IEk`x8d9aqp@s098jQgZ0IEM$KJXphh)lzEPJYt1;IjAZ%uCmd1
zC1z()gArpqKwRAsb4HwV#~1f>9vse6dT?Z5n1+T^*&#}IA2={XL%oC9;Yc6Yp3bhm
z;UVft^$pO*Y+punc#_ec&K|%eFs2XF(4mo3wwrppQ&}lgCNb_gDz3SAih#Evm=88G
zFx1yG(4CP{MT>X2$a+^*$P-_y4{S{TBlvH>eAC;**qBKA&Ns;Y4B(QY&`=6Jf?lr2
zeZaE0FqThmMBMT9=45s{6Pe_}>|j^7TB*j$g(!x5>)go%QP{!r!OO{HTZq^WznG}Z
z!OOrq8kB*sgI7bd$Qht?mOBnlKN55=ct_JkRAGsmg<+$@B_0$ms2C@zbd0YfnuE`Z
z^+gF575j^-Dphg7JN3)Qd>1{O$1Eczi)x=+0;Wk@F9GB2DCJ+k>yU@^lI=;&ON^YV
z9R8T*<-2`R;~T(dkhi0GQ}Yv|$sf+qA234_cFf;ua|Zmh#$VuFpcJW8uq_PbOyMiQ
zRT|#|M*50JN^DIYvrgbGn%@eX*8EQ3K@_>Do|p}5(f2Tn;<7mWtJ>jh@J{Y0f#1>k
zLg0@y#<{W2HGUWPYmL7G{y}409`+NCN5#)!@TWH12L4;)c_@c^mFxvz=a^0dN3<pj
zT#qx?i5i<V-w%E_(QJpuZm3<sjWnD^;tCjVfzL_NOBf*A8pi=AuN+XcjW0DG1O7%9
zKj_hnUx^ANMq<Wq8e=DnX|2HxFdk|gK{-XyS1~cEiN}kgqTXY>>73sY7?7zlz-AuO
zL01BgXuKTwWvxLF6UU*F*adt}tPdPvKZ~n@Mz-tnbYP7vuJyr~QB*Is2J6_gnDLg0
z*Mb3#6zOsCUa;NpSBsh8VZ;BJ=(QKHi{cGCX8G45SX^ASYuPPv$F5`J!V^juB^l8a
zs$&nuE;)EbjN<366PM&@O56-3EcZH`pI7`7iWw!>MWi%gdE|AtC^nVWvfstQ(u7e^
urjq!iwAd<;Ph?nJFNOL?aS!T(F{~^iLgAQII0fSg(Grds!9uYw9QqG?`8MkS

delta 2086
zcmYk6ZEO@p7{{NP-Pzl_>s{||uXjMta&KHkT1qvPE3FiW70a9Q<_iJo3kBi}oNajx
zcr|Ds#%QmDMwG-FUp^Q#P0$Y-HGDvcMuQrNd_V<aq6Q))l4vwh|Fbunu*vNH=KuWX
znP+xp_qmoEO=DRey;{k4mXBoqyWTlU^i-axvzO@3g?L^hYM)80eJRnzX`*%M+K-C^
z@B}Ene}KQ&IpJ#i<t3^qzC~2Q*aI_++3lN&x-fQCVaBcl_R@I!A><lGgTK;+)<ot}
zcqfswGDtM`2u00GfKmrlq6|e=j#9dEy_@A_8_U{;?IT=<>}3til4Uk6s)XID*|;?u
zh`qy_14?}o?E_n0VyPxSkn9X@SIj+>Ro!kf_fjqh+HH~>PZx;TGE>gvEzFb;@qE-^
zDk&iuTZYze%jbFXoNBUm2;T}7o{!ed$>k2k26wqru}=tjg|F<jV83iIJWxJ&R{`b@
zQ^K-1&?gMVQFUW+m7yEz-7yy&SMAfP>QIp#L%b628yG-oGGf*h=Ri1=U~5<_C0!5V
zG({0x=gtfoW5=et$|^S*=I5Wvjpo!<{Bod=R)i4i4)oIsl!OB6Ran_^*=j-~00%!)
zRftmPoM&t47Chh3B7Dm8zC3NVuFq32xFBeRiOdig_WTU%2(|}%oFd-5fD*1MnQ)I2
z3O)+anoB)ct&g!DhXJr_Jx&V(euo+1U{L#Qc4D<S#n_}w`ZA$O=DyLQs^FUJ_AMzd
z5W*2rD=KO;BHbopsf?(t7qL8gIg!6jr1K(W>`RO2ERo8I+6E!4jA*bNg~6PNWkr6v
zh-E}1D}wN4MJy*G84*J?rM!+K(pCa_s~tx$%i#twCL$!Nhrzfg3wB<v@IMe98KQw5
zJGYO}@JQd#u>8g!m;H7^9<b*Hho9KlH#A6FHx2BP=j=V!w!yxkkzqOEZ<Rm$+hl#9
zGoyBJp;{WQF<KOk-1{0^^Albvt~A<)6Q#gb#>V9N;Hzr?$iyL1CwGgSsM%Iu8rso6
zxT%C1wr+A+S%?Zmb+RjzEGN99aXUtO+(wl2cmZ^?I*1lS_Za_zgva+2P4WEwU{BwI
zSv=l;6Auwht@`D;P+`Wi=z6wsqG=w#bklUN$auKGrpu0S{WP~4d>Ub#U)G3TLi0vh
z3g;ew0SZ0_6{X+N=ISW^IJ5{=C|zBvwP!8(VWN6Z->3Dx(4W?0)teo|$~@1D+VlN*
zZKBNXK=d@q@S<Po=t<~Tbq2&3zHzsz_262~|A6tKxoepXMlRR$5f~M_`h(z=T0aiP
zzt`381Mi?RP1h5%5gn*QV3erA)A5Gg0nnH(o%MiU*GYT9?`nP<{GsOGz@O={_{i9I
zT0aQ>5xe8&FQao!n=)Xm$Xx*@<$9H>Fs^rra4L9Od%gxYVas))yjAO$p)b*lNjdgP
zc%H|I0*aB3m%wG!sX=F_HsO=uhc#m&KCTn}06vPQ{7QdQ>z{*v(K<r>Z#_W=_+QQQ
z@b|-F+_4dGgVwP%+{nre(cSC|c{bX@dQX_KF7<1=%gOSZ4RV{)$gayV_dX|{lxLiI
zJhWWe@m)N$S&qhMv0LTwc-9JGDg1&w8_%)z@~?O!OUiUzfk&3hd+Hk5VOdh0l6)Bt
zYf_$6y(9A1x`JhWiJJeA@kEwKj>}@AVEI15E<7VQCvt4DJe(+Se@RY4_hSm$FE1$P
hsqrL)tC*8yQ!;A>fwWz&O=c638^Ax&yi2_=`X4;m5WWBa

diff --git a/packages/debug-info/test-projects/ppc-min/build/min.elf b/packages/debug-info/test-projects/ppc-min/build/min.elf
index 44fee28690cde98c9df76abcd17863761cf78a89..8108423d30745f67a88849561ac1f898e370e328 100755
GIT binary patch
delta 2056
zcmYjRT}+c#7=F+9edlYTg&zBLZ7HSwN-KhbvZ%2rD8`|Hf9N#CZOTt!{767c1-7Y$
z?0><G?j+7-Y%^QTSYq53++vJNrWbR`%!0`-Om<_uGGQ0)X7Nh)zK62xB<Gy>ectE&
zIloVLF6^3#vj@3EoZkY_Zsqnx*+gz=!gv4goBNZG9&d}?5s`(l{+dPc`B3g@f3|*7
zKz*lxsf4I(Xhiv;fVx&un@kDg@?9b7s(?)ug0KEEat0xJwAynkX^6_RsqSmZD<a%5
zDIkZwM-!g2xoQzSw>rN5P{r!8bIw*@-Md1l_~@If2IG^2aDRs}XShhr45GdkR&B`@
zLiqbZ*nMCU>`nlXPgp$m*3!~aBPz`}x8eK>&Yd`)!ubi#b8?fmqfDUGxU}@_G0xN2
zsoB_%AeNDrv}nOZK8~2bt?ek13tGWP;sCoU4~mlP7Y6Y`0HcT$E8p}_fiq<+M&zF|
z9R2`c?Kr#h6fm3)6gL_MO$`i(zx*7>Cawz*l^%l+3}>K#5Hdo*#GzXm6D~q|7RPbw
zIu12D7#jHpDZ@Cq+ze9aKIIZ7AXh@=>{CFHxaYC|pu9Cz*cD<uEG;5fu~czA&KLrV
z<^+_ha=?5I;#fi!#tonp*X#;h-Ci@()dy=V5<x@QtW<P^<hd%UdE80zpKFP8xX?V6
zNyEBAM7jmxC#t<T{^moO9j;NnVKA5z!8WWGqXO$z)pEc>S+;cpt!GhHT1%zhsr4ZK
zmI8nhE@F9X%2|iweTs8_D-JapknG+@vaXTbT2Hcrll)Z!$%dOsy1spR36u}YcjCsd
z_f>Quc8z7RxZUWXIf(lEo>eHi)yk`y@yNB1M#sk<8H|qZu%S^g!w6{>g-h@Ck*^Bp
z&aY3~r`E@o&qR&7%02ipu1u>{<Tl##_2M|5zcy(O^uP&Kq{{5=prDfmU_cGGS-bfE
zfGX76UAPSGxC+&eHN!0P(Pd~t^d~xjCO}7+W~UX3w;MG`vRMG#>FY|RfTdN!6vBS&
z?&pvbMDMS$Kl8H}+4B%U$R-Cs1ANR<CIX!(PP5q(oW|K96&+*in+u2G5WSuz2zB-J
z0Nekc>6koV`Rnw}=-h||rz&C!>(_UqN(Z<ljLJcF1aQao5c1lVdBj;KKeIwr^!(U6
z*xS*Xf2gd0Ek8fD{QU5(vJ3K|6%W$8U>BL2HfEFBqiQ<6Sy}39e<=nn)&{&+Mgm-}
z?Jga!A7`w^Vz^;u5w3P?jBRt(xmv6wvK$uEi(Rf|EaoJV6G_E+pt!{<a-Bq8!DeWg
zzvo+E8sjn-2+AM*8?w5n=iK5RlX1I}d-MsLdlRuJw-el3#yzDxk>KG74^?tIvTR0L
zSbyE-t{C@}ac;(V*tAHCM7cN46FA1WDCaIBc~^50<K75&g^6le+&29@h)}80OD$|X
zgxOh4W55^}z%|@J(4WYGz(}C4gI;fH<P3gNqnWPsD5QFahDK#uFktLS5A?`agUMK5
zM<0qCp|2w~2BW9XbftTtzqc!$8AXUp@|)mE`5@3PBPB8KX#Yq$W1krw9q1eG?XmIu
zliN#vbzWr-%A1t8wZMELBw3b@IEV*C@8B4Img-N%3q%LiOI&P8yvg(|2lI9V`D7nK
zoqlE$b-HG6ppI7voO%13sMD83-#OVoKz$;wQ@#%coDltF&lhkJ33SI-63n7be9|ev
z9O?wDB={B!>_mM!U*L7LCs1GUzbP}}<Bt5!$%Sy8jvF=4%PN>$8@a&VlQ$yctXbAZ
z$24P?oQuZU9eFQWVFoZCJ0hP(%gtafieF0GF4sa1`GQ@cg=XcDy@ubwJ(-c0>~gcL
W8B_iuf40m05&A^$Vqa-$|NaGe6*BAq

delta 1897
zcmX|BU2IfE6h3qBo$a#QpJ{h#cgvREySps~TB!zQ3#F8lBBdZjAP|(;?T<@^l-eyV
zD7eL+AO_>EBS8#_HHtoH8j@;^Mu{dw9>55`$cqvCU^Gp%i9aDeP``7x^(HfOzVH0Z
zxo6JI&9=K6voS%rcuZa;GOp&fRg13N;bXxM&SeHZd#Sbl)}~Zo?YT<(%=zmxxw{85
zZ#Z+a&Etwr#Z_H%x1#l}ikj~zYFbXBX{&0SxTe$|yX1>Rud+`0D0rgRm~5U<1nz|X
znF<q^R3r!AlQrgjO?|3v1AKSZ){LI?ZVfh_R*GY@eQtva<?6}05Lbnl5i{4X;@PLD
z)XMoN@&X5PNIf!6ww@I+=j`0vTq_Z6!P<rOaje}~hp^6Ky{uOo8)`z3TIc5O{fae9
z8;jMBx5ciXih+o140zo;tg}Y-qH*{oz^JLOjSWS5u4IR}taqqzrp^Kjo&<+gE^sF^
zPExo^H(nKysKnr83Ky(QZvn*DOpBKb0_q3KCB$}VDpGYNmK+!yArCW9((Vctdt7DQ
z&ul>k^B4~=rUsKtgZ+>54r3gTLL55fx<oj}4`EJcn@hO5=Kw!(y$v_9OYBy=q=;$P
z%31{RE3boj#yUn(hV5h>rx;Sm(3nNc{AJg|uhSYyrf6A!MKVC|uXD{UmVaN)IgfcE
z3ugt}JnFNCMuusn4}6beo6qaZFkcU{O=pAa8zED0ejnja5S2uao2|spk;t^I;{Ta(
zGi_wX+gO76MVBDna0XFC%G-qb7K$U9*Me*?hzr%dj^%vO-fw2PKr;W^dX}w1PU+v4
z{4el+^uk6IMx1e@E7dldAxmsVK1Km&9DKMGVxjxzuWZ4Q8<hqhpO`iUAKj#B@Nql|
z*$8mBZ##qR>xL_YFHMUe@81q~GgqRWP$&9cBwZF=21E&Q5&B#(+1r~zIo$L>mtzzz
zh7H=<Xv8>OE_R9gsRESE4#fTbquApC(G4*xE{3suBX+vc5!<-p8>F4w#qCs??CT@3
z{eRW8FG<_EE!urOv>kcFW(oSwxPox4fL>0^^ufgV4v<T`CIWC<>?W?oyRhT-haKB|
z3~?XEZVaM{{B03mnvD3i9LDH^%PcTw^ry(*7LmU#xLP7@>3zXy=s0o|CxlzT)ov~8
zx!TkE_2Az9aq|0H{3g1@Dk9Un))DLcP5zER0=*%@6z3VIxFb;HKLpbAAa$VV1wwQL
z1O#+`M_?5civq$d_WS4Uy<)0u@l9dSA9`shq#G($Wm=>R$Wl+KEODg$kSvQhvSf)Y
zivz`Ee1){*GGabs%hHuH5|brMrSv#*sVBgqKPJnfGF~mq9I2wx54)%=i%I3kGH4@g
z8wg0-Q;xWK5Rk$XFia9cDw2lc8)4qj|5O~&kA?TH!Nux5aun}JdL%iVru4xh!z1?5
z!Sq0Cu)ojdhb2$3lzO6PU?fec<iMalA4>SsPajPV_k->o)w7{Po`e0#;gPhS4A<yi
z!q@QhO;%P--Kf+e<Gy7$9xnI+oE8>JpmX`=^xzR=y@k$ZeF~UgL=P~xRT>x#Lf(1(
zv%vfm@Nu*LdEl;j%=hLrFt_kRyjK;qaA&v#J6wPP6AJ++kWe>pc0Qp?(8qxn0(_{O
zs}AUQsuELos-i-h)n`RkXRF7At-bcBVcyW=c1(2Y_v~6v`CDkR7Jbu>dMa*1d|BVM
tqei$}N1R$C{I}lZEW<I7F{Fo_s3$UxZ9dg+I??i~H4v|1EPQT_{sR&kC@BB{

diff --git a/packages/debug-info/test-projects/ppc-min/build/oracle-obj.json b/packages/debug-info/test-projects/ppc-min/build/oracle-obj.json
index cabcc37..fca0882 100644
--- a/packages/debug-info/test-projects/ppc-min/build/oracle-obj.json
+++ b/packages/debug-info/test-projects/ppc-min/build/oracle-obj.json
@@ -5,6 +5,8 @@
     "g_bits": 4,
     "g_counter": 28,
     "g_cv": 0,
+    "g_grid": 56,
+    "g_grid3": 32,
     "g_probe": 0,
     "g_probe_ptr": 0,
     "g_ptr": 24,
@@ -23,7 +25,7 @@
     "0x20": {
       "func": "bump",
       "file": "main.c",
-      "line": 85
+      "line": 100
     },
     "0x10": {
       "func": "square",
diff --git a/packages/debug-info/test-projects/ppc-min/build/oracle.json b/packages/debug-info/test-projects/ppc-min/build/oracle.json
index c638700..9012e00 100644
--- a/packages/debug-info/test-projects/ppc-min/build/oracle.json
+++ b/packages/debug-info/test-projects/ppc-min/build/oracle.json
@@ -4,12 +4,14 @@
     "__GNU_EH_FRAME_HDR": 268435968,
     "__bss_start": 268439564,
     "_edata": 268439562,
-    "_end": 268439632,
+    "_end": 268439672,
     "add": 268435776,
     "bump": 268435808,
     "g_bits": 268439568,
     "g_counter": 268439592,
     "g_cv": 268439564,
+    "g_grid": 268439656,
+    "g_grid3": 268439632,
     "g_probe": 268439600,
     "g_probe_ptr": 268439552,
     "g_ptr": 268439588,
@@ -30,12 +32,12 @@
     "0x10000160": {
       "func": "bump",
       "file": "main.c",
-      "line": 85
+      "line": 100
     },
     "0x10000100": {
       "func": "main",
       "file": "main.c",
-      "line": 97
+      "line": 113
     },
     "0x10000150": {
       "func": "square",
diff --git a/packages/debug-info/test-projects/ppc-min/main.c b/packages/debug-info/test-projects/ppc-min/main.c
index 6db4311..62f6f60 100644
--- a/packages/debug-info/test-projects/ppc-min/main.c
+++ b/packages/debug-info/test-projects/ppc-min/main.c
@@ -82,6 +82,20 @@ int square(int n) {
     return n * n;
 }
 
+/* ---- RANK. A flat element count cannot say how many subscripts reach an ELEMENT, and
+ * `g[i]` on a `[2][3]` is a ROW. The per-dimension extents are their own fact
+ * (variableShape().dims / StructMember.dims), and they are ABI- and byte-order-independent,
+ * so all four toolchains must report them identically. (agbcc-min additionally carries the
+ * `extern T x[][4]` idiom, whose unsized outer bound is a GCC 2.95 ENCODING quirk — modern
+ * producers spell it differently, so it is pinned there rather than shared.) */
+unsigned char g_grid3[2][3][4]; /* fully-bounded rank 3: dims [2,3,4], length 24 */
+
+struct Grid { /*   Grid: id @0 (4)  cells @4 (12: [2][3] of u16)        size 16 */
+    int id;
+    unsigned short cells[2][3]; /* the same fact one level down, on a member */
+};
+struct Grid g_grid;
+
 void bump(void) {
     g_counter += 1;
     g_ptr = &g_counter;                          /* keep the pointer global live */
@@ -92,6 +106,8 @@ void bump(void) {
     g_bits.after = g_counter;
     g_cv.level = (signed char) g_counter;        /* keep struct Cv + its quals live */
     g_probe.count = g_rom_table[g_counter & 1];  /* keep the const table live */
+    g_grid3[1][2][3] = (unsigned char) g_counter; /* keep the rank-3 array live */
+    g_grid.cells[1][2] = (unsigned short) g_grid.id; /* keep struct Grid + its 2-D member live */
 }
 
 int main(void) {