franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #217 from archshift/cmd_buff

Browse Source 
Log the cmd_buff arguments when citra comes across an unimplemented function
This commit is contained in:
bunnei 2014-12-08 23:13:07 -05:00
commit b7327f807c
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/hle/service/service.h
View File

@ -10,6 +10,7 @@
#include <string> #include <string>
#include "common/common.h" #include "common/common.h"
#include "common/string_util.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
@ -79,21 +80,20 @@ public:
u32* cmd_buff = GetCommandBuffer(); u32* cmd_buff = GetCommandBuffer();
auto itr = m_functions.find(cmd_buff[0]); auto itr = m_functions.find(cmd_buff[0]);
if (itr == m_functions.end()) { if (itr == m_functions.end() || itr->second.func == nullptr) {
ERROR_LOG(OSHLE, "unknown/unimplemented function: port=%s, command=0x%08X", // Number of params == bits 0-5 + bits 6-11
GetPortName().c_str(), cmd_buff[0]); int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
// TODO(bunnei): Hack - ignore error std::string error = "unknown/unimplemented function '%s': port=%s";
u32* cmd_buff = Service::GetCommandBuffer(); for (int i = 1; i <= num_params; ++i) {
cmd_buff[1] = 0; error += Common::StringFromFormat(", cmd_buff[%i]=%u", i, cmd_buff[i]);
return MakeResult<bool>(false);
} }
if (itr->second.func == nullptr) {
ERROR_LOG(OSHLE, "unimplemented function: port=%s, name=%s", std::string name = (itr == m_functions.end()) ? Common::StringFromFormat("0x%08X", cmd_buff[0]) : itr->second.name;
GetPortName().c_str(), itr->second.name.c_str());
ERROR_LOG(OSHLE, error.c_str(), name.c_str(), GetPortName().c_str());
// TODO(bunnei): Hack - ignore error // TODO(bunnei): Hack - ignore error
u32* cmd_buff = Service::GetCommandBuffer();
cmd_buff[1] = 0; cmd_buff[1] = 0;
return MakeResult<bool>(false); return MakeResult<bool>(false);
} }