From 5716a3a225274957766688b8db5a2bde6542569b Mon Sep 17 00:00:00 2001 From: "fix94.1" Date: Mon, 14 May 2012 17:46:56 +0000 Subject: [PATCH] -removed linker script yet again, hopefully properly this time :P -modified the wii game launching to work without the linker script --- Makefile | 2 +- scripts/rvl.ld | 304 ------------------------------------------- source/loader/disc.c | 12 +- source/loader/sys.c | 39 ++++++ source/loader/sys.h | 14 +- 5 files changed, 54 insertions(+), 317 deletions(-) delete mode 100644 scripts/rvl.ld diff --git a/Makefile b/Makefile index b3f93e0c..e278f398 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ios := 249 CFLAGS = -g -Os -Wall -Wextra -Wno-multichar $(MACHDEP) $(INCLUDE) -DHAVE_CONFIG_H CXXFLAGS = $(CFLAGS) -LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80A00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size -T../scripts/rvl.ld +LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project diff --git a/scripts/rvl.ld b/scripts/rvl.ld deleted file mode 100644 index 0fb899fc..00000000 --- a/scripts/rvl.ld +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Linkscript for Wii - */ - -OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc"); -OUTPUT_ARCH(powerpc:common); -EXTERN(_start); -ENTRY(_start); - -PHDRS -{ - /*cdat PT_LOAD FLAGS(6);*/ - stub PT_LOAD FLAGS(5); - text PT_LOAD FLAGS(5); - data PT_LOAD FLAGS(6); -} - -SECTIONS -{ - /*. = 0x80004000; - .cdat : - { - KEEP(*(.cdat)) - } :cdat = 0 - __cdat_end = .;*/ - - /* stub is loaded at physical address 0x00003400 (though both 0x80003400 and 0x00003400 are equivalent for IOS) */ - /* This can also be used to load an arbitrary standalone stub at an arbitrary address in memory, for any purpose */ - /* Use -Wl,--section-start,.stub=0xADDRESS to change */ - . = 0x00003400; - - .stub : - { - KEEP(*(.stub)) - } :stub = 0 - - /* default base address */ - /* use -Wl,--section-start,.init=0xADDRESS to change */ - . = 0x80B00000; - - /* Program */ - .init : - { - __init_start = .; - KEEP (*crt0.o(*.init)) - KEEP (*(.init)) - } :text = 0 - .plt : { *(.plt) } - .interp : { *(.interp) } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } - .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } - .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } - .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } - .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } - .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } - .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } - .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rela.got1 : { *(.rela.got1) } - .rela.got2 : { *(.rela.got2) } - .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } - .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } - .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } - .rela.sbss : { *(.rela.sbss .rela.sbss.* .rel.gnu.linkonce.sb.*) } - .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } - .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } - .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } - .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } - .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } - .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - - .text : - { - *(.text) - *(.text.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t.*) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 - - .fini : - { - KEEP (*(.fini)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } = 0 - - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - - .rodata : { *(.rodata) *(.rodata.*) *(.gnu.linkonce.r.*) } :data - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2) *(.sdata2.*) *(.gnu.linkonce.s2.*) } - .sbss2 : { *(.sbss2) *(.sbss2.*) *(.gnu.linkonce.sb2.*) } - /* Adjust the address for the data segment. We want to adjust up to - the same address within the page on the next page up. */ - /* Ensure the __preinit_array_start label is properly aligned. We - could instead move the label definition inside the section, but - the linker would then create the section even if it turns out to - be empty, which isn't pretty. */ - . = ALIGN(32 / 8); - PROVIDE (__preinit_array_start = .); - .preinit_array : { *(.preinit_array) } - PROVIDE (__preinit_array_end = .); - PROVIDE (__init_array_start = .); - .init_array : { *(.init_array) } - PROVIDE (__init_array_end = .); - PROVIDE (__fini_array_start = .); - .fini_array : { *(.fini_array) } - PROVIDE (__fini_array_end = .); - .data : - { - *(.data) - *(.data.*) - *(.gnu.linkonce.d.*) - SORT(CONSTRUCTORS) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .data1 : { *(.data1) } - .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } - .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - .eh_frame : { KEEP (*(.eh_frame)) } - .gcc_except_table : { *(.gcc_except_table) } - .fixup : { *(.fixup) } - .got1 : { *(.got1) } - .got2 : { *(.got2) } - .dynamic : { *(.dynamic) } - - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - - KEEP (*crtbegin.o(.ctors)) - - /* We don't want to include the .ctor section from - from the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - - KEEP (*(EXCLUDE_FILE (*crtend.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - .jcr : { KEEP (*(.jcr)) } - .got : { *(.got.plt) *(.got) } - - - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - - .sdata : - { - *(.sdata) - *(.sdata.*) - *(.gnu.linkonce.s.*) - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - } - - _edata = .; - PROVIDE (edata = .); - - .sbss : - { - __sbss_start = .; - PROVIDE (__sbss_start = .); - PROVIDE (___sbss_start = .); - *(.dynsbss) - *(.sbss) - *(.sbss.*) - *(.gnu.linkonce.sb.*) - *(.scommon) - PROVIDE (__sbss_end = .); - PROVIDE (___sbss_end = .); - . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ - __sbss_end = .; - } - - .bss : - { - __bss_start = .; - PROVIDE (__bss_start = .); - *(.dynbss) - *(.bss) - *(.bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - /* Align here to ensure that the .bss section occupies space up to - _end. Align after .bss to ensure correct alignment even if the - .bss section disappears because there are no input sections. */ - - . = ALIGN(32); - - PROVIDE (__bss_end = .); - __bss_end = .; - } - . = ALIGN(32); - _end = .; - PROVIDE(end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ -} - -__isIPL = 0; -__stack_addr = (__bss_start + SIZEOF(.bss) + 0x20000 + 7) & (-8); -__stack_end = (__bss_start + SIZEOF(.bss)); -__intrstack_addr = (__stack_addr + 0x4000); -__intrstack_end = (__stack_addr); -__Arena1Lo = (__intrstack_addr + 31) & (-32); -__Arena1Hi = (0x81700000); -__Arena2Lo = (0x90002000); -__Arena2Hi = (0x933E0000); - -__gxregs = (__Arena1Hi + 31) & (-32); -__ipcbufferLo = (0x933e0000); -__ipcbufferHi = (0x93400000); - -/* for backward compatibility with old crt0 */ -PROVIDE (__stack = (0x81700000)); - -PROVIDE(__isIPL = __isIPL); -PROVIDE(__stack_addr = __stack_addr); -PROVIDE(__stack_end = __stack_end); -PROVIDE(__intrstack_addr = __intrstack_addr); -PROVIDE(__intrstack_end = __intrstack_end); -PROVIDE(__Arena1Lo = __Arena1Lo); -PROVIDE(__Arena1Hi = __Arena1Hi); -PROVIDE(__Arena2Lo = __Arena2Lo); -PROVIDE(__Arena2Hi = __Arena2Hi); -PROVIDE(__ipcbufferLo = __ipcbufferLo); -PROVIDE(__ipcbufferHi = __ipcbufferHi); -PROVIDE(__gxregs = __gxregs); diff --git a/source/loader/disc.c b/source/loader/disc.c index dff84d3b..850ae103 100644 --- a/source/loader/disc.c +++ b/source/loader/disc.c @@ -40,8 +40,6 @@ GXRModeObj *disc_vmode = NULL; GXRModeObj *vmode = NULL; u32 vmode_reg = 0; -extern void __exception_closeall(); - static u8 Tmd_Buffer[0x49e4 + 0x1C] ALIGNED(32); @@ -387,21 +385,13 @@ s32 Disc_BootPartition(u64 offset, u8 vidMode, bool vipatch, bool countryString, /* Set an appropriate video mode */ __Disc_SetVMode(); - u8 temp_data[4]; - - // fix for PeppaPig - memcpy((char *) &temp_data, (void*)0x800000F4,4); - usleep(100 * 1000); /* Shutdown IOS subsystems */ - SYS_ResetSystem(SYS_SHUTDOWN, 0, 0); + Sys_Shutdown(); /* Originally from tueidj - taken from NeoGamma (thx) */ *(vu32*)0xCC003024 = 1; - - // fix for PeppaPig - memcpy((void*)0x800000F4,(char *) &temp_data, 4); gprintf("Jumping to entrypoint\n"); diff --git a/source/loader/sys.c b/source/loader/sys.c index 77de1ae3..36b989d9 100644 --- a/source/loader/sys.c +++ b/source/loader/sys.c @@ -4,6 +4,8 @@ #include "wiiuse/wpad.h" #include "mem2.hpp" #include +#include +#include #include "sys.h" #include "gecko.h" @@ -24,6 +26,9 @@ static bool return_to_priiloader = false; static bool return_to_disable = false; static bool return_to_bootmii = false; +extern void __exception_closeall(); +static vu16* const _dspReg = (u16*)0xCC005000; +extern u32 __PADDisableRecalibration(s32 disable); void __Wpad_PowerCallback() { @@ -137,3 +142,37 @@ void Sys_LoadMenu(void) /* Return to the Wii system menu */ WII_ReturnToMenu(); //SYS_ResetSystem doesnt work properly with new libogc } + +static void __dsp_shutdown() +{ + u32 tick; + + _dspReg[5] = (DSPCR_DSPRESET|DSPCR_HALT); + _dspReg[27] &= ~0x8000; + while(_dspReg[5]&0x400); + while(_dspReg[5]&0x200); + + _dspReg[5] = (DSPCR_DSPRESET|DSPCR_DSPINT|DSPCR_ARINT|DSPCR_AIINT|DSPCR_HALT); + _dspReg[0] = 0; + while((_SHIFTL(_dspReg[2],16,16)|(_dspReg[3]&0xffff))&0x80000000); + + tick = gettick(); + while((gettick()-tick)<44); + + _dspReg[5] |= DSPCR_RES; + while(_dspReg[5]&DSPCR_RES); +} + +//Modified libogc call +void Sys_Shutdown(void) +{ + __dsp_shutdown(); + u32 ret = __PADDisableRecalibration(TRUE); + + __IOS_ShutdownSubsystems(); + __exception_closeall(); + LCDisable(); + + __lwp_thread_closeall(); + __PADDisableRecalibration(ret); +} diff --git a/source/loader/sys.h b/source/loader/sys.h index 42f8b8a7..bdfea7b1 100644 --- a/source/loader/sys.h +++ b/source/loader/sys.h @@ -18,6 +18,17 @@ extern "C" { #define EXIT_TO_DISABLE 4 #define EXIT_TO_BOOTMII 5 +// DSPCR bits +#define DSPCR_DSPRESET 0x0800 // Reset DSP +#define DSPCR_DSPINT 0x0080 // * interrupt active (RWC) +#define DSPCR_ARINT 0x0020 +#define DSPCR_AIINT 0x0008 +#define DSPCR_HALT 0x0004 // halt DSP +#define DSPCR_RES 0x0001 // reset DSP + +#define _SHIFTL(v, s, w) \ + ((u32) (((u32)(v) & ((0x01 << (w)) - 1)) << (s))) + /* Prototypes */ void Sys_Init(void); void Sys_LoadMenu(void); @@ -25,7 +36,8 @@ extern "C" { void Sys_Test(void); void Sys_Exit(void); void Sys_ExitTo(int); - + void Sys_Shutdown(void); + void Open_Inputs(void); void Close_Inputs(void);