diff --git a/deps/libnintendo-hac b/deps/libnintendo-hac index a00f6a2..2367268 160000 --- a/deps/libnintendo-hac +++ b/deps/libnintendo-hac @@ -1 +1 @@ -Subproject commit a00f6a2f03973937759318ac32d913f2b7231460 +Subproject commit 236726839ca796ea88838fe80730b38b6957be98 diff --git a/src/KipProcess.cpp b/src/KipProcess.cpp index b980efb..238c9ec 100644 --- a/src/KipProcess.cpp +++ b/src/KipProcess.cpp @@ -8,8 +8,6 @@ #include #include -#include - KipProcess::KipProcess(): mFile(), @@ -145,12 +143,12 @@ void KipProcess::displayHeader() { std::cout << "[KIP Header]" << std::endl; std::cout << " Meta:" << std::endl; - std::cout << " Name: " << mHdr.getName() << std::endl; - std::cout << " TitleId: 0x" << std::hex << std::setw(16) << std::setfill('0') << mHdr.getTitleId() << std::endl; - std::cout << " ProcessCategory: " << nn::hac::KernelInitialProcessUtil::getProcessCategoryAsString(mHdr.getProcessCategory()) << std::endl; - std::cout << " InstructionType: " << getInstructionTypeStr(mHdr.getFlagList().hasElement(nn::hac::kip::FLAG_INSTRUCTION_64BIT)) << std::endl; - std::cout << " AddrSpaceWidth: " << getAddressSpaceStr(mHdr.getFlagList().hasElement(nn::hac::kip::FLAG_ADDR_SPACE_64BIT)) << std::endl; - std::cout << " MemoryPool: " << getMemoryPoolStr(mHdr.getFlagList().hasElement(nn::hac::kip::FLAG_USE_SYSTEM_POOL_PARTITION)) << std::endl; + std::cout << " Name: " << mHdr.getName() << std::endl; + std::cout << " TitleId: 0x" << std::hex << std::setw(16) << std::setfill('0') << mHdr.getTitleId() << std::endl; + std::cout << " Version: v" << std::dec << mHdr.getVersion() << std::endl; + std::cout << " Is64BitInstruction: " << std::boolalpha << mHdr.getIs64BitInstructionFlag() << std::endl; + std::cout << " Is64BitAddressSpace: " << std::boolalpha << mHdr.getIs64BitAddressSpaceFlag() << std::endl; + std::cout << " UseSecureMemory: " << std::boolalpha << mHdr.getUseSecureMemoryFlag() << std::endl; std::cout << " Program Sections:" << std::endl; std::cout << " .text:" << std::endl; if (_HAS_BIT(mCliOutputMode, OUTPUT_LAYOUT)) @@ -282,19 +280,4 @@ void KipProcess::displayKernelCap(const nn::hac::KernelCapabilityControl& kern) std::cout << std::endl; } } -} - -const char* KipProcess::getInstructionTypeStr(bool is64Bit) const -{ - return is64Bit? "64Bit" : "32Bit"; -} - -const char* KipProcess::getAddressSpaceStr(bool is64Bit) const -{ - return is64Bit? "64Bit" : "32Bit"; -} - -const char* KipProcess::getMemoryPoolStr(bool isSystemPool) const -{ - return isSystemPool? "System" : "Application"; } \ No newline at end of file diff --git a/src/KipProcess.h b/src/KipProcess.h index 47a88f2..09580e1 100644 --- a/src/KipProcess.h +++ b/src/KipProcess.h @@ -32,8 +32,4 @@ private: void importCodeSegments(); void displayHeader(); void displayKernelCap(const nn::hac::KernelCapabilityControl& kern); - - const char* getInstructionTypeStr(bool is64Bit) const; - const char* getAddressSpaceStr(bool is64Bit) const; - const char* getMemoryPoolStr(bool isSystemPool) const; }; \ No newline at end of file