diff options
author | Twinaphex | 2017-08-16 19:21:08 +0200 |
---|---|---|
committer | GitHub | 2017-08-16 19:21:08 +0200 |
commit | 232f8097145a9e93147893550528374052e5523d (patch) | |
tree | f1d740e45522954e48e036103268c5ccb5dcbef2 /source/sa1.c | |
parent | aa610b2ba997a945c77ce06e9a33638dedb480da (diff) | |
parent | aef91917f7ae66da1e93e1f4c1b21f5b2555ad35 (diff) | |
download | snes9x2005-232f8097145a9e93147893550528374052e5523d.tar.gz snes9x2005-232f8097145a9e93147893550528374052e5523d.tar.bz2 snes9x2005-232f8097145a9e93147893550528374052e5523d.zip |
Merge pull request #42 from jamsilva/master
Changed compile-time flags to use C89 and fixed new warnings raised.
Diffstat (limited to 'source/sa1.c')
-rw-r--r-- | source/sa1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/sa1.c b/source/sa1.c index e190b5c..b17b562 100644 --- a/source/sa1.c +++ b/source/sa1.c @@ -455,7 +455,7 @@ void S9xSetSA1(uint8_t byte, uint32_t address) case 0x2237: Memory.FillRAM [address] = byte; if ((Memory.FillRAM [0x2230] & 0xa4) == 0x84) - S9xSA1DMA(); // Normal DMA to BW-RAM + S9xSA1DMA(); /* Normal DMA to BW-RAM */ break; case 0x223f: SA1.VirtualBitmapFormat = (byte & 0x80) ? 2 : 4; @@ -508,8 +508,8 @@ void S9xSetSA1(uint8_t byte, uint32_t address) break; default: /* cumulative sum */ SA1.sum += (int16_t) SA1.op1 * (int16_t) SA1.op2; - SA1.overflow = (SA1.sum >= (1ULL << 40)); - SA1.sum &= (1ULL << 40) - 1; + SA1.overflow = (SA1.sum >= (((uint64_t) 1) << 40)); + SA1.sum &= (((uint64_t) 1) << 40) - 1; SA1.op2 = 0; break; } |