Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
299 changed files with 12276 additions and 12268 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)
{
_baseStream = baseStream;
this.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;
}
}
}