From 2ff0486335b615af5f2d90ae29f5494ee84d2c00 Mon Sep 17 00:00:00 2001 From: booto Date: Thu, 11 Apr 2019 01:50:52 -0400 Subject: Debugger/Memory: Add support for address spaces Different address spaces can be chosen in the memory view panel. * Effective (or virtual): Probably the view people mostly want. Address translation goes through MMU. * Auxiliary: ARAM address space. Does not display anything in Wii mode. * Physical: Physical address space. Only supports mem1 and mem2 (wii mode) so far. --- Source/Core/Common/CommonPaths.h | 3 ++- Source/Core/Common/FileUtil.cpp | 6 ++++-- Source/Core/Common/FileUtil.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index 55d2a076c5..97213f6448 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -90,7 +90,8 @@ #define WII_SYSCONF "SYSCONF" // Files in the directory returned by GetUserPath(D_DUMP_IDX) -#define RAM_DUMP "ram.raw" +#define MEM1_DUMP "mem1.raw" +#define MEM2_DUMP "mem2.raw" #define ARAM_DUMP "aram.raw" #define FAKEVMEM_DUMP "fakevmem.raw" diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 53f242ecf0..72d441906e 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -794,7 +794,8 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[F_DEBUGGERCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + DEBUGGER_CONFIG; s_user_paths[F_LOGGERCONFIG_IDX] = s_user_paths[D_CONFIG_IDX] + LOGGER_CONFIG; s_user_paths[F_MAINLOG_IDX] = s_user_paths[D_LOGS_IDX] + MAIN_LOG; - s_user_paths[F_RAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + RAM_DUMP; + s_user_paths[F_MEM1DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM1_DUMP; + s_user_paths[F_MEM2DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM2_DUMP; s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP; s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP; s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM; @@ -830,7 +831,8 @@ static void RebuildUserDirectories(unsigned int dir_index) s_user_paths[D_DUMPTEXTURES_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP; s_user_paths[D_DUMPDSP_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP; s_user_paths[D_DUMPSSL_IDX] = s_user_paths[D_DUMP_IDX] + DUMP_SSL_DIR DIR_SEP; - s_user_paths[F_RAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + RAM_DUMP; + s_user_paths[F_MEM1DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM1_DUMP; + s_user_paths[F_MEM2DUMP_IDX] = s_user_paths[D_DUMP_IDX] + MEM2_DUMP; s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP; s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP; break; diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h index 68d6921cdb..dadee2ae23 100644 --- a/Source/Core/Common/FileUtil.h +++ b/Source/Core/Common/FileUtil.h @@ -59,7 +59,8 @@ enum F_DEBUGGERCONFIG_IDX, F_LOGGERCONFIG_IDX, F_MAINLOG_IDX, - F_RAMDUMP_IDX, + F_MEM1DUMP_IDX, + F_MEM2DUMP_IDX, F_ARAMDUMP_IDX, F_FAKEVMEMDUMP_IDX, F_GCSRAM_IDX, -- cgit v1.2.3