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

Fix derps (thanks to @Mrrraou), general cleaup, rewrite of the modules copying function

Browse Source
This commit is contained in:
Aurora
2016-08-30 02:03:56 +02:00
parent cb9576b10e
commit e8b9e49f57
9 changed files with 148 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
exceptions/arm9/source/mainHandler.c
View File

@@ -25,7 +25,7 @@
#define FINAL_BUFFER 0x25000000
#define REG_DUMP_SIZE (4*17)
#define REG_DUMP_SIZE 4 * 17
#define CODE_DUMP_SIZE 48
bool cannotAccessAddress(const void *address)
@@ -37,7 +37,7 @@ bool cannotAccessAddress(const void *address)
for(u32 i = 0; i < 8; i++)
{
if((dataAccessPermissions & 0xF) == 0 || (regionSettings[i] & 1) == 0)
continue; //no access / region not enabled
continue; //No access / region not enabled
u32 regionAddrBase = regionSettings[i] & ~0xFFF;
u32 regionSize = 1 << (((regionSettings[i] >> 1) & 0x1F) + 1);
@@ -88,7 +88,7 @@ void __attribute__((noreturn)) mainHandler(u32 regs[REG_DUMP_SIZE / 4], u32 type
//Dump registers
//Current order of saved regs: cpsr, pc, r8-r14, r0-r7
u32 cpsr = regs[0];
u32 pc = regs[1] - ((type < 3) ? (((cpsr & 0x20) != 0 && type == 1) ? 2 : 4) : 8);
u32 pc = regs[1] - (type < 3 ? (((cpsr & 0x20) != 0 && type == 1) ? 2 : 4) : 8);
registerDump[15] = pc;
registerDump[16] = cpsr;

5
exceptions/arm9/source/types.h
View File

@@ -23,12 +23,9 @@
#pragma once
#include <stdint.h>
#include <stdlib.h>
#include <stdbool.h>
#ifndef NULL
#define NULL 0
#endif
//Common data types
typedef uint8_t u8;
typedef uint16_t u16;