Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7c2f07d124 | ||
|
ede5b3c324 | ||
|
df5be5812f | ||
|
bc392e55df | ||
|
fffc3ed193 | ||
|
7d160e98fd | ||
|
bf96bc84a8 | ||
|
91e4caaa69 |
@@ -228,7 +228,6 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
switch (context.Fpcr.GetRoundingMode())
|
switch (context.Fpcr.GetRoundingMode())
|
||||||
{
|
{
|
||||||
default:
|
|
||||||
case FPRoundingMode.ToNearest:
|
case FPRoundingMode.ToNearest:
|
||||||
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
||||||
overflowToInf = true;
|
overflowToInf = true;
|
||||||
@@ -248,6 +247,9 @@ namespace ARMeilleure.Instructions
|
|||||||
roundUp = false;
|
roundUp = false;
|
||||||
overflowToInf = false;
|
overflowToInf = false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new ArgumentException($"Invalid rounding mode \"{context.Fpcr.GetRoundingMode()}\".");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (roundUp)
|
if (roundUp)
|
||||||
@@ -412,7 +414,6 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
switch (context.Fpcr.GetRoundingMode())
|
switch (context.Fpcr.GetRoundingMode())
|
||||||
{
|
{
|
||||||
default:
|
|
||||||
case FPRoundingMode.ToNearest:
|
case FPRoundingMode.ToNearest:
|
||||||
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
||||||
overflowToInf = true;
|
overflowToInf = true;
|
||||||
@@ -432,6 +433,9 @@ namespace ARMeilleure.Instructions
|
|||||||
roundUp = false;
|
roundUp = false;
|
||||||
overflowToInf = false;
|
overflowToInf = false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new ArgumentException($"Invalid rounding mode \"{context.Fpcr.GetRoundingMode()}\".");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (roundUp)
|
if (roundUp)
|
||||||
@@ -585,7 +589,6 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
switch (context.Fpcr.GetRoundingMode())
|
switch (context.Fpcr.GetRoundingMode())
|
||||||
{
|
{
|
||||||
default:
|
|
||||||
case FPRoundingMode.ToNearest:
|
case FPRoundingMode.ToNearest:
|
||||||
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
roundUp = (error > 0.5d || (error == 0.5d && (intMant & 1u) == 1u));
|
||||||
overflowToInf = true;
|
overflowToInf = true;
|
||||||
@@ -605,6 +608,9 @@ namespace ARMeilleure.Instructions
|
|||||||
roundUp = false;
|
roundUp = false;
|
||||||
overflowToInf = false;
|
overflowToInf = false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw new ArgumentException($"Invalid rounding mode \"{context.Fpcr.GetRoundingMode()}\".");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (roundUp)
|
if (roundUp)
|
||||||
@@ -1433,11 +1439,24 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
switch (fpcr.GetRoundingMode())
|
switch (fpcr.GetRoundingMode())
|
||||||
{
|
{
|
||||||
|
case FPRoundingMode.ToNearest:
|
||||||
|
overflowToInf = true;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsPlusInfinity:
|
||||||
|
overflowToInf = !sign;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsMinusInfinity:
|
||||||
|
overflowToInf = sign;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsZero:
|
||||||
|
overflowToInf = false;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
case FPRoundingMode.ToNearest: overflowToInf = true; break;
|
throw new ArgumentException($"Invalid rounding mode \"{fpcr.GetRoundingMode()}\".");
|
||||||
case FPRoundingMode.TowardsPlusInfinity: overflowToInf = !sign; break;
|
|
||||||
case FPRoundingMode.TowardsMinusInfinity: overflowToInf = sign; break;
|
|
||||||
case FPRoundingMode.TowardsZero: overflowToInf = false; break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
result = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
result = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
||||||
@@ -2845,11 +2864,24 @@ namespace ARMeilleure.Instructions
|
|||||||
|
|
||||||
switch (fpcr.GetRoundingMode())
|
switch (fpcr.GetRoundingMode())
|
||||||
{
|
{
|
||||||
|
case FPRoundingMode.ToNearest:
|
||||||
|
overflowToInf = true;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsPlusInfinity:
|
||||||
|
overflowToInf = !sign;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsMinusInfinity:
|
||||||
|
overflowToInf = sign;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case FPRoundingMode.TowardsZero:
|
||||||
|
overflowToInf = false;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
case FPRoundingMode.ToNearest: overflowToInf = true; break;
|
throw new ArgumentException($"Invalid rounding mode \"{fpcr.GetRoundingMode()}\".");
|
||||||
case FPRoundingMode.TowardsPlusInfinity: overflowToInf = !sign; break;
|
|
||||||
case FPRoundingMode.TowardsMinusInfinity: overflowToInf = sign; break;
|
|
||||||
case FPRoundingMode.TowardsZero: overflowToInf = false; break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
result = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
result = overflowToInf ? FPInfinity(sign) : FPMaxNormal(sign);
|
||||||
|
@@ -6,9 +6,9 @@ namespace ARMeilleure.Memory
|
|||||||
{
|
{
|
||||||
IntPtr Pointer { get; }
|
IntPtr Pointer { get; }
|
||||||
|
|
||||||
bool Commit(ulong offset, ulong size);
|
void Commit(ulong offset, ulong size);
|
||||||
|
|
||||||
void MapAsRx(ulong offset, ulong size);
|
void MapAsRx(ulong offset, ulong size);
|
||||||
void MapAsRwx(ulong offset, ulong size);
|
void MapAsRwx(ulong offset, ulong size);
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -18,7 +18,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
private readonly ManualResetEvent _pauseEvent;
|
private readonly ManualResetEvent _pauseEvent;
|
||||||
private readonly ConcurrentDictionary<OpenALHardwareDeviceSession, byte> _sessions;
|
private readonly ConcurrentDictionary<OpenALHardwareDeviceSession, byte> _sessions;
|
||||||
private bool _stillRunning;
|
private bool _stillRunning;
|
||||||
private Thread _updaterThread;
|
private readonly Thread _updaterThread;
|
||||||
|
|
||||||
public OpenALHardwareDeviceDriver()
|
public OpenALHardwareDeviceDriver()
|
||||||
{
|
{
|
||||||
@@ -73,7 +73,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
throw new ArgumentException($"{channelCount}");
|
throw new ArgumentException($"{channelCount}");
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenALHardwareDeviceSession session = new OpenALHardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
OpenALHardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
||||||
|
|
||||||
_sessions.TryAdd(session, 0);
|
_sessions.TryAdd(session, 0);
|
||||||
|
|
||||||
@@ -123,6 +123,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -10,11 +10,11 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
{
|
{
|
||||||
class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
class OpenALHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
||||||
{
|
{
|
||||||
private OpenALHardwareDeviceDriver _driver;
|
private readonly OpenALHardwareDeviceDriver _driver;
|
||||||
private int _sourceId;
|
private readonly int _sourceId;
|
||||||
private ALFormat _targetFormat;
|
private readonly ALFormat _targetFormat;
|
||||||
private bool _isActive;
|
private bool _isActive;
|
||||||
private Queue<OpenALAudioBuffer> _queuedBuffers;
|
private readonly Queue<OpenALAudioBuffer> _queuedBuffers;
|
||||||
private ulong _playedSampleCount;
|
private ulong _playedSampleCount;
|
||||||
|
|
||||||
private readonly object _lock = new();
|
private readonly object _lock = new();
|
||||||
@@ -32,23 +32,17 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
|
|
||||||
private ALFormat GetALFormat()
|
private ALFormat GetALFormat()
|
||||||
{
|
{
|
||||||
switch (RequestedSampleFormat)
|
return RequestedSampleFormat switch
|
||||||
{
|
{
|
||||||
case SampleFormat.PcmInt16:
|
SampleFormat.PcmInt16 => RequestedChannelCount switch
|
||||||
switch (RequestedChannelCount)
|
{
|
||||||
{
|
1 => ALFormat.Mono16,
|
||||||
case 1:
|
2 => ALFormat.Stereo16,
|
||||||
return ALFormat.Mono16;
|
6 => ALFormat.Multi51Chn16Ext,
|
||||||
case 2:
|
_ => throw new NotImplementedException($"Unsupported channel config {RequestedChannelCount}"),
|
||||||
return ALFormat.Stereo16;
|
},
|
||||||
case 6:
|
_ => throw new NotImplementedException($"Unsupported sample format {RequestedSampleFormat}"),
|
||||||
return ALFormat.Multi51Chn16Ext;
|
};
|
||||||
default:
|
|
||||||
throw new NotImplementedException($"Unsupported channel config {RequestedChannelCount}");
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
throw new NotImplementedException($"Unsupported sample format {RequestedSampleFormat}");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void PrepareToClose() { }
|
public override void PrepareToClose() { }
|
||||||
@@ -69,7 +63,7 @@ namespace Ryujinx.Audio.Backends.OpenAL
|
|||||||
{
|
{
|
||||||
lock (_lock)
|
lock (_lock)
|
||||||
{
|
{
|
||||||
OpenALAudioBuffer driverBuffer = new OpenALAudioBuffer
|
OpenALAudioBuffer driverBuffer = new()
|
||||||
{
|
{
|
||||||
DriverIdentifier = buffer.DataPointer,
|
DriverIdentifier = buffer.DataPointer,
|
||||||
BufferId = AL.GenBuffer(),
|
BufferId = AL.GenBuffer(),
|
||||||
|
@@ -10,19 +10,19 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
|
|||||||
private const string LibraryName = "libsoundio";
|
private const string LibraryName = "libsoundio";
|
||||||
|
|
||||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||||
public unsafe delegate void OnDeviceChangeNativeDelegate(IntPtr ctx);
|
public delegate void OnDeviceChangeNativeDelegate(IntPtr ctx);
|
||||||
|
|
||||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||||
public unsafe delegate void OnBackendDisconnectedDelegate(IntPtr ctx, SoundIoError err);
|
public delegate void OnBackendDisconnectedDelegate(IntPtr ctx, SoundIoError err);
|
||||||
|
|
||||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||||
public unsafe delegate void OnEventsSignalDelegate(IntPtr ctx);
|
public delegate void OnEventsSignalDelegate(IntPtr ctx);
|
||||||
|
|
||||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||||
public unsafe delegate void EmitRtPrioWarningDelegate();
|
public delegate void EmitRtPrioWarningDelegate();
|
||||||
|
|
||||||
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
|
||||||
public unsafe delegate void JackCallbackDelegate(IntPtr msg);
|
public delegate void JackCallbackDelegate(IntPtr msg);
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential)]
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
public struct SoundIoStruct
|
public struct SoundIoStruct
|
||||||
@@ -110,69 +110,69 @@ namespace Ryujinx.Audio.Backends.SoundIo.Native
|
|||||||
}
|
}
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial IntPtr soundio_create();
|
internal static partial IntPtr soundio_create();
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_connect(IntPtr ctx);
|
internal static partial SoundIoError soundio_connect(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial void soundio_disconnect(IntPtr ctx);
|
internal static partial void soundio_disconnect(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial void soundio_flush_events(IntPtr ctx);
|
internal static partial void soundio_flush_events(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial int soundio_output_device_count(IntPtr ctx);
|
internal static partial int soundio_output_device_count(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial int soundio_default_output_device_index(IntPtr ctx);
|
internal static partial int soundio_default_output_device_index(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial IntPtr soundio_get_output_device(IntPtr ctx, int index);
|
internal static partial IntPtr soundio_get_output_device(IntPtr ctx, int index);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
[return: MarshalAs(UnmanagedType.Bool)]
|
[return: MarshalAs(UnmanagedType.Bool)]
|
||||||
public static partial bool soundio_device_supports_format(IntPtr devCtx, SoundIoFormat format);
|
internal static partial bool soundio_device_supports_format(IntPtr devCtx, SoundIoFormat format);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
[return: MarshalAs(UnmanagedType.Bool)]
|
[return: MarshalAs(UnmanagedType.Bool)]
|
||||||
public static partial bool soundio_device_supports_layout(IntPtr devCtx, IntPtr layout);
|
internal static partial bool soundio_device_supports_layout(IntPtr devCtx, IntPtr layout);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
[return: MarshalAs(UnmanagedType.Bool)]
|
[return: MarshalAs(UnmanagedType.Bool)]
|
||||||
public static partial bool soundio_device_supports_sample_rate(IntPtr devCtx, int sampleRate);
|
internal static partial bool soundio_device_supports_sample_rate(IntPtr devCtx, int sampleRate);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial IntPtr soundio_outstream_create(IntPtr devCtx);
|
internal static partial IntPtr soundio_outstream_create(IntPtr devCtx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_open(IntPtr outStreamCtx);
|
internal static partial SoundIoError soundio_outstream_open(IntPtr outStreamCtx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_start(IntPtr outStreamCtx);
|
internal static partial SoundIoError soundio_outstream_start(IntPtr outStreamCtx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_begin_write(IntPtr outStreamCtx, IntPtr areas, IntPtr frameCount);
|
internal static partial SoundIoError soundio_outstream_begin_write(IntPtr outStreamCtx, IntPtr areas, IntPtr frameCount);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_end_write(IntPtr outStreamCtx);
|
internal static partial SoundIoError soundio_outstream_end_write(IntPtr outStreamCtx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_pause(IntPtr devCtx, [MarshalAs(UnmanagedType.Bool)] bool pause);
|
internal static partial SoundIoError soundio_outstream_pause(IntPtr devCtx, [MarshalAs(UnmanagedType.Bool)] bool pause);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial SoundIoError soundio_outstream_set_volume(IntPtr devCtx, double volume);
|
internal static partial SoundIoError soundio_outstream_set_volume(IntPtr devCtx, double volume);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial void soundio_outstream_destroy(IntPtr streamCtx);
|
internal static partial void soundio_outstream_destroy(IntPtr streamCtx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial void soundio_destroy(IntPtr ctx);
|
internal static partial void soundio_destroy(IntPtr ctx);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial IntPtr soundio_channel_layout_get_default(int channelCount);
|
internal static partial IntPtr soundio_channel_layout_get_default(int channelCount);
|
||||||
|
|
||||||
[LibraryImport(LibraryName)]
|
[LibraryImport(LibraryName)]
|
||||||
public static partial IntPtr soundio_strerror(SoundIoError err);
|
internal static partial IntPtr soundio_strerror(SoundIoError err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection.Metadata;
|
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
@@ -141,7 +141,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
throw new NotImplementedException("Input direction is currently not implemented on SoundIO backend!");
|
throw new NotImplementedException("Input direction is currently not implemented on SoundIO backend!");
|
||||||
}
|
}
|
||||||
|
|
||||||
SoundIoHardwareDeviceSession session = new SoundIoHardwareDeviceSession(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
SoundIoHardwareDeviceSession session = new(this, memoryManager, sampleFormat, sampleRate, channelCount, volume);
|
||||||
|
|
||||||
_sessions.TryAdd(session, 0);
|
_sessions.TryAdd(session, 0);
|
||||||
|
|
||||||
@@ -162,7 +162,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
SampleFormat.PcmInt24 => SoundIoFormat.S24LE,
|
SampleFormat.PcmInt24 => SoundIoFormat.S24LE,
|
||||||
SampleFormat.PcmInt32 => SoundIoFormat.S32LE,
|
SampleFormat.PcmInt32 => SoundIoFormat.S32LE,
|
||||||
SampleFormat.PcmFloat => SoundIoFormat.Float32LE,
|
SampleFormat.PcmFloat => SoundIoFormat.Float32LE,
|
||||||
_ => throw new ArgumentException ($"Unsupported sample format {format}"),
|
_ => throw new ArgumentException($"Unsupported sample format {format}"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,6 +202,8 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
|
||||||
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
if (Interlocked.CompareExchange(ref _disposeState, 1, 0) == 0)
|
||||||
{
|
{
|
||||||
Dispose(true);
|
Dispose(true);
|
||||||
|
@@ -12,12 +12,12 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
{
|
{
|
||||||
class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
class SoundIoHardwareDeviceSession : HardwareDeviceSessionOutputBase
|
||||||
{
|
{
|
||||||
private SoundIoHardwareDeviceDriver _driver;
|
private readonly SoundIoHardwareDeviceDriver _driver;
|
||||||
private ConcurrentQueue<SoundIoAudioBuffer> _queuedBuffers;
|
private readonly ConcurrentQueue<SoundIoAudioBuffer> _queuedBuffers;
|
||||||
private SoundIoOutStreamContext _outputStream;
|
private SoundIoOutStreamContext _outputStream;
|
||||||
private DynamicRingBuffer _ringBuffer;
|
private readonly DynamicRingBuffer _ringBuffer;
|
||||||
private ulong _playedSampleCount;
|
private ulong _playedSampleCount;
|
||||||
private ManualResetEvent _updateRequiredEvent;
|
private readonly ManualResetEvent _updateRequiredEvent;
|
||||||
private int _disposeState;
|
private int _disposeState;
|
||||||
|
|
||||||
public SoundIoHardwareDeviceSession(SoundIoHardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
|
public SoundIoHardwareDeviceSession(SoundIoHardwareDeviceDriver driver, IVirtualMemoryManager memoryManager, SampleFormat requestedSampleFormat, uint requestedSampleRate, uint requestedChannelCount, float requestedVolume) : base(memoryManager, requestedSampleFormat, requestedSampleRate, requestedChannelCount)
|
||||||
@@ -54,7 +54,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
|
|
||||||
public override void QueueBuffer(AudioBuffer buffer)
|
public override void QueueBuffer(AudioBuffer buffer)
|
||||||
{
|
{
|
||||||
SoundIoAudioBuffer driverBuffer = new SoundIoAudioBuffer(buffer.DataPointer, GetSampleCount(buffer));
|
SoundIoAudioBuffer driverBuffer = new(buffer.DataPointer, GetSampleCount(buffer));
|
||||||
|
|
||||||
_ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
|
_ringBuffer.Write(buffer.Data, 0, buffer.Data.Length);
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ namespace Ryujinx.Audio.Backends.SoundIo
|
|||||||
_driver.FlushContextEvents();
|
_driver.FlushContextEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void UnregisterBuffer(AudioBuffer buffer) {}
|
public override void UnregisterBuffer(AudioBuffer buffer) { }
|
||||||
|
|
||||||
public override bool WasBufferFullyConsumed(AudioBuffer buffer)
|
public override bool WasBufferFullyConsumed(AudioBuffer buffer)
|
||||||
{
|
{
|
||||||
|
@@ -164,7 +164,7 @@ namespace Ryujinx.Audio
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The default coefficients used for standard 5.1 surround to stereo downmixing.
|
/// The default coefficients used for standard 5.1 surround to stereo downmixing.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static float[] DefaultSurroundToStereoCoefficients = new float[4]
|
public static readonly float[] DefaultSurroundToStereoCoefficients = new float[4]
|
||||||
{
|
{
|
||||||
1.0f,
|
1.0f,
|
||||||
0.707f,
|
0.707f,
|
||||||
|
@@ -15,10 +15,10 @@ namespace Ryujinx.Cpu.Jit
|
|||||||
_impl = new MemoryBlock(size, flags);
|
_impl = new MemoryBlock(size, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Commit(ulong offset, ulong size) => _impl.Commit(offset, size);
|
public void Commit(ulong offset, ulong size) => _impl.Commit(offset, size);
|
||||||
public void MapAsRx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadAndExecute);
|
public void MapAsRx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadAndExecute);
|
||||||
public void MapAsRwx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadWriteExecute);
|
public void MapAsRwx(ulong offset, ulong size) => _impl.Reprotect(offset, size, MemoryPermission.ReadWriteExecute);
|
||||||
|
|
||||||
public void Dispose() => _impl.Dispose();
|
public void Dispose() => _impl.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -140,7 +140,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
FunctionMatch.RunPass(program);
|
FunctionMatch.RunPass(program);
|
||||||
|
|
||||||
foreach (DecodedFunction function in program.OrderBy(x => x.Address).Where(x => !x.IsCompilerGenerated))
|
foreach (DecodedFunction function in program.Where(x => !x.IsCompilerGenerated).OrderBy(x => x.Address))
|
||||||
{
|
{
|
||||||
program.AddFunctionAndSetId(function);
|
program.AddFunctionAndSetId(function);
|
||||||
}
|
}
|
||||||
|
@@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
|
|||||||
|
|
||||||
writer.Write(Params);
|
writer.Write(Params);
|
||||||
|
|
||||||
if (Params.EndsWith(">"))
|
if (Params.EndsWith('>'))
|
||||||
{
|
{
|
||||||
writer.Write(" ");
|
writer.Write(" ");
|
||||||
}
|
}
|
||||||
|
@@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres.Proxy
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Ignore comments and empty lines
|
// Ignore comments and empty lines
|
||||||
if (line.StartsWith("#") || line.Trim().Length == 0)
|
if (line.StartsWith('#') || line.Trim().Length == 0)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@@ -4,36 +4,36 @@
|
|||||||
{
|
{
|
||||||
private const int ModuleId = 1;
|
private const int ModuleId = 1;
|
||||||
|
|
||||||
public static Result SessionCountExceeded => new Result(ModuleId, 7);
|
public static Result SessionCountExceeded => new(ModuleId, 7);
|
||||||
public static Result InvalidCapability => new Result(ModuleId, 14);
|
public static Result InvalidCapability => new(ModuleId, 14);
|
||||||
public static Result ThreadNotStarted => new Result(ModuleId, 57);
|
public static Result ThreadNotStarted => new(ModuleId, 57);
|
||||||
public static Result ThreadTerminating => new Result(ModuleId, 59);
|
public static Result ThreadTerminating => new(ModuleId, 59);
|
||||||
public static Result InvalidSize => new Result(ModuleId, 101);
|
public static Result InvalidSize => new(ModuleId, 101);
|
||||||
public static Result InvalidAddress => new Result(ModuleId, 102);
|
public static Result InvalidAddress => new(ModuleId, 102);
|
||||||
public static Result OutOfResource => new Result(ModuleId, 103);
|
public static Result OutOfResource => new(ModuleId, 103);
|
||||||
public static Result OutOfMemory => new Result(ModuleId, 104);
|
public static Result OutOfMemory => new(ModuleId, 104);
|
||||||
public static Result HandleTableFull => new Result(ModuleId, 105);
|
public static Result HandleTableFull => new(ModuleId, 105);
|
||||||
public static Result InvalidMemState => new Result(ModuleId, 106);
|
public static Result InvalidMemState => new(ModuleId, 106);
|
||||||
public static Result InvalidPermission => new Result(ModuleId, 108);
|
public static Result InvalidPermission => new(ModuleId, 108);
|
||||||
public static Result InvalidMemRange => new Result(ModuleId, 110);
|
public static Result InvalidMemRange => new(ModuleId, 110);
|
||||||
public static Result InvalidPriority => new Result(ModuleId, 112);
|
public static Result InvalidPriority => new(ModuleId, 112);
|
||||||
public static Result InvalidCpuCore => new Result(ModuleId, 113);
|
public static Result InvalidCpuCore => new(ModuleId, 113);
|
||||||
public static Result InvalidHandle => new Result(ModuleId, 114);
|
public static Result InvalidHandle => new(ModuleId, 114);
|
||||||
public static Result UserCopyFailed => new Result(ModuleId, 115);
|
public static Result UserCopyFailed => new(ModuleId, 115);
|
||||||
public static Result InvalidCombination => new Result(ModuleId, 116);
|
public static Result InvalidCombination => new(ModuleId, 116);
|
||||||
public static Result TimedOut => new Result(ModuleId, 117);
|
public static Result TimedOut => new(ModuleId, 117);
|
||||||
public static Result Cancelled => new Result(ModuleId, 118);
|
public static Result Cancelled => new(ModuleId, 118);
|
||||||
public static Result MaximumExceeded => new Result(ModuleId, 119);
|
public static Result MaximumExceeded => new(ModuleId, 119);
|
||||||
public static Result InvalidEnumValue => new Result(ModuleId, 120);
|
public static Result InvalidEnumValue => new(ModuleId, 120);
|
||||||
public static Result NotFound => new Result(ModuleId, 121);
|
public static Result NotFound => new(ModuleId, 121);
|
||||||
public static Result InvalidThread => new Result(ModuleId, 122);
|
public static Result InvalidThread => new(ModuleId, 122);
|
||||||
public static Result PortRemoteClosed => new Result(ModuleId, 123);
|
public static Result PortRemoteClosed => new(ModuleId, 123);
|
||||||
public static Result InvalidState => new Result(ModuleId, 125);
|
public static Result InvalidState => new(ModuleId, 125);
|
||||||
public static Result ReservedValue => new Result(ModuleId, 126);
|
public static Result ReservedValue => new(ModuleId, 126);
|
||||||
public static Result PortClosed => new Result(ModuleId, 131);
|
public static Result PortClosed => new(ModuleId, 131);
|
||||||
public static Result ResLimitExceeded => new Result(ModuleId, 132);
|
public static Result ResLimitExceeded => new(ModuleId, 132);
|
||||||
public static Result ReceiveListBroken => new Result(ModuleId, 258);
|
public static Result ReceiveListBroken => new(ModuleId, 258);
|
||||||
public static Result OutOfVaSpace => new Result(ModuleId, 259);
|
public static Result OutOfVaSpace => new(ModuleId, 259);
|
||||||
public static Result CmdBufferTooSmall => new Result(ModuleId, 260);
|
public static Result CmdBufferTooSmall => new(ModuleId, 260);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace Ryujinx.Horizon.Common
|
namespace Ryujinx.Horizon.Common
|
||||||
{
|
{
|
||||||
public struct OnScopeExit : IDisposable
|
public readonly struct OnScopeExit : IDisposable
|
||||||
{
|
{
|
||||||
private readonly Action _action;
|
private readonly Action _action;
|
||||||
|
|
||||||
|
@@ -13,13 +13,13 @@ namespace Ryujinx.Horizon.Common
|
|||||||
|
|
||||||
public int ErrorCode { get; }
|
public int ErrorCode { get; }
|
||||||
|
|
||||||
public bool IsSuccess => ErrorCode == 0;
|
public readonly bool IsSuccess => ErrorCode == 0;
|
||||||
public bool IsFailure => ErrorCode != 0;
|
public readonly bool IsFailure => ErrorCode != 0;
|
||||||
|
|
||||||
public int Module => ErrorCode & (ModuleMax - 1);
|
public readonly int Module => ErrorCode & (ModuleMax - 1);
|
||||||
public int Description => (ErrorCode >> ModuleBits) & (DescriptionMax - 1);
|
public readonly int Description => (ErrorCode >> ModuleBits) & (DescriptionMax - 1);
|
||||||
|
|
||||||
public string PrintableResult => $"{2000 + Module:D4}-{Description:D4}";
|
public readonly string PrintableResult => $"{2000 + Module:D4}-{Description:D4}";
|
||||||
|
|
||||||
public Result(int module, int description)
|
public Result(int module, int description)
|
||||||
{
|
{
|
||||||
@@ -36,17 +36,17 @@ namespace Ryujinx.Horizon.Common
|
|||||||
ErrorCode = module | (description << ModuleBits);
|
ErrorCode = module | (description << ModuleBits);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool Equals(object obj)
|
public readonly override bool Equals(object obj)
|
||||||
{
|
{
|
||||||
return obj is Result result && result.Equals(this);
|
return obj is Result result && result.Equals(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool Equals(Result other)
|
public readonly bool Equals(Result other)
|
||||||
{
|
{
|
||||||
return other.ErrorCode == ErrorCode;
|
return other.ErrorCode == ErrorCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override int GetHashCode()
|
public readonly override int GetHashCode()
|
||||||
{
|
{
|
||||||
return ErrorCode;
|
return ErrorCode;
|
||||||
}
|
}
|
||||||
@@ -61,7 +61,7 @@ namespace Ryujinx.Horizon.Common
|
|||||||
return !lhs.Equals(rhs);
|
return !lhs.Equals(rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool InRange(int minInclusive, int maxInclusive)
|
public readonly bool InRange(int minInclusive, int maxInclusive)
|
||||||
{
|
{
|
||||||
return (uint)(Description - minInclusive) <= (uint)(maxInclusive - minInclusive);
|
return (uint)(Description - minInclusive) <= (uint)(maxInclusive - minInclusive);
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ namespace Ryujinx.Horizon.Common
|
|||||||
throw new InvalidResultException(this);
|
throw new InvalidResultException(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString()
|
public readonly override string ToString()
|
||||||
{
|
{
|
||||||
if (ResultNames.TryGet(ErrorCode, out string name))
|
if (ResultNames.TryGet(ErrorCode, out string name))
|
||||||
{
|
{
|
||||||
@@ -115,4 +115,4 @@ namespace Ryujinx.Horizon.Common
|
|||||||
return PrintableResult;
|
return PrintableResult;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1698,4 +1698,4 @@ namespace Ryujinx.Horizon.Common
|
|||||||
return _names.TryGetValue(errorCode, out name);
|
return _names.TryGetValue(errorCode, out name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
namespace Ryujinx.Memory
|
namespace Ryujinx.Memory
|
||||||
@@ -101,12 +100,12 @@ namespace Ryujinx.Memory
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="offset">Starting offset of the range to be committed</param>
|
/// <param name="offset">Starting offset of the range to be committed</param>
|
||||||
/// <param name="size">Size of the range to be committed</param>
|
/// <param name="size">Size of the range to be committed</param>
|
||||||
/// <returns>True if the operation was successful, false otherwise</returns>
|
/// <exception cref="SystemException">Throw when the operation was not successful</exception>
|
||||||
/// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
|
/// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
|
||||||
/// <exception cref="InvalidMemoryRegionException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
|
/// <exception cref="InvalidMemoryRegionException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
|
||||||
public bool Commit(ulong offset, ulong size)
|
public void Commit(ulong offset, ulong size)
|
||||||
{
|
{
|
||||||
return MemoryManagement.Commit(GetPointerInternal(offset, size), size, _forJit);
|
MemoryManagement.Commit(GetPointerInternal(offset, size), size, _forJit);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -115,12 +114,12 @@ namespace Ryujinx.Memory
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="offset">Starting offset of the range to be decommitted</param>
|
/// <param name="offset">Starting offset of the range to be decommitted</param>
|
||||||
/// <param name="size">Size of the range to be decommitted</param>
|
/// <param name="size">Size of the range to be decommitted</param>
|
||||||
/// <returns>True if the operation was successful, false otherwise</returns>
|
/// <exception cref="SystemException">Throw when the operation was not successful</exception>
|
||||||
/// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
|
/// <exception cref="ObjectDisposedException">Throw when the memory block has already been disposed</exception>
|
||||||
/// <exception cref="InvalidMemoryRegionException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
|
/// <exception cref="InvalidMemoryRegionException">Throw when either <paramref name="offset"/> or <paramref name="size"/> are out of range</exception>
|
||||||
public bool Decommit(ulong offset, ulong size)
|
public void Decommit(ulong offset, ulong size)
|
||||||
{
|
{
|
||||||
return MemoryManagement.Decommit(GetPointerInternal(offset, size), size);
|
MemoryManagement.Decommit(GetPointerInternal(offset, size), size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@@ -36,15 +36,15 @@ namespace Ryujinx.Memory
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Commit(IntPtr address, ulong size, bool forJit)
|
public static void Commit(IntPtr address, ulong size, bool forJit)
|
||||||
{
|
{
|
||||||
if (OperatingSystem.IsWindows())
|
if (OperatingSystem.IsWindows())
|
||||||
{
|
{
|
||||||
return MemoryManagementWindows.Commit(address, (IntPtr)size);
|
MemoryManagementWindows.Commit(address, (IntPtr)size);
|
||||||
}
|
}
|
||||||
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
||||||
{
|
{
|
||||||
return MemoryManagementUnix.Commit(address, size, forJit);
|
MemoryManagementUnix.Commit(address, size, forJit);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -52,15 +52,15 @@ namespace Ryujinx.Memory
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Decommit(IntPtr address, ulong size)
|
public static void Decommit(IntPtr address, ulong size)
|
||||||
{
|
{
|
||||||
if (OperatingSystem.IsWindows())
|
if (OperatingSystem.IsWindows())
|
||||||
{
|
{
|
||||||
return MemoryManagementWindows.Decommit(address, (IntPtr)size);
|
MemoryManagementWindows.Decommit(address, (IntPtr)size);
|
||||||
}
|
}
|
||||||
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
else if (OperatingSystem.IsLinux() || OperatingSystem.IsMacOS())
|
||||||
{
|
{
|
||||||
return MemoryManagementUnix.Decommit(address, size);
|
MemoryManagementUnix.Decommit(address, size);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -2,8 +2,6 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Runtime.Versioning;
|
using System.Runtime.Versioning;
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
using static Ryujinx.Memory.MemoryManagerUnixHelper;
|
using static Ryujinx.Memory.MemoryManagerUnixHelper;
|
||||||
|
|
||||||
namespace Ryujinx.Memory
|
namespace Ryujinx.Memory
|
||||||
@@ -12,7 +10,7 @@ namespace Ryujinx.Memory
|
|||||||
[SupportedOSPlatform("macos")]
|
[SupportedOSPlatform("macos")]
|
||||||
static class MemoryManagementUnix
|
static class MemoryManagementUnix
|
||||||
{
|
{
|
||||||
private static readonly ConcurrentDictionary<IntPtr, ulong> _allocations = new ConcurrentDictionary<IntPtr, ulong>();
|
private static readonly ConcurrentDictionary<IntPtr, ulong> _allocations = new();
|
||||||
|
|
||||||
public static IntPtr Allocate(ulong size, bool forJit)
|
public static IntPtr Allocate(ulong size, bool forJit)
|
||||||
{
|
{
|
||||||
@@ -68,7 +66,7 @@ namespace Ryujinx.Memory
|
|||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Commit(IntPtr address, ulong size, bool forJit)
|
public static void Commit(IntPtr address, ulong size, bool forJit)
|
||||||
{
|
{
|
||||||
MmapProts prot = MmapProts.PROT_READ | MmapProts.PROT_WRITE;
|
MmapProts prot = MmapProts.PROT_READ | MmapProts.PROT_WRITE;
|
||||||
|
|
||||||
@@ -81,11 +79,9 @@ namespace Ryujinx.Memory
|
|||||||
{
|
{
|
||||||
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Decommit(IntPtr address, ulong size)
|
public static void Decommit(IntPtr address, ulong size)
|
||||||
{
|
{
|
||||||
// Must be writable for madvise to work properly.
|
// Must be writable for madvise to work properly.
|
||||||
if (mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) != 0)
|
if (mprotect(address, size, MmapProts.PROT_READ | MmapProts.PROT_WRITE) != 0)
|
||||||
@@ -102,8 +98,6 @@ namespace Ryujinx.Memory
|
|||||||
{
|
{
|
||||||
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Reprotect(IntPtr address, ulong size, MemoryPermission permission)
|
public static bool Reprotect(IntPtr address, ulong size, MemoryPermission permission)
|
||||||
@@ -146,7 +140,7 @@ namespace Ryujinx.Memory
|
|||||||
|
|
||||||
if (OperatingSystem.IsMacOS())
|
if (OperatingSystem.IsMacOS())
|
||||||
{
|
{
|
||||||
byte[] memName = Encoding.ASCII.GetBytes("Ryujinx-XXXXXX");
|
byte[] memName = "Ryujinx-XXXXXX"u8.ToArray();
|
||||||
|
|
||||||
fixed (byte* pMemName = memName)
|
fixed (byte* pMemName = memName)
|
||||||
{
|
{
|
||||||
@@ -164,7 +158,7 @@ namespace Ryujinx.Memory
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
byte[] fileName = Encoding.ASCII.GetBytes("/dev/shm/Ryujinx-XXXXXX");
|
byte[] fileName = "/dev/shm/Ryujinx-XXXXXX"u8.ToArray();
|
||||||
|
|
||||||
fixed (byte* pFileName = fileName)
|
fixed (byte* pFileName = fileName)
|
||||||
{
|
{
|
||||||
|
@@ -10,7 +10,7 @@ namespace Ryujinx.Memory
|
|||||||
{
|
{
|
||||||
public const int PageSize = 0x1000;
|
public const int PageSize = 0x1000;
|
||||||
|
|
||||||
private static readonly PlaceholderManager _placeholders = new PlaceholderManager();
|
private static readonly PlaceholderManager _placeholders = new();
|
||||||
|
|
||||||
public static IntPtr Allocate(IntPtr size)
|
public static IntPtr Allocate(IntPtr size)
|
||||||
{
|
{
|
||||||
@@ -55,14 +55,20 @@ namespace Ryujinx.Memory
|
|||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Commit(IntPtr location, IntPtr size)
|
public static void Commit(IntPtr location, IntPtr size)
|
||||||
{
|
{
|
||||||
return WindowsApi.VirtualAlloc(location, size, AllocationType.Commit, MemoryProtection.ReadWrite) != IntPtr.Zero;
|
if (WindowsApi.VirtualAlloc(location, size, AllocationType.Commit, MemoryProtection.ReadWrite) == IntPtr.Zero)
|
||||||
|
{
|
||||||
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Decommit(IntPtr location, IntPtr size)
|
public static void Decommit(IntPtr location, IntPtr size)
|
||||||
{
|
{
|
||||||
return WindowsApi.VirtualFree(location, size, AllocationType.Decommit);
|
if (!WindowsApi.VirtualFree(location, size, AllocationType.Decommit))
|
||||||
|
{
|
||||||
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void MapView(IntPtr sharedMemory, ulong srcOffset, IntPtr location, IntPtr size, MemoryBlock owner)
|
public static void MapView(IntPtr sharedMemory, ulong srcOffset, IntPtr location, IntPtr size, MemoryBlock owner)
|
||||||
|
Reference in New Issue
Block a user