drashna/ryujinx
1
0
Fork 0
Code Activity Actions

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

Browse source 
* 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
This commit is contained in:
Alex Barney 2018-12-04 14:23:37 -06:00 • committed by gdkchan
parent c86aacde76
commit 85dbb9559a
299 changed files with 12268 additions and 12276 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Ryujinx.HLE/Loaders/Compression/BackwardsLz.cs
View file

@ -7,22 +7,22 @@ namespace Ryujinx.HLE.Loaders.Compression
{
private class BackwardsReader
{
private Stream BaseStream;
private Stream _baseStream;
public BackwardsReader(Stream BaseStream)
public BackwardsReader(Stream baseStream)
{
this.BaseStream = BaseStream;
_baseStream = baseStream;
}
public byte ReadByte()
{
BaseStream.Seek(-1, SeekOrigin.Current);
_baseStream.Seek(-1, SeekOrigin.Current);
byte Value = (byte)BaseStream.ReadByte();
byte value = (byte)_baseStream.ReadByte();
BaseStream.Seek(-1, SeekOrigin.Current);
_baseStream.Seek(-1, SeekOrigin.Current);
return Value;
return value;
}
public short ReadInt16()
@ -39,67 +39,67 @@ namespace Ryujinx.HLE.Loaders.Compression
}
}
public static byte[] Decompress(Stream Input, int DecompressedLength)
public static byte[] Decompress(Stream input, int decompressedLength)
{
long End = Input.Position;
long end = input.Position;
BackwardsReader Reader = new BackwardsReader(Input);
BackwardsReader reader = new BackwardsReader(input);
int AdditionalDecLength = Reader.ReadInt32();
int StartOffset = Reader.ReadInt32();
int CompressedLength = Reader.ReadInt32();
int additionalDecLength = reader.ReadInt32();
int startOffset = reader.ReadInt32();
int compressedLength = reader.ReadInt32();
Input.Seek(12 - StartOffset, SeekOrigin.Current);
input.Seek(12 - startOffset, SeekOrigin.Current);
byte[] Dec = new byte[DecompressedLength];
byte[] dec = new byte[decompressedLength];
int DecompressedLengthUnpadded = CompressedLength + AdditionalDecLength;
int decompressedLengthUnpadded = compressedLength + additionalDecLength;
int DecompressionStart = DecompressedLength - DecompressedLengthUnpadded;
int decompressionStart = decompressedLength - decompressedLengthUnpadded;
int DecPos = Dec.Length;
int decPos = dec.Length;
byte Mask = 0;
byte Header = 0;
byte mask = 0;
byte header = 0;
while (DecPos > DecompressionStart)
while (decPos > decompressionStart)
{
if ((Mask >>= 1) == 0)
if ((mask >>= 1) == 0)
{
Header = Reader.ReadByte();
Mask = 0x80;
header = reader.ReadByte();
mask = 0x80;
}
if ((Header & Mask) == 0)
if ((header & mask) == 0)
{
Dec[--DecPos] = Reader.ReadByte();
dec[--decPos] = reader.ReadByte();
}
else
{
ushort Pair = (ushort)Reader.ReadInt16();
ushort pair = (ushort)reader.ReadInt16();
int Length = (Pair >> 12) + 3;
int Position = (Pair & 0xfff) + 3;
int length = (pair >> 12) + 3;
int position = (pair & 0xfff) + 3;
DecPos -= Length;
decPos -= length;
if (Length <= Position)
if (length <= position)
{
int SrcPos = DecPos + Position;
int srcPos = decPos + position;
Buffer.BlockCopy(Dec, SrcPos, Dec, DecPos, Length);
Buffer.BlockCopy(dec, srcPos, dec, decPos, length);
}
else
{
for (int Offset = 0; Offset < Length; Offset++)
for (int offset = 0; offset < length; offset++)
{
Dec[DecPos + Offset] = Dec[DecPos + Position + Offset];
dec[decPos + offset] = dec[decPos + position + offset];
}
}
}
}
return Dec;
return dec;
}
}
}

60
Ryujinx.HLE/Loaders/Compression/Lz4.cs
View file

@ -4,75 +4,75 @@ namespace Ryujinx.HLE.Loaders.Compression
{
static class Lz4
{
public static byte[] Decompress(byte[] Cmp, int DecLength)
public static byte[] Decompress(byte[] cmp, int decLength)
{
byte[] Dec = new byte[DecLength];
byte[] dec = new byte[decLength];
int CmpPos = 0;
int DecPos = 0;
int cmpPos = 0;
int decPos = 0;
int GetLength(int Length)
int GetLength(int length)
{
byte Sum;
byte sum;
if (Length == 0xf)
if (length == 0xf)
{
do
{
Length += (Sum = Cmp[CmpPos++]);
length += (sum = cmp[cmpPos++]);
}
while (Sum == 0xff);
while (sum == 0xff);
}
return Length;
return length;
}
do
{
byte Token = Cmp[CmpPos++];
byte token = cmp[cmpPos++];
int EncCount = (Token >> 0) & 0xf;
int LitCount = (Token >> 4) & 0xf;
int encCount = (token >> 0) & 0xf;
int litCount = (token >> 4) & 0xf;
//Copy literal chunck
LitCount = GetLength(LitCount);
litCount = GetLength(litCount);
Buffer.BlockCopy(Cmp, CmpPos, Dec, DecPos, LitCount);
Buffer.BlockCopy(cmp, cmpPos, dec, decPos, litCount);
CmpPos += LitCount;
DecPos += LitCount;
cmpPos += litCount;
decPos += litCount;
if (CmpPos >= Cmp.Length)
if (cmpPos >= cmp.Length)
{
break;
}
//Copy compressed chunck
int Back = Cmp[CmpPos++] << 0 |
Cmp[CmpPos++] << 8;
int back = cmp[cmpPos++] << 0 |
cmp[cmpPos++] << 8;
EncCount = GetLength(EncCount) + 4;
encCount = GetLength(encCount) + 4;
int EncPos = DecPos - Back;
int encPos = decPos - back;
if (EncCount <= Back)
if (encCount <= back)
{
Buffer.BlockCopy(Dec, EncPos, Dec, DecPos, EncCount);
Buffer.BlockCopy(dec, encPos, dec, decPos, encCount);
DecPos += EncCount;
decPos += encCount;
}
else
{
while (EncCount-- > 0)
while (encCount-- > 0)
{
Dec[DecPos++] = Dec[EncPos++];
dec[decPos++] = dec[encPos++];
}
}
}
while (CmpPos < Cmp.Length &&
DecPos < Dec.Length);
while (cmpPos < cmp.Length &&
decPos < dec.Length);
return Dec;
return dec;
}
}
}