ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expect more of these type of messages till all is done

This commit is contained in:
Zach Bacon 2016-07-09 22:08:20 -04:00
parent 79820311d3
commit ba3083b538
No known key found for this signature in database
GPG Key ID: 7D110798AFE84B3A
4 changed files with 409 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

762
src/gba/GBA-arm.cpp
View File

File diff suppressed because it is too large Load Diff

40
src/gba/GBAcpu.h
View File

@ -20,7 +20,7 @@ extern int thumbExecute();
#define UPDATE_REG(address, value) \ #define UPDATE_REG(address, value) \
{ \ { \
WRITE16LE(((u16*)&ioMem[address]), value); \ WRITE16LE(((uint16_t*)&ioMem[address]), value); \
} }
#define ARM_PREFETCH \ #define ARM_PREFETCH \
@ -40,20 +40,20 @@ extern int thumbExecute();
#define THUMB_PREFETCH_NEXT cpuPrefetch[1] = CPUReadHalfWordQuick(armNextPC + 2); #define THUMB_PREFETCH_NEXT cpuPrefetch[1] = CPUReadHalfWordQuick(armNextPC + 2);
extern int SWITicks; extern int SWITicks;
extern u32 mastercode; extern uint32_t mastercode;
extern bool busPrefetch; extern bool busPrefetch;
extern bool busPrefetchEnable; extern bool busPrefetchEnable;
extern u32 busPrefetchCount; extern uint32_t busPrefetchCount;
extern int cpuNextEvent; extern int cpuNextEvent;
extern bool holdState; extern bool holdState;
extern u32 cpuPrefetch[2]; extern uint32_t cpuPrefetch[2];
extern int cpuTotalTicks; extern int cpuTotalTicks;
extern u8 memoryWait[16]; extern uint8_t memoryWait[16];
extern u8 memoryWait32[16]; extern uint8_t memoryWait32[16];
extern u8 memoryWaitSeq[16]; extern uint8_t memoryWaitSeq[16];
extern u8 memoryWaitSeq32[16]; extern uint8_t memoryWaitSeq32[16];
extern u8 cpuBitsSet[256]; extern uint8_t cpuBitsSet[256];
extern u8 cpuLowestBitSet[256]; extern uint8_t cpuLowestBitSet[256];
extern void CPUSwitchMode(int mode, bool saveState, bool breakLoop); extern void CPUSwitchMode(int mode, bool saveState, bool breakLoop);
extern void CPUSwitchMode(int mode, bool saveState); extern void CPUSwitchMode(int mode, bool saveState);
extern void CPUUpdateCPSR(); extern void CPUUpdateCPSR();
@ -64,7 +64,7 @@ extern void CPUSoftwareInterrupt();
extern void CPUSoftwareInterrupt(int comment); extern void CPUSoftwareInterrupt(int comment);
// Waitstates when accessing data // Waitstates when accessing data
inline int dataTicksAccess16(u32 address) // DATA 8/16bits NON SEQ inline int dataTicksAccess16(uint32_t address) // DATA 8/16bits NON SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
int value = memoryWait[addr]; int value = memoryWait[addr];
@ -82,7 +82,7 @@ inline int dataTicksAccess16(u32 address) // DATA 8/16bits NON SEQ
return value; return value;
} }
inline int dataTicksAccess32(u32 address) // DATA 32bits NON SEQ inline int dataTicksAccess32(uint32_t address) // DATA 32bits NON SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
int value = memoryWait32[addr]; int value = memoryWait32[addr];
@ -100,7 +100,7 @@ inline int dataTicksAccess32(u32 address) // DATA 32bits NON SEQ
return value; return value;
} }
inline int dataTicksAccessSeq16(u32 address) // DATA 8/16bits SEQ inline int dataTicksAccessSeq16(uint32_t address) // DATA 8/16bits SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
int value = memoryWaitSeq[addr]; int value = memoryWaitSeq[addr];
@ -118,7 +118,7 @@ inline int dataTicksAccessSeq16(u32 address) // DATA 8/16bits SEQ
return value; return value;
} }
inline int dataTicksAccessSeq32(u32 address) // DATA 32bits SEQ inline int dataTicksAccessSeq32(uint32_t address) // DATA 32bits SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
int value = memoryWaitSeq32[addr]; int value = memoryWaitSeq32[addr];
@ -137,7 +137,7 @@ inline int dataTicksAccessSeq32(u32 address) // DATA 32bits SEQ
} }
// Waitstates when executing opcode // Waitstates when executing opcode
inline int codeTicksAccess16(u32 address) // THUMB NON SEQ inline int codeTicksAccess16(uint32_t address) // THUMB NON SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
@ -159,7 +159,7 @@ inline int codeTicksAccess16(u32 address) // THUMB NON SEQ
} }
} }
inline int codeTicksAccess32(u32 address) // ARM NON SEQ inline int codeTicksAccess32(uint32_t address) // ARM NON SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
@ -181,7 +181,7 @@ inline int codeTicksAccess32(u32 address) // ARM NON SEQ
} }
} }
inline int codeTicksAccessSeq16(u32 address) // THUMB SEQ inline int codeTicksAccessSeq16(uint32_t address) // THUMB SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
@ -200,7 +200,7 @@ inline int codeTicksAccessSeq16(u32 address) // THUMB SEQ
} }
} }
inline int codeTicksAccessSeq32(u32 address) // ARM SEQ inline int codeTicksAccessSeq32(uint32_t address) // ARM SEQ
{ {
int addr = (address >> 24) & 15; int addr = (address >> 24) & 15;
@ -226,10 +226,10 @@ inline int codeTicksAccessSeq32(u32 address) // ARM SEQ
inline void cpuMasterCodeCheck() inline void cpuMasterCodeCheck()
{ {
if ((mastercode) && (mastercode == armNextPC)) { if ((mastercode) && (mastercode == armNextPC)) {
u32 joy = 0; uint32_t joy = 0;
if (systemReadJoypads()) if (systemReadJoypads())
joy = systemReadJoypad(-1); joy = systemReadJoypad(-1);
u32 ext = (joy >> 10); uint32_t ext = (joy >> 10);
cpuTotalTicks += cheatsCheckKeys(P1 ^ 0x3FF, ext); cpuTotalTicks += cheatsCheckKeys(P1 ^ 0x3FF, ext);
} }
} }

10
src/gba/gbafilter.cpp
View File

@ -7,8 +7,8 @@ extern int systemRedShift;
extern int systemGreenShift; extern int systemGreenShift;
extern int systemBlueShift; extern int systemBlueShift;
extern u16 systemColorMap16[0x10000]; extern uint16_t systemColorMap16[0x10000];
extern u32 systemColorMap32[0x10000]; extern uint32_t systemColorMap32[0x10000];
static const unsigned char curve[32] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0e, 0x10, 0x12, static const unsigned char curve[32] = { 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0e, 0x10, 0x12,
0x14, 0x16, 0x18, 0x1c, 0x20, 0x28, 0x30, 0x38, 0x14, 0x16, 0x18, 0x1c, 0x20, 0x28, 0x30, 0x38,
@ -27,7 +27,7 @@ inline void swap(short& a, short& b)
b = temp; b = temp;
} }
void gbafilter_pal(u16* buf, int count) void gbafilter_pal(uint16_t* buf, int count)
{ {
short temp[3 * 3], s; short temp[3 * 3], s;
unsigned pix; unsigned pix;
@ -101,7 +101,7 @@ void gbafilter_pal(u16* buf, int count)
} }
} }
void gbafilter_pal32(u32* buf, int count) void gbafilter_pal32(uint32_t* buf, int count)
{ {
short temp[3 * 3], s; short temp[3 * 3], s;
unsigned pix; unsigned pix;
@ -205,7 +205,7 @@ void gbafilter_pad(u8* buf, int count)
break; break;
case 32: case 32:
while (count--) { while (count--) {
*((u32*)buf) &= mask.whole; *((uint32_t*)buf) &= mask.whole;
buf += 4; buf += 4;
} }
} }

6
src/gba/gbafilter.h
View File

@ -1,5 +1,5 @@
#include "../System.h" #include "../System.h"
void gbafilter_pal(u16* buf, int count); void gbafilter_pal(uint16_t* buf, int count);
void gbafilter_pal32(u32* buf, int count); void gbafilter_pal32(uint32_t* buf, int count);
void gbafilter_pad(u8* buf, int count); void gbafilter_pad(uint8_t* buf, int count);