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

Fixes for 1.0.0, correcting NRO aslr base

Browse Source
This commit is contained in:
plutoo 2017-12-17 03:47:21 +01:00 committed by yellows8
parent 4f8dfc52c6
commit 146aad7f55
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crt0/switch_crt0.s
View File

@ -2,18 +2,19 @@
.global _start .global _start
_start: _start:
bl startup b startup
.word 0 .word 0
.ascii "HOMEBREW" .ascii "HOMEBREW"
.org _start+0x80 .org _start+0x80
startup: startup:
// get aslr base
bl +4
sub x28, x30, #0x84
// save main thread handle // save main thread handle
mov x27, x1 mov x27, x1
// get aslr base
sub x28, x30, #4
// clear .bss // clear .bss
adrp x0, __bss_start__ adrp x0, __bss_start__
adrp x1, __bss_end__ adrp x1, __bss_end__

5
nx/source/kernel/svc.s
View File

@ -107,6 +107,11 @@ SVC_BEGIN svcWaitSynchronization
ret ret
SVC_END SVC_END
SVC_BEGIN svcCancelSynchronization
svc 0x19
ret
SVC_END
SVC_BEGIN svcArbitrateLock SVC_BEGIN svcArbitrateLock
svc 0x1a svc 0x1a
ret ret

3
nx/source/services/applet.c
View File

@ -233,7 +233,8 @@ static Result appletSetFocusHandlingMode(u32 mode) {
rc = _appletSetFocusHandlingMode(invals[0], invals[1], invals[2]); rc = _appletSetFocusHandlingMode(invals[0], invals[1], invals[2]);
if (R_SUCCEEDED(rc)) rc = _appletSetOutOfFocusSuspendingEnabled(invals[3]); if (R_SUCCEEDED(rc) && kernelAbove200())
rc = _appletSetOutOfFocusSuspendingEnabled(invals[3]);
return rc; return rc;
} }