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

Change ReadAsciiString to use long for the Size, avoids some casting

Browse source
This commit is contained in:
gdkchan 2018-03-15 21:02:35 -03:00
commit 3d37a88180
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChocolArm64/Memory/AMemoryHelper.cs
View file

@ -70,11 +70,11 @@ namespace ChocolArm64.Memory
Marshal.StructureToPtr<T>(Value, Ptr, false); Marshal.StructureToPtr<T>(Value, Ptr, false);
} }
public static string ReadAsciiString(AMemory Memory, long Position, int MaxSize = -1) public static string ReadAsciiString(AMemory Memory, long Position, long MaxSize = -1)
{ {
using (MemoryStream MS = new MemoryStream()) using (MemoryStream MS = new MemoryStream())
{ {
for (int Offs = 0; Offs < MaxSize || MaxSize == -1; Offs++) for (long Offs = 0; Offs < MaxSize || MaxSize == -1; Offs++)
{ {
byte Value = (byte)Memory.ReadByte(Position + Offs); byte Value = (byte)Memory.ReadByte(Position + Offs);

2
Ryujinx.Core/OsHle/Homebrew.cs
View file

@ -51,7 +51,7 @@ namespace Ryujinx.Core.OsHle
long Value0 = Memory.ReadInt64(Position + 0x08); long Value0 = Memory.ReadInt64(Position + 0x08);
long Value1 = Memory.ReadInt64(Position + 0x10); long Value1 = Memory.ReadInt64(Position + 0x10);
FileName = AMemoryHelper.ReadAsciiString(Memory, Value0, (int)(Value1 - Value0)); FileName = AMemoryHelper.ReadAsciiString(Memory, Value0, Value1 - Value0);
break; break;
} }

2
Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs
View file

@ -55,7 +55,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
long Position = Context.Request.SendBuff[0].Position; long Position = Context.Request.SendBuff[0].Position;
long Size = Context.Request.SendBuff[0].Size; long Size = Context.Request.SendBuff[0].Size;
string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position, (int)Size); string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position, Size);
return 0; return 0;
} }

4
Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs
View file

@ -89,11 +89,11 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
long Position = Context.Request.ReceiveBuff[0].Position; long Position = Context.Request.ReceiveBuff[0].Position;
long Size = Context.Request.ReceiveBuff[0].Size; long Size = Context.Request.ReceiveBuff[0].Size;
int Count = (int)(Size >> 3); uint Count = (uint)((ulong)Size >> 3);
long[] ReleasedBuffers = AudioOut.GetReleasedBuffers(Track); long[] ReleasedBuffers = AudioOut.GetReleasedBuffers(Track);
for (int Index = 0; Index < Count; Index++) for (uint Index = 0; Index < Count; Index++)
{ {
long Tag = 0; long Tag = 0;

2
Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs
View file

@ -41,7 +41,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
string DeviceName = AMemoryHelper.ReadAsciiString( string DeviceName = AMemoryHelper.ReadAsciiString(
Context.Memory, Context.Memory,
Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Position,
(int)Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Size);
if (DeviceName == string.Empty) if (DeviceName == string.Empty)
{ {

2
Ryujinx.Core/OsHle/Svc/SvcSystem.cs
View file

@ -164,7 +164,7 @@ namespace Ryujinx.Core.OsHle.Svc
long Position = (long)ThreadState.X0; long Position = (long)ThreadState.X0;
long Size = (long)ThreadState.X1; long Size = (long)ThreadState.X1;
string Str = AMemoryHelper.ReadAsciiString(Memory, Position, (int)Size); string Str = AMemoryHelper.ReadAsciiString(Memory, Position, Size);
Logging.Info($"SvcOutputDebugString: {Str}"); Logging.Info($"SvcOutputDebugString: {Str}");