summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-07-05 06:59:58 +0200
committerbunnei <bunneidev@gmail.com>2014-07-05 16:24:52 +0200
commit7b7a435094654da2a707a2089ed5ca9584679c38 (patch)
treeccaecd65308654a5499ba3b26494cadca39dc0ee
parentKernel: Added support for shared memory objects. (diff)
downloadyuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.gz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.bz2
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.lz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.xz
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.tar.zst
yuzu-7b7a435094654da2a707a2089ed5ca9584679c38.zip
-rw-r--r--src/core/hle/service/gsp.cpp59
-rw-r--r--src/core/hle/svc.cpp11
2 files changed, 40 insertions, 30 deletions
diff --git a/src/core/hle/service/gsp.cpp b/src/core/hle/service/gsp.cpp
index f75ba75c2..1fdbdf342 100644
--- a/src/core/hle/service/gsp.cpp
+++ b/src/core/hle/service/gsp.cpp
@@ -9,6 +9,7 @@
#include "core/mem_map.h"
#include "core/hle/hle.h"
#include "core/hle/kernel/event.h"
+#include "core/hle/kernel/shared_memory.h"
#include "core/hle/service/gsp.h"
#include "core/hw/gpu.h"
@@ -36,14 +37,24 @@ union GX_CmdBufferHeader {
BitField<8,8,u32> number_commands;
};
-/// Gets the address of the start (header) of a command buffer in GSP shared memory
-static inline u32 GX_GetCmdBufferAddress(u32 thread_id) {
- return (0x10002000 + 0x800 + (thread_id * 0x200));
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Namespace GSP_GPU
+
+namespace GSP_GPU {
+
+Handle g_event = 0;
+Handle g_shared_memory = 0;
+
+u32 g_thread_id = 0;
+
+enum {
+ REG_FRAMEBUFFER_1 = 0x00400468,
+ REG_FRAMEBUFFER_2 = 0x00400494,
+};
/// Gets a pointer to the start (header) of a command buffer in GSP shared memory
static inline u8* GX_GetCmdBufferPointer(u32 thread_id, u32 offset=0) {
- return Memory::GetPointer(GX_GetCmdBufferAddress(thread_id) + offset);
+ return Kernel::GetSharedMemoryPointer(g_shared_memory, 0x800 + (thread_id * 0x200) + offset);
}
/// Finishes execution of a GSP command
@@ -56,19 +67,6 @@ void GX_FinishCommand(u32 thread_id) {
// TODO: Increment header->index?
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Namespace GSP_GPU
-
-namespace GSP_GPU {
-
-Handle g_event_handle = 0;
-u32 g_thread_id = 0;
-
-enum {
- REG_FRAMEBUFFER_1 = 0x00400468,
- REG_FRAMEBUFFER_2 = 0x00400494,
-};
-
/// Read a GSP GPU hardware register
void ReadHWRegs(Service::Interface* self) {
static const u32 framebuffer_1[] = {GPU::PADDR_VRAM_TOP_LEFT_FRAME1, GPU::PADDR_VRAM_TOP_RIGHT_FRAME1};
@@ -103,24 +101,34 @@ void ReadHWRegs(Service::Interface* self) {
}
+/**
+ * GSP_GPU::RegisterInterruptRelayQueue service function
+ * Inputs:
+ * 1 : "Flags" field, purpose is unknown
+ * 3 : Handle to GSP synchronization event
+ * Outputs:
+ * 0 : Result of function, 0 on success, otherwise error code
+ * 2 : Thread index into GSP command buffer
+ * 4 : Handle to GSP shared memory
+ */
void RegisterInterruptRelayQueue(Service::Interface* self) {
u32* cmd_buff = Service::GetCommandBuffer();
u32 flags = cmd_buff[1];
- u32 event_handle = cmd_buff[3];
-
- _assert_msg_(GSP, (event_handle != 0), "called, but event is nullptr!");
+ g_event = cmd_buff[3];
- g_event_handle = event_handle;
+ _assert_msg_(GSP, (g_event != 0), "handle is not valid!");
- Kernel::SetEventLocked(event_handle, false);
+ Kernel::SetEventLocked(g_event, false);
// Hack - This function will permanently set the state of the GSP event such that GPU command
// synchronization barriers always passthrough. Correct solution would be to set this after the
// GPU as processed all queued up commands, but due to the emulator being single-threaded they
// will always be ready.
- Kernel::SetPermanentLock(event_handle, true);
+ Kernel::SetPermanentLock(g_event, true);
- cmd_buff[2] = g_thread_id; // ThreadID
+ cmd_buff[0] = 0; // Result - no error
+ cmd_buff[2] = g_thread_id; // ThreadID
+ cmd_buff[4] = g_shared_memory; // GSP shared memory
}
@@ -208,6 +216,7 @@ const Interface::FunctionInfo FunctionTable[] = {
Interface::Interface() {
Register(FunctionTable, ARRAY_SIZE(FunctionTable));
+ g_shared_memory = Kernel::CreateSharedMemory("GSPSharedMem");
}
Interface::~Interface() {
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 441d8ce8d..746d24a70 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -12,6 +12,7 @@
#include "core/hle/kernel/event.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h"
+#include "core/hle/kernel/shared_memory.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/function_wrappers.h"
@@ -58,17 +59,17 @@ Result ControlMemory(u32* out_addr, u32 operation, u32 addr0, u32 addr1, u32 siz
}
/// Maps a memory block to specified address
-Result MapMemoryBlock(Handle memblock, u32 addr, u32 mypermissions, u32 otherpermission) {
+Result MapMemoryBlock(Handle handle, u32 addr, u32 permissions, u32 other_permissions) {
DEBUG_LOG(SVC, "called memblock=0x08X, addr=0x%08X, mypermissions=0x%08X, otherpermission=%d",
- memblock, addr, mypermissions, otherpermission);
- switch (mypermissions) {
+ handle, addr, permissions, other_permissions);
+ switch (permissions) {
case MEMORY_PERMISSION_NORMAL:
case MEMORY_PERMISSION_NORMAL + 1:
case MEMORY_PERMISSION_NORMAL + 2:
- Memory::MapBlock_Shared(memblock, addr, mypermissions);
+ Kernel::MapSharedMemory(handle, addr, permissions, other_permissions);
break;
default:
- ERROR_LOG(OSHLE, "unknown permissions=0x%08X", mypermissions);
+ ERROR_LOG(OSHLE, "unknown permissions=0x%08X", permissions);
}
return 0;
}