vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Adjust naming conventions and general refactoring in HLE Project (#490)" (#526)

Browse Source 
This reverts commit 85dbb9559a.
This commit is contained in:
gdkchan
2018-12-04 22:52:39 -02:00
committed by GitHub
parent 85dbb9559a
commit 3615a70cae
299 changed files with 12276 additions and 12268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ryujinx.HLE/Loaders/Executables/IExecutable.cs
View File

@ -3,11 +3,11 @@ namespace Ryujinx.HLE.Loaders.Executables
interface IExecutable
{
byte[] Text { get; }
byte[] Ro { get; }
byte[] RO { get; }
byte[] Data { get; }
int TextOffset { get; }
int RoOffset { get; }
int ROOffset { get; }
int DataOffset { get; }
int BssOffset { get; }
int BssSize { get; }

154
Ryujinx.HLE/Loaders/Executables/KernelInitialProcess.cs
View File

@ -5,145 +5,145 @@ namespace Ryujinx.HLE.Loaders.Executables
{
class KernelInitialProcess : IExecutable
{
public string Name { get; }
public string Name { get; private set; }
public long TitleId { get; }
public long TitleId { get; private set; }
public int ProcessCategory { get; }
public int ProcessCategory { get; private set; }
public byte MainThreadPriority { get; }
public byte DefaultProcessorId { get; }
public byte MainThreadPriority { get; private set; }
public byte DefaultProcessorId { get; private set; }
public bool Is64Bits { get; }
public bool Addr39Bits { get; }
public bool IsService { get; }
public bool Is64Bits { get; private set; }
public bool Addr39Bits { get; private set; }
public bool IsService { get; private set; }
public byte[] Text { get; }
public byte[] Ro { get; }
public byte[] Data { get; }
public byte[] Text { get; private set; }
public byte[] RO { get; private set; }
public byte[] Data { get; private set; }
public int TextOffset { get; }
public int RoOffset { get; }
public int DataOffset { get; }
public int BssOffset { get; }
public int BssSize { get; }
public int TextOffset { get; private set; }
public int ROOffset { get; private set; }
public int DataOffset { get; private set; }
public int BssOffset { get; private set; }
public int BssSize { get; private set; }
public int MainThreadStackSize { get; }
public int MainThreadStackSize { get; private set; }
public int[] Capabilities { get; }
public int[] Capabilities { get; private set; }
private struct SegmentHeader
{
public int Offset { get; }
public int DecompressedSize { get; }
public int CompressedSize { get; }
public int Attribute { get; }
public int Offset { get; private set; }
public int DecompressedSize { get; private set; }
public int CompressedSize { get; private set; }
public int Attribute { get; private set; }
public SegmentHeader(
int offset,
int decompressedSize,
int compressedSize,
int attribute)
int Offset,
int DecompressedSize,
int CompressedSize,
int Attribute)
{
Offset = offset;
DecompressedSize = decompressedSize;
CompressedSize = compressedSize;
Attribute = attribute;
this.Offset = Offset;
this.DecompressedSize = DecompressedSize;
this.CompressedSize = CompressedSize;
this.Attribute = Attribute;
}
}
public KernelInitialProcess(Stream input)
public KernelInitialProcess(Stream Input)
{
BinaryReader reader = new BinaryReader(input);
BinaryReader Reader = new BinaryReader(Input);
string magic = ReadString(reader, 4);
string Magic = ReadString(Reader, 4);
if (magic != "KIP1")
if (Magic != "KIP1")
{
}
Name = ReadString(reader, 12);
Name = ReadString(Reader, 12);
TitleId = reader.ReadInt64();
TitleId = Reader.ReadInt64();
ProcessCategory = reader.ReadInt32();
ProcessCategory = Reader.ReadInt32();
MainThreadPriority = reader.ReadByte();
DefaultProcessorId = reader.ReadByte();
MainThreadPriority = Reader.ReadByte();
DefaultProcessorId = Reader.ReadByte();
byte reserved = reader.ReadByte();
byte flags = reader.ReadByte();
byte Reserved = Reader.ReadByte();
byte Flags = Reader.ReadByte();
Is64Bits = (flags & 0x08) != 0;
Addr39Bits = (flags & 0x10) != 0;
IsService = (flags & 0x20) != 0;
Is64Bits = (Flags & 0x08) != 0;
Addr39Bits = (Flags & 0x10) != 0;
IsService = (Flags & 0x20) != 0;
SegmentHeader[] segments = new SegmentHeader[6];
SegmentHeader[] Segments = new SegmentHeader[6];
for (int index = 0; index < segments.Length; index++)
for (int Index = 0; Index < Segments.Length; Index++)
{
segments[index] = new SegmentHeader(
reader.ReadInt32(),
reader.ReadInt32(),
reader.ReadInt32(),
reader.ReadInt32());
Segments[Index] = new SegmentHeader(
Reader.ReadInt32(),
Reader.ReadInt32(),
Reader.ReadInt32(),
Reader.ReadInt32());
}
TextOffset = segments[0].Offset;
RoOffset = segments[1].Offset;
DataOffset = segments[2].Offset;
BssOffset = segments[3].Offset;
BssSize = segments[3].DecompressedSize;
TextOffset = Segments[0].Offset;
ROOffset = Segments[1].Offset;
DataOffset = Segments[2].Offset;
BssOffset = Segments[3].Offset;
BssSize = Segments[3].DecompressedSize;
MainThreadStackSize = segments[1].Attribute;
MainThreadStackSize = Segments[1].Attribute;
Capabilities = new int[8];
for (int index = 0; index < Capabilities.Length; index++)
for (int Index = 0; Index < Capabilities.Length; Index++)
{
Capabilities[index] = reader.ReadInt32();
Capabilities[Index] = Reader.ReadInt32();
}
input.Seek(0x100, SeekOrigin.Begin);
Input.Seek(0x100, SeekOrigin.Begin);
Text = ReadSegment(segments[0], input);
Ro = ReadSegment(segments[1], input);
Data = ReadSegment(segments[2], input);
Text = ReadSegment(Segments[0], Input);
RO = ReadSegment(Segments[1], Input);
Data = ReadSegment(Segments[2], Input);
}
private byte[] ReadSegment(SegmentHeader header, Stream input)
private byte[] ReadSegment(SegmentHeader Header, Stream Input)
{
long end = input.Position + header.CompressedSize;
long End = Input.Position + Header.CompressedSize;
input.Seek(end, SeekOrigin.Begin);
Input.Seek(End, SeekOrigin.Begin);
byte[] data = BackwardsLz.Decompress(input, header.DecompressedSize);
byte[] Data = BackwardsLz.Decompress(Input, Header.DecompressedSize);
input.Seek(end, SeekOrigin.Begin);
Input.Seek(End, SeekOrigin.Begin);
return data;
return Data;
}
private static string ReadString(BinaryReader reader, int maxSize)
private static string ReadString(BinaryReader Reader, int MaxSize)
{
string value = string.Empty;
string Value = string.Empty;
for (int index = 0; index < maxSize; index++)
for (int Index = 0; Index < MaxSize; Index++)
{
char chr = (char)reader.ReadByte();
char Chr = (char)Reader.ReadByte();
if (chr == '\0')
if (Chr == '\0')
{
reader.BaseStream.Seek(maxSize - index - 1, SeekOrigin.Current);
Reader.BaseStream.Seek(MaxSize - Index - 1, SeekOrigin.Current);
break;
}
value += chr;
Value += Chr;
}
return value;
return Value;
}
}
}

80
Ryujinx.HLE/Loaders/Executables/NxRelocatableObject.cs
View File

@ -4,61 +4,61 @@ namespace Ryujinx.HLE.Loaders.Executables
{
class NxRelocatableObject : IExecutable
{
public byte[] Text { get; }
public byte[] Ro { get; }
public byte[] Data { get; }
public byte[] Text { get; private set; }
public byte[] RO { get; private set; }
public byte[] Data { get; private set; }
public int Mod0Offset { get; }
public int TextOffset { get; }
public int RoOffset { get; }
public int DataOffset { get; }
public int BssSize { get; }
public int Mod0Offset { get; private set; }
public int TextOffset { get; private set; }
public int ROOffset { get; private set; }
public int DataOffset { get; private set; }
public int BssSize { get; private set; }
public int BssOffset => DataOffset + Data.Length;
public ulong SourceAddress { get; }
public ulong BssAddress { get; }
public ulong SourceAddress { get; private set; }
public ulong BssAddress { get; private set; }
public NxRelocatableObject(Stream input, ulong sourceAddress = 0, ulong bssAddress = 0)
public NxRelocatableObject(Stream Input, ulong SourceAddress = 0, ulong BssAddress = 0)
{
SourceAddress = sourceAddress;
BssAddress = bssAddress;
this.SourceAddress = SourceAddress;
this.BssAddress = BssAddress;
BinaryReader reader = new BinaryReader(input);
BinaryReader Reader = new BinaryReader(Input);
input.Seek(4, SeekOrigin.Begin);
Input.Seek(4, SeekOrigin.Begin);
int mod0Offset = reader.ReadInt32();
int padding8 = reader.ReadInt32();
int paddingC = reader.ReadInt32();
int nroMagic = reader.ReadInt32();
int unknown14 = reader.ReadInt32();
int fileSize = reader.ReadInt32();
int unknown1C = reader.ReadInt32();
int textOffset = reader.ReadInt32();
int textSize = reader.ReadInt32();
int roOffset = reader.ReadInt32();
int roSize = reader.ReadInt32();
int dataOffset = reader.ReadInt32();
int dataSize = reader.ReadInt32();
int bssSize = reader.ReadInt32();
int Mod0Offset = Reader.ReadInt32();
int Padding8 = Reader.ReadInt32();
int Paddingc = Reader.ReadInt32();
int NroMagic = Reader.ReadInt32();
int Unknown14 = Reader.ReadInt32();
int FileSize = Reader.ReadInt32();
int Unknown1c = Reader.ReadInt32();
int TextOffset = Reader.ReadInt32();
int TextSize = Reader.ReadInt32();
int ROOffset = Reader.ReadInt32();
int ROSize = Reader.ReadInt32();
int DataOffset = Reader.ReadInt32();
int DataSize = Reader.ReadInt32();
int BssSize = Reader.ReadInt32();
Mod0Offset = mod0Offset;
TextOffset = textOffset;
RoOffset = roOffset;
DataOffset = dataOffset;
BssSize = bssSize;
this.Mod0Offset = Mod0Offset;
this.TextOffset = TextOffset;
this.ROOffset = ROOffset;
this.DataOffset = DataOffset;
this.BssSize = BssSize;
byte[] Read(long position, int size)
byte[] Read(long Position, int Size)
{
input.Seek(position, SeekOrigin.Begin);
Input.Seek(Position, SeekOrigin.Begin);
return reader.ReadBytes(size);
return Reader.ReadBytes(Size);
}
Text = Read(textOffset, textSize);
Ro = Read(roOffset, roSize);
Data = Read(dataOffset, dataSize);
Text = Read(TextOffset, TextSize);
RO = Read(ROOffset, ROSize);
Data = Read(DataOffset, DataSize);
}
}
}

114
Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
View File

@ -6,14 +6,14 @@ namespace Ryujinx.HLE.Loaders.Executables
{
class NxStaticObject : IExecutable
{
public byte[] Text { get; }
public byte[] Ro { get; }
public byte[] Data { get; }
public byte[] Text { get; private set; }
public byte[] RO { get; private set; }
public byte[] Data { get; private set; }
public int TextOffset { get; }
public int RoOffset { get; }
public int DataOffset { get; }
public int BssSize { get; }
public int TextOffset { get; private set; }
public int ROOffset { get; private set; }
public int DataOffset { get; private set; }
public int BssSize { get; private set; }
public int BssOffset => DataOffset + Data.Length;
@ -21,88 +21,88 @@ namespace Ryujinx.HLE.Loaders.Executables
private enum NsoFlags
{
IsTextCompressed = 1 << 0,
IsRoCompressed = 1 << 1,
IsROCompressed = 1 << 1,
IsDataCompressed = 1 << 2,
HasTextHash = 1 << 3,
HasRoHash = 1 << 4,
HasROHash = 1 << 4,
HasDataHash = 1 << 5
}
public NxStaticObject(Stream input)
public NxStaticObject(Stream Input)
{
BinaryReader reader = new BinaryReader(input);
BinaryReader Reader = new BinaryReader(Input);
input.Seek(0, SeekOrigin.Begin);
Input.Seek(0, SeekOrigin.Begin);
int nsoMagic = reader.ReadInt32();
int version = reader.ReadInt32();
int reserved = reader.ReadInt32();
int flagsMsk = reader.ReadInt32();
int textOffset = reader.ReadInt32();
int textMemOffset = reader.ReadInt32();
int textDecSize = reader.ReadInt32();
int modNameOffset = reader.ReadInt32();
int roOffset = reader.ReadInt32();
int roMemOffset = reader.ReadInt32();
int roDecSize = reader.ReadInt32();
int modNameSize = reader.ReadInt32();
int dataOffset = reader.ReadInt32();
int dataMemOffset = reader.ReadInt32();
int dataDecSize = reader.ReadInt32();
int bssSize = reader.ReadInt32();
int NsoMagic = Reader.ReadInt32();
int Version = Reader.ReadInt32();
int Reserved = Reader.ReadInt32();
int FlagsMsk = Reader.ReadInt32();
int TextOffset = Reader.ReadInt32();
int TextMemOffset = Reader.ReadInt32();
int TextDecSize = Reader.ReadInt32();
int ModNameOffset = Reader.ReadInt32();
int ROOffset = Reader.ReadInt32();
int ROMemOffset = Reader.ReadInt32();
int RODecSize = Reader.ReadInt32();
int ModNameSize = Reader.ReadInt32();
int DataOffset = Reader.ReadInt32();
int DataMemOffset = Reader.ReadInt32();
int DataDecSize = Reader.ReadInt32();
int BssSize = Reader.ReadInt32();
byte[] buildId = reader.ReadBytes(0x20);
byte[] BuildId = Reader.ReadBytes(0x20);
int textSize = reader.ReadInt32();
int roSize = reader.ReadInt32();
int dataSize = reader.ReadInt32();
int TextSize = Reader.ReadInt32();
int ROSize = Reader.ReadInt32();
int DataSize = Reader.ReadInt32();
input.Seek(0x24, SeekOrigin.Current);
Input.Seek(0x24, SeekOrigin.Current);
int dynStrOffset = reader.ReadInt32();
int dynStrSize = reader.ReadInt32();
int dynSymOffset = reader.ReadInt32();
int dynSymSize = reader.ReadInt32();
int DynStrOffset = Reader.ReadInt32();
int DynStrSize = Reader.ReadInt32();
int DynSymOffset = Reader.ReadInt32();
int DynSymSize = Reader.ReadInt32();
byte[] textHash = reader.ReadBytes(0x20);
byte[] roHash = reader.ReadBytes(0x20);
byte[] dataHash = reader.ReadBytes(0x20);
byte[] TextHash = Reader.ReadBytes(0x20);
byte[] ROHash = Reader.ReadBytes(0x20);
byte[] DataHash = Reader.ReadBytes(0x20);
NsoFlags flags = (NsoFlags)flagsMsk;
NsoFlags Flags = (NsoFlags)FlagsMsk;
TextOffset = textMemOffset;
RoOffset = roMemOffset;
DataOffset = dataMemOffset;
BssSize = bssSize;
this.TextOffset = TextMemOffset;
this.ROOffset = ROMemOffset;
this.DataOffset = DataMemOffset;
this.BssSize = BssSize;
//Text segment
input.Seek(textOffset, SeekOrigin.Begin);
Input.Seek(TextOffset, SeekOrigin.Begin);
Text = reader.ReadBytes(textSize);
Text = Reader.ReadBytes(TextSize);
if (flags.HasFlag(NsoFlags.IsTextCompressed))
if (Flags.HasFlag(NsoFlags.IsTextCompressed))
{
Text = Lz4.Decompress(Text, textDecSize);
Text = Lz4.Decompress(Text, TextDecSize);
}
//Read-only data segment
input.Seek(roOffset, SeekOrigin.Begin);
Input.Seek(ROOffset, SeekOrigin.Begin);
Ro = reader.ReadBytes(roSize);
RO = Reader.ReadBytes(ROSize);
if (flags.HasFlag(NsoFlags.IsRoCompressed))
if (Flags.HasFlag(NsoFlags.IsROCompressed))
{
Ro = Lz4.Decompress(Ro, roDecSize);
RO = Lz4.Decompress(RO, RODecSize);
}
//Data segment
input.Seek(dataOffset, SeekOrigin.Begin);
Input.Seek(DataOffset, SeekOrigin.Begin);
Data = reader.ReadBytes(dataSize);
Data = Reader.ReadBytes(DataSize);
if (flags.HasFlag(NsoFlags.IsDataCompressed))
if (Flags.HasFlag(NsoFlags.IsDataCompressed))
{
Data = Lz4.Decompress(Data, dataDecSize);
Data = Lz4.Decompress(Data, DataDecSize);
}
}
}