Config fix, offset search, version bump

Raytwo · Raytwo · commit fa609536c099 · 2020-12-18T01:18:57.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "arcropolis"
-version = "0.9.4"
+version = "0.9.5"
 authors = ["Raytwo <raytwost@gmail.com>, jam1garner <jam1.mcleod@hotmail.com>"]
 edition = "2018"
 
diff --git a/src/config.rs b/src/config.rs
@@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
 const CONFIG_PATH: &str = "sd:/atmosphere/contents/01006A800016E000/romfs/arcropolis.toml";
 
 lazy_static::lazy_static! {
-    pub static ref CONFIG: Config = Config::open().unwrap();
+    pub static ref CONFIG: Box<Config> = Config::open().unwrap();
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
@@ -109,22 +109,22 @@ impl Config {
         }
     }
 
-    pub fn open() -> Result<Config, String> {
+    pub fn open() -> Result<Box<Config>, String> {
         match fs::read_to_string(CONFIG_PATH) {
             // File exists
             Ok(content) => {
                 // Try deserializing
                 let mut config = match toml::from_str(&content) {
                     // Deserialized properly
                     Ok(conf) => {
-                        conf
+                        Box::new(conf)
                     },
                     // Something happened when deserializing
                     Err(_) => {
                         println!("[ARC::Config] Configuration file could not be deserialized");
                         show_error(69, "Configuration file could not be deserialized", &format!("Your configuration file ({}) is either poorly manually edited, outdated, corrupted or in a format unfit for ARCropolis.\n\nA new configuration file will now be generated, but it might ignore your modpacks. Consider double checking.", CONFIG_PATH));
                         println!("[ARC::Config] Generating configuration file...");
-                        Config::new()
+                        Box::new(Config::new())
                     }
                 };
 
@@ -152,7 +152,7 @@ impl Config {
                 skyline_web::DialogOk::ok(format!("Thank you for installing ARCropolis!\n\nConfiguration file will now be generated"));
                 println!("[ARC::Config] Configuration file not found. Generating a new one...");
 
-                let config = Config::new();
+                let config = Box::new(Config::new());
                 config.save().unwrap();
 
                 Ok(config)
diff --git a/src/offsets.rs b/src/offsets.rs
@@ -1,6 +1,9 @@
 use skyline::hooks::{getRegionAddress, Region};
 
-// default 9.0.1 offsets
+// default 9.0.2 offsets
+pub static mut LOADED_TABLES_ADRP_OFFSET: usize = 0x35bb1f8;
+pub static mut RES_SERVICE_ADRP_OFFSET: usize = 0x335a860;
+
 pub static mut LOOKUP_STREAM_HASH_OFFSET: usize = 0x335A7F0;
 pub static mut IDK_OFFSET: usize = 0x335F5F0;
 pub static mut ADD_IDX_TO_TABLE1_AND_TABLE2_OFFSET: usize = 0x3359A40;
@@ -20,12 +23,127 @@ pub static mut PARSE_MODEL_XMB_2_OFFSET:usize = 0x34073E4;
 pub static mut TITLE_SCREEN_VERSION_OFFSET:usize = 0x35BAE00;
 pub static mut PARSE_NUS3BANK_FILE_OFFSET:usize = 0x3552D94;
 
+static LOADED_TABLES_ADRP_SEARCH_CODE: &[u8] = &[
+    0xf3, 0x03, 0x00, 0xaa, 0x1f, 0x01, 0x09, 0x6b, 0xe0, 0x04, 0x00, 0x54,
+];
+
+static RES_SERVICE_ADRP_SEARCH_CODE: &[u8] = &[
+    0x04, 0x01, 0x49, 0xfa, 0x21, 0x05, 0x00, 0x54, 0x5f, 0x00, 0x00, 0xf9, 0x7f, 0x00, 0x00, 0xf9,
+];
+
+static IDK_SEARCH_CODE: &[u8] = &[
+    0xf8, 0x5f, 0xbc, 0xa9, 0xf6, 0x57, 0x01, 0xa9, 0xf4, 0x4f, 0x02, 0xa9, 0xfd, 0x7b, 0x03, 0xa9,
+    0xfd, 0xc3, 0x00, 0x91, 0xe8, 0x5f, 0x00, 0x32, 0x3f, 0x00, 0x08, 0x6b,
+];
+
+static ADD_IDX_TO_TABLE1_AND_TABLE2_SEARCH_CODE: &[u8] = &[
+    0xf6, 0x57, 0xbd, 0xa9, 0xf4, 0x4f, 0x01, 0xa9, 0xfd, 0x7b, 0x02, 0xa9, 0xfd, 0x83, 0x00, 0x91,
+    0x08, 0x18, 0x40, 0xb9, 0x1f, 0x01, 0x01, 0x6b,
+];
+
+static LOOKUP_STREAM_HASH_SEARCH_CODE: &[u8] = &[
+    0x29, 0x58, 0x40, 0xf9, 0x28, 0x60, 0x40, 0xf9, 0x2a, 0x05, 0x40, 0xb9, 0x09, 0x0d, 0x0a, 0x8b,
+    0xaa, 0x01, 0x00, 0x34, 0x5f, 0x01, 0x00, 0xf1,
+];
+
+static PARSE_EFF_SEARCH_CODE: &[u8] = &[
+    0x09, 0x19, 0x40, 0xb9, 0x3f, 0x01, 0x0a, 0x6b, 0xfb, 0x03, 0x16, 0xaa, 0xc9, 0x02, 0x00, 0x54,
+    0x09, 0x05, 0x40, 0xf9, 0x2b, 0x0d, 0x0a, 0x8b,
+];
+
+static PARSE_EFF_NUTEXB_SEARCH_CODE: &[u8] = &[
+    0x1a, 0x01, 0x40, 0xf9, 0x02, 0x00, 0x00, 0x14, 0xfa, 0x03, 0x1f, 0xaa, 
+];
+
+static PARSE_PARAM_SEARCH_CODE: &[u8] = &[
+    0x28, 0x01, 0x40, 0xf9, 0x28, 0x03, 0x00, 0xb4, 0x09, 0x41, 0x00, 0x91, 0x68, 0xa6, 0x01, 0xa9,
+    0x0a, 0x09, 0x80, 0xb9, 0x29, 0x01, 0x0a, 0x8b, 0x69, 0x16, 0x00, 0xf9, 0x08, 0x0d, 0x80, 0xb9,
+];
+
+static PARSE_MODEL_XMB_SEARCH_CODE: &[u8] = &[
+    0x01, 0x01, 0x40, 0xf9, 0x03, 0x00, 0x00, 0x14, 0xf7, 0x17, 0x40, 0xf9, 0xe1, 0x03, 0x1f, 0xaa,
+    0xe0, 0x22, 0x42, 0xf9, 0xcd, 0x07, 0x00, 0x94, 0xe8, 0x46, 0x42, 0xf9, 0x08, 0x01, 0x40, 0xf9,
+];
+
+static PARSE_MODEL_XMB_2_SEARCH_CODE: &[u8] = &[
+    0x01, 0x01, 0x40, 0xf9, 0xde, 0xff, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00,
+];
+
+static PARSE_LOG_XMB_SEARCH_CODE: &[u8] = &[
+    0x13, 0x01, 0x40, 0xf9, 0x02, 0x00, 0x00, 0x14, 0xf3, 0x03, 0x1f, 0xaa, 0xe0, 0x03, 0x1c, 0x32,
+    0xe1, 0x0b, 0x1d, 0x32,
+];
+
+static PARSE_ARC_FILE_SEARCH_CODE: &[u8] = &[
+    0x8a, 0x00, 0x00, 0xb4, 0x55, 0x01, 0x40, 0xf9, 0x02, 0x00, 0x00, 0x14, 0xf5, 0x03, 0x1f, 0xaa,
+];
+
+static PARSE_FONT_FILE_SEARCH_CODE: &[u8] = &[
+    0x01, 0x01, 0x40, 0xf9, 0xad, 0xff, 0xff, 0x17, 0x08, 0xc0, 0x41, 0x39, 0x48, 0x00, 0x00, 0x34,
+    0xc0, 0x03, 0x5f, 0xd6, 0x00, 0x30, 0x40, 0xf9,
+];
+
+static PARSE_NUMATB_NUTEXB_SEARCH_CODE: &[u8] = &[
+    0x1b, 0x01, 0x40, 0xf9, 0x02, 0x00, 0x00, 0x14, 0xfb, 0x03, 0x1f, 0xaa,
+];
+
+static PARSE_NUMSHEXB_FILE_SEARCH_CODE: &[u8] = &[
+    0x49, 0x01, 0x00, 0x34, 0x28, 0x01, 0x00, 0xb4, 0x16, 0x01, 0x40, 0xf9, 0x07, 0x00, 0x00, 0x14,
+];
+
+static PARSE_NUMATB_FILE_SEARCH_CODE: &[u8] = &[
+    0xea, 0x7e, 0x40, 0x92, 0x4a, 0xf1, 0x7d, 0xd3, 0x29, 0x69, 0x6a, 0xb8, 0xea, 0x5f, 0x00, 0x32,
+];
+
+static PARSE_NUMSHB_FILE_SEARCH_CODE: &[u8] = &[
+    0x0a, 0x7f, 0x40, 0x92, 0x4a, 0xf1, 0x7d, 0xd3, 0x29, 0x69, 0x6a, 0xb8, 0xea, 0x5f, 0x00, 0x32, 0x3f, 0x01, 0x0a, 0x6b, 0xa0, 0x01, 0x00, 0x54
+];
+
+static PARSE_NUMDLB_FILE_SEARCH_CODE: &[u8] = &[
+    0x08, 0x01, 0x40, 0xf9, 0xfb, 0xfe, 0xff, 0x17, 0xf3, 0x0f, 0x1e, 0xf8, 0xfd, 0x7b, 0x01, 0xa9,
+    0xfd, 0x43, 0x00, 0x91, 0xf3, 0x03, 0x00, 0xaa,
+];
+
+static TITLE_SCREEN_VERSION_SEARCH_CODE: &[u8] = &[
+    0xfc, 0x0f, 0x1d, 0xf8, 0xf4, 0x4f, 0x01, 0xa9, 0xfd, 0x7b, 0x02, 0xa9, 0xfd, 0x83, 0x00, 0x91,
+    0xff, 0x07, 0x40, 0xd1, 0xf4, 0x03, 0x01, 0xaa, 0xf3, 0x03, 0x00, 0xaa,
+];
+
+static PARSE_NUS3BANK_FILE_SEARCH_CODE: &[u8] = &[
+    0xf6, 0x01, 0x40, 0xf9, 0xf6, 0x10, 0x00, 0xb4, 0x8f, 0x6a, 0x7a, 0xb8, 0xf0, 0x5f, 0x00, 0x32,
+    0xff, 0x01, 0x10, 0x6b, 0x60, 0x10, 0x00, 0x54,
+];
+
 fn find_subsequence(haystack: &[u8], needle: &[u8]) -> Option<usize> {
     haystack
         .windows(needle.len())
         .position(|window| window == needle)
 }
 
+fn offset_from_adrp(adrp_offset: usize) -> usize {
+    unsafe {
+        let adrp = *(offset_to_addr(adrp_offset) as *const u32);
+        let immhi = (adrp & 0b0_00_00000_1111111111111111111_00000) >> 3;
+        let immlo = (adrp & 0b0_11_00000_0000000000000000000_00000) >> 29;
+        let imm = ((immhi | immlo) << 12) as i32 as usize;
+        let base = adrp_offset & 0xFFFFFFFFFFFFF000;
+        base + imm
+    }
+}
+
+fn offset_from_ldr(ldr_offset: usize) -> usize {
+    unsafe {
+        let ldr = *(offset_to_addr(ldr_offset) as *const u32);
+        let size = (ldr & 0b11_000_0_00_00_000000000000_00000_00000) >> 30;
+        let imm = (ldr & 0b00_000_0_00_00_111111111111_00000_00000) >> 10;
+        (imm as usize) << size
+    }
+}
+
+pub fn offset_to_addr(offset: usize) -> *const () {
+    unsafe { (getRegionAddress(Region::Text) as *const u8).offset(offset as isize) as _ }
+}
+
 macro_rules! find_offsets {
     (
         $(
@@ -42,7 +160,7 @@ macro_rules! find_offsets {
                 if let Some(offset) = find_subsequence(text, $search_pattern) {
                     $out_variable = offset
                 } else {
-                    println!("Error: no offset found for '{}'. Defaulting to 8.1.0 offset. This most likely won't work.", stringify!($out_variable));
+                    println!("Error: no offset found for '{}'. Defaulting to 9.0.2 offset. This most likely won't work.", stringify!($out_variable));
                 }
             }
         )*
@@ -53,25 +171,58 @@ pub fn search_offsets() {
     unsafe {
         smash::resource::LOADED_TABLES_OFFSET = 0x50567a0;
         smash::resource::RES_SERVICE_OFFSET = 0x50567a8;
-    }
+
+        let text_ptr = getRegionAddress(Region::Text) as *const u8;
+        let text_size = (getRegionAddress(Region::Rodata) as usize) - (text_ptr as usize);
+
+        let text = std::slice::from_raw_parts(text_ptr, text_size);
+
+        if let Some(offset) = find_subsequence(text, LOADED_TABLES_ADRP_SEARCH_CODE) {
+            LOADED_TABLES_ADRP_OFFSET = offset + 12;
+
+            let adrp_offset = offset_from_adrp(LOADED_TABLES_ADRP_OFFSET);
+            let ldr_offset = offset_from_ldr(LOADED_TABLES_ADRP_OFFSET + 4);
+            smash::resource::LOADED_TABLES_OFFSET = adrp_offset + ldr_offset;
+        } else {
+            println!("Error: no offset found for 'loaded_tables_adrp'. Defaulting to 9.0.2 offset. This likely won't work.");
+        }
+
+        if let Some(offset) = find_subsequence(text, RES_SERVICE_ADRP_SEARCH_CODE) {
+            RES_SERVICE_ADRP_OFFSET = offset + 16;
+
+            let adrp_offset = offset_from_adrp(RES_SERVICE_ADRP_OFFSET);
+            let ldr_offset = offset_from_ldr(RES_SERVICE_ADRP_OFFSET + 4);
+            smash::resource::RES_SERVICE_OFFSET = adrp_offset + ldr_offset;
+        } else {
+            println!("Error: no offset found for 'res_service_adrp'. Defaulting to 9.0.2 offset. This likely won't work.");
+        }
+
         find_offsets!(
-            //(IDK_OFFSET, IDK_SEARCH_CODE),
-            //(ADD_IDX_TO_TABLE1_AND_TABLE2_OFFSET, ADD_IDX_TO_TABLE1_AND_TABLE2_SEARCH_CODE),
-            //(LOOKUP_STREAM_HASH_OFFSET, LOOKUP_STREAM_HASH_SEARCH_CODE),
-            // (PARSE_EFF_NUTEXB_OFFSET, PARSE_EFF_NUTEXB_SEARCH_CODE),
-            // (PARSE_EFF_OFFSET, PARSE_EFF_SEARCH_CODE),
-            // (PARSE_PARAM_OFFSET, PARSE_PARAM_SEARCH_CODE),
-            // (PARSE_MODEL_XMB_OFFSET, PARSE_MODEL_XMB_SEARCH_CODE),
-            // (PARSE_ARC_FILE_OFFSET, PARSE_ARC_FILE_SEARCH_CODE),
-            // (PARSE_FONT_FILE_OFFSET, PARSE_FONT_FILE_SEARCH_CODE),
-            // (PARSE_NUMATB_NUTEXB_OFFSET, PARSE_NUMATB_NUTEXB_SEARCH_CODE),
-            // (PARSE_NUMSHEXB_FILE_OFFSET, PARSE_NUMSHEXB_FILE_SEARCH_CODE),
-            // (PARSE_NUMATB_FILE_OFFSET, PARSE_NUMATB_FILE_SEARCH_CODE),
-            // (PARSE_NUMDLB_FILE_OFFSET, PARSE_NUMDLB_FILE_SEARCH_CODE),
-            // (PARSE_LOG_XMB_OFFSET, PARSE_LOG_XMB_SEARCH_CODE),
-            // (PARSE_MODEL_XMB_2_OFFSET, PARSE_MODEL_XMB_2_SEARCH_CODE),
-            //(TITLE_SCREEN_VERSION_OFFSET, TITLE_SCREEN_VERSION_SEARCH_CODE),
+            (IDK_OFFSET, IDK_SEARCH_CODE),
+            (ADD_IDX_TO_TABLE1_AND_TABLE2_OFFSET, ADD_IDX_TO_TABLE1_AND_TABLE2_SEARCH_CODE),
+            (LOOKUP_STREAM_HASH_OFFSET, LOOKUP_STREAM_HASH_SEARCH_CODE),
+            (PARSE_EFF_OFFSET, PARSE_EFF_SEARCH_CODE),
+            (PARSE_EFF_NUTEXB_OFFSET, PARSE_EFF_NUTEXB_SEARCH_CODE),
+            (PARSE_PARAM_OFFSET, PARSE_PARAM_SEARCH_CODE),
+            (PARSE_MODEL_XMB_OFFSET, PARSE_MODEL_XMB_SEARCH_CODE),
+            (PARSE_ARC_FILE_OFFSET, PARSE_ARC_FILE_SEARCH_CODE),
+            (PARSE_FONT_FILE_OFFSET, PARSE_FONT_FILE_SEARCH_CODE),
+            (PARSE_NUMATB_NUTEXB_OFFSET, PARSE_NUMATB_NUTEXB_SEARCH_CODE),
+            (PARSE_NUMSHEXB_FILE_OFFSET, PARSE_NUMSHEXB_FILE_SEARCH_CODE),
+            (PARSE_NUMATB_FILE_OFFSET, PARSE_NUMATB_FILE_SEARCH_CODE),
+            (PARSE_NUMSHB_FILE_OFFSET, PARSE_NUMSHB_FILE_SEARCH_CODE),
+            (PARSE_NUMDLB_FILE_OFFSET, PARSE_NUMDLB_FILE_SEARCH_CODE),
+            (PARSE_LOG_XMB_OFFSET, PARSE_LOG_XMB_SEARCH_CODE),
+            (PARSE_MODEL_XMB_2_OFFSET, PARSE_MODEL_XMB_2_SEARCH_CODE),
+            (TITLE_SCREEN_VERSION_OFFSET, TITLE_SCREEN_VERSION_SEARCH_CODE),
+            (PARSE_NUS3BANK_FILE_OFFSET, PARSE_NUS3BANK_FILE_SEARCH_CODE),
         );
+
+        PARSE_ARC_FILE_OFFSET += 4;
+        PARSE_NUMSHEXB_FILE_OFFSET += 8;
+        PARSE_NUMATB_FILE_OFFSET += 64;
+        PARSE_NUMSHB_FILE_OFFSET += 64;
+    }
 }
 
 // #[allow(dead_code)]
diff --git a/src/replacement_files.rs b/src/replacement_files.rs
@@ -293,7 +293,7 @@ impl FileCtx {
     pub fn get_subfile(&self, t1_index: u32) -> &mut SubFile {
         let loaded_arc = LoadedTables::get_instance().get_arc();
 
-        let mut file_info = loaded_arc.lookup_file_information_by_t1_index(t1_index);
+        let file_info = loaded_arc.lookup_file_information_by_t1_index(t1_index);
         //let file_index = loaded_arc.lookup_fileinfoindex_by_t1_index(t1_index);
 
         // TODO: Make a constant for Redirect
