Implement GetSystemClockContext

ChocolArm64/AOpCodeTable.cs

@@ -206,6 +206,7 @@ namespace ChocolArm64
             SetA64("0>101110000xxxxx0<xxx0xxxxxxxxxx", AInstEmit.Ext_V,         typeof(AOpCodeSimdExt));
             SetA64("011111101x1xxxxx110101xxxxxxxxxx", AInstEmit.Fabd_S,        typeof(AOpCodeSimdReg));
             SetA64("000111100x100000110000xxxxxxxxxx", AInstEmit.Fabs_S,        typeof(AOpCodeSimd));
+            SetA64("0>0011101<100000111110xxxxxxxxxx", AInstEmit.Fabs_V,        typeof(AOpCodeSimd));
             SetA64("000111100x1xxxxx001010xxxxxxxxxx", AInstEmit.Fadd_S,        typeof(AOpCodeSimdReg));
             SetA64("0>0011100<1xxxxx110101xxxxxxxxxx", AInstEmit.Fadd_V,        typeof(AOpCodeSimdReg));
             SetA64("0>1011100<1xxxxx110101xxxxxxxxxx", AInstEmit.Faddp_V,       typeof(AOpCodeSimdReg));

ChocolArm64/Instruction/AInstEmitSimdArithmetic.cs

@@ -309,6 +309,14 @@ namespace ChocolArm64.Instruction
             });
         }
 
+        public static void Fabs_V(AILEmitterCtx Context)
+        {
+            EmitVectorUnaryOpF(Context, () =>
+            {
+                EmitUnaryMathCall(Context, nameof(Math.Abs));
+            });
+        }
+
         public static void Fadd_S(AILEmitterCtx Context)
         {
             if (AOptimizations.UseSse2)

README.md

@@ -64,7 +64,7 @@ https://discord.gg/VkQYXAZ
 
 **Running**
 
-To run this emulator, you need the .NET Core 2.0 (or higher) SDK.
+To run this emulator, you need the .NET Core 2.1 (or higher) SDK *and* the OpenAL 11 Core SDK.  
 Run `dotnet run -c Release -- path\to\homebrew.nro` inside the Ryujinx solution folder to run homebrew apps.  
 Run `dotnet run -c Release -- path\to\game_exefs_and_romfs_folder` to run official games (they need to be decrypted and extracted first!)
 
@@ -73,5 +73,5 @@ You can check out the compatibility list within the Wiki. Only a handful of game
 
 **Latest build**
 
-These builds are compiled automatically for each commit on the master branch. They may be unstable or not work at all.
+These builds are compiled automatically for each commit on the master branch. They may be unstable or might not work at all.  
-To download the latest automatic build for Windows (64-bits), [Click Here](https://ci.appveyor.com/api/projects/gdkchan/ryujinx/artifacts/ryujinx_latest_unstable.zip?pr=false).
+The latest automatic build for Windows (64-bit) can be found on the [official website](https://ryujinx.org/#/Build).

Ryujinx.Core/OsHle/Services/Nfp/IUser.cs

@@ -1,28 +0,0 @@
-using Ryujinx.Core.Logging;
-using Ryujinx.Core.OsHle.Ipc;
-using System.Collections.Generic;
-
-namespace Ryujinx.Core.OsHle.Services.Nfp
-{
-    class IUser : IpcService
-    {
-        private Dictionary<int, ServiceProcessRequest> m_Commands;
-
-        public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
-
-        public IUser()
-        {
-            m_Commands = new Dictionary<int, ServiceProcessRequest>()
-            {
-                { 0, Initialize }
-            };
-        }
-
-        public long Initialize(ServiceCtx Context)
-        {
-            Context.Ns.Log.PrintStub(LogClass.ServiceNfp, "Stubbed.");
-
-            return 0;
-        }
-    }
-}

Ryujinx.Graphics/Gal/GalTextureFormat.cs

@@ -8,7 +8,9 @@ namespace Ryujinx.Graphics.Gal
         R32          = 0xf,
         A1B5G5R5     = 0x14,
         B5G6R5       = 0x15,
+        BC7U         = 0x17,
         G8R8         = 0x18,
+        R16          = 0x1b,
         R8           = 0x1d,
         BC1          = 0x24,
         BC2          = 0x25,

Ryujinx.Graphics/Gal/OpenGL/OGLEnumConverter.cs

@@ -66,6 +66,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
                 case GalTextureFormat.A1B5G5R5:     return (PixelFormat.Rgba, PixelType.UnsignedShort5551);
                 case GalTextureFormat.B5G6R5:       return (PixelFormat.Rgb,  PixelType.UnsignedShort565);
                 case GalTextureFormat.G8R8:         return (PixelFormat.Rg,   PixelType.UnsignedByte);
+                case GalTextureFormat.R16:          return (PixelFormat.Red,  PixelType.HalfFloat);
                 case GalTextureFormat.R8:           return (PixelFormat.Red,  PixelType.UnsignedByte);
             }
 
@@ -76,11 +77,12 @@ namespace Ryujinx.Graphics.Gal.OpenGL
         {
             switch (Format)
             {
-                case GalTextureFormat.BC1: return PixelInternalFormat.CompressedRgbaS3tcDxt1Ext;
+                case GalTextureFormat.BC7U: return PixelInternalFormat.CompressedRgbaBptcUnorm;
-                case GalTextureFormat.BC2: return PixelInternalFormat.CompressedRgbaS3tcDxt3Ext;
+                case GalTextureFormat.BC1:  return PixelInternalFormat.CompressedRgbaS3tcDxt1Ext;
-                case GalTextureFormat.BC3: return PixelInternalFormat.CompressedRgbaS3tcDxt5Ext;
+                case GalTextureFormat.BC2:  return PixelInternalFormat.CompressedRgbaS3tcDxt3Ext;
-                case GalTextureFormat.BC4: return PixelInternalFormat.CompressedRedRgtc1;
+                case GalTextureFormat.BC3:  return PixelInternalFormat.CompressedRgbaS3tcDxt5Ext;
-                case GalTextureFormat.BC5: return PixelInternalFormat.CompressedRgRgtc2;
+                case GalTextureFormat.BC4:  return PixelInternalFormat.CompressedRedRgtc1;
+                case GalTextureFormat.BC5:  return PixelInternalFormat.CompressedRgRgtc2;
             }
 
             throw new NotImplementedException(Format.ToString());

Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs

@@ -202,6 +202,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
         {
             switch (Format)
             {
+                case GalTextureFormat.BC7U:
                 case GalTextureFormat.BC1:
                 case GalTextureFormat.BC2:
                 case GalTextureFormat.BC3:

Ryujinx.Graphics/Gal/Shader/GlslDecl.cs

@@ -159,7 +159,8 @@ namespace Ryujinx.Graphics.Gal.Shader
                 case ShaderIrOperAbuf Abuf:
                 {
                     //This is a built-in input variable.
-                    if (Abuf.Offs == VertexIdAttr)
+                    if (Abuf.Offs == VertexIdAttr ||
+                        Abuf.Offs == InstanceIdAttr)
                     {
                         break;
                     }

Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs

@@ -975,7 +975,8 @@ namespace Ryujinx.Graphics.Gal.Shader
             switch (Node)
             {
                 case ShaderIrOperAbuf Abuf:
-                    return Abuf.Offs == GlslDecl.VertexIdAttr
+                    return Abuf.Offs == GlslDecl.VertexIdAttr ||
+                           Abuf.Offs == GlslDecl.InstanceIdAttr
                         ? OperType.I32
                         : OperType.F32;
 

Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs

@@ -14,7 +14,7 @@ namespace Ryujinx.Graphics.Gal.Shader
 
             for (int Index = 0; Index <= Size; Index++)
             {
-                Opers[Index] = new ShaderIrOperAbuf(Abuf, Reg);
+                Opers[Index] = new ShaderIrOperAbuf(Abuf + Index * 4, Reg);
             }
 
             return Opers;

Ryujinx.HLE/Gpu/BlockLinearSwizzle.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class BlockLinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/INvGpuEngine.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     interface INvGpuEngine
     {

Ryujinx.HLE/Gpu/ISwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     interface ISwizzle
     {

Ryujinx.HLE/Gpu/LinearSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class LinearSwizzle : ISwizzle
     {

Ryujinx.HLE/Gpu/MacroInterpreter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class MacroInterpreter
     {

Ryujinx.HLE/Gpu/NvGpu.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System.Threading;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpu
     {

Ryujinx.HLE/Gpu/NvGpuBufferType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuBufferType
     {

Ryujinx.HLE/Gpu/NvGpuEngine.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine2d.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuEngine2d : INvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine2dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine2dReg
     {

Ryujinx.HLE/Gpu/NvGpuEngine3d.cs

@@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuEngine3d : INvGpuEngine
     {

Ryujinx.HLE/Gpu/NvGpuEngine3dReg.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuEngine3dReg
     {

Ryujinx.HLE/Gpu/NvGpuFifo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuFifo
     {

Ryujinx.HLE/Gpu/NvGpuFifoMeth.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum NvGpuFifoMeth
     {

Ryujinx.HLE/Gpu/NvGpuMethod.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     delegate void NvGpuMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry);
 }

Ryujinx.HLE/Gpu/NvGpuPBEntry.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     struct NvGpuPBEntry
     {

Ryujinx.HLE/Gpu/NvGpuPushBuffer.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class NvGpuPushBuffer
     {

Ryujinx.HLE/Gpu/NvGpuVmm.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuVmm : IAMemory, IGalMemory
     {

Ryujinx.HLE/Gpu/NvGpuVmmCache.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     class NvGpuVmmCache
     {

Ryujinx.HLE/Gpu/Texture.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.Gal;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     struct Texture
     {

Ryujinx.HLE/Gpu/TextureFactory.cs

@@ -1,7 +1,7 @@
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureFactory
     {

Ryujinx.HLE/Gpu/TextureHelper.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureHelper
     {
@@ -33,6 +33,7 @@ namespace Ryujinx.Core.Gpu
                 case GalTextureFormat.A1B5G5R5:     return Texture.Width * Texture.Height * 2;
                 case GalTextureFormat.B5G6R5:       return Texture.Width * Texture.Height * 2;
                 case GalTextureFormat.G8R8:         return Texture.Width * Texture.Height * 2;
+                case GalTextureFormat.R16:          return Texture.Width * Texture.Height * 2;
                 case GalTextureFormat.R8:           return Texture.Width * Texture.Height;
 
                 case GalTextureFormat.BC1:
@@ -44,6 +45,7 @@ namespace Ryujinx.Core.Gpu
                     return W * H * 8;
                 }
 
+                case GalTextureFormat.BC7U:
                 case GalTextureFormat.BC2:
                 case GalTextureFormat.BC3:
                 case GalTextureFormat.BC5:

Ryujinx.HLE/Gpu/TextureReader.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureReader
     {
@@ -17,7 +17,9 @@ namespace Ryujinx.Core.Gpu
                 case GalTextureFormat.A1B5G5R5:     return Read5551    (Memory, Texture);
                 case GalTextureFormat.B5G6R5:       return Read565     (Memory, Texture);
                 case GalTextureFormat.G8R8:         return Read2Bpp    (Memory, Texture);
+                case GalTextureFormat.R16:          return Read2Bpp    (Memory, Texture);
                 case GalTextureFormat.R8:           return Read1Bpp    (Memory, Texture);
+                case GalTextureFormat.BC7U:         return Read16Bpt4x4(Memory, Texture);
                 case GalTextureFormat.BC1:          return Read8Bpt4x4 (Memory, Texture);
                 case GalTextureFormat.BC2:          return Read16Bpt4x4(Memory, Texture);
                 case GalTextureFormat.BC3:          return Read16Bpt4x4(Memory, Texture);

Ryujinx.HLE/Gpu/TextureSwizzle.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     enum TextureSwizzle
     {

Ryujinx.HLE/Gpu/TextureWriter.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using Ryujinx.Graphics.Gal;
 using System;
 
-namespace Ryujinx.Core.Gpu
+namespace Ryujinx.HLE.Gpu
 {
     static class TextureWriter
     {

Ryujinx.HLE/Hid/Hid.cs

@@ -1,9 +1,10 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public class Hid
     {
@@ -85,11 +86,16 @@ namespace Ryujinx.Core.Input
             {
                 ShMemPositions = SharedMem.GetVirtualPositions();
 
-                (AMemory Memory, long Position) ShMem = ShMemPositions[ShMemPositions.Length - 1];
+                (AMemory Memory, long Position) = ShMemPositions[ShMemPositions.Length - 1];
 
-                Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{ShMem.Position:x16}!");
+                for (long Offset = 0; Offset < Horizon.HidSize; Offset += 8)
+                {
+                    Memory.WriteInt64Unchecked(Position + Offset, 0);
+                }
 
-                Init(ShMem.Memory, ShMem.Position);
+                Log.PrintInfo(LogClass.Hid, $"HID shared memory successfully mapped to 0x{Position:x16}!");
+
+                Init(Memory, Position);
             }
         }
 
@@ -124,9 +130,7 @@ namespace Ryujinx.Core.Input
         {
             long BaseControllerOffset = Position + HidControllersOffset + 8 * HidControllerSize;
 
-            HidControllerType Type =
+            HidControllerType Type = HidControllerType.ControllerType_Handheld;
-                HidControllerType.ControllerType_Handheld |
-                HidControllerType.ControllerType_JoyconPair;
 
             bool IsHalf = false;
 
@@ -186,18 +190,22 @@ namespace Ryujinx.Core.Input
 
                     ControllerOffset += HidControllersLayoutHeaderSize;
 
+                    long LastEntryOffset = ControllerOffset + LastEntry * HidControllersInputEntrySize;
+
                     ControllerOffset += CurrEntry * HidControllersInputEntrySize;
 
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x0,  Timestamp);
+                    long SampleCounter = Memory.ReadInt64Unchecked(LastEntryOffset) + 1;
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x8,  Timestamp);
+
+                    Memory.WriteInt64Unchecked(ControllerOffset + 0x0,  SampleCounter);
+                    Memory.WriteInt64Unchecked(ControllerOffset + 0x8,  SampleCounter);
 
                     Memory.WriteInt64Unchecked(ControllerOffset + 0x10, (uint)Buttons);
 
                     Memory.WriteInt32Unchecked(ControllerOffset + 0x18, LeftStick.DX);
                     Memory.WriteInt32Unchecked(ControllerOffset + 0x1c, LeftStick.DY);
 
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x20, RightStick.DX);
+                    Memory.WriteInt32Unchecked(ControllerOffset + 0x20, RightStick.DX);
-                    Memory.WriteInt64Unchecked(ControllerOffset + 0x24, RightStick.DY);
+                    Memory.WriteInt32Unchecked(ControllerOffset + 0x24, RightStick.DY);
 
                     Memory.WriteInt64Unchecked(ControllerOffset + 0x28,
                         (uint)HidControllerConnState.Controller_State_Connected |

Ryujinx.HLE/Hid/HidControllerButtons.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerButtons

Ryujinx.HLE/Hid/HidControllerColorDesc.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerColorDesc

Ryujinx.HLE/Hid/HidControllerConnState.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerConnState

Ryujinx.HLE/Hid/HidControllerId.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum HidControllerId
     {

Ryujinx.HLE/Hid/HidControllerLayouts.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum HidControllerLayouts
     {

Ryujinx.HLE/Hid/HidControllerType.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     [Flags]
     public enum HidControllerType

Ryujinx.HLE/Hid/HidJoystickPosition.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct HidJoystickPosition
     {

Ryujinx.HLE/Hid/HidTouchPoint.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct HidTouchPoint
     {

Ryujinx.HLE/Hid/JoyCon.cs

@@ -1,5 +1,5 @@
 //TODO: This is only used by Config, it doesn't belong to Core.
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public struct JoyConLeft
     {

Ryujinx.HLE/Hid/JoyConColor.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Input
+namespace Ryujinx.HLE.Input
 {
     public enum JoyConColor //Thanks to CTCaer
     {

Ryujinx.HLE/Loaders/Compression/Lz4.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Loaders.Compression
+namespace Ryujinx.HLE.Loaders.Compression
 {
     static class Lz4
     {

Ryujinx.HLE/Loaders/ElfDyn.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfDyn
     {

Ryujinx.HLE/Loaders/ElfDynTag.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfDynTag
     {

Ryujinx.HLE/Loaders/ElfRel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfRel
     {

Ryujinx.HLE/Loaders/ElfRelType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfRelType
     {

Ryujinx.HLE/Loaders/ElfSym.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     struct ElfSym
     {

Ryujinx.HLE/Loaders/ElfSymBinding.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymBinding
     {

Ryujinx.HLE/Loaders/ElfSymType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymType
     {

Ryujinx.HLE/Loaders/ElfSymVisibility.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     enum ElfSymVisibility
     {

Ryujinx.HLE/Loaders/Executable.cs

@@ -1,9 +1,9 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.Core.OsHle;
+using Ryujinx.HLE.OsHle;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.Loaders
+namespace Ryujinx.HLE.Loaders
 {
     class Executable
     {

Ryujinx.HLE/Loaders/Executables/IExecutable.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     public interface IExecutable
     {

Ryujinx.HLE/Loaders/Executables/Nro.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     class Nro : IExecutable
     {

Ryujinx.HLE/Loaders/Executables/Nso.cs

@@ -1,8 +1,8 @@
-using Ryujinx.Core.Loaders.Compression;
+using Ryujinx.HLE.Loaders.Compression;
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.Loaders.Executables
+namespace Ryujinx.HLE.Loaders.Executables
 {
     class Nso : IExecutable
     {

Ryujinx.HLE/Logging/LogClass.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public enum LogClass
     {

Ryujinx.HLE/Logging/LogEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public class LogEventArgs : EventArgs
     {

Ryujinx.HLE/Logging/LogLevel.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public enum LogLevel
     {

Ryujinx.HLE/Logging/Logger.cs

@@ -2,7 +2,7 @@ using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
-namespace Ryujinx.Core.Logging
+namespace Ryujinx.HLE.Logging
 {
     public class Logger
     {

Ryujinx.HLE/OsHle/AppletStateMgr.cs

@@ -1,9 +1,9 @@
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Services.Am;
+using Ryujinx.HLE.OsHle.Services.Am;
 using System;
 using System.Collections.Concurrent;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class AppletStateMgr : IDisposable
     {

Ryujinx.HLE/OsHle/Diagnostics/Demangler.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Ryujinx.Core.OsHle.Diagnostics
+namespace Ryujinx.HLE.OsHle.Diagnostics
 {
     static class Demangler
     {

Ryujinx.HLE/OsHle/ErrorCode.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     static class ErrorCode
     {

Ryujinx.HLE/OsHle/ErrorModule.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     enum ErrorModule
     {

Ryujinx.HLE/OsHle/Exceptions/GuestBrokeExecutionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle.Exceptions
+namespace Ryujinx.HLE.OsHle.Exceptions
 {
     public class GuestBrokeExecutionException : Exception
     {

Ryujinx.HLE/OsHle/Exceptions/UndefinedInstructionException.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle.Exceptions
+namespace Ryujinx.HLE.OsHle.Exceptions
 {
     public class UndefinedInstructionException : Exception
     {

Ryujinx.HLE/OsHle/GlobalStateTable.cs

@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class GlobalStateTable
     {

Ryujinx.HLE/OsHle/Handles/HSharedMem.cs

@@ -2,7 +2,7 @@ using ChocolArm64.Memory;
 using System;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class HSharedMem
     {

Ryujinx.HLE/OsHle/Handles/HTransferMem.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Memory;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class HTransferMem
     {

Ryujinx.HLE/OsHle/Handles/KEvent.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KEvent : KSynchronizationObject { }
 }

Ryujinx.HLE/OsHle/Handles/KProcessHandleTable.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KProcessHandleTable
     {

Ryujinx.HLE/OsHle/Handles/KProcessScheduler.cs

@@ -1,9 +1,9 @@
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KProcessScheduler : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KSession.cs

@@ -1,7 +1,7 @@
-using Ryujinx.Core.OsHle.Services;
+using Ryujinx.HLE.OsHle.Services;
 using System;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KSession : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KSynchronizationObject.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KSynchronizationObject : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/KThread.cs

@@ -1,7 +1,7 @@
 using ChocolArm64;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class KThread : KSynchronizationObject
     {

Ryujinx.HLE/OsHle/Handles/SchedulerThread.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class SchedulerThread : IDisposable
     {

Ryujinx.HLE/OsHle/Handles/ThreadQueue.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Handles
+namespace Ryujinx.HLE.OsHle.Handles
 {
     class ThreadQueue
     {

Ryujinx.HLE/OsHle/Homebrew.cs

@@ -1,6 +1,6 @@
 using ChocolArm64.Memory;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     static class Homebrew
     {

Ryujinx.HLE/OsHle/Horizon.cs

@@ -1,11 +1,11 @@
-using Ryujinx.Core.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Executables;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.Collections.Concurrent;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     public class Horizon : IDisposable
     {

Ryujinx.HLE/OsHle/IdDictionary.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class IdDictionary
     {

Ryujinx.HLE/OsHle/Ipc/IpcBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcHandleDesc.cs

@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     class IpcHandleDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcHandler.cs

@@ -1,9 +1,9 @@
 using ChocolArm64.Memory;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     static class IpcHandler
     {

Ryujinx.HLE/OsHle/Ipc/IpcMagic.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     abstract class IpcMagic
     {

Ryujinx.HLE/OsHle/Ipc/IpcMessage.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     class IpcMessage
     {

Ryujinx.HLE/OsHle/Ipc/IpcMessageType.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     enum IpcMessageType
     {

Ryujinx.HLE/OsHle/Ipc/IpcPtrBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcPtrBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/IpcRecvListBuffDesc.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     struct IpcRecvListBuffDesc
     {

Ryujinx.HLE/OsHle/Ipc/ServiceProcessRequest.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Ipc
+namespace Ryujinx.HLE.OsHle.Ipc
 {
     delegate long ServiceProcessRequest(ServiceCtx Context);
 }

Ryujinx.HLE/OsHle/Kernel/KernelErr.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     static class KernelErr
     {

Ryujinx.HLE/OsHle/Kernel/NsTimeConverter.cs

@@ -1,4 +1,4 @@
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     static class NsTimeConverter
     {

Ryujinx.HLE/OsHle/Kernel/SvcHandler.cs

@@ -1,14 +1,14 @@
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
-using System.Collections.Generic;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler : IDisposable
     {
@@ -47,6 +47,7 @@ namespace Ryujinx.Core.OsHle.Kernel
                 { 0x0b, SvcSleepThread                   },
                 { 0x0c, SvcGetThreadPriority             },
                 { 0x0d, SvcSetThreadPriority             },
+                { 0x0e, SvcGetThreadCoreMask             },
                 { 0x0f, SvcSetThreadCoreMask             },
                 { 0x10, SvcGetCurrentProcessorNumber     },
                 { 0x12, SvcClearEvent                    },

Ryujinx.HLE/OsHle/Kernel/SvcMemory.cs

@@ -1,11 +1,11 @@
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {

Ryujinx.HLE/OsHle/Kernel/SvcSystem.cs

@@ -1,16 +1,16 @@
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Exceptions;
+using Ryujinx.HLE.OsHle.Exceptions;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
-using Ryujinx.Core.OsHle.Ipc;
+using Ryujinx.HLE.OsHle.Ipc;
-using Ryujinx.Core.OsHle.Services;
+using Ryujinx.HLE.OsHle.Services;
 using System;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {

Ryujinx.HLE/OsHle/Kernel/SvcThread.cs

@@ -1,11 +1,11 @@
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {
@@ -139,6 +139,28 @@ namespace Ryujinx.Core.OsHle.Kernel
             }
         }
 
+        private void SvcGetThreadCoreMask(AThreadState ThreadState)
+        {
+            int Handle = (int)ThreadState.X2;
+
+            Ns.Log.PrintDebug(LogClass.KernelSvc, "Handle = " + Handle.ToString("x8"));
+
+            KThread Thread = GetThread(ThreadState.Tpidr, Handle);
+
+            if (Thread != null)
+            {
+                ThreadState.X0 = 0;
+                ThreadState.X1 = (ulong)Thread.IdealCore;
+                ThreadState.X2 = (ulong)Thread.CoreMask;
+            }
+            else
+            {
+                Ns.Log.PrintWarning(LogClass.KernelSvc, $"Invalid thread handle 0x{Handle:x8}!");
+
+                ThreadState.X0 = MakeError(ErrorModule.Kernel, KernelErr.InvalidHandle);
+            }
+        }
+
         private void SvcSetThreadCoreMask(AThreadState ThreadState)
         {
             //FIXME: This is wrong, but the "correct" way to handle

Ryujinx.HLE/OsHle/Kernel/SvcThreadSync.cs

@@ -1,14 +1,14 @@
 using ChocolArm64.State;
-using Ryujinx.Core.Logging;
+using Ryujinx.HLE.Logging;
-using Ryujinx.Core.OsHle.Handles;
+using Ryujinx.HLE.OsHle.Handles;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 
-using static Ryujinx.Core.OsHle.ErrorCode;
+using static Ryujinx.HLE.OsHle.ErrorCode;
 
-namespace Ryujinx.Core.OsHle.Kernel
+namespace Ryujinx.HLE.OsHle.Kernel
 {
     partial class SvcHandler
     {

Ryujinx.HLE/OsHle/MemoryAllocator.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Ryujinx.Core.OsHle
+namespace Ryujinx.HLE.OsHle
 {
     class MemoryAllocator
     {