mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code style tweaks

Browse source
This commit is contained in:
Alex Barney 2018-09-23 21:18:20 -05:00
parent 86aa80c87b
commit fba8a7c6e0
2 changed files with 49 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
LibHac/Keyset.cs
View file

@ -270,10 +270,9 @@ namespace LibHac
{ {
private const int TitleKeySize = 0x10; private const int TitleKeySize = 0x10;
public static readonly Dictionary<string, KeyValue> public static readonly Dictionary<string, KeyValue> CommonKeyDict;
CommonKeyDict, public static readonly Dictionary<string, KeyValue> UniqueKeyDict;
UniqueKeyDict, public static readonly Dictionary<string, KeyValue> AllKeyDict;
AllKeyDict;
static ExternalKeys() static ExternalKeys()
{ {

103
libhac/Nso.cs
View file

@ -1,21 +1,18 @@
using LibHac.Streams; using System.Collections;
using Ryujinx.HLE.Loaders.Compression;
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Text; using LibHac.Streams;
using Ryujinx.HLE.Loaders.Compression;
namespace LibHac namespace LibHac
{ {
public class Nso public class Nso
{ {
public NsoSection[] Sections; public NsoSection[] Sections { get; }
public RodataRelativeExtent[] RodataRelativeExtents; public RodataRelativeExtent[] RodataRelativeExtents { get; }
public uint BssSize; public uint BssSize { get; }
public byte[] BuildID = new byte[0x20]; public byte[] BuildId { get; } = new byte[0x20];
private SharedStreamSource StreamSource; private SharedStreamSource StreamSource { get; }
public Nso(Stream stream) public Nso(Stream stream)
{ {
@ -25,101 +22,93 @@ namespace LibHac
throw new InvalidDataException("NSO magic is incorrect!"); throw new InvalidDataException("NSO magic is incorrect!");
reader.ReadUInt32(); // Version reader.ReadUInt32(); // Version
reader.ReadUInt32(); // Reserved/Unused reader.ReadUInt32(); // Reserved/Unused
BitArray flags = new BitArray(new int[] { (int) reader.ReadUInt32() }); BitArray flags = new BitArray(new[] { (int)reader.ReadUInt32() });
NsoSection textSection = new NsoSection(StreamSource); NsoSection textSection = new NsoSection(StreamSource);
NsoSection rodataSection = new NsoSection(StreamSource); NsoSection rodataSection = new NsoSection(StreamSource);
NsoSection dataSection = new NsoSection(StreamSource); NsoSection dataSection = new NsoSection(StreamSource);
textSection.IsCompressed = flags[0]; textSection.IsCompressed = flags[0];
textSection.CheckHash = flags[3];
rodataSection.IsCompressed = flags[1]; rodataSection.IsCompressed = flags[1];
rodataSection.CheckHash = flags[4];
dataSection.IsCompressed = flags[2]; dataSection.IsCompressed = flags[2];
textSection.CheckHash = flags[3];
rodataSection.CheckHash = flags[4];
dataSection.CheckHash = flags[5]; dataSection.CheckHash = flags[5];
ReadSegmentHeader(textSection, reader); textSection.ReadSegmentHeader(reader);
reader.ReadUInt32(); // Module offset (TODO) reader.ReadUInt32(); // Module offset (TODO)
ReadSegmentHeader(rodataSection, reader); rodataSection.ReadSegmentHeader(reader);
reader.ReadUInt32(); // Module file size reader.ReadUInt32(); // Module file size
ReadSegmentHeader(dataSection, reader); dataSection.ReadSegmentHeader(reader);
BssSize = reader.ReadUInt32(); BssSize = reader.ReadUInt32();
reader.Read(BuildID, 0, 0x20); reader.Read(BuildId, 0, 0x20);
textSection.CompressedSize = reader.ReadUInt32(); textSection.CompressedSize = reader.ReadUInt32();
rodataSection.CompressedSize = reader.ReadUInt32(); rodataSection.CompressedSize = reader.ReadUInt32();
dataSection.CompressedSize = reader.ReadUInt32(); dataSection.CompressedSize = reader.ReadUInt32();
reader.ReadBytes(0x1C); // Padding reader.ReadBytes(0x1C); // Padding
RodataRelativeExtents = new RodataRelativeExtent[] RodataRelativeExtents = new[]
{ {
ReadRodataRelativeExtent(reader), ReadRodataRelativeExtent(reader), ReadRodataRelativeExtent(reader) new RodataRelativeExtent(reader), new RodataRelativeExtent(reader), new RodataRelativeExtent(reader)
}; };
reader.Read(textSection.Hash, 0, 0x20); reader.Read(textSection.Hash, 0, 0x20);
reader.Read(rodataSection.Hash, 0, 0x20); reader.Read(rodataSection.Hash, 0, 0x20);
reader.Read(dataSection.Hash, 0, 0x20); reader.Read(dataSection.Hash, 0, 0x20);
Sections = new NsoSection[] {textSection, rodataSection, dataSection }; Sections = new[] { textSection, rodataSection, dataSection };
reader.Close(); reader.Close();
} }
public void ReadSegmentHeader(NsoSection section, BinaryReader reader)
{
section.FileOffset = reader.ReadUInt32();
section.MemoryOffset = reader.ReadUInt32();
section.DecompressedSize = reader.ReadUInt32();
}
public RodataRelativeExtent ReadRodataRelativeExtent(BinaryReader reader)
{
RodataRelativeExtent extent = new RodataRelativeExtent();
extent.RegionRodataOffset = reader.ReadUInt32();
extent.RegionSize = reader.ReadUInt32();
return extent;
}
public class NsoSection public class NsoSection
{ {
private readonly SharedStreamSource StreamSource; private SharedStreamSource StreamSource { get; }
public bool IsCompressed, public bool IsCompressed { get; set; }
CheckHash; public bool CheckHash { get; set; }
public uint FileOffset, public uint FileOffset { get; set; }
MemoryOffset, public uint MemoryOffset { get; set; }
DecompressedSize, public uint DecompressedSize { get; set; }
CompressedSize; public uint CompressedSize { get; set; }
public byte[] Hash = new byte[0x20];
public byte[] Hash { get; } = new byte[0x20];
public NsoSection(SharedStreamSource streamSource) public NsoSection(SharedStreamSource streamSource)
{ {
StreamSource = streamSource; StreamSource = streamSource;
} }
public Stream OpenCompressedStream() public Stream OpenSection()
{ {
return StreamSource.CreateStream(FileOffset, CompressedSize); return StreamSource.CreateStream(FileOffset, CompressedSize);
} }
public Stream OpenDecompressedStream() public byte[] DecompressSection()
{
return new MemoryStream(Decompress());
}
public byte[] Decompress()
{ {
byte[] compressed = new byte[CompressedSize]; byte[] compressed = new byte[CompressedSize];
OpenCompressedStream().Read(compressed, 0, (int) CompressedSize); OpenSection().Read(compressed, 0, (int)CompressedSize);
if (IsCompressed) if (IsCompressed)
return Lz4.Decompress(compressed, (int)DecompressedSize); return Lz4.Decompress(compressed, (int)DecompressedSize);
else else
return compressed; return compressed;
} }
internal void ReadSegmentHeader(BinaryReader reader)
{
FileOffset = reader.ReadUInt32();
MemoryOffset = reader.ReadUInt32();
DecompressedSize = reader.ReadUInt32();
}
} }
public class RodataRelativeExtent public class RodataRelativeExtent
{ {
public uint public uint RegionRodataOffset { get; }
RegionRodataOffset, public uint RegionSize { get; }
RegionSize;
public RodataRelativeExtent(BinaryReader reader)
{
RegionRodataOffset = reader.ReadUInt32();
RegionSize = reader.ReadUInt32();
}
} }
} }
} }