From 1c46c7161e224a23799dd0c3d757762b05492444 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 11 Oct 2022 08:28:49 -0700 Subject: [PATCH] Use __ppc_linker.h in start.c --- {src/Runtime => include}/__ppc_eabi_linker.h | 1 - include/dolphin/__start.h | 15 --------------- src/Dolphin/os/__start.c | 1 + 3 files changed, 1 insertion(+), 16 deletions(-) rename {src/Runtime => include}/__ppc_eabi_linker.h (97%) diff --git a/src/Runtime/__ppc_eabi_linker.h b/include/__ppc_eabi_linker.h similarity index 97% rename from src/Runtime/__ppc_eabi_linker.h rename to include/__ppc_eabi_linker.h index 722acb18..98ba18f6 100644 --- a/src/Runtime/__ppc_eabi_linker.h +++ b/include/__ppc_eabi_linker.h @@ -35,7 +35,6 @@ typedef struct __eti_init_info { unsigned long code_size; } __eti_init_info; -/* TODO: Fix this once we can link with generated symbols */ __declspec(section ".init") extern __eti_init_info _eti_init_info[]; __declspec(section ".init") extern const char _f_init_rom[]; __declspec(section ".init") extern char _f_init[]; diff --git a/include/dolphin/__start.h b/include/dolphin/__start.h index 9c3d9050..128828fb 100644 --- a/include/dolphin/__start.h +++ b/include/dolphin/__start.h @@ -41,19 +41,4 @@ __declspec(section ".init") extern char _stack_addr[]; __declspec(section ".init") extern char _SDA_BASE_[]; __declspec(section ".init") extern char _SDA2_BASE_[]; -typedef struct __rom_copy_info { - char* rom; - char* addr; - unsigned int size; -} __rom_copy_info; - -__declspec(section ".init") extern __rom_copy_info _rom_copy_info[]; - -typedef struct __bss_init_info { - char* addr; - unsigned int size; -} __bss_init_info; - -__declspec(section ".init") extern __bss_init_info _bss_init_info[]; - #endif // _DOLPHIN__START diff --git a/src/Dolphin/os/__start.c b/src/Dolphin/os/__start.c index 9db19ecc..c4a22b0e 100644 --- a/src/Dolphin/os/__start.c +++ b/src/Dolphin/os/__start.c @@ -1,4 +1,5 @@ #include "dolphin/__start.h" +#include "__ppc_eabi_linker.h" void __check_pad3(void) { if ((Pad3Button & 0x0eef) == 0x0eef) {