Subrepo Updates (#1368)

* git subrepo pull --force tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "fed1e3ddb"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "fed1e3ddb"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "4ed847317"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ"
  branch:   "main"
  commit:   "4ed847317"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "7f398831f"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "7f398831f"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

* git subrepo pull (merge) --force tools/fado

subrepo:
  subdir:   "tools/fado"
  merged:   "8ce048376"
upstream:
  origin:   "git@github.com:EllipticEllipsis/fado.git"
  branch:   "master"
  commit:   "8ce048376"
git-subrepo:
  version:  "0.4.6"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

6 files changed, 66 insertions, 14 deletions

diff --git a/tools/asm-processor/.gitrepo b/tools/asm-processor/.gitrepo
index e9ee1dd74..6265b2fc5 100644
--- a/tools/asm-processor/.gitrepo
+++ b/tools/asm-processor/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = git@github.com:simonlindholm/asm-processor.git
 	branch = main
-	commit = bbd86ea1faf84e6a7a0e101ab8068a00a3dfb2fc
-	parent = 8985197b6da23db874ac6e8a29ddec5636944bba
+	commit = fed1e3ddb9967bd427f4599b1b8ededa296bd9f9
+	parent = 4fa13e4132cf8adb2f07bb34927e62e525c8cc79
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.6
diff --git a/tools/asm-processor/asm_processor.py b/tools/asm-processor/asm_processor.py
index 0d62bc32a..317585291 100644
--- a/tools/asm-processor/asm_processor.py
+++ b/tools/asm-processor/asm_processor.py
@@ -2,7 +2,6 @@
 import argparse
 import tempfile
 import struct
-import copy
 import sys
 import re
 import os
@@ -82,7 +81,14 @@ R_MIPS_HI16 = 5
 R_MIPS_LO16 = 6
 
 MIPS_DEBUG_ST_STATIC = 2
+MIPS_DEBUG_ST_PROC = 6
+MIPS_DEBUG_ST_BLOCK = 7
+MIPS_DEBUG_ST_END = 8
+MIPS_DEBUG_ST_FILE = 11
 MIPS_DEBUG_ST_STATIC_PROC = 14
+MIPS_DEBUG_ST_STRUCT = 26
+MIPS_DEBUG_ST_UNION = 27
+MIPS_DEBUG_ST_ENUM = 28
 
 
 class ElfFormat:
@@ -605,11 +611,11 @@ class GlobalAsmBlock:
         line = re.sub(r'^[a-zA-Z0-9_]+:\s*', '', line)
         changed_section = False
         emitting_double = False
-        if line.startswith('glabel ') and self.cur_section == '.text':
+        if (line.startswith('glabel ') or line.startswith('jlabel ')) and self.cur_section == '.text':
             self.text_glabels.append(line.split()[1])
         if not line:
             pass # empty line
-        elif line.startswith('glabel ') or line.startswith('dlabel ') or line.startswith('endlabel ') or (' ' not in line and line.endswith(':')):
+        elif line.startswith('glabel ') or line.startswith('dlabel ') or line.startswith('jlabel ') or line.startswith('endlabel ') or (' ' not in line and line.endswith(':')):
             pass # label
         elif line.startswith('.section') or line in ['.text', '.data', '.rdata', '.rodata', '.bss', '.late_rodata']:
             # section change
@@ -651,19 +657,26 @@ class GlobalAsmBlock:
             emitting_double = True
         elif line.startswith('.space'):
             self.add_sized(int(line.split()[1], 0), real_line)
-        elif line.startswith('.balign') or line.startswith('.align'):
+        elif line.startswith('.balign'):
             align = int(line.split()[1])
             if align != 4:
                 self.fail("only .balign 4 is supported", real_line)
             self.align4()
+        elif line.startswith('.align'):
+            align = int(line.split()[1])
+            if align != 2:
+                self.fail("only .align 2 is supported", real_line)
+            self.align4()
         elif line.startswith('.asci'):
             z = (line.startswith('.asciz') or line.startswith('.asciiz'))
             self.add_sized(self.count_quoted_size(line, z, real_line, output_enc), real_line)
         elif line.startswith('.byte'):
             self.add_sized(len(line.split(',')), real_line)
-        elif line.startswith('.half'):
+        elif line.startswith('.half') or line.startswith('.hword') or line.startswith(".short"):
             self.align2()
             self.add_sized(2*len(line.split(',')), real_line)
+        elif line.startswith('.size'):
+            pass
         elif line.startswith('.'):
             # .macro, ...
             self.fail("asm directive not supported", real_line)
@@ -1268,6 +1281,7 @@ def fixup_objfile(objfile_name, functions, asm_prelude, assembler, output_enc, d
 
         # Add static symbols from .mdebug, so they can be referred to from GLOBAL_ASM
         if mdebug_section and convert_statics != "no":
+            static_name_count = {}
             strtab_index = len(objfile.symtab.strtab.data)
             new_strtab_data = []
             ifd_max, cb_fd_offset = fmt.unpack('II', mdebug_section.data[18*4 : 20*4])
@@ -1276,20 +1290,28 @@ def fixup_objfile(objfile_name, functions, asm_prelude, assembler, output_enc, d
             for i in range(ifd_max):
                 offset = cb_fd_offset + 18*4*i
                 iss_base, _, isym_base, csym = fmt.unpack('IIII', objfile.data[offset + 2*4 : offset + 6*4])
+                scope_level = 0
                 for j in range(csym):
                     offset2 = cb_sym_offset + 12 * (isym_base + j)
                     iss, value, st_sc_index = fmt.unpack('III', objfile.data[offset2 : offset2 + 12])
                     st = (st_sc_index >> 26)
                     sc = (st_sc_index >> 21) & 0x1f
-                    if st in [MIPS_DEBUG_ST_STATIC, MIPS_DEBUG_ST_STATIC_PROC]:
+                    if st in (MIPS_DEBUG_ST_STATIC, MIPS_DEBUG_ST_STATIC_PROC):
                         symbol_name_offset = cb_ss_offset + iss_base + iss
                         symbol_name_offset_end = objfile.data.find(b'\0', symbol_name_offset)
                         assert symbol_name_offset_end != -1
-                        symbol_name = objfile.data[symbol_name_offset : symbol_name_offset_end + 1]
+                        symbol_name = objfile.data[symbol_name_offset : symbol_name_offset_end]
+                        if scope_level > 1:
+                            # For in-function statics, append an increasing counter to
+                            # the name, to avoid duplicate conflicting symbols.
+                            count = static_name_count.get(symbol_name, 0) + 1
+                            static_name_count[symbol_name] = count
+                            symbol_name += b":" + str(count).encode("utf-8")
                         emitted_symbol_name = symbol_name
                         if convert_statics == "global-with-filename":
                             # Change the emitted symbol name to include the filename,
-                            # but don't let that affect deduplication logic.
+                            # but don't let that affect deduplication logic (we still
+                            # want to be able to reference statics from GLOBAL_ASM).
                             emitted_symbol_name = objfile_name.encode("utf-8") + b":" + symbol_name
                         section_name = {1: '.text', 2: '.data', 3: '.bss', 15: '.rodata'}[sc]
                         section = objfile.find_section(section_name)
@@ -1304,10 +1326,23 @@ def fixup_objfile(objfile_name, functions, asm_prelude, assembler, output_enc, d
                             st_other=STV_DEFAULT,
                             st_shndx=section.index,
                             strtab=objfile.symtab.strtab,
-                            name=symbol_name[:-1].decode('latin1'))
-                        strtab_index += len(emitted_symbol_name)
-                        new_strtab_data.append(emitted_symbol_name)
+                            name=symbol_name.decode('latin1'))
+                        strtab_index += len(emitted_symbol_name) + 1
+                        new_strtab_data.append(emitted_symbol_name + b'\0')
                         new_syms.append(sym)
+                    if st in (
+                        MIPS_DEBUG_ST_FILE,
+                        MIPS_DEBUG_ST_STRUCT,
+                        MIPS_DEBUG_ST_UNION,
+                        MIPS_DEBUG_ST_ENUM,
+                        MIPS_DEBUG_ST_BLOCK,
+                        MIPS_DEBUG_ST_PROC,
+                        MIPS_DEBUG_ST_STATIC_PROC,
+                    ):
+                        scope_level += 1
+                    if st == MIPS_DEBUG_ST_END:
+                        scope_level -= 1
+                assert scope_level == 0
             objfile.symtab.strtab.data += b''.join(new_strtab_data)
 
         # Get rid of duplicate symbols, favoring ones that are not UNDEF.
diff --git a/tools/asm-processor/mypy.ini b/tools/asm-processor/mypy.ini
new file mode 100644
index 000000000..9a57d3c52
--- /dev/null
+++ b/tools/asm-processor/mypy.ini
@@ -0,0 +1,3 @@
+[mypy]
+files = asm_processor.py, build.py
+
diff --git a/tools/asm-processor/prelude.inc b/tools/asm-processor/prelude.inc
index 3e58ff149..9bc893962 100644
--- a/tools/asm-processor/prelude.inc
+++ b/tools/asm-processor/prelude.inc
@@ -1,11 +1,21 @@
 .set noat
 .set noreorder
 .set gp=64
+
 .macro glabel label
     .global \label
     \label:
 .endm
 
+.macro dlabel label
+    .global \label
+    \label:
+.endm
+
+.macro jlabel label
+    \label:
+.endm
+
 
 # Float register aliases (o32 ABI, odd ones are rarely used)
 
diff --git a/tools/asm-processor/tests/static-global.c b/tools/asm-processor/tests/static-global.c
index a7f616907..12b143462 100644
--- a/tools/asm-processor/tests/static-global.c
+++ b/tools/asm-processor/tests/static-global.c
@@ -25,9 +25,11 @@ nop
 )
 
 static int xtext(int a, int b, int c) {
+    static int bss2;
     return 1;
 }
 
 void baz(void) {
+    { static int bss2; }
     xtext(bss2, rodata2[0], data2[0]);
 }
diff --git a/tools/asm-processor/tests/static-global.objdump b/tools/asm-processor/tests/static-global.objdump
index a519e4f48..c792e6a93 100644
--- a/tools/asm-processor/tests/static-global.objdump
+++ b/tools/asm-processor/tests/static-global.objdump
@@ -15,6 +15,8 @@ SYMBOL TABLE:
 00000004 g     O .data	00000000 data2
 00000004 g     O .bss	00000000 bss2
 00000030 g     F .text	00000000 xtext
+00000008 g     O .bss	00000000 bss2:1
+0000000c g     O .bss	00000000 bss2:2
 
 
 RELOCATION RECORDS FOR [.text]: