From cb398f1e4a0bdb9fca49e196da347e6cda6ea653 Mon Sep 17 00:00:00 2001 From: TuxSH <1922548+TuxSH@users.noreply.github.com> Date: Mon, 11 Apr 2022 01:06:59 +0100 Subject: [PATCH] ldr => ldrb --- k11_extension/source/svc.c | 4 ++-- k11_extension/source/svcHandler.s | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/k11_extension/source/svc.c b/k11_extension/source/svc.c index 8c1bbc7..27a064a 100644 --- a/k11_extension/source/svc.c +++ b/k11_extension/source/svc.c @@ -101,7 +101,7 @@ void signalSvcEntry(u32 svcId) KProcess *currentProcess = currentCoreContext->objectContext.currentProcess; // Since DBGEVENT_SYSCALL_ENTRY is non blocking, we'll cheat using EXCEVENT_UNDEFINED_SYSCALL (debug->svcId is fortunately an u16!) - if(debugOfProcess(currentProcess) != NULL && shouldSignalSyscallDebugEvent(currentProcess, svcId)) + if(debugOfProcess(currentProcess) != NULL && svcId != 0xFF && shouldSignalSyscallDebugEvent(currentProcess, svcId)) SignalDebugEvent(DBGEVENT_OUTPUT_STRING, 0xFFFFFFFE, svcId); } @@ -110,7 +110,7 @@ void signalSvcReturn(u32 svcId) KProcess *currentProcess = currentCoreContext->objectContext.currentProcess; // Since DBGEVENT_SYSCALL_RETURN is non blocking, we'll cheat using EXCEVENT_UNDEFINED_SYSCALL (debug->svcId is fortunately an u16!) - if(debugOfProcess(currentProcess) != NULL && shouldSignalSyscallDebugEvent(currentProcess, svcId)) + if(debugOfProcess(currentProcess) != NULL && svcId != 0xFF && shouldSignalSyscallDebugEvent(currentProcess, svcId)) SignalDebugEvent(DBGEVENT_OUTPUT_STRING, 0xFFFFFFFF, svcId); } diff --git a/k11_extension/source/svcHandler.s b/k11_extension/source/svcHandler.s index a865b1b..5b2efe7 100644 --- a/k11_extension/source/svcHandler.s +++ b/k11_extension/source/svcHandler.s @@ -85,7 +85,7 @@ svcHandler: add sp, #4 ldr r10, =svcSignalingEnabled @ should work, I guess - ldr r10, [r10] + ldrb r10, [r10] cmp r10, #0 bne _signal_svc_end @ returns to _no_signal_return