diff options
| author | Twinaphex | 2017-06-18 18:41:06 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-18 18:41:06 +0200 |
| commit | 1aecedc999445e9a27e04f665fd562b576775d08 (patch) | |
| tree | c526c7d332be548a42364eea9113b6d33345b840 /source/sa1.h | |
| parent | dc596c886e0ec2728dc353dd7862cdf1e5a5ff44 (diff) | |
| parent | bcaf44c511efaad9d803dde9b0fdbb046498c66f (diff) | |
| download | snesemu-1aecedc999445e9a27e04f665fd562b576775d08.tar.gz snesemu-1aecedc999445e9a27e04f665fd562b576775d08.tar.bz2 snesemu-1aecedc999445e9a27e04f665fd562b576775d08.zip | |
Merge pull request #36 from jamsilva/master
Compatibility fixes.
Diffstat (limited to 'source/sa1.h')
| -rw-r--r-- | source/sa1.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/sa1.h b/source/sa1.h index 6eb9935..7bd02cb 100644 --- a/source/sa1.h +++ b/source/sa1.h @@ -43,7 +43,7 @@ typedef struct uint32_t WaitCounter; uint8_t* WaitByteAddress1; uint8_t* WaitByteAddress2; - uint8_t* Map [MEMMAP_NUM_BLOCKS]; + uint8_t* Map [MEMMAP_NUM_BLOCKS]; uint8_t* WriteMap [MEMMAP_NUM_BLOCKS]; int16_t op1; int16_t op2; @@ -104,8 +104,7 @@ static inline void S9xSA1UnpackStatus() static inline void S9xSA1PackStatus() { SA1.Registers.PL &= ~(Zero | Negative | Carry | Overflow); - SA1.Registers.PL |= SA1._Carry | ((SA1._Zero == 0) << 1) | - (SA1._Negative & 0x80) | (SA1._Overflow << 6); + SA1.Registers.PL |= SA1._Carry | ((SA1._Zero == 0) << 1) | (SA1._Negative & 0x80) | (SA1._Overflow << 6); } static inline void S9xSA1FixCycles() |