franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incorrect types for svcBreak

Browse Source 
svcBreak reason should be a u32, not a u64.
This commit is contained in:
David Marcec 2018-10-10 12:23:50 +11:00
parent bc6939beaa
commit a4412c8e22
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/svc.cpp
View File

@ -303,13 +303,13 @@ static ResultCode ArbitrateUnlock(VAddr mutex_addr) {
struct BreakReason { struct BreakReason {
union { union {
u64 raw; u32 raw;
BitField<31, 1, u64> dont_kill_application; BitField<31, 1, u32> dont_kill_application;
}; };
}; };
/// Break program execution /// Break program execution
static void Break(u64 reason, u64 info1, u64 info2) { static void Break(u32 reason, u64 info1, u64 info2) {
BreakReason break_reason{reason}; BreakReason break_reason{reason};
if (break_reason.dont_kill_application) { if (break_reason.dont_kill_application) {
LOG_ERROR( LOG_ERROR(

5
src/core/hle/kernel/svc_wrap.h
View File

@ -239,4 +239,9 @@ void SvcWrap() {
func(Param(0), Param(1), Param(2)); func(Param(0), Param(1), Param(2));
} }
template <void func(u32, u64, u64)>
void SvcWrap() {
func((u32)(Param(0) & 0xFFFFFFFF), Param(1), Param(2));
}
} // namespace Kernel } // namespace Kernel