diff --git a/app/src/main/cpp/core/arm/memory.cpp b/app/src/main/cpp/core/arm/memory.cpp index 9ae4813d..0e8bf7d5 100644 --- a/app/src/main/cpp/core/arm/memory.cpp +++ b/app/src/main/cpp/core/arm/memory.cpp @@ -26,14 +26,14 @@ namespace core::memory { // TODO: Boundary checks void Write(void* data, uint64_t offset, size_t size) { std::memcpy((void*)(offset), data, size); } - void WriteU8 (uint8_t value, uint64_t offset) { Write(reinterpret_cast(&value), offset, 1); } + void WriteU8(uint8_t value, uint64_t offset) { Write(reinterpret_cast(&value), offset, 1); } void WriteU16(uint16_t value, uint64_t offset) { Write(reinterpret_cast(&value), offset, 2); } void WriteU32(uint32_t value, uint64_t offset) { Write(reinterpret_cast(&value), offset, 4); } void WriteU64(uint64_t value, uint64_t offset) { Write(reinterpret_cast(&value), offset, 8); } void Read(void* destination, uint64_t offset, size_t size) { std::memcpy(destination, (void*)(offset), size); } - uint8_t ReadU8 (uint64_t offset) { uint8_t value; Read(reinterpret_cast(&value), offset, 1); return value; } + uint8_t ReadU8(uint64_t offset) { uint8_t value; Read(reinterpret_cast(&value), offset, 1); return value; } uint16_t ReadU16(uint64_t offset) { uint16_t value; Read(reinterpret_cast(&value), offset, 2); return value; } uint32_t ReadU32(uint64_t offset) { uint32_t value; Read(reinterpret_cast(&value), offset, 4); return value; } uint64_t ReadU64(uint64_t offset) { uint64_t value; Read(reinterpret_cast(&value), offset, 8); return value; } diff --git a/app/src/main/cpp/core/hos/kernel/svc.cpp b/app/src/main/cpp/core/hos/kernel/svc.cpp index 675e459e..a317a47a 100644 --- a/app/src/main/cpp/core/hos/kernel/svc.cpp +++ b/app/src/main/cpp/core/hos/kernel/svc.cpp @@ -168,7 +168,8 @@ namespace core::kernel { { std::pair* result = &(svcTable[svc]); - if (result->second) { + if (result->second) + { uint32_t returnCode = result->second(); SetRegister(UC_ARM64_REG_W0, returnCode); return returnCode;