mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved metadata to process

Browse source
This commit is contained in:
emmaus 2018-08-02 20:14:49 +00:00 committed by emmauss
parent d137405e94
commit a9a2c0c2f5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.HLE/OsHle/Horizon.cs
View file

@ -85,13 +85,13 @@ namespace Ryujinx.HLE.OsHle
using (FileStream Input = new FileStream(File, FileMode.Open)) using (FileStream Input = new FileStream(File, FileMode.Open))
{ {
SystemStateMgr.TitleMetadata = new Npdm(Input); MainProcess.Metadata = new Npdm(Input);
} }
} }
LoadNpdm("*.npdm"); LoadNpdm("*.npdm");
if (!SystemStateMgr.TitleMetadata.Is64Bits) if (!MainProcess.Metadata.Is64Bits)
{ {
throw new Exception("32-bit titles are unsupported!"); throw new Exception("32-bit titles are unsupported!");
} }

3
Ryujinx.HLE/OsHle/Process.cs
View file

@ -4,6 +4,7 @@ using ChocolArm64.Memory;
using ChocolArm64.State; using ChocolArm64.State;
using Ryujinx.HLE.Loaders; using Ryujinx.HLE.Loaders;
using Ryujinx.HLE.Loaders.Executables; using Ryujinx.HLE.Loaders.Executables;
using Ryujinx.HLE.Loaders.Npdm;
using Ryujinx.HLE.Logging; using Ryujinx.HLE.Logging;
using Ryujinx.HLE.OsHle.Diagnostics; using Ryujinx.HLE.OsHle.Diagnostics;
using Ryujinx.HLE.OsHle.Exceptions; using Ryujinx.HLE.OsHle.Exceptions;
@ -48,6 +49,8 @@ namespace Ryujinx.HLE.OsHle
public AppletStateMgr AppletState { get; private set; } public AppletStateMgr AppletState { get; private set; }
public Npdm Metadata { get; set; }
private SvcHandler SvcHandler; private SvcHandler SvcHandler;
private ConcurrentDictionary<int, AThread> TlsSlots; private ConcurrentDictionary<int, AThread> TlsSlots;

2
Ryujinx.HLE/OsHle/SystemStateMgr.cs
View file

@ -5,8 +5,6 @@ namespace Ryujinx.HLE.OsHle
{ {
public class SystemStateMgr public class SystemStateMgr
{ {
internal static Npdm TitleMetadata { get; set; }
internal static string[] LanguageCodes = new string[] internal static string[] LanguageCodes = new string[]
{ {
"ja", "ja",