diff options
author | Twinaphex | 2017-01-29 06:00:06 +0100 |
---|---|---|
committer | GitHub | 2017-01-29 06:00:06 +0100 |
commit | b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b (patch) | |
tree | adce7b06d1acc25f52c6e10616451bba02f9f7a5 /source/sa1.h | |
parent | 813fc89d37d1d8c8d2fa090a28f74aa0fdcea5df (diff) | |
parent | 0e59b999fa976de2d00490f552a1ff0a27d40f63 (diff) | |
download | snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.gz snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.tar.bz2 snes9x2005-b9ad67f2d3f5bc1f7ebaad2eeb225d669aa7f58b.zip |
Merge pull request #30 from jamsilva/master
Converted most types to stdint-style (fixing a few in the process).
Diffstat (limited to 'source/sa1.h')
-rw-r--r-- | source/sa1.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/sa1.h b/source/sa1.h index 079fef5..2b83eb3 100644 --- a/source/sa1.h +++ b/source/sa1.h @@ -47,7 +47,7 @@ typedef struct uint8_t* WriteMap [MEMMAP_NUM_BLOCKS]; int16_t op1; int16_t op2; - int arithmetic_op; + int arithmetic_op; // For savestate compatibility can't change to int32_t int64_t sum; bool overflow; uint8_t VirtualBitmapFormat; @@ -56,14 +56,14 @@ typedef struct SSA1Registers Registers; } SSA1; -#define SA1CheckZero() (SA1._Zero == 0) -#define SA1CheckCarry() (SA1._Carry) -#define SA1CheckIRQ() (SA1.Registers.PL & IRQ) -#define SA1CheckDecimal() (SA1.Registers.PL & Decimal) -#define SA1CheckIndex() (SA1.Registers.PL & IndexFlag) -#define SA1CheckMemory() (SA1.Registers.PL & MemoryFlag) -#define SA1CheckOverflow() (SA1._Overflow) -#define SA1CheckNegative() (SA1._Negative & 0x80) +#define SA1CheckZero() (SA1._Zero == 0) +#define SA1CheckCarry() (SA1._Carry) +#define SA1CheckIRQ() (SA1.Registers.PL & IRQ) +#define SA1CheckDecimal() (SA1.Registers.PL & Decimal) +#define SA1CheckIndex() (SA1.Registers.PL & IndexFlag) +#define SA1CheckMemory() (SA1.Registers.PL & MemoryFlag) +#define SA1CheckOverflow() (SA1._Overflow) +#define SA1CheckNegative() (SA1._Negative & 0x80) #define SA1CheckEmulation() (SA1.Registers.P.W & Emulation) #define SA1ClearFlags(f) (SA1.Registers.P.W &= ~(f)) |