From b4a93cfddecdb939562e56d7609657d2f14b6702 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 30 Apr 2017 21:36:00 -0700
Subject: DSP: Create backing memory for entire DSP RAM

Also move address space mapping out of video_core.
---
 src/audio_core/hle/dsp.cpp | 14 ++++++++------
 src/audio_core/hle/dsp.h   | 21 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 9 deletions(-)

(limited to 'src/audio_core/hle')

diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp
index 31421fdc6..260b182ed 100644
--- a/src/audio_core/hle/dsp.cpp
+++ b/src/audio_core/hle/dsp.cpp
@@ -16,31 +16,33 @@ namespace HLE {
 
 // Region management
 
-std::array<SharedMemory, 2> g_regions;
+DspMemory g_dsp_memory;
 
 static size_t CurrentRegionIndex() {
     // The region with the higher frame counter is chosen unless there is wraparound.
     // This function only returns a 0 or 1.
+    u16 frame_counter_0 = g_dsp_memory.region_0.frame_counter;
+    u16 frame_counter_1 = g_dsp_memory.region_1.frame_counter;
 
-    if (g_regions[0].frame_counter == 0xFFFFu && g_regions[1].frame_counter != 0xFFFEu) {
+    if (frame_counter_0 == 0xFFFFu && frame_counter_1 != 0xFFFEu) {
         // Wraparound has occurred.
         return 1;
     }
 
-    if (g_regions[1].frame_counter == 0xFFFFu && g_regions[0].frame_counter != 0xFFFEu) {
+    if (frame_counter_1 == 0xFFFFu && frame_counter_0 != 0xFFFEu) {
         // Wraparound has occurred.
         return 0;
     }
 
-    return (g_regions[0].frame_counter > g_regions[1].frame_counter) ? 0 : 1;
+    return (frame_counter_0 > frame_counter_1) ? 0 : 1;
 }
 
 static SharedMemory& ReadRegion() {
-    return g_regions[CurrentRegionIndex()];
+    return CurrentRegionIndex() == 0 ? g_dsp_memory.region_0 : g_dsp_memory.region_1;
 }
 
 static SharedMemory& WriteRegion() {
-    return g_regions[1 - CurrentRegionIndex()];
+    return CurrentRegionIndex() != 0 ? g_dsp_memory.region_0 : g_dsp_memory.region_1;
 }
 
 // Audio processing and mixing
diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h
index 0a0f60ac1..94ce48863 100644
--- a/src/audio_core/hle/dsp.h
+++ b/src/audio_core/hle/dsp.h
@@ -31,8 +31,8 @@ namespace HLE {
 // double-buffer. The frame counter is located as the very last u16 of each region and is
 // incremented each audio tick.
 
-constexpr VAddr region0_base = 0x1FF50000;
-constexpr VAddr region1_base = 0x1FF70000;
+constexpr u32 region0_offset = 0x50000;
+constexpr u32 region1_offset = 0x70000;
 
 /**
  * The DSP is native 16-bit. The DSP also appears to be big-endian. When reading 32-bit numbers from
@@ -512,7 +512,22 @@ struct SharedMemory {
 };
 ASSERT_DSP_STRUCT(SharedMemory, 0x8000);
 
-extern std::array<SharedMemory, 2> g_regions;
+union DspMemory {
+    std::array<u8, 0x80000> raw_memory;
+    struct {
+        u8 unused_0[0x50000];
+        SharedMemory region_0;
+        u8 unused_1[0x18000];
+        SharedMemory region_1;
+        u8 unused_2[0x8000];
+    };
+};
+static_assert(offsetof(DspMemory, region_0) == region0_offset,
+              "DSP region 0 is at the wrong offset");
+static_assert(offsetof(DspMemory, region_1) == region1_offset,
+              "DSP region 1 is at the wrong offset");
+
+extern DspMemory g_dsp_memory;
 
 // Structures must have an offset that is a multiple of two.
 static_assert(offsetof(SharedMemory, frame_counter) % 2 == 0,
-- 
cgit v1.2.3