|
@@ -22,9 +22,9 @@ namespace Ryujinx.HLE.HOS.Services.Lm
|
|
|
|
|
|
|
|
public long Log(ServiceCtx Context)
|
|
public long Log(ServiceCtx Context)
|
|
|
{
|
|
{
|
|
|
- byte[] LogBuffer = Context.Memory.ReadBytes(
|
|
|
|
|
- Context.Request.PtrBuff[0].Position,
|
|
|
|
|
- Context.Request.PtrBuff[0].Size);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ (long BufPos, long BufSize) = Context.Request.GetBufferType0x21();
|
|
|
|
|
+ byte[] LogBuffer = Context.Memory.ReadBytes(BufPos, BufSize);
|
|
|
|
|
|
|
|
using (MemoryStream MS = new MemoryStream(LogBuffer))
|
|
using (MemoryStream MS = new MemoryStream(LogBuffer))
|
|
|
{
|
|
{
|
|
@@ -50,20 +50,36 @@ namespace Ryujinx.HLE.HOS.Services.Lm
|
|
|
|
|
|
|
|
string FieldStr = string.Empty;
|
|
string FieldStr = string.Empty;
|
|
|
|
|
|
|
|
- if (Field == LmLogField.Skip)
|
|
|
|
|
|
|
+ if (Field == LmLogField.Start)
|
|
|
{
|
|
{
|
|
|
- Reader.ReadByte();
|
|
|
|
|
|
|
+ Reader.ReadBytes(Size);
|
|
|
|
|
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
+ else if (Field == LmLogField.Stop)
|
|
|
|
|
+ {
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
else if (Field == LmLogField.Line)
|
|
else if (Field == LmLogField.Line)
|
|
|
{
|
|
{
|
|
|
FieldStr = Field + ": " + Reader.ReadInt32();
|
|
FieldStr = Field + ": " + Reader.ReadInt32();
|
|
|
}
|
|
}
|
|
|
- else
|
|
|
|
|
|
|
+ else if (Field == LmLogField.DropCount)
|
|
|
|
|
+ {
|
|
|
|
|
+ FieldStr = Field + ": " + Reader.ReadInt64();
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (Field == LmLogField.Time)
|
|
|
|
|
+ {
|
|
|
|
|
+ FieldStr = Field + ": " + Reader.ReadInt64() + "s";
|
|
|
|
|
+ }
|
|
|
|
|
+ else if (Field < LmLogField.Count)
|
|
|
{
|
|
{
|
|
|
FieldStr = Field + ": \"" + Encoding.UTF8.GetString(Reader.ReadBytes(Size)) + "\"";
|
|
FieldStr = Field + ": \"" + Encoding.UTF8.GetString(Reader.ReadBytes(Size)) + "\"";
|
|
|
}
|
|
}
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ FieldStr = "Field" + Field + ": \"" + Encoding.UTF8.GetString(Reader.ReadBytes(Size)) + "\"";
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
SB.AppendLine(" " + FieldStr);
|
|
SB.AppendLine(" " + FieldStr);
|
|
|
}
|
|
}
|