all repos — mgba @ 5d3acef7fe566cc25fccae9fc2a75430faf5037f

mGBA Game Boy Advance Emulator

DS Memory: More baseline
Jeffrey Pfau jeffrey@endrift.com
Fri, 03 Jun 2016 19:59:45 -0700
commit

5d3acef7fe566cc25fccae9fc2a75430faf5037f

parent

0088229e9f9fa9a64af4d60097e20c6c6a52cffa

2 files changed, 133 insertions(+), 3 deletions(-)

jump to
M src/ds/memory.c → src/ds/memory.c 
@@ -104,6 +104,7 @@
 	ds->memory.bios7 = NULL;
 	ds->memory.bios9 = NULL;
 	ds->memory.wram = NULL;
+	ds->memory.wram7 = NULL;
 	ds->memory.ram = NULL;
 	ds->memory.itcm = NULL;
 	ds->memory.dtcm = NULL;

@@ -131,6 +132,7 @@ }
 
 void DSMemoryDeinit(struct DS* ds) {
 	mappedMemoryFree(ds->memory.wram, DS_SIZE_WORKING_RAM);
+	mappedMemoryFree(ds->memory.wram7, DS7_SIZE_WORKING_RAM);
 	mappedMemoryFree(ds->memory.ram, DS_SIZE_RAM);
 	mappedMemoryFree(ds->memory.itcm, DS9_SIZE_ITCM);
 	mappedMemoryFree(ds->memory.dtcm, DS9_SIZE_DTCM);

@@ -142,6 +144,11 @@ mappedMemoryFree(ds->memory.wram, DS_SIZE_WORKING_RAM);
 	}
 	ds->memory.wram = anonymousMemoryMap(DS_SIZE_WORKING_RAM);
 
+	if (ds->memory.wram7) {
+		mappedMemoryFree(ds->memory.wram7, DS7_SIZE_WORKING_RAM);
+	}
+	ds->memory.wram7 = anonymousMemoryMap(DS7_SIZE_WORKING_RAM);
+
 	if (ds->memory.ram) {
 		mappedMemoryFree(ds->memory.ram, DS_SIZE_RAM);
 	}

@@ -164,7 +171,11 @@ ds->memory.activeDMA9 = -1;
 	ds->memory.nextDMA = INT_MAX;
 	ds->memory.eventDiff = 0;
 
-	if (!ds->memory.wram || !ds->memory.ram || !ds->memory.itcm || !ds->memory.dtcm) {
+	// TODO: Correct size
+	ds->memory.wramSize7 = 0x8000;
+	ds->memory.wramSize9 = 0;
+
+	if (!ds->memory.wram || !ds->memory.wram7 || !ds->memory.ram || !ds->memory.itcm || !ds->memory.dtcm) {
 		DSMemoryDeinit(ds);
 		mLOG(DS_MEM, FATAL, "Could not map memory");
 	}

@@ -178,6 +189,15 @@ int newRegion = address >> DS_BASE_OFFSET;
 
 	memory->activeRegion7 = newRegion;
 	switch (newRegion) {
+	case DS_REGION_WORKING_RAM:
+		if (address >= DS7_BASE_WORKING_RAM || !memory->wramSize7) {
+			cpu->memory.activeRegion = memory->wram7;
+			cpu->memory.activeMask = DS7_SIZE_WORKING_RAM - 1;
+		} else {
+			cpu->memory.activeRegion = memory->wram;
+			cpu->memory.activeMask = ds->memory.wramSize7 - 1;
+		}
+		return;
 	case DS_REGION_RAM:
 		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
 			cpu->memory.activeRegion = memory->ram;

@@ -187,7 +207,7 @@ }
 		break;
 	case DS7_REGION_BIOS:
 		if (memory->bios7) {
-			cpu->memory.activeRegion = memory->bios9;
+			cpu->memory.activeRegion = memory->bios7;
 			cpu->memory.activeMask = DS9_SIZE_BIOS - 1;
 		} else {
 			cpu->memory.activeRegion = _deadbeef;

@@ -210,12 +230,25 @@ uint32_t value = 0;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS7_REGION_BIOS:
+		LOAD_32(value, address & (DS7_SIZE_BIOS - 1), memory->bios7);
+		break;
+	case DS_REGION_WORKING_RAM:
+		if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			LOAD_32(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			LOAD_32(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		}
+		break;
 	case DS_REGION_RAM:
 		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
 			LOAD_32(value, address & (DS_SIZE_RAM - 1), memory->ram);
+			break;
 		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load32: %08X", address);
 		break;
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load32: %08X", address);
 		break;
 	}
 

@@ -235,7 +268,24 @@ uint32_t value = 0;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS7_REGION_BIOS:
+		LOAD_16(value, address & (DS7_SIZE_BIOS - 1), memory->bios7);
+		break;
+	case DS_REGION_WORKING_RAM:
+		if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			LOAD_16(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			LOAD_16(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		}
+		break;
+	case DS_REGION_RAM:
+		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			LOAD_16(value, address & (DS_SIZE_RAM - 1), memory->ram);
+			break;
+		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load16: %08X", address);
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load16: %08X", address);
 		break;
 	}
 

@@ -255,7 +305,14 @@ uint32_t value = 0;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS_REGION_RAM:
+		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			value = ((uint8_t*) memory->ram)[address & (DS_SIZE_RAM - 1)];
+			break;
+		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load8: %08X", address);
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Load8: %08X", address);
 		break;
 	}
 

@@ -272,7 +329,22 @@ struct DSMemory* memory = &ds->memory;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS_REGION_WORKING_RAM:
+		if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			STORE_32(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			STORE_32(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		}
+		break;
+	case DS_REGION_RAM:
+		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			STORE_32(value, address & (DS_SIZE_RAM - 1), memory->ram);
+			break;
+		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store32: %08X:%08X", address, value);
+		break;
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store32: %08X:%08X", address, value);
 		break;
 	}
 

@@ -288,7 +360,22 @@ struct DSMemory* memory = &ds->memory;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS_REGION_WORKING_RAM:
+		if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			STORE_16(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			STORE_16(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		}
+		break;
+	case DS_REGION_RAM:
+		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			STORE_16(value, address & (DS_SIZE_RAM - 1), memory->ram);
+			break;
+		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store16: %08X:%04X", address, value);
+		break;
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store16: %08X:%04X", address, value);
 		break;
 	}
 

@@ -304,7 +391,14 @@ struct DSMemory* memory = &ds->memory;
 	int wait = 0;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS_REGION_RAM:
+		if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			((uint8_t*) memory->ram)[address & (DS_SIZE_RAM - 1)] = value;
+			break;
+		}
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store8: %08X:%02X", address, value);
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 Store8: %08X:%02X", address, value);
 		break;
 	}
 

@@ -337,8 +431,23 @@ uint32_t addressMisalign = address & 0x3;
 	address &= 0xFFFFFFFC;
 
 	switch (address >> DS_BASE_OFFSET) {
-	default:
+	case DS_REGION_WORKING_RAM:
+		LDM_LOOP(if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			LOAD_32(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			LOAD_32(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		});
 		break;
+	case DS_REGION_RAM:
+		LDM_LOOP(if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			LOAD_32(value, address & (DS_SIZE_RAM - 1), memory->ram);
+		} else {
+			mLOG(DS_MEM, STUB, "Unimplemented DS7 LDM: %08X", address);
+		});
+		break;
+	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS7 LDM: %08X", address);
+		LDM_LOOP(value = 0);
 	}
 
 	if (cycleCounter) {

@@ -381,7 +490,23 @@ uint32_t addressMisalign = address & 0x3;
 	address &= 0xFFFFFFFC;
 
 	switch (address >> DS_BASE_OFFSET) {
+	case DS_REGION_WORKING_RAM:
+		STM_LOOP(if (address >= DS7_BASE_WORKING_RAM || !ds->memory.wramSize7) {
+			STORE_32(value, address & (DS7_SIZE_WORKING_RAM - 1), memory->wram7);
+		} else {
+			STORE_32(value, address & (ds->memory.wramSize7 - 1), memory->wram);
+		});
+		break;
+	case DS_REGION_RAM:
+		STM_LOOP(if ((address & (DS_SIZE_RAM - 1)) < DS_SIZE_RAM) {
+			STORE_32(value, address & (DS_SIZE_RAM - 1), memory->ram);
+		} else {
+			mLOG(DS_MEM, STUB, "Unimplemented DS9 STM: %08X", address);
+		});
+		break;
 	default:
+		mLOG(DS_MEM, STUB, "Unimplemented DS9 STM: %08X", address);
+		STM_LOOP();
 		break;
 	}
M src/ds/memory.h → src/ds/memory.h 
@@ -32,6 +32,7 @@ DS7_BASE_BIOS = 0x00000000,
 	DS9_BASE_ITCM = 0x00000000,
 	DS_BASE_RAM = 0x02000000,
 	DS_BASE_WORKING_RAM = 0x03000000,
+	DS7_BASE_WORKING_RAM = 0x03800000,
 	DS_BASE_IO = 0x04000000,
 	DS9_BASE_PALETTE_RAM = 0x05000000,
 	DS_BASE_VRAM = 0x06000000,

@@ -48,6 +49,7 @@ DS7_SIZE_BIOS = 0x00004000,
 	DS9_SIZE_BIOS = 0x00008000,
 	DS_SIZE_RAM = 0x00400000,
 	DS_SIZE_WORKING_RAM = 0x00008000,
+	DS7_SIZE_WORKING_RAM = 0x00010000,
 	DS9_SIZE_PALETTE_RAM = 0x00000800,
 	DS9_SIZE_OAM = 0x00000800,
 	DS_SIZE_SLOT2 = 0x02000000,

@@ -110,9 +112,12 @@ uint32_t* itcm;
 	uint32_t* dtcm;
 	uint32_t* ram;
 	uint32_t* wram;
+	uint32_t* wram7;
 	uint32_t* rom;
 
 	size_t romSize;
+	size_t wramSize7;
+	size_t wramSize9;
 
 	char waitstatesSeq32[256];
 	char waitstatesSeq16[256];