Remove asm from tree (#82)

riidefi · Jul 28, 2021 · 1c01664 · 1c01664
1 parent 7834670
commit 1c01664
Show file tree

Hide file tree

Showing 183 changed files with 44 additions and 1,621,913 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,17 +47,15 @@ jobs:
           Remove-Item '.\tools.zip'
           Remove-Item -LiteralPath 'tools2' -Force -Recurse
 
-      - name: Re-generate assembly
-        run: python -m mkwutil.gen_asm
+      - uses: actions/cache@v2
+        with:
+          path: asm/dol
+          key: asm-dol
 
-      # https://stackoverflow.com/a/56389437
-      - name: Verify assembly still the same
-        run: |
-          $ChangedFiles = $(git status --porcelain | Measure-Object | Select-Object -expand Count)
-          if ($ChangedFiles -gt 0) {
-            git status --porcelain
-            throw "Found $ChangedFiles changed files! Did you run gen_asm?"
-          }
+      - uses: actions/cache@v2
+        with:
+          path: asm/rel
+          key: asm-rel
 
       - name: Build mkw
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,10 @@
 /pack/dol.lcf
 /pack/rel.lcf
 
+# Auto-generated assembly
+/asm/dol/
+/asm/rel/
+
 # Executables
 *.exe
 *.dll
@@ -58,9 +62,6 @@ tmp
 *.map
 out.html
 
-# Compiler tools bundle
-tools.7z
-
 # Editors
 .vscode/
 *.bndb

diff --git a/README.md b/README.md
@@ -85,7 +85,6 @@ The dead-stripping feature can be re-enabled by:
   - [pack/dol_slices.csv](./pack/dol_slices.csv)
   - [pack/rel_slices.csv](./pack/rel_slices.csv)
 - Entries must be sorted in the spreadsheet (current limitation).
-- After modifying slices, run `python3 -m mkwutil.gen_asm`.
 - Add your new build target to `mkwutil/sources.py`.
 - Run `build.py`.
 

diff --git a/asm/dol/bss_802a4080_802f2338.s b/asm/dol/bss_802a4080_802f2338.s
diff --git a/asm/dol/bss_802f2410_802f2440.s b/asm/dol/bss_802f2410_802f2440.s
diff --git a/asm/dol/bss_802f247c_802f3480.s b/asm/dol/bss_802f247c_802f3480.s
diff --git a/asm/dol/bss_802f34b0_802f34c0.s b/asm/dol/bss_802f34b0_802f34c0.s
diff --git a/asm/dol/bss_802f3624_802f3820.s b/asm/dol/bss_802f3624_802f3820.s
diff --git a/asm/dol/bss_802f3a20_802f3f40.s b/asm/dol/bss_802f3a20_802f3f40.s
diff --git a/asm/dol/bss_802f4040_80346cf0.s b/asm/dol/bss_802f4040_80346cf0.s
diff --git a/asm/dol/bss_80346d18_803481b0.s b/asm/dol/bss_80346d18_803481b0.s
diff --git a/asm/dol/bss_80348230_80357220.s b/asm/dol/bss_80348230_80357220.s
diff --git a/asm/dol/bss_80357238_803832d8.s b/asm/dol/bss_80357238_803832d8.s
diff --git a/asm/dol/bss_803832e4_80384320.s b/asm/dol/bss_803832e4_80384320.s
diff --git a/asm/dol/bss_80384348_80384b60.s b/asm/dol/bss_80384348_80384b60.s
diff --git a/asm/dol/bss_80384b6c_80384b70.s b/asm/dol/bss_80384b6c_80384b70.s
diff --git a/asm/dol/bss_80384bf4_80384c00.s b/asm/dol/bss_80384bf4_80384c00.s
diff --git a/asm/dol/ctors_80244de0_80244e88.s b/asm/dol/ctors_80244de0_80244e88.s
diff --git a/asm/dol/ctors_80244e8c_80244e90.s b/asm/dol/ctors_80244e8c_80244e90.s