mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-27 15:22:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stylefix

Browse Source
This commit is contained in:
plutoo 2018-01-20 19:33:53 +01:00
parent 97141448e9
commit d4db5b7647
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/include/switch/runtime/env.h
View File

@ -27,7 +27,7 @@ enum {
typedef void NORETURN (*LoaderReturnFn)(int result_code); typedef void NORETURN (*LoaderReturnFn)(int result_code);
void envParse(void* ctx, Handle main_thread, LoaderReturnFn saved_lr); void envSetup(void* ctx, Handle main_thread, LoaderReturnFn saved_lr);
Handle envGetMainThreadHandle(void); Handle envGetMainThreadHandle(void);
bool envIsNso(void); bool envIsNso(void);

2
nx/source/runtime/argv.c
View File

@ -12,7 +12,7 @@ extern char* fake_heap_end;
extern u32 __argdata__; extern u32 __argdata__;
void __system_initArgv(void) void argvSetup(void)
{ {
Result rc=0; Result rc=0;
MemoryInfo meminfo; MemoryInfo meminfo;

2
nx/source/runtime/env.c
View File

@ -15,7 +15,7 @@ static char* g_nextLoadArgv = NULL;
extern __attribute__((weak)) u32 __nx_applet_type; extern __attribute__((weak)) u32 __nx_applet_type;
void envParse(void* ctx, Handle main_thread, LoaderReturnFn saved_lr) void envSetup(void* ctx, Handle main_thread, LoaderReturnFn saved_lr)
{ {
// If we're running under NSO, we should just call svcExitProcess. // If we're running under NSO, we should just call svcExitProcess.
// Otherwise we should return to loader via LR. // Otherwise we should return to loader via LR.

7
nx/source/runtime/init.c
View File

@ -4,8 +4,7 @@ void __nx_exit(int rc);
void virtmemSetup(void); void virtmemSetup(void);
void newlibSetup(void); void newlibSetup(void);
void argvSetup(void);
void __system_initArgv(void);
extern u32 __nx_applet_type; extern u32 __nx_applet_type;
@ -102,13 +101,13 @@ void __attribute__((weak)) __libnx_init(void* ctx, Handle main_thread, void* sav
// Called by crt0. // Called by crt0.
// Libnx initialization goes here. // Libnx initialization goes here.
envParse(ctx, main_thread, saved_lr); envSetup(ctx, main_thread, saved_lr);
newlibSetup(); newlibSetup();
virtmemSetup(); virtmemSetup();
__libnx_initheap(); __libnx_initheap();
// Build argc/argv if present // Build argc/argv if present
__system_initArgv(); argvSetup();
// Initialize services. // Initialize services.
__appInit(); __appInit();