2 files changed, 25 insertions, 8 deletions
diff --git a/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs b/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
index f63722c1..46aff27e 100644
--- a/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
+++ b/Ryujinx.Audio.Renderer/Dsp/Command/AuxiliaryBufferCommand.cs
@@ -16,7 +16,7 @@
 //
 
 using Ryujinx.Audio.Renderer.Common;
-using Ryujinx.Cpu;
+using Ryujinx.Memory;
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -65,7 +65,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             IsEffectEnabled = isEnabled;
         }
 
-        private uint Read(MemoryManager memoryManager, ulong bufferAddress, uint countMax, Span<int> outBuffer, uint count, uint readOffset, uint updateCount)
+        private uint Read(IVirtualMemoryManager memoryManager, ulong bufferAddress, uint countMax, Span<int> outBuffer, uint count, uint readOffset, uint updateCount)
         {
             if (countMax == 0 || bufferAddress == 0)
             {
@@ -104,7 +104,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             return count;
         }
 
-        private uint Write(MemoryManager memoryManager, ulong outBufferAddress, uint countMax, ReadOnlySpan<int> buffer, uint count, uint writeOffset, uint updateCount)
+        private uint Write(IVirtualMemoryManager memoryManager, ulong outBufferAddress, uint countMax, ReadOnlySpan<int> buffer, uint count, uint writeOffset, uint updateCount)
         {
             if (countMax == 0 || outBufferAddress == 0)
             {
@@ -175,8 +175,8 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
             }
             else
             {
-                MemoryHelper.FillWithZeros(context.MemoryManager, (long)BufferInfo.SendBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
-                MemoryHelper.FillWithZeros(context.MemoryManager, (long)BufferInfo.ReturnBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
+                ZeroFill(context.MemoryManager, BufferInfo.SendBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
+                ZeroFill(context.MemoryManager, BufferInfo.ReturnBufferInfo, Unsafe.SizeOf<AuxiliaryBufferInfo>());
 
                 if (InputBufferIndex != OutputBufferIndex)
                 {
@@ -184,5 +184,22 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                 }
             }
         }
+
+        private static void ZeroFill(IVirtualMemoryManager memoryManager, ulong address, int size)
+        {
+            ulong endAddress = address + (ulong)size;
+
+            while (address + 7UL < endAddress)
+            {
+                memoryManager.Write(address, 0UL);
+                address += 8;
+            }
+
+            while (address < endAddress)
+            {
+                memoryManager.Write(address, (byte)0);
+                address++;
+            }
+        }
     }
 }
diff --git a/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs b/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
index d65f6ced..4b80c93b 100644
--- a/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
+++ b/Ryujinx.Audio.Renderer/Dsp/Command/CommandList.cs
@@ -19,7 +19,7 @@ using Ryujinx.Audio.Renderer.Integration;
 using Ryujinx.Audio.Renderer.Server;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
-using Ryujinx.Cpu;
+using Ryujinx.Memory;
 using System;
 using System.Collections.Generic;
 
@@ -37,7 +37,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
 
         public List<ICommand> Commands { get; }
 
-        public MemoryManager MemoryManager { get; }
+        public IVirtualMemoryManager MemoryManager { get; }
 
         public HardwareDevice OutputDevice { get; private set; }
 
@@ -50,7 +50,7 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
         {
         }
 
-        public CommandList(MemoryManager memoryManager, Memory<float> mixBuffer, uint sampleCount, uint sampleRate, uint mixBufferCount, uint voiceChannelCountMax)
+        public CommandList(IVirtualMemoryManager memoryManager, Memory<float> mixBuffer, uint sampleCount, uint sampleRate, uint mixBufferCount, uint voiceChannelCountMax)
         {
             SampleCount = sampleCount;
             SampleRate = sampleRate;