drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 5 Pull Requests Actions Releases 7 Activity

[nostalgia/core/gba] Fix memory range

Browse Source
This commit is contained in:
Gary Talent 2020-02-11 21:47:48 -06:00
parent 9d4d3cd331
commit 87968a87f0
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/gba/addresses.hpp
View File

@ -45,7 +45,7 @@
typedef uint16_t BgMapTile[1024];
#define MEM_BG_MAP reinterpret_cast<BgMapTile*>(0x06000000)
#define MEM_ROM *reinterpret_cast<char*>(0x08000000)
#define MEM_ROM reinterpret_cast<char*>(0x08000000)
#define MEM_WRAM_BEGIN reinterpret_cast<uint8_t*>(0x02000000)
#define MEM_WRAM_END reinterpret_cast<uint8_t*>(0x0203FFFF)

2
src/nostalgia/core/gba/media.cpp
View File

@ -23,7 +23,7 @@ char *loadRom(const char*) {
constexpr auto headerP2Len = 16;
constexpr auto headerLen = headerP1Len + headerP2Len + 1;
for (auto current = &MEM_ROM; current < reinterpret_cast<char*>(0x0a000000); current += headerLen) {
for (auto current = MEM_ROM; current < reinterpret_cast<char*>(0x0a000000); current += headerLen) {
if (ox_memcmp(current, headerP1, headerP1Len) == 0 &&
ox_memcmp(current + headerP1Len, headerP2, headerP2Len) == 0) {
return current + headerLen;

4
src/nostalgia/core/gba/tests.cpp
View File

@ -13,10 +13,6 @@ namespace nostalgia::core {
void free(void *ptr);
void panic(const char *msg) {
oxPanic(msg, OxError(1));
}
void initHeap(char *heapBegin, char *heapEnd);
}