From: Javier S. Pedro Date: Wed, 19 Jan 2011 02:38:40 +0000 (+0100) Subject: removing bool8_32 type X-Git-Url: http://vcs.maemo.org/git/?p=drnoksnes;a=commitdiff_plain;h=8f46190aa1d041567c69ff34f8ad8d430f902e01 removing bool8_32 type --- diff --git a/gfx.cpp b/gfx.cpp index 44dd230..45e5dce 100644 --- a/gfx.cpp +++ b/gfx.cpp @@ -555,7 +555,7 @@ void S9xSetInfoString (const char * fmt, ...) va_end(ap); } -INLINE void SelectTileRenderer (bool8_32 normal) +static inline void SelectTileRenderer (bool normal) { if (normal) { @@ -681,7 +681,7 @@ void S9xSetupOBJ () IPPU.OBJChanged = FALSE; } -void DrawOBJS (bool8_32 OnMain = FALSE, uint8 D = 0) +static void DrawOBJS (bool OnMain = FALSE, uint8 D = 0) { uint32 O; uint32 BaseTile, Tile; @@ -833,7 +833,7 @@ void DrawOBJS (bool8_32 OnMain = FALSE, uint8 D = 0) } } -void DrawBackgroundMosaic (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) +static void DrawBackgroundMosaic (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) { CHECK_SOUND(); @@ -1044,7 +1044,7 @@ void DrawBackgroundMosaic (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) } } -void DrawBackgroundOffset (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) +static void DrawBackgroundOffset (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) { CHECK_SOUND(); @@ -1172,7 +1172,7 @@ void DrawBackgroundOffset (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) uint32 MaxCount = 8; uint32 s = Left * GFX_PIX_SIZE + Y * GFX.PPL; - bool8_32 left_hand_edge = (Left == 0); + bool left_hand_edge = (Left == 0); Width = Right - Left; if (Left & 7) @@ -1187,7 +1187,7 @@ void DrawBackgroundOffset (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) // for the tile at the left-hand edge of the screen. VOffset = LineData [Y].BG[bg].VOffset; HOffset = LineHOffset; - left_hand_edge = FALSE; + left_hand_edge = false; } else { @@ -1325,7 +1325,7 @@ void DrawBackgroundOffset (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) } } -void DrawBackgroundMode5 (uint32 /* BGMODE */, uint32 bg, uint8 Z1, uint8 Z2) +static void DrawBackgroundMode5 (uint32 /*BGMODE*/, uint32 bg, uint8 Z1, uint8 Z2) { CHECK_SOUND(); @@ -1634,7 +1634,7 @@ void DrawBackgroundMode5 (uint32 /* BGMODE */, uint32 bg, uint8 Z1, uint8 Z2) } } -void DrawBackground (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) +static void DrawBackground (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) { BG.TileSize = BGSizes [PPU.BG[bg].BGSize]; BG.BitShift = BitShifts[BGMode][bg]; @@ -2177,18 +2177,12 @@ void DrawBackground (uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2) RENDER_BACKGROUND_MODE7_LINE(TYPE,FUNC) \ \ - -void DrawBGMode7Background (uint8 *Screen, int bg) -{ - RENDER_BACKGROUND_MODE7 (uint8, (uint8) (b & bmask)) -} - -void DrawBGMode7Background16 (uint8 *Screen, int bg) +static void DrawBGMode7Background16 (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7 (uint16, GFX.ScreenColors [b & bmask]); } -void DrawBGMode7Background16Add (uint8 *Screen, int bg) +static void DrawBGMode7Background16Add (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7 (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2199,7 +2193,7 @@ void DrawBGMode7Background16Add (uint8 *Screen, int bg) GFX.ScreenColors [b & bmask]); } -void DrawBGMode7Background16Add1_2 (uint8 *Screen, int bg) +static void DrawBGMode7Background16Add1_2 (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7 (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2210,7 +2204,7 @@ void DrawBGMode7Background16Add1_2 (uint8 *Screen, int bg) GFX.ScreenColors [b & bmask]); } -void DrawBGMode7Background16Sub (uint8 *Screen, int bg) +static void DrawBGMode7Background16Sub (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7 (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2221,7 +2215,7 @@ void DrawBGMode7Background16Sub (uint8 *Screen, int bg) GFX.ScreenColors [b & bmask]); } -void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) +static void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7 (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2258,12 +2252,12 @@ void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) Screen += GFX.StartY * GFX.Pitch; \ uint8 *Depth = GFX.DB + GFX.StartY * GFX.PPL; \ struct SLineMatrixData *l = &LineMatrixData [GFX.StartY]; \ - bool8_32 allowSimpleCase = FALSE; \ + bool allowSimpleCase = false; \ if (!l->MatrixB && !l->MatrixC && (l->MatrixA == 0x0100) && (l->MatrixD == 0x0100) \ && !LineMatrixData[GFX.EndY].MatrixB && !LineMatrixData[GFX.EndY].MatrixC \ && (LineMatrixData[GFX.EndY].MatrixA == 0x0100) && (LineMatrixData[GFX.EndY].MatrixD == 0x0100) \ ) \ - allowSimpleCase = TRUE; \ + allowSimpleCase = true; \ \ for (uint32 Line = GFX.StartY; Line <= GFX.EndY; Line++, Screen += GFX.Pitch, Depth += GFX.PPL, l++) \ { \ @@ -2284,7 +2278,7 @@ void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) yy += (VOffset - CentreY) % 1023; \ else \ yy += VOffset - CentreY; \ - bool8_32 simpleCase = FALSE; \ + bool simpleCase = false; \ int BB; \ int DD; \ /* Make a special case for the identity matrix, since it's a common case and */ \ @@ -2293,7 +2287,7 @@ void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) { \ BB = CentreX << 8; \ DD = (yy + CentreY) << 8; \ - simpleCase = TRUE; \ + simpleCase = true; \ } \ else \ { \ @@ -2608,7 +2602,7 @@ void DrawBGMode7Background16Sub1_2 (uint8 *Screen, int bg) } \ } -STATIC uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D) +static inline uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D) { register uint32 x = ((A >> 2) & HIGH_BITS_SHIFTED_TWO_MASK) + ((B >> 2) & HIGH_BITS_SHIFTED_TWO_MASK) + @@ -2622,12 +2616,12 @@ STATIC uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D) return x+y; } -void DrawBGMode7Background16_i (uint8 *Screen, int bg) +static void DrawBGMode7Background16_i (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7_i (uint16, theColor, (GFX.ScreenColors[b & GFX.Mode7Mask])); } -void DrawBGMode7Background16Add_i (uint8 *Screen, int bg) +static void DrawBGMode7Background16Add_i (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7_i (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2638,7 +2632,7 @@ void DrawBGMode7Background16Add_i (uint8 *Screen, int bg) theColor, (GFX.ScreenColors[b & GFX.Mode7Mask])); } -void DrawBGMode7Background16Add1_2_i (uint8 *Screen, int bg) +static void DrawBGMode7Background16Add1_2_i (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7_i (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2649,7 +2643,7 @@ void DrawBGMode7Background16Add1_2_i (uint8 *Screen, int bg) theColor, (GFX.ScreenColors[b & GFX.Mode7Mask])); } -void DrawBGMode7Background16Sub_i (uint8 *Screen, int bg) +static void DrawBGMode7Background16Sub_i (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7_i (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2660,7 +2654,7 @@ void DrawBGMode7Background16Sub_i (uint8 *Screen, int bg) theColor, (GFX.ScreenColors[b & GFX.Mode7Mask])); } -void DrawBGMode7Background16Sub1_2_i (uint8 *Screen, int bg) +static void DrawBGMode7Background16Sub1_2_i (uint8 *Screen, int bg) { RENDER_BACKGROUND_MODE7_i (uint16, *(d + GFX.DepthDelta) ? (*(d + GFX.DepthDelta) != 1 ? @@ -2705,13 +2699,9 @@ TWO_LOW_BITS_MASK = RGB_LOW_BITS_MASK | (RGB_LOW_BITS_MASK << 1); \ HIGH_BITS_SHIFTED_TWO_MASK = (( (FIRST_COLOR_MASK | SECOND_COLOR_MASK | THIRD_COLOR_MASK) & \ ~TWO_LOW_BITS_MASK ) >> 2); -void RenderScreen (uint8 *Screen, bool8_32 sub, bool8_32 force_no_add, uint8 D) +static void RenderScreen(uint8 *Screen, bool sub, bool force_no_add, uint8 D) { - bool8_32 BG0; - bool8_32 BG1; - bool8_32 BG2; - bool8_32 BG3; - bool8_32 OB; + bool BG0, BG1, BG2, BG3, OB; GFX.S = Screen; @@ -3795,7 +3785,7 @@ _BUILD_PIXEL(GBR565) _BUILD_PIXEL(GBR555) _BUILD_PIXEL(RGB5551) -bool8_32 S9xSetRenderPixelFormat (int format) +bool8 S9xSetRenderPixelFormat (int format) { extern uint32 current_graphic_format; diff --git a/gfx.h b/gfx.h index 6df3a05..dd23335 100644 --- a/gfx.h +++ b/gfx.h @@ -82,7 +82,7 @@ struct SGFX { uint8 r212d; uint8 r2130; uint8 r2131; - bool8_32 Pseudo; + bool8 Pseudo; #ifdef GFX_MULTI_FORMAT uint32 PixelFormat; @@ -119,7 +119,7 @@ struct SBG uint8 *Buffer; uint8 *Buffered; - bool8_32 DirectColourMode; + bool8 DirectColourMode; }; struct SLineMatrixData @@ -232,7 +232,7 @@ bool8 S9xDeinitUpdate (int Width, int Height); void S9xSyncSpeed (); #ifdef GFX_MULTI_FORMAT -bool8_32 S9xSetRenderPixelFormat (int format); +bool8 S9xSetRenderPixelFormat (int format); #endif void S9xSetInfoString(const char * fmt, ...); diff --git a/memmap.cpp b/memmap.cpp index 95bfab2..fd7f132 100644 --- a/memmap.cpp +++ b/memmap.cpp @@ -68,17 +68,17 @@ static uint8 bytes0x2000 [0x2000]; extern char *rom_filename; extern bool8 LoadZip(const char* , int32 *, int32 *); -bool8_32 CMemory::AllASCII (uint8 *b, int size) +bool CMemory::AllASCII (uint8 *b, int size) { for (int i = 0; i < size; i++) { if (b[i] < 32 || b[i] > 126) - return (FALSE); + return false; } - return (TRUE); + return true; } -int CMemory::ScoreHiROM (bool8_32 skip_header) +int CMemory::ScoreHiROM (bool skip_header) { int score = 0; int o = skip_header ? 0xff00 + 0x200 : 0xff00; @@ -105,7 +105,7 @@ int CMemory::ScoreHiROM (bool8_32 skip_header) return (score); } -int CMemory::ScoreLoROM (bool8_32 skip_header) +int CMemory::ScoreLoROM (bool skip_header) { int score = 0; int o = skip_header ? 0x7f00 + 0x200 : 0x7f00; @@ -160,7 +160,7 @@ char *CMemory::Safe (const char *s) /* Init() */ /* This function allocates all the memory needed by the emulator */ /**********************************************************************************************/ -bool8_32 CMemory::Init () +bool CMemory::Init () { RAM = (uint8 *) malloc (0x20000); SRAM = (uint8 *) malloc (0x20000); @@ -182,7 +182,7 @@ bool8_32 CMemory::Init () !IPPU.TileCached [TILE_4BIT] || !IPPU.TileCached [TILE_8BIT]) { Deinit (); - return (FALSE); + return false; } // FillRAM uses first 32K of ROM image area, otherwise space just @@ -216,7 +216,7 @@ bool8_32 CMemory::Init () SDD1Data = NULL; SDD1Index = NULL; - return (TRUE); + return true; } void CMemory::Deinit () @@ -315,13 +315,13 @@ int checkzip( char * fn ) #pragma warning(disable : 4101) #pragma warning(disable : 4700) #endif -bool8_32 CMemory::LoadROM (const char *filename) +bool CMemory::LoadROM (const char *filename) { unsigned long FileSize = 0; int retry_count = 0; STREAM ROMFile; - bool8_32 Interleaved = FALSE; - bool8_32 Tales = FALSE; + bool Interleaved = FALSE; + bool Tales = FALSE; char dir [_MAX_DIR + 1]; char drive [_MAX_DRIVE + 1]; char name [_MAX_FNAME + 1]; @@ -360,7 +360,7 @@ again: HeaderCount = 0; uint8 *ptr = ROM; - bool8_32 more = FALSE; + bool more = FALSE; do { @@ -382,7 +382,7 @@ again: if (ptr - ROM < MAX_ROM_SIZE + 0x200 && (isdigit (ext [0]) && ext [1] == 0 && ext [0] < '9')) { - more = TRUE; + more = true; ext [0]++; PathMake(fname, drive, dir, name, ext); } @@ -393,12 +393,12 @@ again: isdigit (name [2]) && isdigit (name [3]) && isdigit (name [4]) && isdigit (name [5]) && isalpha (name [len - 1]))) { - more = TRUE; + more = true; name [len - 1]++; PathMake(fname, drive, dir, name, ext); } else - more = FALSE; + more = false; } while (more && (ROMFile = OPEN_STREAM (fname, "rb")) != NULL); } @@ -577,7 +577,7 @@ again: } else { - bool8_32 t = LoROM; + bool8 t = LoROM; LoROM = HiROM; HiROM = t; @@ -640,7 +640,7 @@ again: S9xReset (); - return (TRUE); + return true; } void S9xDeinterleaveMode2 () @@ -687,11 +687,11 @@ void S9xDeinterleaveMode2 () } free ((char *) tmp); } - Memory.InitROM (FALSE); + Memory.InitROM (false); S9xReset (); } -void CMemory::InitROM (bool8_32 Interleaved) +void CMemory::InitROM (bool Interleaved) { #ifndef ZSNES_FX SuperFX.nRomBanks = CalculatedSize >> 15; @@ -960,7 +960,7 @@ void CMemory::InitROM (bool8_32 Interleaved) S9xMessage (S9X_INFO, S9X_ROM_INFO, String); } -bool8_32 CMemory::LoadSRAM (const char *filename) +bool CMemory::LoadSRAM (const char *filename) { int size = Memory.SRAMSize ? (1 << (Memory.SRAMSize + 3)) * 128 : 0; @@ -992,18 +992,18 @@ bool8_32 CMemory::LoadSRAM (const char *filename) else S9xHardResetSRTC (); - return (TRUE); + return true; } S9xHardResetSRTC (); - return (FALSE); + return false; } if (Settings.SDD1) S9xSDD1LoadLoggedData (); - return (TRUE); + return true; } -bool8_32 CMemory::SaveSRAM (const char *filename) +bool CMemory::SaveSRAM (const char *filename) { size_t size = Memory.SRAMSize ? (1 << (Memory.SRAMSize + 3)) * 128 : 0; @@ -1025,14 +1025,14 @@ bool8_32 CMemory::SaveSRAM (const char *filename) { if (fwrite((char *) ::SRAM, size, 1, file) == size) { fclose(file); - return TRUE; + return true; } fclose(file); - return FALSE; + return false; } } - return FALSE; + return true; } void CMemory::FixROMSpeed () @@ -1276,7 +1276,7 @@ void CMemory::HiROMMap () WriteProtectROM (); } -void CMemory::TalesROMMap (bool8_32 Interleaved) +void CMemory::TalesROMMap (bool Interleaved) { int c; int i; @@ -2569,7 +2569,7 @@ static long ReadInt (FILE *f, unsigned nbytes) #define IPS_EOF 0x00454F46l -void CMemory::CheckForIPSPatch (const char *rom_filename, bool8_32 header, +void CMemory::CheckForIPSPatch (const char *rom_filename, bool header, int32 &rom_size) { char fname [_MAX_PATH + 1]; diff --git a/memmap.h b/memmap.h index aef517f..d5a79c1 100644 --- a/memmap.h +++ b/memmap.h @@ -79,11 +79,11 @@ class CMemory { public: - bool8_32 LoadROM (const char *); - void InitROM (bool8_32); - bool8_32 LoadSRAM (const char *); - bool8_32 SaveSRAM (const char *); - bool8_32 Init (); + bool LoadROM (const char *); + void InitROM (bool Interleaved); + bool LoadSRAM (const char *); + bool SaveSRAM (const char *); + bool Init (); void Deinit (); void FreeSDD1Data (); @@ -100,17 +100,17 @@ public: void SufamiTurboLoROMMap (); void HiROMMap (); void SuperFXROMMap (); - void TalesROMMap (bool8_32); + void TalesROMMap (bool Interleaved); void AlphaROMMap (); void SA1ROMMap (); void BSHiROMMap (); - bool8_32 AllASCII (uint8 *b, int size); - int ScoreHiROM (bool8_32 skip_header); - int ScoreLoROM (bool8_32 skip_header); + bool AllASCII (uint8 *b, int size); + int ScoreHiROM (bool skip_header); + int ScoreLoROM (bool skip_header); void ApplyROMFixes (); - void CheckForIPSPatch (const char *rom_filename, bool8_32 header, - int32 &rom_size); - + void CheckForIPSPatch (const char *rom_filename, bool header, + int32 &rom_size); + const char *TVStandard (); const char *Speed (); const char *StaticRAMSize (); @@ -136,8 +136,8 @@ public: uint8 *BWRAM; uint8 *FillRAM; uint8 *C4RAM; - bool8_32 HiROM; - bool8_32 LoROM; + bool8 HiROM; + bool8 LoROM; uint16 SRAMMask; uint8 SRAMSize; uint8 *Map [MEMMAP_NUM_BLOCKS]; diff --git a/port.h b/port.h index b1cf4a6..5ffb924 100644 --- a/port.h +++ b/port.h @@ -73,8 +73,6 @@ typedef int16_t int16; typedef int32_t int32; typedef int64_t int64; -typedef uint8_t bool8_32; - //Defines for Extern C #ifdef __cplusplus #define EXTERN_C extern "C" diff --git a/ppu.h b/ppu.h index 4cde0e6..c7032b1 100644 --- a/ppu.h +++ b/ppu.h @@ -67,14 +67,14 @@ struct ClipData { }; struct InternalPPU { - bool8_32 ColorsChanged; + bool8 ColorsChanged; uint8 HDMA; - bool8_32 HDMAStarted; + bool8 HDMAStarted; uint8 MaxBrightness; - bool8_32 LatchedBlanking; - bool8_32 OBJChanged; - bool8_32 RenderThisFrame; - bool8_32 DirectColourMapsNeedRebuild; + bool8 LatchedBlanking; + bool8 OBJChanged; + bool8 RenderThisFrame; + bool8 DirectColourMapsNeedRebuild; uint32 FrameCount; uint32 RenderedFramesCount; uint32 DisplayedRenderedFrameCount; @@ -82,9 +82,9 @@ struct InternalPPU { uint32 FrameSkip; uint8 *TileCache [3]; uint8 *TileCached [3]; - bool8_32 FirstVRAMRead; - bool8_32 LatchedInterlace; - bool8_32 DoubleWidthPixels; + bool8 FirstVRAMRead; + bool8 LatchedInterlace; + bool8 DoubleWidthPixels; int RenderedScreenHeight; int RenderedScreenWidth; uint32 Red [256]; @@ -121,7 +121,7 @@ struct SPPU { uint8 Brightness; struct { - bool8_32 High; + bool8 High; uint8 Increment; uint16 Address; uint16 Mask1; @@ -138,7 +138,7 @@ struct SPPU { uint16 SCSize; } BG [4]; - bool8_32 CGFLIP; + bool8 CGFLIP; uint16 CGDATA [256]; uint8 FirstSprite; uint8 LastSprite; @@ -174,21 +174,21 @@ struct SPPU { uint16 ScreenHeight; uint32 WRAM; uint8 BG_Forced; - bool8_32 ForcedBlanking; - bool8_32 OBJThroughMain; - bool8_32 OBJThroughSub; + bool8 ForcedBlanking; + bool8 OBJThroughMain; + bool8 OBJThroughSub; uint8 OBJSizeSelect; uint16 OBJNameBase; - bool8_32 OBJAddition; + bool8 OBJAddition; uint8 OAMReadFlip; uint8 OAMData [512 + 32]; - bool8_32 VTimerEnabled; - bool8_32 HTimerEnabled; + bool8 VTimerEnabled; + bool8 HTimerEnabled; short HTimerPosition; uint8 Mosaic; - bool8_32 BGMosaic [4]; - bool8_32 Mode7HFlip; - bool8_32 Mode7VFlip; + bool8 BGMosaic [4]; + bool8 Mode7HFlip; + bool8 Mode7VFlip; uint8 Mode7Repeat; uint8 Window1Left; uint8 Window1Right; @@ -198,12 +198,12 @@ struct SPPU { uint8 ClipWindowOverlapLogic [6]; uint8 ClipWindow1Enable [6]; uint8 ClipWindow2Enable [6]; - bool8_32 ClipWindow1Inside [6]; - bool8_32 ClipWindow2Inside [6]; - bool8_32 RecomputeClipWindows; + bool8 ClipWindow1Inside [6]; + bool8 ClipWindow2Inside [6]; + bool8 RecomputeClipWindows; uint8 CGFLIPRead; uint16 OBJNameSelect; - bool8_32 Need16x8Mulitply; + bool8 Need16x8Mulitply; uint8 Joypad3ButtonReadPos; uint8 MouseSpeed[2]; }; @@ -214,9 +214,9 @@ struct SPPU { #define CLIP_XNOR 3 struct SDMA { - bool8_32 TransferDirection; - bool8_32 AAddressFixed; - bool8_32 AAddressDecrement; + bool8 TransferDirection; + bool8 AAddressFixed; + bool8 AAddressDecrement; uint8 TransferMode; uint8 ABank; @@ -228,7 +228,7 @@ struct SDMA { uint16 TransferBytes; // H-DMA only: - bool8_32 HDMAIndirectAddressing; + bool8 HDMAIndirectAddressing; uint16 IndirectAddress; uint8 IndirectBank; uint8 Repeat;