Clean up again

This commit is contained in:
Starlet Leonhart 2019-07-02 17:48:42 -04:00
parent 13b1354a00
commit f10e4463fe

View File

@ -8,7 +8,8 @@
using namespace core::cpu; using namespace core::cpu;
namespace core::kernel { namespace core::kernel {
static uint32_t OutputDebugString() { static uint32_t OutputDebugString()
{
std::string debug(GetRegister(UC_ARM64_REG_X1), '\0'); std::string debug(GetRegister(UC_ARM64_REG_X1), '\0');
memory::Read((void*)debug.data(), GetRegister(UC_ARM64_REG_X0), GetRegister(UC_ARM64_REG_X1)); memory::Read((void*)debug.data(), GetRegister(UC_ARM64_REG_X0), GetRegister(UC_ARM64_REG_X1));
@ -16,8 +17,10 @@ namespace core::kernel {
return 0; return 0;
} }
static uint32_t GetInfo() { static uint32_t GetInfo()
switch(GetRegister(UC_ARM64_REG_X1)) { {
switch (GetRegister(UC_ARM64_REG_X1))
{
case 12: case 12:
SetRegister(UC_ARM64_REG_X1, BASE_ADDRESS); SetRegister(UC_ARM64_REG_X1, BASE_ADDRESS);
break; break;
@ -165,7 +168,7 @@ namespace core::kernel {
{ {
std::pair<int, uint32_t(*)()>* result = &(svcTable[svc]); std::pair<int, uint32_t(*)()>* result = &(svcTable[svc]);
if(result->second) { if (result->second) {
uint32_t returnCode = result->second(); uint32_t returnCode = result->second();
SetRegister(UC_ARM64_REG_W0, returnCode); SetRegister(UC_ARM64_REG_W0, returnCode);
return returnCode; return returnCode;