fix iwram persistence

velipso · Sep 11, 2023 · 8634d5c · 8634d5c
1 parent 5268b11
commit 8634d5c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/src/import.ts b/src/import.ts
@@ -2493,7 +2493,8 @@ export class Import {
         if (ewram - 0x02000000 > 256 * 1024) {
           throw new CompError(struct.flp, 'Out of memory for static allocation in EWRAM');
         }
-        memory = { iwram, ewram };
+        memory.iwram = iwram;
+        memory.ewram = ewram;
       } else {
         const baseAddr = bases[0].addr;
         const sects = await section.flatten(bases[0], memory, length);

diff --git a/src/itests/memory.ts b/src/itests/memory.ts
@@ -130,6 +130,41 @@ export function load(def: (test: ITest) => void) {
 .struct baz = ewram
   .i8 data
 .end
+`,
+    },
+  });
+
+  def({
+    name: 'memory.multiple-files',
+    desc: 'Memory allocation across disparate files',
+    kind: 'make',
+    stdout: [
+      'one = 03000000',
+      'two = 03000004',
+      'three = 0300000c',
+    ],
+    files: {
+      '/root/main': `
+.import './two' { two }
+.import './three' { three }
+.struct one = iwram
+  .i32 one
+.end
+.include './two'
+.include './three'
+.printf "one = %08x", one
+.printf "two = %08x", two
+.printf "three = %08x", three
+`,
+      '/root/two': `
+.struct two = iwram
+  .i32 two[2]
+.end
+`,
+      '/root/three': `
+.struct three = iwram
+  .i32 three[3]
+.end
 `,
     },
   });

diff --git a/src/main.ts b/src/main.ts
@@ -13,7 +13,7 @@ import { IItestArgs, itest } from './itest.ts';
 import { argParse, Path } from './deps.ts';
 import { ILexKeyValue, lexKeyValue } from './lexer.ts';
 
-export const version = 2003000;
+export const version = 2003001;
 
 function printVersion() {
   const vmaj = Math.floor(version / 1000000) % 1000;