solvise/Ryujinx
1
1
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

PrntStub: Add a way to print arrays (#711)

Browse source 
* PrntStub: Add a way to print arrays

This commit adds support for printing arrays in stubs (useful for IPC InBuffer/InPointer).
This also add an util to parse an array of structure from a BinaryReader

* Fix missing space

Co-Authored-By: Ac_K <Acoustik666@gmail.com>
This commit is contained in:
Thomas Guillemard 2019-06-27 13:11:51 +02:00 committed by Ac_K
parent 3db9daa3bd
commit db21621bb6
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Ryujinx.Common/Extensions/BinaryReaderExtensions.cs
View file

@ -19,6 +19,26 @@ namespace Ryujinx.Common
} }
} }
public unsafe static T[] ReadStructArray<T>(this BinaryReader reader, int count)
where T : struct
{
int size = Marshal.SizeOf<T>();
T[] result = new T[count];
for (int i = 0; i < count; i++)
{
byte[] data = reader.ReadBytes(size);
fixed (byte* ptr = data)
{
result[i] = Marshal.PtrToStructure<T>((IntPtr)ptr);
}
}
return result;
}
public unsafe static void WriteStruct<T>(this BinaryWriter writer, T value) public unsafe static void WriteStruct<T>(this BinaryWriter writer, T value)
where T : struct where T : struct
{ {

21
Ryujinx.Common/Logging/Formatters/DefaultLogFormatter.cs
View file

@ -1,4 +1,5 @@
using System.Reflection; using System;
using System.Reflection;
using System.Text; using System.Text;
namespace Ryujinx.Common.Logging namespace Ryujinx.Common.Logging
@ -31,7 +32,23 @@ namespace Ryujinx.Common.Logging
{ {
sb.Append(prop.Name); sb.Append(prop.Name);
sb.Append(": "); sb.Append(": ");
sb.Append(prop.GetValue(args.Data));
if (typeof(Array).IsAssignableFrom(prop.PropertyType))
{
Array enumerable = (Array)prop.GetValue(args.Data);
foreach (var item in enumerable)
{
sb.Append(item.ToString());
sb.Append(", ");
}
sb.Remove(sb.Length - 2, 2);
}
else
{
sb.Append(prop.GetValue(args.Data));
}
sb.Append(" - "); sb.Append(" - ");
} }