Improve game compatibility

cli/Cargo.toml

@@ -20,7 +20,7 @@ base64 = "0.22"
 clap = { version = "4.5", features = ["derive"] }
 cpp_demangle = "0.5"
 ds-decomp = { path = "../lib" }
-ds-rom = "0.7"
+ds-rom = { git = "https://github.com/AetiasHax/ds-rom", branch = "0.7.1" }
 env_logger = "0.11"
 fxhash = "0.2"
 log = "0.4"

cli/src/analysis/data.rs

@@ -1,10 +1,10 @@
 use ds_decomp::{
-    analysis::functions::Function,
+    analysis::functions::{CalledFunction, Function},
     config::{
-        module::{AnalysisOptions, Module, ModuleKind},
+        module::{Module, ModuleKind},
         relocations::{Relocation, RelocationFromModulesError, RelocationModule},
         section::{SectionCodeError, SectionIndex, SectionKind},
-        symbol::{SymbolMapError, SymbolMaps},
+        symbol::{InstructionMode, SymFunction, SymLabel, SymbolKind, SymbolMapError, SymbolMaps},
     },
 };
 use snafu::Snafu;
@@ -18,9 +18,18 @@ pub struct AnalyzeExternalReferencesOptions<'a> {
 #[derive(Debug, Snafu)]
 pub enum AnalyzeExternalReferencesError {
     #[snafu(display(
-        "Local function call from {from:#010x} in {module_kind} to {to:#010x} leads to no function"
+        "Failed to add relocation for local function call from {from:#010x} in {module_kind} to {to:#010x} as it leads to no function"
     ))]
     LocalFunctionNotFound { from: u32, to: u32, module_kind: ModuleKind },
+    #[snafu(display(
+        "Failed to add relocation for function call from {from:#010x} in {from_module} to {to:#010x} in {to_module} as it leads to a non-function symbol"
+    ))]
+    InvalidCallDestinationSymbol {
+        from: u32,
+        to: u32,
+        from_module: ModuleKind,
+        to_module: ModuleKind,
+    },
     #[snafu(transparent)]
     SymbolMap { source: SymbolMapError },
     #[snafu(transparent)]
@@ -30,153 +39,133 @@ pub enum AnalyzeExternalReferencesError {
 }
 
 pub fn analyze_external_references(
-    options: AnalyzeExternalReferencesOptions,
-    analysis_options: &AnalysisOptions,
+    options: &mut AnalyzeExternalReferencesOptions,
 ) -> Result<RelocationResult, AnalyzeExternalReferencesError> {
-    let AnalyzeExternalReferencesOptions { modules, module_index, symbol_maps } = options;
-
     let mut result = RelocationResult::new();
-    find_relocations_in_functions(
-        &mut result,
-        AnalyzeExternalReferencesOptions { modules, module_index, symbol_maps },
-        analysis_options,
-    )?;
-    find_external_references_in_sections(modules, module_index, &mut result)?;
+    find_relocations_in_functions(&mut result, options)?;
+    find_external_references_in_sections(options, &mut result)?;
     Ok(result)
 }
 
 fn find_external_references_in_sections(
-    modules: &[Module],
-    module_index: usize,
+    options: &mut AnalyzeExternalReferencesOptions,
     result: &mut RelocationResult,
 ) -> Result<(), AnalyzeExternalReferencesError> {
-    for section in modules[module_index].sections().iter() {
+    let o = options;
+    for section in o.modules[o.module_index].sections().iter() {
         match section.kind() {
             SectionKind::Data | SectionKind::Rodata => {}
             SectionKind::Code | SectionKind::Bss => continue,
         }
 
         let code = section
-            .code(modules[module_index].code(), modules[module_index].base_address())?
+            .code(o.modules[o.module_index].code(), o.modules[o.module_index].base_address())?
             .unwrap();
         for word in section.iter_words(code, None) {
-            find_external_data(modules, module_index, word.address, word.value, result)?;
+            find_external_data(o, word.address, word.value, result)?;
         }
     }
     Ok(())
 }
 
 fn find_relocations_in_functions(
     result: &mut RelocationResult,
-    options: AnalyzeExternalReferencesOptions,
-    analysis_options: &AnalysisOptions,
+    options: &mut AnalyzeExternalReferencesOptions,
 ) -> Result<(), AnalyzeExternalReferencesError> {
-    let AnalyzeExternalReferencesOptions { modules, module_index, symbol_maps } = options;
-
-    for section in modules[module_index].sections().iter() {
+    for section in options.modules[options.module_index].sections().iter() {
         for function in section.functions().values() {
-            add_function_calls_as_relocations(
-                function,
-                result,
-                AnalyzeExternalReferencesOptions { modules, module_index, symbol_maps },
-                analysis_options,
-            )?;
-            find_external_data_from_pools(modules, module_index, function, result)?;
+            add_function_calls_as_relocations(function, result, options)?;
+            find_external_data_from_pools(options, function, result)?;
         }
     }
     Ok(())
 }
 
+fn iter_function_calls(function: &Function) -> impl Iterator<Item = (&u32, &CalledFunction)> {
+    function
+        .function_calls()
+        .iter()
+        // TODO: Condition code resets to AL for relocated call instructions
+        .filter(|(_, called_function)| !called_function.ins.is_conditional())
+}
+
 fn add_function_calls_as_relocations(
     function: &Function,
     result: &mut RelocationResult,
-    options: AnalyzeExternalReferencesOptions,
-    analysis_options: &AnalysisOptions,
+    options: &mut AnalyzeExternalReferencesOptions,
 ) -> Result<(), AnalyzeExternalReferencesError> {
     let AnalyzeExternalReferencesOptions { modules, module_index, symbol_maps } = options;
 
-    for (&address, &called_function) in function.function_calls() {
-        if called_function.ins.is_conditional() {
-            // Dumb mwld linker bug removes the condition code from relocated call instructions
-            continue;
-        }
-
-        let local_module = &modules[module_index];
+    for (&address, &called_function) in iter_function_calls(function) {
+        let local_module = &modules[*module_index];
         let is_local =
             local_module.sections().get_by_contained_address(called_function.address).is_some();
 
         let module: RelocationModule = if is_local {
             let module_kind = local_module.kind();
             let symbol_map = symbol_maps.get_mut(module_kind);
-            let symbol = match symbol_map.get_function_containing(called_function.address) {
+            let symbol = match symbol_map.by_address(called_function.address)? {
                 Some((_, symbol)) => symbol,
                 None => {
-                    if !analysis_options.allow_unknown_function_calls {
-                        let error = LocalFunctionNotFoundSnafu {
-                            from: address,
-                            to: called_function.address,
-                            module_kind,
-                        }
-                        .build();
-                        log::error!("{error}");
-                        return Err(error);
-                    } else {
-                        log::warn!(
-                            "Local function call from {:#010x} in {} to {:#010x} leads to no function, inserting an unknown function symbol",
-                            address,
-                            module_kind,
-                            called_function.address
-                        );
-
-                        let thumb_bit = if called_function.thumb { 1 } else { 0 };
-                        let function_address = called_function.address | thumb_bit;
-
-                        if let Some((_, symbol)) = symbol_map.get_function(function_address)? {
-                            symbol
-                        } else {
-                            let name = format!(
-                                "{}{:08x}_unk",
-                                local_module.default_func_prefix, function_address
-                            );
-                            let (_, symbol) = symbol_map.add_unknown_function(
-                                name,
-                                function_address,
-                                called_function.thumb,
-                            );
-                            symbol
-                        }
+                    let error = LocalFunctionNotFoundSnafu {
+                        from: address,
+                        to: called_function.address,
+                        module_kind,
                     }
+                    .build();
+                    log::error!("{error}");
+                    return Err(error);
                 }
             };
-            if called_function.address != symbol.addr {
-                log::warn!(
-                    "Local function call from {:#010x} in {} to {:#010x} goes to middle of function '{}' at {:#010x}, adding an external label symbol",
-                    address,
-                    module_kind,
-                    called_function.address,
-                    symbol.name,
-                    symbol.addr
-                );
-                symbol_map.add_external_label(called_function.address, called_function.thumb)?;
+            match &symbol.kind {
+                SymbolKind::Function(_) | SymbolKind::Label(SymLabel { external: true, .. }) => {}
+
+                SymbolKind::Label(SymLabel { external: false, .. })
+                | SymbolKind::Undefined
+                | SymbolKind::PoolConstant
+                | SymbolKind::JumpTable(_)
+                | SymbolKind::Data(_)
+                | SymbolKind::Bss(_) => {
+                    return InvalidCallDestinationSymbolSnafu {
+                        from: address,
+                        to: called_function.address,
+                        from_module: module_kind,
+                        to_module: module_kind,
+                    }
+                    .fail();
+                }
             }
 
             module_kind.into()
         } else {
             let candidates = modules.iter().filter(|&module| {
                 let symbol_map = symbol_maps.get(module.kind()).unwrap();
-                let Some((function, _)) = symbol_map.get_function(called_function.address).unwrap()
+                let Some((_, symbol)) = symbol_map.by_address(called_function.address).unwrap()
                 else {
                     return false;
                 };
-                function.mode.into_thumb() == Some(called_function.thumb)
+
+                let mode = match &symbol.kind {
+                    SymbolKind::Function(SymFunction { mode, .. })
+                    | SymbolKind::Label(SymLabel { external: true, mode }) => mode,
+
+                    SymbolKind::Label(SymLabel { external: false, .. })
+                    | SymbolKind::Undefined
+                    | SymbolKind::PoolConstant
+                    | SymbolKind::JumpTable(_)
+                    | SymbolKind::Data(_)
+                    | SymbolKind::Bss(_) => return false,
+                };
+
+                mode.into_thumb() == Some(called_function.thumb)
             });
             RelocationModule::from_modules(candidates)?
         };
 
         if module == RelocationModule::None {
             log::warn!(
                 "No functions from {address:#010x} in {} to {:#010x}:",
-                modules[module_index].kind(),
+                modules[*module_index].kind(),
                 called_function.address
             );
         }
@@ -201,44 +190,37 @@ fn add_function_calls_as_relocations(
 }
 
 fn find_external_data_from_pools(
-    modules: &[Module],
-    module_index: usize,
+    options: &mut AnalyzeExternalReferencesOptions,
     function: &Function,
     result: &mut RelocationResult,
 ) -> Result<(), AnalyzeExternalReferencesError> {
-    let module = &modules[module_index];
-    for pool_constant in function.iter_pool_constants(module.code(), module.base_address()) {
-        find_external_data(
-            modules,
-            module_index,
-            pool_constant.address,
-            pool_constant.value,
-            result,
-        )?;
+    for pool_constant in function.iter_pool_constants() {
+        find_external_data(options, pool_constant.address, pool_constant.value, result)?;
     }
     Ok(())
 }
 
 fn find_external_data(
-    modules: &[Module],
-    module_index: usize,
+    options: &mut AnalyzeExternalReferencesOptions,
     address: u32,
     pointer: u32,
     result: &mut RelocationResult,
 ) -> Result<(), AnalyzeExternalReferencesError> {
-    let local_module = &modules[module_index];
+    let o = options;
+
+    let local_module = &o.modules[o.module_index];
     let is_local = local_module.sections().get_by_contained_address(pointer).is_some();
     if is_local {
         return Ok(());
     }
 
-    let candidates = find_symbol_candidates(modules, module_index, pointer);
+    let candidates = find_symbol_candidates(o, pointer);
     if candidates.is_empty() {
         // Probably not a pointer
         return Ok(());
     }
 
-    let candidate_modules = candidates.iter().map(|c| &modules[c.module_index]);
+    let candidate_modules = candidates.iter().map(|c| &o.modules[c.module_index]);
     let module = RelocationModule::from_modules(candidate_modules)?;
 
     result.relocations.push(Relocation::new_load(address, pointer, 0, module));
@@ -247,26 +229,47 @@ fn find_external_data(
 }
 
 fn find_symbol_candidates(
-    modules: &[Module],
-    module_index: usize,
+    options: &mut AnalyzeExternalReferencesOptions,
     pointer: u32,
 ) -> Vec<SymbolCandidate> {
-    modules
+    options
+        .modules
         .iter()
         .enumerate()
         .filter_map(|(index, module)| {
-            if index == module_index {
+            if index == options.module_index {
                 return None;
             }
             let (section_index, section) = module.sections().get_by_contained_address(pointer)?;
+            let symbol_map = options.symbol_maps.get(module.kind()).unwrap();
             if section.kind() == SectionKind::Code {
-                let function = section.functions().get(&(pointer & !1))?;
+                let (_, symbol) = symbol_map.by_address(pointer & !1).unwrap()?;
+                let symbol_is_thumb = match &symbol.kind {
+                    SymbolKind::Function(function) => function.mode == InstructionMode::Thumb,
+                    SymbolKind::Label(SymLabel { external: true, mode }) => {
+                        *mode == InstructionMode::Thumb
+                    }
+                    SymbolKind::Label(SymLabel { external: false, .. })
+                    | SymbolKind::Undefined
+                    | SymbolKind::PoolConstant
+                    | SymbolKind::JumpTable(_)
+                    | SymbolKind::Data(_)
+                    | SymbolKind::Bss(_) => return None,
+                };
+
                 let thumb = (pointer & 1) != 0;
-                if function.is_thumb() != thumb {
+                if symbol_is_thumb != thumb {
                     return None;
                 }
             }
-            Some(SymbolCandidate { module_index: index, section_index })
+            if let Some((_, symbol)) = symbol_map.by_address(pointer).unwrap()
+                && symbol.local
+            {
+                // Existing symbol is local, so it can't be referred to by a relocation
+                None
+            } else {
+                Some(SymbolCandidate { module_index: index, section_index })
+            }
         })
         .collect::<Vec<_>>()
 }