review

ethteck · Mar 19, 2024 · 2da5509 · 2da5509
1 parent 1ac8368
commit 2da5509
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 30 deletions.
diff --git a/src/splat/segtypes/common/data.py b/src/splat/segtypes/common/data.py
@@ -60,11 +60,7 @@ def split(self, rom_bytes: bytes):
             if preamble:
                 f.write(preamble + "\n")
 
-            f.write(f".section {self.get_linker_section_linksection()}")
-            section_flags = self.get_section_flags()
-            if section_flags:
-                f.write(f', "{section_flags}"')
-            f.write("\n\n")
+            f.write(f"{self.get_section_asm_line()}\n\n")
 
             f.write(self.spim_section.disassemble())
 

diff --git a/src/splat/segtypes/common/textbin.py b/src/splat/segtypes/common/textbin.py
@@ -47,11 +47,7 @@ def write_asm_contents(self, rom_bytes, f: TextIO):
         assert isinstance(self.rom_start, int)
         assert isinstance(self.rom_end, int)
 
-        f.write(f".section {self.get_linker_section_linksection()}")
-        section_flags = self.get_section_flags()
-        if section_flags:
-            f.write(f', "{section_flags}"')
-        f.write("\n\n")
+        f.write(f"{self.get_section_asm_line()}\n\n")
 
         # Check if there's a symbol at this address
         sym = None

diff --git a/src/splat/segtypes/n64/asm.py b/src/splat/segtypes/n64/asm.py
@@ -22,11 +22,7 @@ def get_file_header(self):
             ret.append(preamble)
             ret.append("")
 
-        line = f".section {self.get_linker_section_linksection()}"
-        section_flags = self.get_section_flags()
-        if section_flags:
-            line += f', "{section_flags}"'
-        ret.append(line)
+        ret.append(self.get_section_asm_line())
         ret.append("")
 
         return ret
diff --git a/src/splat/segtypes/n64/hasm.py b/src/splat/segtypes/n64/hasm.py
@@ -22,11 +22,7 @@ def get_file_header(self):
             ret.append(preamble)
             ret.append("")
 
-        line = f".section {self.get_linker_section_linksection()}"
-        section_flags = self.get_section_flags()
-        if section_flags:
-            line += f', "{section_flags}"'
-        ret.append(line)
+        ret.append(self.get_section_asm_line())
         ret.append("")
 
         return ret
diff --git a/src/splat/segtypes/ps2/asm.py b/src/splat/segtypes/ps2/asm.py
@@ -17,11 +17,7 @@ def get_file_header(self):
             ret.append(preamble)
             ret.append("")
 
-        line = f".section {self.get_linker_section_linksection()}"
-        section_flags = self.get_section_flags()
-        if section_flags:
-            line += f', "{section_flags}"'
-        ret.append(line)
+        ret.append(self.get_section_asm_line())
         ret.append("")
 
         return ret
diff --git a/src/splat/segtypes/psx/asm.py b/src/splat/segtypes/psx/asm.py
@@ -17,11 +17,7 @@ def get_file_header(self):
             ret.append(preamble)
             ret.append("")
 
-        line = f".section {self.get_linker_section_linksection()}"
-        section_flags = self.get_section_flags()
-        if section_flags:
-            line += f', "{section_flags}"'
-        ret.append(line)
+        ret.append(self.get_section_asm_line())
         ret.append("")
 
         return ret
diff --git a/src/splat/segtypes/segment.py b/src/splat/segtypes/segment.py
@@ -574,6 +574,13 @@ def get_section_flags(self) -> Optional[str]:
         """
         return None
 
+    def get_section_asm_line(self) -> str:
+        line = f".section {self.get_linker_section_linksection()}"
+        section_flags = self.get_section_flags()
+        if section_flags:
+            line += f', "{section_flags}"'
+        return line
+
     def out_path(self) -> Optional[Path]:
         return None