MirrorBackup/GodMode9
1
0
Fork 0
forked from Mirror/GodMode9
Code Pull Requests Activity

Improved memory buffer organization

Browse Source
This commit is contained in:
d0k3 2016-12-07 15:12:35 +01:00
parent 68b81ade76
commit 8e4b04a18e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/common.h
View File

@ -46,10 +46,13 @@
// buffer area defines (in use by godmode.c) // buffer area defines (in use by godmode.c)
#define DIR_BUFFER (0x21000000) #define DIR_BUFFER (0x21000000)
#define WORK_BUFFER ((u8*)0x21100000)
#define DIR_BUFFER_SIZE (0x100000) #define DIR_BUFFER_SIZE (0x100000)
#define WORK_BUFFER_SIZE (0x100000) // buffer area defines (temporary, in use by various functions)
// buffer area defines (in use by fs.c) // -> godmode.c hexviewer
// -> ncch.c seed setup
#define TEMP_BUFFER ((u8*)0x21100000)
#define TEMP_BUFFER_SIZE (0x100000)
// buffer area defines (in use by fs.c and gameio.c)
#define MAIN_BUFFER ((u8*)0x21200000) #define MAIN_BUFFER ((u8*)0x21200000)
#define MAIN_BUFFER_SIZE (0x100000) // must be multiple of 0x200 #define MAIN_BUFFER_SIZE (0x100000) // must be multiple of 0x200
// buffer area defines (in use by nand.c) // buffer area defines (in use by nand.c)
@ -58,11 +61,8 @@
// buffer area defines (in use by sddata.c) // buffer area defines (in use by sddata.c)
#define SDCRYPT_BUFFER ((u8*)0x21400000) #define SDCRYPT_BUFFER ((u8*)0x21400000)
#define SDCRYPT_BUFFER_SIZE (0x100000) #define SDCRYPT_BUFFER_SIZE (0x100000)
// buffer area defines (in use by cia.c)
#define GAME_BUFFER ((u8*)0x21500000)
#define GAME_BUFFER_SIZE (0x100000)
// buffer area defines (in use by vgame.c) // buffer area defines (in use by vgame.c)
#define VGAME_BUFFER ((u8*)0x21600000) #define VGAME_BUFFER ((u8*)0x21500000)
#define VGAME_BUFFER_SIZE (0x200000) // 2MB, big RomFS #define VGAME_BUFFER_SIZE (0x200000) // 2MB, big RomFS
// buffer area defines (in use by image.c, for RAMdrive) // buffer area defines (in use by image.c, for RAMdrive)
#define RAMDRV_BUFFER_O3DS ((u8*)0x22200000) // in O3DS FCRAM #define RAMDRV_BUFFER_O3DS ((u8*)0x22200000) // in O3DS FCRAM

6
source/game/ncch.c
View File

@ -97,7 +97,7 @@ u32 GetNcchSeed(u8* seed, NcchHeader* ncch) {
nand_drv[i], sha256sum[0], sha256sum[1], sha256sum[2], sha256sum[3]); nand_drv[i], sha256sum[0], sha256sum[1], sha256sum[2], sha256sum[3]);
// check seedsave for seed // check seedsave for seed
u8* seedsave = (u8*) GAME_BUFFER; u8* seedsave = (u8*) TEMP_BUFFER;
if (f_open(&file, path, FA_READ | FA_OPEN_EXISTING) != FR_OK) if (f_open(&file, path, FA_READ | FA_OPEN_EXISTING) != FR_OK)
continue; continue;
f_read(&file, seedsave, 0x200, &btr); f_read(&file, seedsave, 0x200, &btr);
@ -124,11 +124,11 @@ u32 GetNcchSeed(u8* seed, NcchHeader* ncch) {
// not found -> try seeddb.bin // not found -> try seeddb.bin
const char* base[] = { INPUT_PATHS }; const char* base[] = { INPUT_PATHS };
for (u32 i = 0; i < (sizeof(base)/sizeof(char*)); i++) { for (u32 i = 0; i < (sizeof(base)/sizeof(char*)); i++) {
SeedInfo* seeddb = (SeedInfo*) GAME_BUFFER; SeedInfo* seeddb = (SeedInfo*) TEMP_BUFFER;
snprintf(path, 128, "%s/%s", base[i], SEEDDB_NAME); snprintf(path, 128, "%s/%s", base[i], SEEDDB_NAME);
if (f_open(&file, path, FA_READ | FA_OPEN_EXISTING) != FR_OK) if (f_open(&file, path, FA_READ | FA_OPEN_EXISTING) != FR_OK)
continue; continue;
f_read(&file, seeddb, GAME_BUFFER_SIZE, &btr); f_read(&file, seeddb, TEMP_BUFFER_SIZE, &btr);
f_close(&file); f_close(&file);
if (seeddb->n_entries > (btr - 16) / 32) if (seeddb->n_entries > (btr - 16) / 32)
continue; // filesize / seeddb size mismatch continue; // filesize / seeddb size mismatch

10
source/godmode.c
View File

@ -244,8 +244,8 @@ u32 SdFormatMenu(void) {
u32 HexViewer(const char* path) { u32 HexViewer(const char* path) {
static const u32 max_data = (SCREEN_HEIGHT / 8) * 16; static const u32 max_data = (SCREEN_HEIGHT / 8) * 16;
static u32 mode = 0; static u32 mode = 0;
u8* data = WORK_BUFFER; u8* data = TEMP_BUFFER;
u8* bottom_cpy = WORK_BUFFER + 0xC0000; // a copy of the bottom screen framebuffer u8* bottom_cpy = TEMP_BUFFER + 0xC0000; // a copy of the bottom screen framebuffer
u32 fsize = FileGetSize(path); u32 fsize = FileGetSize(path);
bool dual_screen; bool dual_screen;
@ -264,8 +264,8 @@ u32 HexViewer(const char* path) {
static const u32 edit_bsize = 0x4000; // should be multiple of 0x200 * 2 static const u32 edit_bsize = 0x4000; // should be multiple of 0x200 * 2
bool edit_mode = false; bool edit_mode = false;
u8* edit_buffer = WORK_BUFFER; u8* edit_buffer = TEMP_BUFFER;
u8* edit_buffer_cpy = WORK_BUFFER + edit_bsize; u8* edit_buffer_cpy = TEMP_BUFFER + edit_bsize;
u32 edit_start; u32 edit_start;
int cursor = 0; int cursor = 0;
@ -478,7 +478,7 @@ u32 HexViewer(const char* path) {
if (diffs && ShowPrompt(true, "You made edits in %i place(s).\nWrite changes to file?", diffs)) if (diffs && ShowPrompt(true, "You made edits in %i place(s).\nWrite changes to file?", diffs))
if (!FileSetData(path, edit_buffer, min(edit_bsize, (fsize - edit_start)), edit_start, false)) if (!FileSetData(path, edit_buffer, min(edit_bsize, (fsize - edit_start)), edit_start, false))
ShowPrompt(false, "Failed writing to file!"); ShowPrompt(false, "Failed writing to file!");
data = WORK_BUFFER; data = TEMP_BUFFER;
last_offset = (u32) -1; // force reload from file last_offset = (u32) -1; // force reload from file
} else if (pad_state & BUTTON_A) { } else if (pad_state & BUTTON_A) {
if (pad_state & BUTTON_DOWN) data[cursor]--; if (pad_state & BUTTON_DOWN) data[cursor]--;