LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Minor stuff (2)

Browse Source
This commit is contained in:
Aurora 2016-09-13 02:29:57 +02:00
parent 6f040caa98
commit 934c4bed0b
3 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/draw.c
View File

@ -57,14 +57,14 @@ void selectScreen(bool isBottomScreen)
void drawCharacter(char character, int posX, int posY, u32 color) void drawCharacter(char character, int posX, int posY, u32 color)
{ {
u8 *const select = (bottomScreenSelected) ? fb->bottom : fb->top_left; u8 *const select = bottomScreenSelected ? fb->bottom : fb->top_left;
for(int y = 0; y < 8; y++) for(int y = 0; y < 8; y++)
{ {
char charPos = font[character * 8 + y]; char charPos = font[character * 8 + y];
for(int x = 7; x >= 0; x--) for(int x = 7; x >= 0; x--)
if ((charPos >> x) & 1) if((charPos >> x) & 1)
{ {
int screenPos = (posX * SCREEN_HEIGHT * 3 + (SCREEN_HEIGHT - y - posY - 1) * 3) + (7 - x) * 3 * SCREEN_HEIGHT; int screenPos = (posX * SCREEN_HEIGHT * 3 + (SCREEN_HEIGHT - y - posY - 1) * 3) + (7 - x) * 3 * SCREEN_HEIGHT;
@ -85,11 +85,11 @@ int drawString(const char *string, int posX, int posY, u32 color)
line_i = 0; line_i = 0;
i++; i++;
} }
else if(line_i >= ((bottomScreenSelected ? SCREEN_BOTTOM_WIDTH : SCREEN_TOP_WIDTH)- posX) / SPACING_X) else if(line_i >= ((bottomScreenSelected ? SCREEN_BOTTOM_WIDTH : SCREEN_TOP_WIDTH) - posX) / SPACING_X)
{ {
// Make sure we never get out of the screen. //Make sure we never get out of the screen
posY += SPACING_Y; posY += SPACING_Y;
line_i = 2; //Little offset so we know the same string continues. line_i = 2; //Little offset so we know the same string continues
if(string[i] == ' ') i++; //Spaces at the start look weird if(string[i] == ' ') i++; //Spaces at the start look weird
} }

6
source/draw.h
View File

@ -29,9 +29,9 @@
#include "types.h" #include "types.h"
#define SCREEN_TOP_WIDTH 400 #define SCREEN_TOP_WIDTH 400
#define SCREEN_BOTTOM_WIDTH 320 #define SCREEN_BOTTOM_WIDTH 320
#define SCREEN_HEIGHT 240 #define SCREEN_HEIGHT 240
#define SPACING_Y 10 #define SPACING_Y 10
#define SPACING_X 8 #define SPACING_X 8

66
source/exceptions.c
View File

@ -94,6 +94,10 @@ void detectAndProcessExceptionDumps(void)
"FIQ", "undefined instruction", "prefetch abort", "data abort" "FIQ", "undefined instruction", "prefetch abort", "data abort"
}; };
const char *specialExceptions[] = {
"(kernel panic)", "(svcBreak)"
};
const char *registerNames[] = { const char *registerNames[] = {
"R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "R8", "R9", "R10", "R11", "R12", "R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7", "R8", "R9", "R10", "R11", "R12",
"SP", "LR", "PC", "CPSR", "FPEXC" "SP", "LR", "PC", "CPSR", "FPEXC"
@ -104,73 +108,64 @@ void detectAndProcessExceptionDumps(void)
initScreens(); initScreens();
drawString("An exception occurred", 10, 10, COLOR_RED); drawString("An exception occurred", 10, 10, COLOR_RED);
int posY = drawString(dumpHeader->processor == 11 ? "Processor: ARM11 (core )" : "Processor: ARM9", 10, 30, COLOR_WHITE) + SPACING_Y; int posY = drawString(dumpHeader->processor == 11 ? "Processor: ARM11 (core )" : "Processor: ARM9", 10, 30, COLOR_WHITE);
if(dumpHeader->processor == 11) drawCharacter('0' + dumpHeader->core, 10 + 29 * SPACING_X, 30, COLOR_WHITE); if(dumpHeader->processor == 11) drawCharacter('0' + dumpHeader->core, 10 + 29 * SPACING_X, 30, COLOR_WHITE);
posY = drawString("Exception type: ", 10, posY, COLOR_WHITE); posY = drawString("Exception type: ", 10, posY + SPACING_Y, COLOR_WHITE);
posY = drawString(handledExceptionNames[dumpHeader->type], 10 + 17 * SPACING_X, posY, COLOR_WHITE); drawString(handledExceptionNames[dumpHeader->type], 10 + 17 * SPACING_X, posY, COLOR_WHITE);
if(dumpHeader->type == 2) if(dumpHeader->type == 2)
{ {
if((regs[16] & 0x20) == 0 && dumpHeader->codeDumpSize >= 4) if((regs[16] & 0x20) == 0 && dumpHeader->codeDumpSize >= 4)
{ {
u32 instr = *(vu32 *)((vu8 *)dumpHeader + sizeof(ExceptionDumpHeader) + dumpHeader->registerDumpSize + dumpHeader->codeDumpSize - 4); u32 instr = *(vu32 *)(stackDump - 4);
if(instr == 0xE12FFF7E) if(instr == 0xE12FFF7E) drawString(specialExceptions[0], 10 + 32 * SPACING_X, posY, COLOR_WHITE);
posY = drawString("(kernel panic)", 10 + 32 * SPACING_X, posY, COLOR_WHITE); else if(instr == 0xEF00003C) drawString(specialExceptions[1], 10 + 32 * SPACING_X, posY, COLOR_WHITE);
else if(instr == 0xEF00003C)
posY = drawString("(svcBreak)", 10 + 32 * SPACING_X, posY, COLOR_WHITE);
} }
else if((regs[16] & 0x20) == 0 && dumpHeader->codeDumpSize >= 2) else if((regs[16] & 0x20) == 0 && dumpHeader->codeDumpSize >= 2)
{ {
u16 instr = *(vu16 *)((vu8 *)dumpHeader + sizeof(ExceptionDumpHeader) + dumpHeader->registerDumpSize + dumpHeader->codeDumpSize - 2); u16 instr = *(vu16 *)(stackDump - 2);
if(instr == 0xDF3C) if(instr == 0xDF3C) drawString(specialExceptions[1], 10 + 32 * SPACING_X, posY, COLOR_WHITE);
posY = drawString("(svcBreak)", 10 + 32 * SPACING_X, posY, COLOR_WHITE);
} }
} }
if(dumpHeader->processor == 11 && dumpHeader->additionalDataSize != 0) if(dumpHeader->processor == 11 && dumpHeader->additionalDataSize != 0)
{ {
posY += SPACING_Y;
char processName[] = "Current process: "; char processName[] = "Current process: ";
memcpy(processName + sizeof(processName) - 9, (void *)additionalData, 8); memcpy(processName + sizeof(processName) - 9, (void *)additionalData, 8);
posY = drawString(processName, 10, posY, COLOR_WHITE); posY = drawString(processName, 10, posY + SPACING_Y, COLOR_WHITE);
} }
posY += 3 * SPACING_Y; posY += SPACING_Y;
for(u32 i = 0; i < 17; i += 2) for(u32 i = 0; i < 17; i += 2)
{ {
posY = drawString(registerNames[i], 10, posY, COLOR_WHITE); posY = drawString(registerNames[i], 10, posY + SPACING_Y, COLOR_WHITE);
hexItoa(regs[i], hexString, 8); hexItoa(regs[i], hexString, 8);
posY = drawString(hexString, 10 + 7 * SPACING_X, posY, COLOR_WHITE); drawString(hexString, 10 + 7 * SPACING_X, posY, COLOR_WHITE);
if(dumpHeader->processor != 9 || i != 16) if(i != 16 || dumpHeader->processor != 9)
{ {
posY = drawString(registerNames[i + 1], 10 + 22 * SPACING_X, posY, COLOR_WHITE); drawString(registerNames[i + 1], 10 + 22 * SPACING_X, posY, COLOR_WHITE);
hexItoa(i == 16 ? regs[20] : regs[i + 1], hexString, 8); hexItoa(i == 16 ? regs[20] : regs[i + 1], hexString, 8);
posY = drawString(hexString, 10 + 29 * SPACING_X, posY, COLOR_WHITE); drawString(hexString, 10 + 29 * SPACING_X, posY, COLOR_WHITE);
} }
posY += SPACING_Y;
} }
posY += 2 * SPACING_Y; posY += SPACING_Y;
u32 mode = regs[16] & 0xF; u32 mode = regs[16] & 0xF;
if(dumpHeader->type == 3 && (mode == 7 || mode == 11)) if(dumpHeader->type == 3 && (mode == 7 || mode == 11))
{ posY = drawString("Incorrect dump: failed to dump code and/or stack", 10, posY + SPACING_Y, COLOR_YELLOW) + SPACING_Y;
posY = drawString("Incorrect dump: failed to dump code and/or stack", 10, posY, COLOR_YELLOW) + 2 * SPACING_Y;
if(dumpHeader->processor != 9) posY -= SPACING_Y;
}
selectScreen(true); selectScreen(true);
int posYBottom = drawString("Stack dump:", 10, 10, COLOR_WHITE) + 2 * SPACING_Y; int posYBottom = drawString("Stack dump:", 10, 10, COLOR_WHITE) + SPACING_Y;
for(u32 line = 0; line < 19 && stackDump < additionalData; line++) for(u32 line = 0; line < 19 && stackDump < additionalData; line++)
{ {
hexItoa(regs[13] + 8 * line, hexString, 8); hexItoa(regs[13] + 8 * line, hexString, 8);
drawString(hexString, 10, posYBottom, COLOR_WHITE); posYBottom = drawString(hexString, 10, posYBottom + SPACING_Y, COLOR_WHITE);
drawCharacter(':', 10 + 8 * SPACING_X, posYBottom, COLOR_WHITE); drawCharacter(':', 10 + 8 * SPACING_X, posYBottom, COLOR_WHITE);
for(u32 i = 0; i < 8 && stackDump < additionalData; i++, stackDump++) for(u32 i = 0; i < 8 && stackDump < additionalData; i++, stackDump++)
@ -179,13 +174,10 @@ void detectAndProcessExceptionDumps(void)
hexItoa(*stackDump, byteString, 2); hexItoa(*stackDump, byteString, 2);
drawString(byteString, 10 + 10 * SPACING_X + 3 * i * SPACING_X, posYBottom, COLOR_WHITE); drawString(byteString, 10 + 10 * SPACING_X + 3 * i * SPACING_X, posYBottom, COLOR_WHITE);
} }
posYBottom += SPACING_Y;
} }
selectScreen(false); selectScreen(false);
u32 size = dumpHeader->totalSize;
char path[42]; char path[42];
char fileName[] = "crash_dump_00000000.dmp"; char fileName[] = "crash_dump_00000000.dmp";
const char *pathFolder = dumpHeader->processor == 9 ? "/luma/dumps/arm9" : "/luma/dumps/arm11"; const char *pathFolder = dumpHeader->processor == 9 ? "/luma/dumps/arm9" : "/luma/dumps/arm11";
@ -195,16 +187,16 @@ void detectAndProcessExceptionDumps(void)
concatenateStrings(path, "/"); concatenateStrings(path, "/");
concatenateStrings(path, fileName); concatenateStrings(path, fileName);
if(fileWrite((void *)dumpHeader, path, size)) if(fileWrite((void *)dumpHeader, path, dumpHeader->totalSize))
{ {
posY = drawString("You can find a dump in the following file:", 10, posY, COLOR_WHITE) + SPACING_Y; posY = drawString("You can find a dump in the following file:", 10, posY + SPACING_Y, COLOR_WHITE);
posY = drawString(path, 10, posY, COLOR_WHITE) + 2 * SPACING_Y; posY = drawString(path, 10, posY + SPACING_Y, COLOR_WHITE) + SPACING_Y;
} }
else posY = drawString("Error writing the dump file", 10, posY, COLOR_RED) + SPACING_Y; else posY = drawString("Error writing the dump file", 10, posY + SPACING_Y, COLOR_RED);
drawString("Press any button to shutdown", 10, posY, COLOR_WHITE); drawString("Press any button to shutdown", 10, posY + SPACING_Y, COLOR_WHITE);
memset32((void *)dumpHeader, 0, size); memset32((void *)dumpHeader, 0, dumpHeader->totalSize);
waitInput(); waitInput();
mcuPowerOff(); mcuPowerOff();