Fix missing recomp syms

Author: Francessco121

include/dlls/objects/223_cannon_claw.h

@@ -1,7 +1,8 @@
 #ifndef _DLLS_223_H
 #define _DLLS_223_H
 
-#include "common.h"
+#include <PR/ultratypes.h>
+#include "game/actor/actor.h"
 #include "dll_def.h"
 
 DLL_INTERFACE_BEGIN(223_cannon_claw)

include/dlls/objects/365.h

@@ -0,0 +1,14 @@
+#ifndef _DLLS_365_H
+#define _DLLS_365_H
+
+#include <PR/ultratypes.h>
+#include "game/actor/actor.h"
+#include "dll_def.h"
+
+typedef struct
+{
+	u8 mPad[0x62];
+	s8 m0062;
+} TStruct365Func0006;
+
+#endif //_DLLS_365_H

src/dlls/engine/29_gplay/gplay.c

@@ -1,5 +1,11 @@
 #include <PR/ultratypes.h>
-#include "common.h"
+
+#include "game/actor/actor.h"
+#include "sys/dll.h"
+#include "sys/math.h"
+#include "variables.h"
+#include "functions.h"
+#include "dll.h"
 
 static const char str1[] = "gplayLoadGame error: savegame and backup failed to load.\n";
 static const char str2[] = "gplayLoadOptions error: saveoptions failed to load.\n";
@@ -87,6 +93,7 @@ void gplay_func_110(s8 param1) {
 }
 
 #if 1
+void gplay_func_198(s8 param1, u8 *param2);
 #pragma GLOBAL_ASM("asm/nonmatchings/dlls/engine/29_gplay/gplay_func_198.s")
 #else
 void gplay_func_198(s8 param1, u8 *param2) {

src/dlls/engine/31_flash/flash.c

@@ -99,9 +99,10 @@ static s32 osFlashReadArray(OSIoMesg *mb, s32 priority, u32 page_num, void *dram
 }
 
 #if 1
+s16 flash_save_game(FlashStruct *param1, u8 param2, s32 param3, s32 param4);
 #pragma GLOBAL_ASM("asm/nonmatchings/dlls/engine/31_flash/flash_save_game.s")
 #else
-/*export*/ s16 _flash_save_game(FlashStruct *param1, u8 param2, s32 param3, s32 param4) {
+/*export*/ s16 flash_save_game(FlashStruct *param1, u8 param2, s32 param3, s32 param4) {
     u32 *buf;
     s16 i;
     s16 page;

src/dlls/engine/31_flash/syms.txt

@@ -4,7 +4,7 @@ flash_load_game = 0x6C;
 flash_save_game = 0x224;
 flash_compute_checksum = 0x404;
 osFlashInit = 0x4DC;
-flash_compute_checksum_func_638 = 0x638;
+flash_func_638 = 0x638;
 osFlashReadStatus = 0x640;
 osFlashReadId = 0x70C;
 osFlashClearStatus = 0x820;

src/dlls/objects/223_cannon_claw/cannon_claw.c

@@ -1,6 +1,8 @@
 #include <PR/ultratypes.h>
 
-#include "common.h"
+#include "game/actor/actor.h"
+#include "variables.h"
+#include "functions.h"
 
 static void cannon_claw_func_1B4(TActor *a0);
 

src/dlls/objects/365/365.c

@@ -1,12 +1,9 @@
 #include <PR/ultratypes.h>
 
-#include "common.h"
-
-typedef struct
-{
-	u8 mPad[0x62];
-	s8 m0062;
-} TStruct365Func0006;
+#include "game/actor/actor.h"
+#include "variables.h"
+#include "functions.h"
+#include "dlls/objects/365.h"
 
 static s32 func_0007(TActor *arg0, TActor *arg1, TStruct365Func0006 *arg2, s32 arg3);
 

src/dlls/objects/365/syms.txt

@@ -0,0 +1 @@
+func_0007 = 0xe4;

tools/gen_recomp_syms.py

@@ -1,12 +1,13 @@
 import argparse
 import shutil
+from subprocess import check_output
 from elftools.elf.elffile import ELFFile
 from elftools.elf.sections import SymbolTableSection
 from typing import TextIO
 import math
 import os
 from pathlib import Path
-from pycparser import c_ast, parse_file, c_generator
+from pycparser import c_ast, c_generator, CParser
 
 from dino.dll import DLL
 from dino.dll_analysis import get_all_dll_functions
@@ -27,7 +28,7 @@
 
     # 0x8001B4F0-0x8001C8D4 is handwritten assembly that trips up recomp, split it into a bunch of
     # functions that don't technically exist to get recomp working. This will basically make problematic
-    # conditional branches turn into condotional tail calls into these fake functions
+    # conditional branches turn into conditional tail calls into these fake functions
     # Note: Some of the fake functions must overlap fake functions below them
     0x8001B4F0: { "name": "func_8001B4F0", "size": 0x200 },
     0x8001B6F0: { "name": "func_8001B6F0", "size": 0x510 },
@@ -152,21 +153,26 @@ def gen_core_syms(syms_toml: TextIO, datasyms_toml: TextIO):
 
     datasyms_toml.write("]\n")
 
-PYCPARSER_CPP_ARGS = [
-    '-D_LANGUAGE_C',
-    '-D_MIPS_SZLONG=32',
-    '-DF3DEX_GBI_2',
-    '-Iinclude'
+GCC_PREPROCESS_CMD = [
+    "gcc",
+    "-nostdinc",
+    "-E",
+    "-D_LANGUAGE_C",
+    "-D_MIPS_SZLONG=32",
+    "-DF3DEX_GBI_2",
+    "-Iinclude"
 ]
 
+c_gen = c_generator.CGenerator()
+c_parser = CParser()
+
 def gen_dll_recomp_header(header: TextIO,
                           c_source_paths: list[Path],
                           symbol_renames: "dict[str, str]"):
     # Parse C source
     includes: list[str] = []
     declarations: list[tuple[str, str]] = []
-
-    c_gen = c_generator.CGenerator()
+    found_symbols: "set[str]" = set()
 
     for c_source_path in c_source_paths:
         # Get includes
@@ -177,17 +183,19 @@ def gen_dll_recomp_header(header: TextIO,
                     includes.append(line[line.index(" ") + 1:])
 
         # Get declarations
-        ast: c_ast.FileAST = parse_file(str(c_source_path), use_cpp=True,
-            cpp_args=PYCPARSER_CPP_ARGS)
+        preprocessed_text = check_output(GCC_PREPROCESS_CMD + [str(c_source_path)], universal_newlines=True)
+        ast: c_ast.FileAST = c_parser.parse(preprocessed_text)
 
         for child in ast:
             if isinstance(child, c_ast.Decl):
                 original = child.name
+                if original in found_symbols:
+                    continue
                 rename = symbol_renames.get(original)
                 if rename != None:
                     # Turn data decl into an extern
                     type = child.type
-                    if isinstance(type, c_ast.ArrayDecl) or isinstance(type, c_ast.PtrDecl):
+                    if isinstance(type, c_ast.ArrayDecl) or isinstance(type, c_ast.PtrDecl) or isinstance(type, c_ast.FuncDecl):
                         type = type.type
                     if not isinstance(type, c_ast.TypeDecl):
                         continue
@@ -201,8 +209,11 @@ def gen_dll_recomp_header(header: TextIO,
                     alias = "#define {} {}".format(original, rename)
 
                     declarations.append((decl, alias))
+                    found_symbols.add(original)
             elif isinstance(child, c_ast.FuncDef):
                 original = child.decl.name
+                if original in found_symbols:
+                    continue
                 rename = symbol_renames.get(original)
                 if rename != None:
                     # Turn func def into an extern decl
@@ -217,6 +228,7 @@ def gen_dll_recomp_header(header: TextIO,
                     alias = "#define {} {}".format(original, rename)
 
                     declarations.append((decl, alias))
+                    found_symbols.add(original)
 
     # Write
     header.write("#ifndef _DLL_29_INTERNAL_H\n")
@@ -249,11 +261,13 @@ def scan_dll_elf(
         st_info_type = sym.entry["st_info"]["type"]
         st_info_bind = sym.entry["st_info"]["bind"]
 
-        if st_info_type != "STT_FUNC" and st_info_type != "STT_OBJECT":
+        maybe_unref_static_func = st_info_type == "STT_NOTYPE" and st_shndx == "SHN_ABS"
+
+        if st_info_type != "STT_FUNC" and st_info_type != "STT_OBJECT" and not maybe_unref_static_func:
             continue
         if st_shndx == "SHN_UNDEF":
             continue
-        if st_info_bind != "STB_LOCAL" and size == 0:
+        if st_info_bind != "STB_LOCAL" and size == 0 and not maybe_unref_static_func:
             continue
         if value & 0x80000000:
             # External symbol reference, already covered by core syms
@@ -276,9 +290,8 @@ def scan_dll_elf(
 
         vram = dll_vram + sec_offset + value
 
-        if st_info_type == "STT_FUNC":
+        if st_info_type == "STT_FUNC" or maybe_unref_static_func:
             # Function
-
             func_info = vrams_to_funcs.get(vram)
             if func_info == None:
                 print("Failed to find DLL {} func {} at {:0X} ({:0X})"