Code style fixes and nits on the HLE project (#355)
* Some style fixes and nits on ITimeZoneService * Remove some unneeded usings * Remove the Ryujinx.HLE.OsHle.Handles namespace * Remove hbmenu automatic load on process exit * Rename Ns to Device, rename Os to System, rename SystemState to State * Move Exceptions and Utilities out of OsHle * Rename OsHle to HOS * Rename OsHle folder to HOS * IManagerDisplayService and ISystemDisplayService style fixes * BsdError shouldn't be public * Add a empty new line before using static * Remove unused file * Some style fixes on NPDM * Exit gracefully when the application is closed * Code style fixes on IGeneralService * Add 0x prefix on values printed as hex * Small improvements on finalization code * Move ProcessId and ThreadId out of AThreadState * Rename VFs to FileSystem * FsAccessHeader shouldn't be public. Also fix file names casing * More case changes on NPDM * Remove unused files * Move using to the correct place on NPDM * Use properties on KernelAccessControlMmio * Address PR feedback
This commit is contained in:
parent
182d716867
commit
521751795a
258 changed files with 1574 additions and 1546 deletions
17
Ryujinx.HLE/Utilities/EndianSwap.cs
Normal file
17
Ryujinx.HLE/Utilities/EndianSwap.cs
Normal file
|
@ -0,0 +1,17 @@
|
|||
namespace Ryujinx.HLE.Utilities
|
||||
{
|
||||
static class EndianSwap
|
||||
{
|
||||
public static short Swap16(short Value) => (short)(((Value >> 8) & 0xff) | (Value << 8));
|
||||
|
||||
public static int Swap32(int Value)
|
||||
{
|
||||
uint UintVal = (uint)Value;
|
||||
|
||||
return (int)(((UintVal >> 24) & 0x000000ff) |
|
||||
((UintVal >> 8) & 0x0000ff00) |
|
||||
((UintVal << 8) & 0x00ff0000) |
|
||||
((UintVal << 24) & 0xff000000));
|
||||
}
|
||||
}
|
||||
}
|
25
Ryujinx.HLE/Utilities/IntUtils.cs
Normal file
25
Ryujinx.HLE/Utilities/IntUtils.cs
Normal file
|
@ -0,0 +1,25 @@
|
|||
namespace Ryujinx.HLE.Utilities
|
||||
{
|
||||
static class IntUtils
|
||||
{
|
||||
public static int AlignUp(int Value, int Size)
|
||||
{
|
||||
return (Value + (Size - 1)) & ~(Size - 1);
|
||||
}
|
||||
|
||||
public static long AlignUp(long Value, int Size)
|
||||
{
|
||||
return (Value + (Size - 1)) & ~((long)Size - 1);
|
||||
}
|
||||
|
||||
public static int AlignDown(int Value, int Size)
|
||||
{
|
||||
return Value & ~(Size - 1);
|
||||
}
|
||||
|
||||
public static long AlignDown(long Value, int Size)
|
||||
{
|
||||
return Value & ~((long)Size - 1);
|
||||
}
|
||||
}
|
||||
}
|
51
Ryujinx.HLE/Utilities/StringUtils.cs
Normal file
51
Ryujinx.HLE/Utilities/StringUtils.cs
Normal file
|
@ -0,0 +1,51 @@
|
|||
using System;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Ryujinx.HLE.Utilities
|
||||
{
|
||||
static class StringUtils
|
||||
{
|
||||
public static byte[] GetFixedLengthBytes(string InputString, int Size, Encoding Encoding)
|
||||
{
|
||||
InputString = InputString + "\0";
|
||||
|
||||
int BytesCount = Encoding.GetByteCount(InputString);
|
||||
|
||||
byte[] Output = new byte[Size];
|
||||
|
||||
if (BytesCount < Size)
|
||||
{
|
||||
Encoding.GetBytes(InputString, 0, InputString.Length, Output, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
int NullSize = Encoding.GetByteCount("\0");
|
||||
|
||||
Output = Encoding.GetBytes(InputString);
|
||||
|
||||
Array.Resize(ref Output, Size - NullSize);
|
||||
|
||||
Output = Output.Concat(Encoding.GetBytes("\0")).ToArray();
|
||||
}
|
||||
|
||||
return Output;
|
||||
}
|
||||
|
||||
public static byte[] HexToBytes(string HexString)
|
||||
{
|
||||
//Ignore last charactor if HexLength % 2 != 0.
|
||||
int BytesInHex = HexString.Length / 2;
|
||||
|
||||
byte[] Output = new byte[BytesInHex];
|
||||
|
||||
for (int Index = 0; Index < BytesInHex; Index++)
|
||||
{
|
||||
Output[Index] = byte.Parse(HexString.Substring(Index * 2, 2), NumberStyles.HexNumber);
|
||||
}
|
||||
|
||||
return Output;
|
||||
}
|
||||
}
|
||||
}
|
45
Ryujinx.HLE/Utilities/StructReader.cs
Normal file
45
Ryujinx.HLE/Utilities/StructReader.cs
Normal file
|
@ -0,0 +1,45 @@
|
|||
using ChocolArm64.Memory;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ryujinx.HLE.Utilities
|
||||
{
|
||||
class StructReader
|
||||
{
|
||||
private AMemory Memory;
|
||||
|
||||
public long Position { get; private set; }
|
||||
|
||||
public StructReader(AMemory Memory, long Position)
|
||||
{
|
||||
this.Memory = Memory;
|
||||
this.Position = Position;
|
||||
}
|
||||
|
||||
public T Read<T>() where T : struct
|
||||
{
|
||||
T Value = AMemoryHelper.Read<T>(Memory, Position);
|
||||
|
||||
Position += Marshal.SizeOf<T>();
|
||||
|
||||
return Value;
|
||||
}
|
||||
|
||||
public T[] Read<T>(int Size) where T : struct
|
||||
{
|
||||
int StructSize = Marshal.SizeOf<T>();
|
||||
|
||||
int Count = Size / StructSize;
|
||||
|
||||
T[] Output = new T[Count];
|
||||
|
||||
for (int Index = 0; Index < Count; Index++)
|
||||
{
|
||||
Output[Index] = AMemoryHelper.Read<T>(Memory, Position);
|
||||
|
||||
Position += StructSize;
|
||||
}
|
||||
|
||||
return Output;
|
||||
}
|
||||
}
|
||||
}
|
25
Ryujinx.HLE/Utilities/StructWriter.cs
Normal file
25
Ryujinx.HLE/Utilities/StructWriter.cs
Normal file
|
@ -0,0 +1,25 @@
|
|||
using ChocolArm64.Memory;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Ryujinx.HLE.Utilities
|
||||
{
|
||||
class StructWriter
|
||||
{
|
||||
private AMemory Memory;
|
||||
|
||||
public long Position { get; private set; }
|
||||
|
||||
public StructWriter(AMemory Memory, long Position)
|
||||
{
|
||||
this.Memory = Memory;
|
||||
this.Position = Position;
|
||||
}
|
||||
|
||||
public void Write<T>(T Value) where T : struct
|
||||
{
|
||||
AMemoryHelper.Write(Memory, Position, Value);
|
||||
|
||||
Position += Marshal.SizeOf<T>();
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue