all repos — mgba @ 15478c1dc2a8bd38aa216c17853aa22b4b506c58

mGBA Game Boy Advance Emulator

DS Memory: Fix VRAM LDM/STM
Vicki Pfau vi@endrift.com
Thu, 16 Mar 2017 09:41:47 -0700
commit

15478c1dc2a8bd38aa216c17853aa22b4b506c58

parent

eafcb0f5554ee6c21c0fb1ac73219ed6a2c99e1b

1 files changed, 8 insertions(+), 8 deletions(-)

jump to
M src/ds/memory.c → src/ds/memory.c 
@@ -1248,11 +1248,11 @@ break;
 	case DS_REGION_VRAM:
 		LDM_LOOP(unsigned mask = _selectVRAM(memory, address >> DS_VRAM_OFFSET);
 		value = 0;
-		int i = 0;
-		for (i = 0; i < 9; ++i) {
-			if (mask & (1 << i)) {
+		int j = 0;
+		for (j = 0; j < 9; ++j) {
+			if (mask & (1 << j)) {
 				uint32_t newValue;
-				LOAD_32(newValue, address & _vramMask[i], memory->vramBank[i]);
+				LOAD_32(newValue, address & _vramMask[j], memory->vramBank[j]);
 				value |= newValue;
 			}
 		});

@@ -1344,10 +1344,10 @@ ds->video.renderer->writePalette(ds->video.renderer, address & (DS9_SIZE_PALETTE_RAM - 4), value));
 		break;
 	case DS_REGION_VRAM:
 		STM_LOOP(unsigned mask = _selectVRAM(memory, address >> DS_VRAM_OFFSET);
-		int i = 0;
-		for (i = 0; i < 9; ++i) {
-			if (mask & (1 << i)) {
-				STORE_32(value, address & _vramMask[i], memory->vramBank[i]);
+		int j = 0;
+		for (j = 0; j < 9; ++j) {
+			if (mask & (1 << j)) {
+				STORE_32(value, address & _vramMask[j], memory->vramBank[j]);
 			}
 		});
 		break;