all repos — mgba @ 4db61f400be9e49fb754c0473768143010cd2c20

mGBA Game Boy Advance Emulator

GBA Memory: Fix bad Load8 on big endian
Jeffrey Pfau jeffrey@endrift.com
Tue, 06 Oct 2015 21:25:45 -0700
commit

4db61f400be9e49fb754c0473768143010cd2c20

parent

19453933df4dc383c1569767080d152031366806

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

jump to
M CHANGES → CHANGES 
@@ -17,6 +17,7 @@ - GBA Video: Fix objwin and blending interaction on sprites
  - GBA Video: Fix OBJ semitransparency improperly interacting with other blending ops
  - GBA: Fix autodetect problems with some bad dumps of Super Mario Advance 2
  - GBA Memory: Fix bad BIOS Load16 on big endian
+ - GBA Memory: Fix bad Load8 on big endian
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
M src/gba/memory.c → src/gba/memory.c 
@@ -535,12 +535,12 @@ if (memory->activeRegion == REGION_BIOS) {
 				value = ((uint8_t*) memory->bios)[address];
 			} else {
 				GBALog(gba, GBA_LOG_GAME_ERROR, "Bad BIOS Load8: 0x%08X", address);
-				value = ((uint8_t*) &memory->biosPrefetch)[address & 3];
+				value = (memory->biosPrefetch >> ((address & 3) * 8)) & 0xFF;
 			}
 		} else {
 			GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load8: 0x%08x", address);
 			LOAD_BAD;
-			value = ((uint8_t*) &value)[address & 3];
+			value = (value >> ((address & 3) * 8)) & 0xFF;
 		}
 		break;
 	case REGION_WORKING_RAM:

@@ -602,7 +602,7 @@ break;
 	default:
 		GBALog(gba, GBA_LOG_GAME_ERROR, "Bad memory Load8: 0x%08x", address);
 		LOAD_BAD;
-		value = ((uint8_t*) &value)[address & 3];
+		value = (value >> ((address & 3) * 8)) & 0xFF;
 		break;
 	}