aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
diff options
context:
space:
mode:
authorAlex Barney <thealexbarney@gmail.com>2018-12-04 14:23:37 -0600
committergdkchan <gab.dark.100@gmail.com>2018-12-04 18:23:37 -0200
commit85dbb9559ad317a657dafd24da27fec4b3f5250f (patch)
treeecd92931bc2146e549484d9a3af308469089ad4e /Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
parentc86aacde76b5f8e503e2b412385c8491ecc86b3b (diff)
Adjust naming conventions and general refactoring in HLE Project (#490)
* Rename enum fields * Naming conventions * Remove unneeded ".this" * Remove unneeded semicolons * Remove unused Usings * Don't use var * Remove unneeded enum underlying types * Explicitly label class visibility * Remove unneeded @ prefixes * Remove unneeded commas * Remove unneeded if expressions * Method doesn't use unsafe code * Remove unneeded casts * Initialized objects don't need an empty constructor * Remove settings from DotSettings * Revert "Explicitly label class visibility" This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51. * Small changes * Revert external enum renaming * Changes from feedback * Remove unneeded property setters
Diffstat (limited to 'Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs')
-rw-r--r--Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs132
1 files changed, 66 insertions, 66 deletions
diff --git a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
index 9fecb650..5509e865 100644
--- a/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
+++ b/Ryujinx.HLE/Loaders/Executables/NxStaticObject.cs
@@ -6,14 +6,14 @@ namespace Ryujinx.HLE.Loaders.Executables
{
class NxStaticObject : IExecutable
{
- public byte[] Text { get; private set; }
- public byte[] RO { get; private set; }
- public byte[] Data { get; private set; }
+ public byte[] Text { get; }
+ public byte[] Ro { get; }
+ public byte[] Data { 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 TextOffset { get; }
+ public int RoOffset { get; }
+ public int DataOffset { get; }
+ public int BssSize { get; }
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);
-
- 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();
-
- byte[] BuildId = Reader.ReadBytes(0x20);
-
- int TextSize = Reader.ReadInt32();
- int ROSize = Reader.ReadInt32();
- int DataSize = Reader.ReadInt32();
-
- Input.Seek(0x24, SeekOrigin.Current);
-
- 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);
-
- NsoFlags Flags = (NsoFlags)FlagsMsk;
-
- this.TextOffset = TextMemOffset;
- this.ROOffset = ROMemOffset;
- this.DataOffset = DataMemOffset;
- this.BssSize = BssSize;
+ BinaryReader reader = new BinaryReader(input);
+
+ 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();
+
+ byte[] buildId = reader.ReadBytes(0x20);
+
+ int textSize = reader.ReadInt32();
+ int roSize = reader.ReadInt32();
+ int dataSize = reader.ReadInt32();
+
+ input.Seek(0x24, SeekOrigin.Current);
+
+ 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);
+
+ NsoFlags flags = (NsoFlags)flagsMsk;
+
+ TextOffset = textMemOffset;
+ RoOffset = roMemOffset;
+ DataOffset = dataMemOffset;
+ 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);
}
}
}