Просмотр исходного кода

SVC: Remove GetPointer usage in CreatePort.

Subv 8 лет назад
Родитель
Сommit
46fc7595b4
2 измененных файлов с 4 добавлено и 6 удалено
  1. 2 4
      src/core/hle/function_wrappers.h
  2. 2 2
      src/core/hle/svc.cpp

+ 2 - 4
src/core/hle/function_wrappers.h

@@ -206,13 +206,11 @@ void Wrap() {
     FuncReturn(func(PARAM(0), PARAM(1)).raw);
     FuncReturn(func(PARAM(0), PARAM(1)).raw);
 }
 }
 
 
-template <ResultCode func(Kernel::Handle*, Kernel::Handle*, const char*, u32)>
+template <ResultCode func(Kernel::Handle*, Kernel::Handle*, VAddr, u32)>
 void Wrap() {
 void Wrap() {
     Kernel::Handle param_1 = 0;
     Kernel::Handle param_1 = 0;
     Kernel::Handle param_2 = 0;
     Kernel::Handle param_2 = 0;
-    u32 retval = func(&param_1, &param_2,
-                      reinterpret_cast<const char*>(Memory::GetPointer(PARAM(2))), PARAM(3))
-                     .raw;
+    u32 retval = func(&param_1, &param_2, PARAM(2), PARAM(3)).raw;
     Core::CPU().SetReg(1, param_1);
     Core::CPU().SetReg(1, param_1);
     Core::CPU().SetReg(2, param_2);
     Core::CPU().SetReg(2, param_2);
     FuncReturn(retval);
     FuncReturn(retval);

+ 2 - 2
src/core/hle/svc.cpp

@@ -1104,9 +1104,9 @@ static ResultCode CreateMemoryBlock(Kernel::Handle* out_handle, u32 addr, u32 si
 }
 }
 
 
 static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port,
 static ResultCode CreatePort(Kernel::Handle* server_port, Kernel::Handle* client_port,
-                             const char* name, u32 max_sessions) {
+                             VAddr name_address, u32 max_sessions) {
     // TODO(Subv): Implement named ports.
     // TODO(Subv): Implement named ports.
-    ASSERT_MSG(name == nullptr, "Named ports are currently unimplemented");
+    ASSERT_MSG(name_address == 0, "Named ports are currently unimplemented");
 
 
     using Kernel::ServerPort;
     using Kernel::ServerPort;
     using Kernel::ClientPort;
     using Kernel::ClientPort;