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

Scripting: Fix segment addressing

This commit is contained in:
Vicki Pfau 2022-05-19 21:09:48 -07:00
parent a747545014
commit 7e36a71953
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/core/scripting.c
View File

@ -166,66 +166,67 @@ struct mScriptUILibrary {
void* textBufferContext; void* textBufferContext;
}; };
#define CALCULATE_SEGMENT_INFO \
uint32_t segmentSize = adapter->block.end - adapter->block.start; \
uint32_t segmentStart = adapter->block.segmentStart - adapter->block.start; \
if (adapter->block.segmentStart) { \
segmentSize -= segmentStart; \
}
#define CALCULATE_SEGMENT_ADDRESS \
uint32_t segmentAddress = address % segmentSize; \
int segment = address / segmentSize; \
segmentAddress += adapter->block.start; \
if (adapter->block.segmentStart && segment) { \
segmentAddress += segmentStart; \
}
static uint32_t mScriptMemoryAdapterRead8(struct mScriptMemoryAdapter* adapter, uint32_t address) { static uint32_t mScriptMemoryAdapterRead8(struct mScriptMemoryAdapter* adapter, uint32_t address) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; return adapter->core->rawRead8(adapter->core, segmentAddress, segment);
address = adapter->block.start + segmentAddress;
return adapter->core->rawRead8(adapter->core, address, segment);
} }
static uint32_t mScriptMemoryAdapterRead16(struct mScriptMemoryAdapter* adapter, uint32_t address) { static uint32_t mScriptMemoryAdapterRead16(struct mScriptMemoryAdapter* adapter, uint32_t address) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; return adapter->core->rawRead16(adapter->core, segmentAddress, segment);
address = adapter->block.start + segmentAddress;
return adapter->core->rawRead16(adapter->core, address, segment);
} }
static uint32_t mScriptMemoryAdapterRead32(struct mScriptMemoryAdapter* adapter, uint32_t address) { static uint32_t mScriptMemoryAdapterRead32(struct mScriptMemoryAdapter* adapter, uint32_t address) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; return adapter->core->rawRead32(adapter->core, segmentAddress, segment);
address = adapter->block.start + segmentAddress;
return adapter->core->rawRead32(adapter->core, address, segment);
} }
static struct mScriptValue* mScriptMemoryAdapterReadRange(struct mScriptMemoryAdapter* adapter, uint32_t address, uint32_t length) { static struct mScriptValue* mScriptMemoryAdapterReadRange(struct mScriptMemoryAdapter* adapter, uint32_t address, uint32_t length) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
struct mScriptValue* value = mScriptValueAlloc(mSCRIPT_TYPE_MS_LIST); struct mScriptValue* value = mScriptValueAlloc(mSCRIPT_TYPE_MS_LIST);
struct mScriptList* list = value->value.opaque; struct mScriptList* list = value->value.opaque;
uint32_t i; uint32_t i;
for (i = 0; i < length; ++i, ++address) { for (i = 0; i < length; ++i, ++address) {
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize;
segmentAddress += adapter->block.start;
*mScriptListAppend(list) = mSCRIPT_MAKE_U32(adapter->core->rawRead8(adapter->core, segmentAddress, segment)); *mScriptListAppend(list) = mSCRIPT_MAKE_U32(adapter->core->rawRead8(adapter->core, segmentAddress, segment));
} }
return value; return value;
} }
static void mScriptMemoryAdapterWrite8(struct mScriptMemoryAdapter* adapter, uint32_t address, uint8_t value) { static void mScriptMemoryAdapterWrite8(struct mScriptMemoryAdapter* adapter, uint32_t address, uint8_t value) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; adapter->core->rawWrite8(adapter->core, address, segmentAddress, value);
address = adapter->block.start + segmentAddress;
adapter->core->rawWrite8(adapter->core, address, segment, value);
} }
static void mScriptMemoryAdapterWrite16(struct mScriptMemoryAdapter* adapter, uint32_t address, uint16_t value) { static void mScriptMemoryAdapterWrite16(struct mScriptMemoryAdapter* adapter, uint32_t address, uint16_t value) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; adapter->core->rawWrite16(adapter->core, address, segmentAddress, value);
address = adapter->block.segmentStart + segmentAddress;
adapter->core->rawWrite16(adapter->core, address, segment, value);
} }
static void mScriptMemoryAdapterWrite32(struct mScriptMemoryAdapter* adapter, uint32_t address, uint32_t value) { static void mScriptMemoryAdapterWrite32(struct mScriptMemoryAdapter* adapter, uint32_t address, uint32_t value) {
uint32_t segmentSize = adapter->block.end - adapter->block.start; CALCULATE_SEGMENT_INFO;
uint32_t segmentAddress = address % segmentSize; CALCULATE_SEGMENT_ADDRESS;
int segment = address / segmentSize; adapter->core->rawWrite32(adapter->core, address, segmentAddress, value);
address = adapter->block.segmentStart + segmentAddress;
adapter->core->rawWrite32(adapter->core, address, segment, value);
} }
mSCRIPT_DECLARE_STRUCT(mScriptMemoryAdapter); mSCRIPT_DECLARE_STRUCT(mScriptMemoryAdapter);