From e36e97c64d7b973fbbc3ac92e9f115d74a4d9e2d Mon Sep 17 00:00:00 2001 From: LDj3SNuD <35856442+LDj3SNuD@users.noreply.github.com> Date: Sat, 8 Aug 2020 17:18:51 +0200 Subject: CPU: This PR fixes Fpscr, among other things. (#1433) * CPU: This PR fixes Fpscr, among other things. * Add Fpscr.Qc = 1 if sat. for Vqrshrn & Vqrshrun. * Fix Vcmp & Vcmpe opcode table. * Revert "Fix Vcmp & Vcmpe opcode table." This reverts commit c117d9410d693185ff5f8ee8e457ffbfb2027dd5. * Address PR feedbacks. --- Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs') diff --git a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs index c3602c15..715cb96a 100644 --- a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs +++ b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs @@ -9,7 +9,6 @@ using Ryujinx.HLE.HOS.Kernel.Memory; using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Threading; using System; -using System.Collections.Generic; using System.Threading; namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall @@ -2131,10 +2130,10 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall private static int GetPsr(ARMeilleure.State.ExecutionContext context) { - return (context.GetPstateFlag(ARMeilleure.State.PState.NFlag) ? (1 << 31) : 0) | - (context.GetPstateFlag(ARMeilleure.State.PState.ZFlag) ? (1 << 30) : 0) | - (context.GetPstateFlag(ARMeilleure.State.PState.CFlag) ? (1 << 29) : 0) | - (context.GetPstateFlag(ARMeilleure.State.PState.VFlag) ? (1 << 28) : 0); + return (context.GetPstateFlag(ARMeilleure.State.PState.NFlag) ? (1 << (int)ARMeilleure.State.PState.NFlag) : 0) | + (context.GetPstateFlag(ARMeilleure.State.PState.ZFlag) ? (1 << (int)ARMeilleure.State.PState.ZFlag) : 0) | + (context.GetPstateFlag(ARMeilleure.State.PState.CFlag) ? (1 << (int)ARMeilleure.State.PState.CFlag) : 0) | + (context.GetPstateFlag(ARMeilleure.State.PState.VFlag) ? (1 << (int)ARMeilleure.State.PState.VFlag) : 0); } // Thread synchronization -- cgit v1.2.3