mirror of
https://github.com/DarkMatterCore/nxdumptool.git
synced 2024-11-26 04:02:11 +00:00
Save exception info to logfile.
Benchmark test updated to dump the inserted gamecard.
This commit is contained in:
parent
76b19aed96
commit
444c82b7c0
4 changed files with 100 additions and 11 deletions
105
source/main.c
105
source/main.c
|
@ -27,17 +27,101 @@
|
|||
|
||||
#include "utils.h"
|
||||
#include "bktr.h"
|
||||
#include "gamecard.h"
|
||||
|
||||
#define TEST_BUF_SIZE 0x800000
|
||||
|
||||
alignas(16) u8 __nx_exception_stack[0x1000];
|
||||
u64 __nx_exception_stack_size = sizeof(__nx_exception_stack);
|
||||
|
||||
void __libnx_exception_handler(ThreadExceptionDump *ctx)
|
||||
{
|
||||
LOGFILE("Exception triggered!");
|
||||
|
||||
FILE *logfile = fopen(LOGFILE_PATH, "a+");
|
||||
if (!logfile) return;
|
||||
|
||||
fprintf(logfile, "\r\n error_desc: 0x%x ", ctx->error_desc);
|
||||
|
||||
switch(ctx->error_desc)
|
||||
{
|
||||
case ThreadExceptionDesc_InstructionAbort:
|
||||
fprintf(logfile, "(InstructionAbort)");
|
||||
break;
|
||||
case ThreadExceptionDesc_MisalignedPC:
|
||||
fprintf(logfile, "(MisalignedPC)");
|
||||
break;
|
||||
case ThreadExceptionDesc_MisalignedSP:
|
||||
fprintf(logfile, "(MisalignedSP)");
|
||||
break;
|
||||
case ThreadExceptionDesc_SError:
|
||||
fprintf(logfile, "(SError)");
|
||||
break;
|
||||
case ThreadExceptionDesc_BadSVC:
|
||||
fprintf(logfile, "(BadSVC)");
|
||||
break;
|
||||
case ThreadExceptionDesc_Trap:
|
||||
fprintf(logfile, "(Trap)");
|
||||
break;
|
||||
case ThreadExceptionDesc_Other:
|
||||
fprintf(logfile, "(Other)");
|
||||
break;
|
||||
default:
|
||||
fprintf(logfile, "(Unknown)");
|
||||
break;
|
||||
}
|
||||
|
||||
fprintf(logfile, "\r\n\r\n");
|
||||
|
||||
if (threadExceptionIsAArch64(ctx))
|
||||
{
|
||||
for(u32 i = 0; i < 29; i++) fprintf(logfile, " [X%d]: 0x%lx\r\n", i, ctx->cpu_gprs[i].x);
|
||||
fprintf(logfile, "\r\n");
|
||||
|
||||
fprintf(logfile, " fp: 0x%lx\r\n", ctx->fp.x);
|
||||
fprintf(logfile, " lr: 0x%lx\r\n", ctx->lr.x);
|
||||
fprintf(logfile, " sp: 0x%lx\r\n", ctx->sp.x);
|
||||
fprintf(logfile, " pc: 0x%lx\r\n", ctx->pc.x);
|
||||
fprintf(logfile, " far: 0x%lx\r\n", ctx->far.x);
|
||||
} else {
|
||||
for(u32 i = 0; i < 29; i++) fprintf(logfile, " [X%d]: 0x%x\r\n", i, ctx->cpu_gprs[i].r);
|
||||
fprintf(logfile, "\r\n");
|
||||
|
||||
fprintf(logfile, " fp: 0x%x\r\n", ctx->fp.r);
|
||||
fprintf(logfile, " lr: 0x%x\r\n", ctx->lr.r);
|
||||
fprintf(logfile, " sp: 0x%x\r\n", ctx->sp.r);
|
||||
fprintf(logfile, " pc: 0x%x\r\n", ctx->pc.r);
|
||||
fprintf(logfile, " far: 0x%x\r\n", ctx->far.r);
|
||||
}
|
||||
|
||||
fprintf(logfile, "\r\n");
|
||||
|
||||
fprintf(logfile, " pstate: 0x%x\r\n", ctx->pstate);
|
||||
fprintf(logfile, " afsr0: 0x%x\r\n", ctx->afsr0);
|
||||
fprintf(logfile, " afsr1: 0x%x\r\n", ctx->afsr1);
|
||||
fprintf(logfile, " esr: 0x%x\r\n\r\n", ctx->esr);
|
||||
|
||||
fclose(logfile);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static Mutex g_fileMutex = 0;
|
||||
static CondVar g_readCondvar = 0, g_writeCondvar = 0;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
FILE *fileobj;
|
||||
BktrContext *bktr_ctx;
|
||||
RomFileSystemFileEntry *bktr_file_entry;
|
||||
void *data;
|
||||
size_t data_size;
|
||||
size_t data_written;
|
||||
|
@ -56,7 +140,7 @@ static void consolePrint(const char *text, ...)
|
|||
static int read_thread_func(void *arg)
|
||||
{
|
||||
ThreadSharedData *shared_data = (ThreadSharedData*)arg;
|
||||
if (!shared_data || !shared_data->bktr_ctx || !shared_data->bktr_file_entry || !shared_data->data) return -1;
|
||||
if (!shared_data || !shared_data->data || !shared_data->total_size) return -1;
|
||||
|
||||
u8 *buf = malloc(TEST_BUF_SIZE);
|
||||
if (!buf) return -2;
|
||||
|
@ -65,7 +149,7 @@ static int read_thread_func(void *arg)
|
|||
{
|
||||
if (blksize > (shared_data->total_size - offset)) blksize = (shared_data->total_size - offset);
|
||||
|
||||
if (!bktrReadFileEntryData(shared_data->bktr_ctx, shared_data->bktr_file_entry, buf, blksize, offset)) break;
|
||||
if (!gamecardReadStorage(buf, blksize, offset)) break;
|
||||
|
||||
mutexLock(&g_fileMutex);
|
||||
|
||||
|
@ -269,7 +353,12 @@ int main(int argc, char *argv[])
|
|||
|
||||
consolePrint("bktr get file entry by path success: %.*s | 0x%lX\n", bktr_file_entry->name_length, bktr_file_entry->name, bktr_file_entry->size);
|
||||
|
||||
if (!utilsCreateConcatenationFile("sdmc:/nxdt_test/data.arc"))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (!utilsCreateConcatenationFile("sdmc:/nxdt_test/gamecard.xci"))
|
||||
{
|
||||
consolePrint("create concatenationfile failed\n");
|
||||
goto out2;
|
||||
|
@ -277,7 +366,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
consolePrint("create concatenationfile success\n");
|
||||
|
||||
tmp_file = fopen("sdmc:/nxdt_test/data.arc", "wb");
|
||||
tmp_file = fopen("sdmc:/nxdt_test/gamecard.xci", "wb");
|
||||
if (!tmp_file)
|
||||
{
|
||||
consolePrint("open concatenationfile failed\n");
|
||||
|
@ -289,12 +378,10 @@ int main(int argc, char *argv[])
|
|||
ThreadSharedData shared_data = {0};
|
||||
|
||||
shared_data.fileobj = tmp_file;
|
||||
shared_data.bktr_ctx = &bktr_ctx;
|
||||
shared_data.bktr_file_entry = bktr_file_entry;
|
||||
shared_data.data = buf;
|
||||
shared_data.data_size = 0;
|
||||
shared_data.data_written = 0;
|
||||
shared_data.total_size = bktr_file_entry->size;
|
||||
gamecardGetTotalSize(&(shared_data.total_size));
|
||||
|
||||
thrd_t read_thread, write_thread;
|
||||
|
||||
|
|
|
@ -59,7 +59,8 @@ static ServicesInfoEntry g_serviceInfo[] = {
|
|||
{ false, "clk", &servicesClkGetServiceType, NULL, NULL }, /* Placeholder for pcv / clkrst */
|
||||
{ false, "fsp-usb", &servicesFspUsbCheckAvailability, &fspusbInitialize, &fspusbExit }, /* Checks if fsp-usb is really available */
|
||||
{ false, "es", NULL, &esInitialize, &esExit },
|
||||
{ false, "set:cal", NULL, &setcalInitialize, &setcalExit }
|
||||
{ false, "set:cal", NULL, &setcalInitialize, &setcalExit },
|
||||
{ false, "usb:ds", NULL, &usbCommsInitialize, &usbCommsExit }
|
||||
};
|
||||
|
||||
static const u32 g_serviceInfoCount = MAX_ELEMENTS(g_serviceInfo);
|
||||
|
|
|
@ -215,7 +215,7 @@ void utilsWriteLogMessage(const char *func_name, const char *fmt, ...)
|
|||
va_list args;
|
||||
FILE *logfile = NULL;
|
||||
|
||||
logfile = fopen(APP_BASE_PATH "nxdumptool.log", "a+");
|
||||
logfile = fopen(LOGFILE_PATH, "a+");
|
||||
if (!logfile) goto out;
|
||||
|
||||
time_t now = time(NULL);
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <switch.h>
|
||||
|
||||
#define APP_BASE_PATH "sdmc:/switch/nxdumptool/"
|
||||
#define LOGFILE_PATH APP_BASE_PATH "nxdumptool.log"
|
||||
|
||||
#define LOGFILE(fmt, ...) utilsWriteLogMessage(__func__, fmt, ##__VA_ARGS__)
|
||||
|
||||
|
|
Loading…
Reference in a new issue