mirrors/Atmosphere
0
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-08-04 07:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/Atmosphere-NX/Atmosphere into kefir

Browse source
This commit is contained in:
rashevskyv 2020-12-11 17:56:25 +02:00
commit fe7ae526d9
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/.gitrepo
View file

@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = https://github.com/Atmosphere-NX/Atmosphere-libs remote = https://github.com/Atmosphere-NX/Atmosphere-libs
branch = master branch = master
commit = 5a18bea64545105c52d642d7789029b5ca875864 commit = 59b4e75021fbaf3fcf4c0e8dd2c07e309e1869d1
parent = 17c8c390fc84d059b89f563a8fae6936649d0d45 parent = 569e1bc650f8d995b1392772a5b53fd0a05bbf3f
method = merge method = merge
cmdver = 0.4.1 cmdver = 0.4.1

2
libraries/libmesosphere/source/arch/arm64/svc/kern_svc_handlers_asm.s
View file

@ -201,6 +201,7 @@ _ZN3ams4kern4arch5arm6412SvcHandler64Ev:
ldp x30, x8, [sp, #(8 * 30)] ldp x30, x8, [sp, #(8 * 30)]
ldp x9, x10, [sp, #(8 * 32)] ldp x9, x10, [sp, #(8 * 32)]
ldr x11, [sp, #(8 * 34)] ldr x11, [sp, #(8 * 34)]
ldr x18, [sp, #(8 * 18)]
msr sp_el0, x8 msr sp_el0, x8
msr elr_el1, x9 msr elr_el1, x9
msr spsr_el1, x10 msr spsr_el1, x10
@ -217,7 +218,6 @@ _ZN3ams4kern4arch5arm6412SvcHandler64Ev:
mov x15, xzr mov x15, xzr
mov x16, xzr mov x16, xzr
mov x17, xzr mov x17, xzr
mov x18, xzr
/* Return. */ /* Return. */
add sp, sp, #0x120 add sp, sp, #0x120