Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-17 19:21:30 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NCCH] You guessed it, more parsing

Browse source
This commit is contained in:
wheremyfoodat 2022-10-02 03:54:15 +03:00
parent 71cc187f93
commit cd1037857a
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/loader/ncch.hpp
View file

@ -15,7 +15,7 @@ struct NCCH {
bool isNew3DS = false; bool isNew3DS = false;
bool initialized = false; bool initialized = false;
bool compressExeFS = false; bool compressCode = false; // Shows whether the .code file in the ExeFS is compressed
bool mountRomFS = false; bool mountRomFS = false;
bool encrypted = false; bool encrypted = false;
bool fixedCryptoKey = false; bool fixedCryptoKey = false;

29
src/core/loader/ncch.cpp
View file

@ -1,4 +1,4 @@
#include <cryptopp/aes.h> #include <vector>
#include "loader/ncch.hpp" #include "loader/ncch.hpp"
#include "memory.hpp" #include "memory.hpp"
@ -45,7 +45,7 @@ bool NCCH::loadFromHeader(u8* header, IOFile& file) {
Helpers::panic("Encrypted NCSD file"); Helpers::panic("Encrypted NCSD file");
} }
compressExeFS = (exheader[0xD] & 1) != 0; compressCode = (exheader[0xD] & 1) != 0;
stackSize = *(u32*)&exheader[0x1C]; stackSize = *(u32*)&exheader[0x1C];
bssSize = *(u32*)&exheader[0x3C]; bssSize = *(u32*)&exheader[0x3C];
} }
@ -54,8 +54,8 @@ bool NCCH::loadFromHeader(u8* header, IOFile& file) {
// Read ExeFS // Read ExeFS
if (hasExeFS()) { if (hasExeFS()) {
printf("ExeFS offset: %08llX, size: %08llX\n", exeFS.offset, exeFS.size); u64 exeFSOffset = fileOffset + exeFS.offset; // Offset of ExeFS in the file = exeFS offset + ncch offset
auto exeFSOffset = fileOffset + exeFS.offset; printf("ExeFS offset: %08llX, size: %08llX (Offset in file = %08llX)\n", exeFS.offset, exeFS.size, exeFSOffset);
constexpr size_t exeFSHeaderSize = 0x200; constexpr size_t exeFSHeaderSize = 0x200;
u8 exeFSHeader[exeFSHeaderSize]; u8 exeFSHeader[exeFSHeaderSize];
@ -81,6 +81,16 @@ bool NCCH::loadFromHeader(u8* header, IOFile& file) {
if (fileSize != 0) { if (fileSize != 0) {
printf("File %d. Name: %s, Size: %08X, Offset: %08X\n", file, name, fileSize, fileOffset); printf("File %d. Name: %s, Size: %08X, Offset: %08X\n", file, name, fileSize, fileOffset);
} }
if (std::strcmp(name, ".code") == 0) {
std::vector<u8> buff;
if (compressCode) {
//Helpers::panic("Compressed .code file!");
} else {
Helpers::panic("Uncompressed .code file!");
}
}
} }
} }
@ -88,16 +98,15 @@ bool NCCH::loadFromHeader(u8* header, IOFile& file) {
printf("RomFS offset: %08llX, size: %08llX\n", romFS.offset, romFS.size); printf("RomFS offset: %08llX, size: %08llX\n", romFS.offset, romFS.size);
} }
if (stackSize != VirtualAddrs::DefaultStackSize) { if (stackSize != 0 && stackSize != VirtualAddrs::DefaultStackSize) {
Helpers::panic("Stack size != 0x4000"); Helpers::panic("Stack size != 0x4000");
} }
if (compressExeFS) {
Helpers::panic("Compressed ExeFS");
}
if (encrypted) { if (encrypted) {
Helpers::panic("Encrypted NCCH partition"); if (hasExeFS())
Helpers::panic("Encrypted NCCH partition with ExeFS");
else
printf("Encrypted NCCH partition. Hopefully not required because it doesn't have an ExeFS. Skipped\n");
} }
initialized = true; initialized = true;