all repos — mgba @ 76d64114794ed7370e843ba74ec069a1f28913d5

mGBA Game Boy Advance Emulator

GB Serialize: Fix IRQ pending/EI pending confusion
Vicki Pfau vi@endrift.com
Tue, 18 Sep 2018 20:12:42 -0700
commit

76d64114794ed7370e843ba74ec069a1f28913d5

parent

65473a97f9606b51e7be0d81ef073d71235c0460

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

jump to
M CHANGESCHANGES

@@ -56,6 +56,7 @@ - GBA Memory: Fix Vast Fame support (taizou) (fixes mgba.io/i/1170)

- GB, GBA Savedata: Fix unmasking savedata crash - GBA DMA: Fix temporal sorting of DMAs of different priorities - FFmpeg: Fix encoding audio/video queue issues + - GB Serialize: Fix IRQ pending/EI pending confusion Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
M include/mgba/internal/gb/serialize.hinclude/mgba/internal/gb/serialize.h

@@ -47,7 +47,7 @@ * | 0x0003C - 0x0003F: EI pending cycles

* | 0x00040 - 0x00043: Reserved (DI pending cycles) * | 0x00044 - 0x00047: Flags * | bit 0: Is condition met? - * | bit 1: Is condition IRQ pending? + * | bit 1: Is IRQ pending? * | bit 2: Double speed * | bit 3: Is EI pending? * | bits 4 - 31: Reserved

@@ -232,7 +232,7 @@ DECL_BITFIELD(GBSerializedCpuFlags, uint32_t);

DECL_BIT(GBSerializedCpuFlags, Condition, 0); DECL_BIT(GBSerializedCpuFlags, IrqPending, 1); DECL_BIT(GBSerializedCpuFlags, DoubleSpeed, 2); -DECL_BIT(GBSerializedCpuFlags, EiPending, 1); +DECL_BIT(GBSerializedCpuFlags, EiPending, 3); DECL_BITFIELD(GBSerializedTimerFlags, uint8_t); DECL_BIT(GBSerializedTimerFlags, IrqPending, 0);