Citra-emu/uncart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Memory management cleaning, dump options

Browse Source 
-newlib handles allocations, in the default case, by starting to
allocate memory right after the end of the program in memory, and will
continue to allocate memory as requested until it hits the stack. As a
result, it is safe to use memory allocation function to get memory for
usage. Changed some of the memory management in the application to use
memalign (memory needs to be aligned to at least 16 bits if sdmmc.c is
to work, preferably 32 bits).
-Added an option for the user to either dump the full ROM, or just the
partitions.
This commit is contained in:
Gabriel Marcano 2016-06-07 02:34:07 -04:00
parent 913bc867b7
commit 2c3870dbad
3 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -36,7 +36,10 @@ CFLAGS := -g -Wall -Wextra -Wpedantic -O2 -flto\
-ffast-math -std=c11\
$(ARCH)
CFLAGS += $(INCLUDE) -DARM9 -Werror-implicit-function-declaration -Wcast-align -Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op -Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow -Wsign-conversion -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused
CFLAGS += $(INCLUDE) -DARM9 -Werror-implicit-function-declaration -Wcast-align\
-Wcast-qual -Wdisabled-optimization -Wformat=2 -Winit-self -Wlogical-op \
-Wmissing-declarations -Wmissing-include-dirs -Wredundant-decls -Wshadow \
-Wsign-conversion -Wstrict-overflow=5 -Wswitch-default -Wundef -Wno-unused
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions

64
source/main.c
View File

@ -9,6 +9,8 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <malloc.h> //For memalign
extern s32 CartID;
extern s32 CartID2;
@ -55,7 +57,7 @@ static int dump_cart_region(u32 start_sector, u32 end_sector, FIL* output_file,
Cart_Dummy();
Cart_Dummy();
//If there is less data to read than the curren read_size, fix it
//If there is less data to read than the current read_size, fix it
if (end_sector - current_sector < read_size)
{
read_size = end_sector - current_sector;
@ -84,6 +86,15 @@ static int dump_cart_region(u32 start_sector, u32 end_sector, FIL* output_file,
}
int main() {
// Arbitrary target buffer
// aligning to 32 bits in case other parts of the software assume alignment
const u32 target_buf_size = 16u * 1024u * 1024u; // 16MB
u32 * const target = memalign(32, target_buf_size);
u32 * const ncchHeaderData = memalign(32, sizeof(NCCH_HEADER));
NCCH_HEADER * const ncchHeader = (NCCH_HEADER*)ncchHeaderData;
NCSD_HEADER * const ncsdHeader = (NCSD_HEADER*)target;
restart_program:
// Setup boring stuff - clear the screen, initialize SD output, etc...
@ -93,19 +104,8 @@ restart_program:
Debug("Insert your game cart now.");
wait_key();
// Arbitrary target buffer
// TODO: This should be done in a nicer way ;)
u32* target = (u32*)0x22000000;
NCSD_HEADER *ncsdHeader = (NCSD_HEADER*)target;
u32 target_buf_size = 16u * 1024u * 1024u; // 16MB
memset(target, 0, target_buf_size); // Clear our buffer
u32* ncchHeaderData = (u32*)0x23000000;
NCCH_HEADER *ncchHeader = (NCCH_HEADER*)ncchHeaderData;
*(vu32*)0x10000020 = 0; // InitFS stuff
*(vu32*)0x10000020 = 0x340; // InitFS stuff
// ROM DUMPING CODE STARTS HERE
Cart_Init();
@ -114,6 +114,7 @@ restart_program:
CTR_CmdReadHeader(ncchHeader);
Debug("Done reading NCCH header.");
// Check that the NCCH header magic is there
if (strncmp((const char*)(ncchHeader->magic), "NCCH", 4))
{
Debug("NCCH magic not found in header!!!");
@ -132,6 +133,7 @@ restart_program:
CTR_CmdReadData(0, 0x200, 0x1000 / 0x200, target);
Debug("Done reading NCSD header.");
// Check for NCSD magic
if (strncmp((const char*)(ncsdHeader->magic), "NCSD", 4)) {
Debug("NCSD magic not found in header!!!");
Debug("Press A to continue anyway.");
@ -139,16 +141,47 @@ restart_program:
goto restart_prompt;
}
Debug("Uncart can either dump the entire ROM (including");
Debug("empty space), or a trimmed version based on the");
Debug("size of the cart partitions.");
Debug("");
u32 input;
do
{
Debug("Press A to dump all of ROM, B for only the");
Debug("trimmed version.");
input = InputWait();
}
while (!(input & BUTTON_A) && !(input & BUTTON_B));
const u32 mediaUnit = 0x200 * (1u << ncsdHeader->partition_flags[MEDIA_UNIT_SIZE]); //Correctly set the media unit size
//Calculate the actual size by counting the adding the size of each partition, plus the initial offset
//size is in media units
u32 cartSize = ncsdHeader->offsetsize_table[0].offset;
u32 cartSize;
// Maximum number of blocks in a single file
u32 file_max_blocks;
if (input & BUTTON_B)
{
cartSize = ncsdHeader->offsetsize_table[0].offset;
for(int i = 0; i < 8; i++){
cartSize += ncsdHeader->offsetsize_table[i].size;
}
Debug("Cart data size: %llu MB", (u64)cartSize * (u64)mediaUnit / 1024ull / 1024ull);
// Maximum number of blocks in a single file
file_max_blocks = 0xFFFFFFFFu / mediaUnit; // 4GiB - 513
}
else
{
cartSize = ncsdHeader->media_size;
// Maximum number of blocks in a single file
file_max_blocks = 0x80000000u / mediaUnit; // 2GiB
}
struct Context context = {
.buffer = (u8*)target,
@ -157,8 +190,6 @@ restart_program:
.media_unit = mediaUnit,
};
// Maximum number of blocks in a single file
u32 file_max_blocks = 0xFFFFFFFFu / mediaUnit; // 4GiB - 1
u32 current_part = 0;
while (current_part * file_max_blocks < cartSize) {
@ -221,6 +252,9 @@ restart_prompt:
if (!(InputWait() & BUTTON_B))
goto restart_program;
free(ncchHeaderData);
free(target);
Reboot();
return 0;
}

20
source/start.s
View File

@ -86,23 +86,19 @@ _enable_caches:
pop {r4-r5, pc}
_fix_sdmc_mount:
@ Fix mounting of SDMC
ldr r0, =0x10000020
mov r1, #0x340
str r1, [r0]
mov pc, lr
_init:
push {r0-r12, lr}
bl _enable_caches
@@ Initialize .bss
@ ldr r0, =__bss_start__
@ ldr r1, =__bss_end__
@ ldr r2, =__bss_end__
@ sbc r2, r0
@ eor r4, r4
@zero_bss:
@ strb r4, [r0], #1
@ subs r2, r2, #1
@ bne zero_bss
bl _fix_sdmc_mount
bl main