External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-12-24 12:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #143 from davidgfnet/master

Browse Source 
Fix init / libc_init ordering
This commit is contained in:
Francisco Javier Trujillo Mata
2023-06-29 19:46:45 +02:00
committed by GitHub
parent 710deac140 4b2982cb7d
commit 865574ea87
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/startup/crt0.c
View File

@@ -75,6 +75,9 @@ void _main(SceSize args, void *argp)
/* Call libc initialization hook */
__libcglue_init(argc, argv);
/* Init can contain C++ constructors that require working threading */
_init();
/* Make sure _fini() is called when the program ends. */
atexit((void *) _fini);
@@ -96,21 +99,13 @@ void _main(SceSize args, void *argp)
int _start(SceSize args, void *argp)
{
void (*_main_func)(SceSize args, void *argp) = _main;
void (*_init_func)(void) = _init;
if ((&module_info != NULL) && (module_info.modattribute & 0x1000)) {
if ((&module_info != NULL) && (module_info.modattribute & PSP_MODULE_KERNEL)) {
/* If we're running in kernel mode, the addresses of our _main() thread
and _init() function must also reside in kernel mode. */
must also reside in kernel mode. */
_main_func = (void *) ((u32) _main_func | 0x80000000);
_init_func = (void *) ((u32) _init_func | 0x80000000);
}
/* Call _init() here, because an app may have code that needs to run in
kernel mode, but want their main() thread to run in user mode. If they
define "constructors" they can do any kernel mode initialization here
before their app is switched. */
_init_func();
if (&sce_newlib_nocreate_thread_in_start != NULL) {
/* The program does not want main() to be run in a seperate thread. */
_main_func(args, argp);

5
src/startup/crt0_prx.c
View File

@@ -58,8 +58,6 @@ void _main(SceSize args, void *argp)
int loc = 0;
char *ptr = argp;
_init();
/* Turn our thread arguments into main()'s argc and argv[]. */
while(loc < args)
{
@@ -77,6 +75,9 @@ void _main(SceSize args, void *argp)
/* Call libc initialization hook */
__libcglue_init(argc, argv);
/* Init can contain C++ constructors that require working threading */
_init();
/* Make sure _fini() is called when the program ends. */
atexit((void *) _fini);