logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-All-Avoid-extraneous-semicolons-at-top-level.patch (82870B)

    

  1. From 44be0c1af5be67d662b9a92cddc5d8b85b4e788c Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 7 Nov 2020 13:58:35 -0800
  4. Subject: [PATCH] All: Avoid extraneous semicolons at top-level
  6. These are unnecessary and not allowed in ISO C.
  7. ---
  8.  include/mgba-util/common.h                    |   2 +-
  9.  include/mgba-util/elf-read.h                  |   4 +-
  10.  include/mgba-util/patch/fast.h                |   2 +-
  11.  include/mgba-util/vector.h                    |   2 +-
  12.  include/mgba/core/bitmap-cache.h              |  18 +-
  13.  include/mgba/core/cache-set.h                 |   6 +-
  14.  include/mgba/core/cheats.h                    |   6 +-
  15.  include/mgba/core/interface.h                 |   2 +-
  16.  include/mgba/core/library.h                   |   2 +-
  17.  include/mgba/core/map-cache.h                 |  34 ++--
  18.  include/mgba/core/mem-search.h                |   2 +-
  19.  include/mgba/core/rewind.h                    |   2 +-
  20.  include/mgba/core/tile-cache.h                |  12 +-
  21.  include/mgba/debugger/debugger.h              |   6 +-
  22.  include/mgba/internal/arm/debugger/debugger.h |   2 +-
  23.  include/mgba/internal/debugger/parser.h       |   2 +-
  24.  include/mgba/internal/gb/audio.h              | 116 ++++++------
  25.  include/mgba/internal/gb/cheats.h             |   2 +-
  26.  include/mgba/internal/gb/gb.h                 |   2 +-
  27.  include/mgba/internal/gb/io.h                 |   2 +-
  28.  include/mgba/internal/gb/mbc.h                |   2 +-
  29.  include/mgba/internal/gb/memory.h             |  14 +-
  30.  include/mgba/internal/gb/serialize.h          | 110 ++++++------
  31.  include/mgba/internal/gb/sio.h                |  10 +-
  32.  include/mgba/internal/gb/timer.h              |   6 +-
  33.  include/mgba/internal/gb/video.h              |  62 +++----
  34.  include/mgba/internal/gba/audio.h             |  34 ++--
  35.  include/mgba/internal/gba/bios.h              |   2 +-
  36.  include/mgba/internal/gba/dma.h               |  18 +-
  37.  include/mgba/internal/gba/gba.h               |  10 +-
  38.  include/mgba/internal/gba/hardware.h          |  20 +--
  39.  include/mgba/internal/gba/io.h                |   2 +-
  40.  include/mgba/internal/gba/memory.h            |   2 +-
  41.  include/mgba/internal/gba/rr/rr.h             |   2 +-
  42.  include/mgba/internal/gba/savedata.h          |   2 +-
  43.  include/mgba/internal/gba/serialize.h         |  38 ++--
  44.  include/mgba/internal/gba/sio.h               |  34 ++--
  45.  include/mgba/internal/gba/timer.h             |  10 +-
  46.  include/mgba/internal/gba/video.h             | 168 +++++++++---------
  47.  src/arm/debugger/debugger.c                   |   2 +-
  48.  src/arm/isa-arm.c                             |   2 +-
  49.  src/core/cache-set.c                          |   6 +-
  50.  src/core/cheats.c                             |   6 +-
  51.  src/core/input.c                              |   4 +-
  52.  src/core/interface.c                          |   2 +-
  53.  src/core/library.c                            |   2 +-
  54.  src/core/mem-search.c                         |   2 +-
  55.  src/core/rewind.c                             |   2 +-
  56.  src/core/serialize.c                          |   2 +-
  57.  src/debugger/debugger.c                       |   6 +-
  58.  src/debugger/parser.c                         |   2 +-
  59.  src/gb/cheats.c                               |   2 +-
  60.  src/gb/gb.c                                   |   2 +-
  61.  src/gb/io.c                                   |   2 +-
  62.  src/gb/mbc.c                                  |   2 +-
  63.  src/gb/memory.c                               |   2 +-
  64.  src/gb/serialize.c                            |   2 +-
  65.  src/gb/sio.c                                  |   2 +-
  66.  src/gba/audio.c                               |   2 +-
  67.  src/gba/bios.c                                |  10 +-
  68.  src/gba/dma.c                                 |   2 +-
  69.  src/gba/extra/battlechip.c                    |   4 +-
  70.  src/gba/gba.c                                 |   4 +-
  71.  src/gba/hardware.c                            |   2 +-
  72.  src/gba/io.c                                  |   2 +-
  73.  src/gba/memory.c                              |   2 +-
  74.  src/gba/savedata.c                            |   2 +-
  75.  src/gba/serialize.c                           |   2 +-
  76.  src/gba/sio.c                                 |   2 +-
  77.  src/gba/video.c                               |   2 +-
  78.  src/platform/opengl/gles2.c                   |   8 +-
  79.  src/platform/sdl/sdl-audio.c                  |   2 +-
  80.  src/platform/sdl/sdl-audio.h                  |   2 +-
  81.  src/platform/sdl/sdl-events.c                 |   4 +-
  82.  src/platform/sdl/sdl-events.h                 |   4 +-
  83.  src/sm83/decoder.c                            |  88 ++++-----
  84.  src/sm83/isa-sm83.c                           | 110 ++++++------
  85.  src/util/elf-read.c                           |   4 +-
  86.  src/util/patch-fast.c                         |   2 +-
  87.  src/util/string.c                             |   2 +-
  88.  80 files changed, 543 insertions(+), 543 deletions(-)
  90. diff --git a/include/mgba-util/common.h b/include/mgba-util/common.h
  91. index 8c52f3463..e2b0529b6 100644
  92. --- a/include/mgba-util/common.h
  93. +++ b/include/mgba-util/common.h
  94. @@ -258,7 +258,7 @@ typedef intptr_t ssize_t;
  95.  #define CONSTRUCTOR(FN) static __attribute__((constructor)) void FN(void)
  96.  #endif
  97.  
  98. -#define DECL_BITFIELD(NAME, TYPE) typedef TYPE NAME
  99. +#define DECL_BITFIELD(NAME, TYPE) typedef TYPE NAME;
  100.  
  101.  #define DECL_BITS(TYPE, FIELD, START, SIZE) \
  102.  	ATTRIBUTE_UNUSED static inline TYPE TYPE ## Is ## FIELD (TYPE src) { \
  103. diff --git a/include/mgba-util/elf-read.h b/include/mgba-util/elf-read.h
  104. index 86683ea82..d57c16a4a 100644
  105. --- a/include/mgba-util/elf-read.h
  106. +++ b/include/mgba-util/elf-read.h
  107. @@ -19,8 +19,8 @@ CXX_GUARD_START
  108.  struct ELF;
  109.  struct VFile;
  110.  
  111. -DECLARE_VECTOR(ELFProgramHeaders, Elf32_Phdr);
  112. -DECLARE_VECTOR(ELFSectionHeaders, Elf32_Shdr);
  113. +DECLARE_VECTOR(ELFProgramHeaders, Elf32_Phdr)
  114. +DECLARE_VECTOR(ELFSectionHeaders, Elf32_Shdr)
  115.  
  116.  struct ELF* ELFOpen(struct VFile*);
  117.  void ELFClose(struct ELF*);
  118. diff --git a/include/mgba-util/patch/fast.h b/include/mgba-util/patch/fast.h
  119. index ee59cd23f..2130a8fb4 100644
  120. --- a/include/mgba-util/patch/fast.h
  121. +++ b/include/mgba-util/patch/fast.h
  122. @@ -21,7 +21,7 @@ struct PatchFastExtent {
  123.  	uint32_t extent[PATCH_FAST_EXTENT];
  124.  };
  125.  
  126. -DECLARE_VECTOR(PatchFastExtents, struct PatchFastExtent);
  127. +DECLARE_VECTOR(PatchFastExtents, struct PatchFastExtent)
  128.  
  129.  struct PatchFast {
  130.  	struct Patch d;
  131. diff --git a/include/mgba-util/vector.h b/include/mgba-util/vector.h
  132. index c18b6c8b5..8d911d3d0 100644
  133. --- a/include/mgba-util/vector.h
  134. +++ b/include/mgba-util/vector.h
  135. @@ -96,7 +96,7 @@ CXX_GUARD_START
  136.  		dest->size = src->size; \
  137.  	} \
  138.  
  139. -DECLARE_VECTOR(StringList, char*);
  140. +DECLARE_VECTOR(StringList, char*)
  141.  
  142.  CXX_GUARD_END
  143.  
  144. diff --git a/include/mgba/core/bitmap-cache.h b/include/mgba/core/bitmap-cache.h
  145. index d8bd416e9..48a4b8cd0 100644
  146. --- a/include/mgba/core/bitmap-cache.h
  147. +++ b/include/mgba/core/bitmap-cache.h
  148. @@ -12,15 +12,15 @@ CXX_GUARD_START
  149.  
  150.  #include <mgba/core/interface.h>
  151.  
  152. -DECL_BITFIELD(mBitmapCacheConfiguration, uint32_t);
  153. -DECL_BIT(mBitmapCacheConfiguration, ShouldStore, 0);
  154. -
  155. -DECL_BITFIELD(mBitmapCacheSystemInfo, uint32_t);
  156. -DECL_BITS(mBitmapCacheSystemInfo, EntryBPP, 0, 3);
  157. -DECL_BIT(mBitmapCacheSystemInfo, UsesPalette, 3);
  158. -DECL_BITS(mBitmapCacheSystemInfo, Width, 4, 10);
  159. -DECL_BITS(mBitmapCacheSystemInfo, Height, 14, 10);
  160. -DECL_BITS(mBitmapCacheSystemInfo, Buffers, 24, 2);
  161. +DECL_BITFIELD(mBitmapCacheConfiguration, uint32_t)
  162. +DECL_BIT(mBitmapCacheConfiguration, ShouldStore, 0)
  163. +
  164. +DECL_BITFIELD(mBitmapCacheSystemInfo, uint32_t)
  165. +DECL_BITS(mBitmapCacheSystemInfo, EntryBPP, 0, 3)
  166. +DECL_BIT(mBitmapCacheSystemInfo, UsesPalette, 3)
  167. +DECL_BITS(mBitmapCacheSystemInfo, Width, 4, 10)
  168. +DECL_BITS(mBitmapCacheSystemInfo, Height, 14, 10)
  169. +DECL_BITS(mBitmapCacheSystemInfo, Buffers, 24, 2)
  170.  
  171.  struct mBitmapCacheEntry {
  172.  	uint32_t paletteVersion;
  173. diff --git a/include/mgba/core/cache-set.h b/include/mgba/core/cache-set.h
  174. index 5749c0e64..abeb639e7 100644
  175. --- a/include/mgba/core/cache-set.h
  176. +++ b/include/mgba/core/cache-set.h
  177. @@ -15,9 +15,9 @@ CXX_GUARD_START
  178.  #include <mgba/core/tile-cache.h>
  179.  #include <mgba-util/vector.h>
  180.  
  181. -DECLARE_VECTOR(mMapCacheSet, struct mMapCache);
  182. -DECLARE_VECTOR(mBitmapCacheSet, struct mBitmapCache);
  183. -DECLARE_VECTOR(mTileCacheSet, struct mTileCache);
  184. +DECLARE_VECTOR(mMapCacheSet, struct mMapCache)
  185. +DECLARE_VECTOR(mBitmapCacheSet, struct mBitmapCache)
  186. +DECLARE_VECTOR(mTileCacheSet, struct mTileCache)
  187.  
  188.  struct mCacheSet {
  189.  	struct mMapCacheSet maps;
  190. diff --git a/include/mgba/core/cheats.h b/include/mgba/core/cheats.h
  191. index d05ac8e5f..885aee7ec 100644
  192. --- a/include/mgba/core/cheats.h
  193. +++ b/include/mgba/core/cheats.h
  194. @@ -44,9 +44,9 @@ struct mCheat {
  195.  	int32_t operandOffset;
  196.  };
  197.  
  198. -mLOG_DECLARE_CATEGORY(CHEATS);
  199. +mLOG_DECLARE_CATEGORY(CHEATS)
  200.  
  201. -DECLARE_VECTOR(mCheatList, struct mCheat);
  202. +DECLARE_VECTOR(mCheatList, struct mCheat)
  203.  
  204.  struct mCheatDevice;
  205.  struct mCheatSet {
  206. @@ -69,7 +69,7 @@ struct mCheatSet {
  207.  	struct StringList lines;
  208.  };
  209.  
  210. -DECLARE_VECTOR(mCheatSets, struct mCheatSet*);
  211. +DECLARE_VECTOR(mCheatSets, struct mCheatSet*)
  212.  
  213.  struct mCheatDevice {
  214.  	struct mCPUComponent d;
  215. diff --git a/include/mgba/core/interface.h b/include/mgba/core/interface.h
  216. index 51ba6447f..73bb091ec 100644
  217. --- a/include/mgba/core/interface.h
  218. +++ b/include/mgba/core/interface.h
  219. @@ -93,7 +93,7 @@ struct mCoreCallbacks {
  220.  	void (*keysRead)(void* context);
  221.  };
  222.  
  223. -DECLARE_VECTOR(mCoreCallbacksList, struct mCoreCallbacks);
  224. +DECLARE_VECTOR(mCoreCallbacksList, struct mCoreCallbacks)
  225.  
  226.  struct mAVStream {
  227.  	void (*videoDimensionsChanged)(struct mAVStream*, unsigned width, unsigned height);
  228. diff --git a/include/mgba/core/library.h b/include/mgba/core/library.h
  229. index d55ad4094..b53ff833d 100644
  230. --- a/include/mgba/core/library.h
  231. +++ b/include/mgba/core/library.h
  232. @@ -26,7 +26,7 @@ struct mLibraryEntry {
  233.  
  234.  #ifdef USE_SQLITE3
  235.  
  236. -DECLARE_VECTOR(mLibraryListing, struct mLibraryEntry);
  237. +DECLARE_VECTOR(mLibraryListing, struct mLibraryEntry)
  238.  
  239.  struct mLibrary;
  240.  struct mLibrary* mLibraryCreateEmpty(void);
  241. diff --git a/include/mgba/core/map-cache.h b/include/mgba/core/map-cache.h
  242. index 6dc9e72f6..a1521e462 100644
  243. --- a/include/mgba/core/map-cache.h
  244. +++ b/include/mgba/core/map-cache.h
  245. @@ -13,23 +13,23 @@ CXX_GUARD_START
  246.  #include <mgba/core/interface.h>
  247.  #include <mgba/core/tile-cache.h>
  248.  
  249. -DECL_BITFIELD(mMapCacheConfiguration, uint32_t);
  250. -DECL_BIT(mMapCacheConfiguration, ShouldStore, 0);
  251. -
  252. -DECL_BITFIELD(mMapCacheSystemInfo, uint32_t);
  253. -DECL_BITS(mMapCacheSystemInfo, PaletteBPP, 0, 2);
  254. -DECL_BITS(mMapCacheSystemInfo, PaletteCount, 2, 4);
  255. -DECL_BITS(mMapCacheSystemInfo, TilesWide, 8, 4);
  256. -DECL_BITS(mMapCacheSystemInfo, TilesHigh, 12, 4);
  257. -DECL_BITS(mMapCacheSystemInfo, MacroTileSize, 16, 7);
  258. -DECL_BITS(mMapCacheSystemInfo, MapAlign, 23, 2);
  259. -
  260. -DECL_BITFIELD(mMapCacheEntryFlags, uint16_t);
  261. -DECL_BITS(mMapCacheEntryFlags, PaletteId, 0, 4);
  262. -DECL_BIT(mMapCacheEntryFlags, VramClean, 4);
  263. -DECL_BIT(mMapCacheEntryFlags, HMirror, 5);
  264. -DECL_BIT(mMapCacheEntryFlags, VMirror, 6);
  265. -DECL_BITS(mMapCacheEntryFlags, Mirror, 5, 2);
  266. +DECL_BITFIELD(mMapCacheConfiguration, uint32_t)
  267. +DECL_BIT(mMapCacheConfiguration, ShouldStore, 0)
  268. +
  269. +DECL_BITFIELD(mMapCacheSystemInfo, uint32_t)
  270. +DECL_BITS(mMapCacheSystemInfo, PaletteBPP, 0, 2)
  271. +DECL_BITS(mMapCacheSystemInfo, PaletteCount, 2, 4)
  272. +DECL_BITS(mMapCacheSystemInfo, TilesWide, 8, 4)
  273. +DECL_BITS(mMapCacheSystemInfo, TilesHigh, 12, 4)
  274. +DECL_BITS(mMapCacheSystemInfo, MacroTileSize, 16, 7)
  275. +DECL_BITS(mMapCacheSystemInfo, MapAlign, 23, 2)
  276. +
  277. +DECL_BITFIELD(mMapCacheEntryFlags, uint16_t)
  278. +DECL_BITS(mMapCacheEntryFlags, PaletteId, 0, 4)
  279. +DECL_BIT(mMapCacheEntryFlags, VramClean, 4)
  280. +DECL_BIT(mMapCacheEntryFlags, HMirror, 5)
  281. +DECL_BIT(mMapCacheEntryFlags, VMirror, 6)
  282. +DECL_BITS(mMapCacheEntryFlags, Mirror, 5, 2)
  283.  
  284.  struct mMapCacheEntry {
  285.  	uint32_t vramVersion;
  286. diff --git a/include/mgba/core/mem-search.h b/include/mgba/core/mem-search.h
  287. index d45601556..110c13982 100644
  288. --- a/include/mgba/core/mem-search.h
  289. +++ b/include/mgba/core/mem-search.h
  290. @@ -51,7 +51,7 @@ struct mCoreMemorySearchResult {
  291.  	int32_t oldValue;
  292.  };
  293.  
  294. -DECLARE_VECTOR(mCoreMemorySearchResults, struct mCoreMemorySearchResult);
  295. +DECLARE_VECTOR(mCoreMemorySearchResults, struct mCoreMemorySearchResult)
  296.  
  297.  struct mCore;
  298.  void mCoreMemorySearch(struct mCore* core, const struct mCoreMemorySearchParams* params, struct mCoreMemorySearchResults* out, size_t limit);
  299. diff --git a/include/mgba/core/rewind.h b/include/mgba/core/rewind.h
  300. index 04549761d..0779c5b67 100644
  301. --- a/include/mgba/core/rewind.h
  302. +++ b/include/mgba/core/rewind.h
  303. @@ -15,7 +15,7 @@ CXX_GUARD_START
  304.  #include <mgba-util/threading.h>
  305.  #endif
  306.  
  307. -DECLARE_VECTOR(mCoreRewindPatches, struct PatchFast);
  308. +DECLARE_VECTOR(mCoreRewindPatches, struct PatchFast)
  309.  
  310.  struct VFile;
  311.  struct mCoreRewindContext {
  312. diff --git a/include/mgba/core/tile-cache.h b/include/mgba/core/tile-cache.h
  313. index f8600b3ad..64a9937b2 100644
  314. --- a/include/mgba/core/tile-cache.h
  315. +++ b/include/mgba/core/tile-cache.h
  316. @@ -12,13 +12,13 @@ CXX_GUARD_START
  317.  
  318.  #include <mgba/core/interface.h>
  319.  
  320. -DECL_BITFIELD(mTileCacheConfiguration, uint32_t);
  321. -DECL_BIT(mTileCacheConfiguration, ShouldStore, 0);
  322. +DECL_BITFIELD(mTileCacheConfiguration, uint32_t)
  323. +DECL_BIT(mTileCacheConfiguration, ShouldStore, 0)
  324.  
  325. -DECL_BITFIELD(mTileCacheSystemInfo, uint32_t);
  326. -DECL_BITS(mTileCacheSystemInfo, PaletteBPP, 0, 2);
  327. -DECL_BITS(mTileCacheSystemInfo, PaletteCount, 2, 4);
  328. -DECL_BITS(mTileCacheSystemInfo, MaxTiles, 16, 13);
  329. +DECL_BITFIELD(mTileCacheSystemInfo, uint32_t)
  330. +DECL_BITS(mTileCacheSystemInfo, PaletteBPP, 0, 2)
  331. +DECL_BITS(mTileCacheSystemInfo, PaletteCount, 2, 4)
  332. +DECL_BITS(mTileCacheSystemInfo, MaxTiles, 16, 13)
  333.  
  334.  struct mTileCacheEntry {
  335.  	uint32_t paletteVersion;
  336. diff --git a/include/mgba/debugger/debugger.h b/include/mgba/debugger/debugger.h
  337. index 2a4bc2dce..353b5da4e 100644
  338. --- a/include/mgba/debugger/debugger.h
  339. +++ b/include/mgba/debugger/debugger.h
  340. @@ -14,7 +14,7 @@ CXX_GUARD_START
  341.  #include <mgba/core/log.h>
  342.  #include <mgba-util/vector.h>
  343.  
  344. -mLOG_DECLARE_CATEGORY(DEBUGGER);
  345. +mLOG_DECLARE_CATEGORY(DEBUGGER)
  346.  
  347.  extern const uint32_t DEBUGGER_ID;
  348.  
  349. @@ -87,8 +87,8 @@ struct mWatchpoint {
  350.  	struct ParseTree* condition;
  351.  };
  352.  
  353. -DECLARE_VECTOR(mBreakpointList, struct mBreakpoint);
  354. -DECLARE_VECTOR(mWatchpointList, struct mWatchpoint);
  355. +DECLARE_VECTOR(mBreakpointList, struct mBreakpoint)
  356. +DECLARE_VECTOR(mWatchpointList, struct mWatchpoint)
  357.  
  358.  struct mDebugger;
  359.  struct ParseTree;
  360. diff --git a/include/mgba/internal/arm/debugger/debugger.h b/include/mgba/internal/arm/debugger/debugger.h
  361. index 5dc73485c..a2d9e581a 100644
  362. --- a/include/mgba/internal/arm/debugger/debugger.h
  363. +++ b/include/mgba/internal/arm/debugger/debugger.h
  364. @@ -24,7 +24,7 @@ struct ARMDebugBreakpoint {
  365.  	} sw;
  366.  };
  367.  
  368. -DECLARE_VECTOR(ARMDebugBreakpointList, struct ARMDebugBreakpoint);
  369. +DECLARE_VECTOR(ARMDebugBreakpointList, struct ARMDebugBreakpoint)
  370.  
  371.  struct ARMDebugger {
  372.  	struct mDebuggerPlatform d;
  373. diff --git a/include/mgba/internal/debugger/parser.h b/include/mgba/internal/debugger/parser.h
  374. index 37f194ddb..6edea602f 100644
  375. --- a/include/mgba/internal/debugger/parser.h
  376. +++ b/include/mgba/internal/debugger/parser.h
  377. @@ -13,7 +13,7 @@
  378.  CXX_GUARD_START
  379.  
  380.  struct Token;
  381. -DECLARE_VECTOR(LexVector, struct Token);
  382. +DECLARE_VECTOR(LexVector, struct Token)
  383.  
  384.  enum Operation {
  385.  	OP_ASSIGN,
  386. diff --git a/include/mgba/internal/gb/audio.h b/include/mgba/internal/gb/audio.h
  387. index e01e60a3f..62367bbb8 100644
  388. --- a/include/mgba/internal/gb/audio.h
  389. +++ b/include/mgba/internal/gb/audio.h
  390. @@ -12,64 +12,64 @@ CXX_GUARD_START
  391.  
  392.  #include <mgba/core/timing.h>
  393.  
  394. -DECL_BITFIELD(GBAudioRegisterDuty, uint8_t);
  395. -DECL_BITS(GBAudioRegisterDuty, Length, 0, 6);
  396. -DECL_BITS(GBAudioRegisterDuty, Duty, 6, 2);
  397. -
  398. -DECL_BITFIELD(GBAudioRegisterSweep, uint8_t);
  399. -DECL_BITS(GBAudioRegisterSweep, StepTime, 0, 3);
  400. -DECL_BIT(GBAudioRegisterSweep, Direction, 3);
  401. -DECL_BITS(GBAudioRegisterSweep, InitialVolume, 4, 4);
  402. -
  403. -DECL_BITFIELD(GBAudioRegisterControl, uint16_t);
  404. -DECL_BITS(GBAudioRegisterControl, Rate, 0, 11);
  405. -DECL_BITS(GBAudioRegisterControl, Frequency, 0, 11);
  406. -DECL_BIT(GBAudioRegisterControl, Stop, 14);
  407. -DECL_BIT(GBAudioRegisterControl, Restart, 15);
  408. -
  409. -DECL_BITFIELD(GBAudioRegisterSquareSweep, uint8_t);
  410. -DECL_BITS(GBAudioRegisterSquareSweep, Shift, 0, 3);
  411. -DECL_BIT(GBAudioRegisterSquareSweep, Direction, 3);
  412. -DECL_BITS(GBAudioRegisterSquareSweep, Time, 4, 3);
  413. -
  414. -DECL_BITFIELD(GBAudioRegisterBank, uint8_t);
  415. -DECL_BIT(GBAudioRegisterBank, Size, 5);
  416. -DECL_BIT(GBAudioRegisterBank, Bank, 6);
  417. -DECL_BIT(GBAudioRegisterBank, Enable, 7);
  418. -
  419. -DECL_BITFIELD(GBAudioRegisterBankVolume, uint8_t);
  420. -DECL_BITS(GBAudioRegisterBankVolume, VolumeGB, 5, 2);
  421. -DECL_BITS(GBAudioRegisterBankVolume, VolumeGBA, 5, 3);
  422. -
  423. -DECL_BITFIELD(GBAudioRegisterNoiseFeedback, uint8_t);
  424. -DECL_BITS(GBAudioRegisterNoiseFeedback, Ratio, 0, 3);
  425. -DECL_BIT(GBAudioRegisterNoiseFeedback, Power, 3);
  426. -DECL_BITS(GBAudioRegisterNoiseFeedback, Frequency, 4, 4);
  427. -
  428. -DECL_BITFIELD(GBAudioRegisterNoiseControl, uint8_t);
  429. -DECL_BIT(GBAudioRegisterNoiseControl, Stop, 6);
  430. -DECL_BIT(GBAudioRegisterNoiseControl, Restart, 7);
  431. -
  432. -DECL_BITFIELD(GBRegisterNR50, uint8_t);
  433. -DECL_BITS(GBRegisterNR50, VolumeRight, 0, 3);
  434. -DECL_BITS(GBRegisterNR50, VolumeLeft, 4, 3);
  435. -
  436. -DECL_BITFIELD(GBRegisterNR51, uint8_t);
  437. -DECL_BIT(GBRegisterNR51, Ch1Right, 0);
  438. -DECL_BIT(GBRegisterNR51, Ch2Right, 1);
  439. -DECL_BIT(GBRegisterNR51, Ch3Right, 2);
  440. -DECL_BIT(GBRegisterNR51, Ch4Right, 3);
  441. -DECL_BIT(GBRegisterNR51, Ch1Left, 4);
  442. -DECL_BIT(GBRegisterNR51, Ch2Left, 5);
  443. -DECL_BIT(GBRegisterNR51, Ch3Left, 6);
  444. -DECL_BIT(GBRegisterNR51, Ch4Left, 7);
  445. -
  446. -DECL_BITFIELD(GBAudioEnable, uint8_t);
  447. -DECL_BIT(GBAudioEnable, PlayingCh1, 0);
  448. -DECL_BIT(GBAudioEnable, PlayingCh2, 1);
  449. -DECL_BIT(GBAudioEnable, PlayingCh3, 2);
  450. -DECL_BIT(GBAudioEnable, PlayingCh4, 3);
  451. -DECL_BIT(GBAudioEnable, Enable, 7);
  452. +DECL_BITFIELD(GBAudioRegisterDuty, uint8_t)
  453. +DECL_BITS(GBAudioRegisterDuty, Length, 0, 6)
  454. +DECL_BITS(GBAudioRegisterDuty, Duty, 6, 2)
  455. +
  456. +DECL_BITFIELD(GBAudioRegisterSweep, uint8_t)
  457. +DECL_BITS(GBAudioRegisterSweep, StepTime, 0, 3)
  458. +DECL_BIT(GBAudioRegisterSweep, Direction, 3)
  459. +DECL_BITS(GBAudioRegisterSweep, InitialVolume, 4, 4)
  460. +
  461. +DECL_BITFIELD(GBAudioRegisterControl, uint16_t)
  462. +DECL_BITS(GBAudioRegisterControl, Rate, 0, 11)
  463. +DECL_BITS(GBAudioRegisterControl, Frequency, 0, 11)
  464. +DECL_BIT(GBAudioRegisterControl, Stop, 14)
  465. +DECL_BIT(GBAudioRegisterControl, Restart, 15)
  466. +
  467. +DECL_BITFIELD(GBAudioRegisterSquareSweep, uint8_t)
  468. +DECL_BITS(GBAudioRegisterSquareSweep, Shift, 0, 3)
  469. +DECL_BIT(GBAudioRegisterSquareSweep, Direction, 3)
  470. +DECL_BITS(GBAudioRegisterSquareSweep, Time, 4, 3)
  471. +
  472. +DECL_BITFIELD(GBAudioRegisterBank, uint8_t)
  473. +DECL_BIT(GBAudioRegisterBank, Size, 5)
  474. +DECL_BIT(GBAudioRegisterBank, Bank, 6)
  475. +DECL_BIT(GBAudioRegisterBank, Enable, 7)
  476. +
  477. +DECL_BITFIELD(GBAudioRegisterBankVolume, uint8_t)
  478. +DECL_BITS(GBAudioRegisterBankVolume, VolumeGB, 5, 2)
  479. +DECL_BITS(GBAudioRegisterBankVolume, VolumeGBA, 5, 3)
  480. +
  481. +DECL_BITFIELD(GBAudioRegisterNoiseFeedback, uint8_t)
  482. +DECL_BITS(GBAudioRegisterNoiseFeedback, Ratio, 0, 3)
  483. +DECL_BIT(GBAudioRegisterNoiseFeedback, Power, 3)
  484. +DECL_BITS(GBAudioRegisterNoiseFeedback, Frequency, 4, 4)
  485. +
  486. +DECL_BITFIELD(GBAudioRegisterNoiseControl, uint8_t)
  487. +DECL_BIT(GBAudioRegisterNoiseControl, Stop, 6)
  488. +DECL_BIT(GBAudioRegisterNoiseControl, Restart, 7)
  489. +
  490. +DECL_BITFIELD(GBRegisterNR50, uint8_t)
  491. +DECL_BITS(GBRegisterNR50, VolumeRight, 0, 3)
  492. +DECL_BITS(GBRegisterNR50, VolumeLeft, 4, 3)
  493. +
  494. +DECL_BITFIELD(GBRegisterNR51, uint8_t)
  495. +DECL_BIT(GBRegisterNR51, Ch1Right, 0)
  496. +DECL_BIT(GBRegisterNR51, Ch2Right, 1)
  497. +DECL_BIT(GBRegisterNR51, Ch3Right, 2)
  498. +DECL_BIT(GBRegisterNR51, Ch4Right, 3)
  499. +DECL_BIT(GBRegisterNR51, Ch1Left, 4)
  500. +DECL_BIT(GBRegisterNR51, Ch2Left, 5)
  501. +DECL_BIT(GBRegisterNR51, Ch3Left, 6)
  502. +DECL_BIT(GBRegisterNR51, Ch4Left, 7)
  503. +
  504. +DECL_BITFIELD(GBAudioEnable, uint8_t)
  505. +DECL_BIT(GBAudioEnable, PlayingCh1, 0)
  506. +DECL_BIT(GBAudioEnable, PlayingCh2, 1)
  507. +DECL_BIT(GBAudioEnable, PlayingCh3, 2)
  508. +DECL_BIT(GBAudioEnable, PlayingCh4, 3)
  509. +DECL_BIT(GBAudioEnable, Enable, 7)
  510.  
  511.  struct GB;
  512.  struct GBAudioEnvelope {
  513. diff --git a/include/mgba/internal/gb/cheats.h b/include/mgba/internal/gb/cheats.h
  514. index 0eb7d3b3c..45a01d167 100644
  515. --- a/include/mgba/internal/gb/cheats.h
  516. +++ b/include/mgba/internal/gb/cheats.h
  517. @@ -29,7 +29,7 @@ struct GBCheatPatch {
  518.  	bool checkByte;
  519.  };
  520.  
  521. -DECLARE_VECTOR(GBCheatPatchList, struct GBCheatPatch);
  522. +DECLARE_VECTOR(GBCheatPatchList, struct GBCheatPatch)
  523.  
  524.  struct GBCheatSet {
  525.  	struct mCheatSet d;
  526. diff --git a/include/mgba/internal/gb/gb.h b/include/mgba/internal/gb/gb.h
  527. index d0e59e07e..7750a2d92 100644
  528. --- a/include/mgba/internal/gb/gb.h
  529. +++ b/include/mgba/internal/gb/gb.h
  530. @@ -25,7 +25,7 @@ extern const uint32_t DMG_SM83_FREQUENCY;
  531.  extern const uint32_t CGB_SM83_FREQUENCY;
  532.  extern const uint32_t SGB_SM83_FREQUENCY;
  533.  
  534. -mLOG_DECLARE_CATEGORY(GB);
  535. +mLOG_DECLARE_CATEGORY(GB)
  536.  
  537.  // TODO: Prefix GBAIRQ
  538.  enum GBIRQ {
  539. diff --git a/include/mgba/internal/gb/io.h b/include/mgba/internal/gb/io.h
  540. index 1df09da2f..c642970b5 100644
  541. --- a/include/mgba/internal/gb/io.h
  542. +++ b/include/mgba/internal/gb/io.h
  543. @@ -12,7 +12,7 @@ CXX_GUARD_START
  544.  
  545.  #include <mgba/core/log.h>
  546.  
  547. -mLOG_DECLARE_CATEGORY(GB_IO);
  548. +mLOG_DECLARE_CATEGORY(GB_IO)
  549.  
  550.  enum GBIORegisters {
  551.  	REG_JOYP = 0x00,
  552. diff --git a/include/mgba/internal/gb/mbc.h b/include/mgba/internal/gb/mbc.h
  553. index 72f4e1a47..22ed2f407 100644
  554. --- a/include/mgba/internal/gb/mbc.h
  555. +++ b/include/mgba/internal/gb/mbc.h
  556. @@ -12,7 +12,7 @@ CXX_GUARD_START
  557.  
  558.  #include <mgba/core/log.h>
  559.  
  560. -mLOG_DECLARE_CATEGORY(GB_MBC);
  561. +mLOG_DECLARE_CATEGORY(GB_MBC)
  562.  
  563.  struct GB;
  564.  struct GBMemory;
  565. diff --git a/include/mgba/internal/gb/memory.h b/include/mgba/internal/gb/memory.h
  566. index 3c7387b14..43134c723 100644
  567. --- a/include/mgba/internal/gb/memory.h
  568. +++ b/include/mgba/internal/gb/memory.h
  569. @@ -14,8 +14,8 @@ CXX_GUARD_START
  570.  #include <mgba/core/timing.h>
  571.  #include <mgba/gb/interface.h>
  572.  
  573. -mLOG_DECLARE_CATEGORY(GB_MBC);
  574. -mLOG_DECLARE_CATEGORY(GB_MEM);
  575. +mLOG_DECLARE_CATEGORY(GB_MBC)
  576. +mLOG_DECLARE_CATEGORY(GB_MEM)
  577.  
  578.  struct GB;
  579.  
  580. @@ -72,11 +72,11 @@ struct GBMemory;
  581.  typedef void (*GBMemoryBankControllerWrite)(struct GB*, uint16_t address, uint8_t value);
  582.  typedef uint8_t (*GBMemoryBankControllerRead)(struct GBMemory*, uint16_t address);
  583.  
  584. -DECL_BITFIELD(GBMBC7Field, uint8_t);
  585. -DECL_BIT(GBMBC7Field, CS, 7);
  586. -DECL_BIT(GBMBC7Field, CLK, 6);
  587. -DECL_BIT(GBMBC7Field, DI, 1);
  588. -DECL_BIT(GBMBC7Field, DO, 0);
  589. +DECL_BITFIELD(GBMBC7Field, uint8_t)
  590. +DECL_BIT(GBMBC7Field, CS, 7)
  591. +DECL_BIT(GBMBC7Field, CLK, 6)
  592. +DECL_BIT(GBMBC7Field, DI, 1)
  593. +DECL_BIT(GBMBC7Field, DO, 0)
  594.  
  595.  enum GBMBC7MachineState {
  596.  	GBMBC7_STATE_IDLE = 0,
  597. diff --git a/include/mgba/internal/gb/serialize.h b/include/mgba/internal/gb/serialize.h
  598. index ef2d5c4bc..90faeeafa 100644
  599. --- a/include/mgba/internal/gb/serialize.h
  600. +++ b/include/mgba/internal/gb/serialize.h
  601. @@ -16,7 +16,7 @@ CXX_GUARD_START
  602.  extern const uint32_t GB_SAVESTATE_MAGIC;
  603.  extern const uint32_t GB_SAVESTATE_VERSION;
  604.  
  605. -mLOG_DECLARE_CATEGORY(GB_STATE);
  606. +mLOG_DECLARE_CATEGORY(GB_STATE)
  607.  
  608.  /* Savestate format:
  609.   * 0x00000 - 0x00003: Version Magic (0x01000002)
  610. @@ -182,25 +182,25 @@ mLOG_DECLARE_CATEGORY(GB_STATE);
  611.   * Total size: 0x11800 (71,680) bytes
  612.  */
  613.  
  614. -DECL_BITFIELD(GBSerializedAudioFlags, uint32_t);
  615. -DECL_BITS(GBSerializedAudioFlags, Ch1Volume, 0, 4);
  616. -DECL_BITS(GBSerializedAudioFlags, Ch1Dead, 4, 2);
  617. -DECL_BIT(GBSerializedAudioFlags, Ch1Hi, 6);
  618. -DECL_BITS(GBSerializedAudioFlags, Ch2Volume, 8, 4);
  619. -DECL_BITS(GBSerializedAudioFlags, Ch2Dead, 12, 2);
  620. -DECL_BIT(GBSerializedAudioFlags, Ch2Hi, 14);
  621. -DECL_BITS(GBSerializedAudioFlags, Ch4Volume, 16, 4);
  622. -DECL_BITS(GBSerializedAudioFlags, Ch4Dead, 20, 2);
  623. -DECL_BITS(GBSerializedAudioFlags, Frame, 22, 3);
  624. -DECL_BIT(GBSerializedAudioFlags, Ch1SweepEnabled, 25);
  625. -DECL_BIT(GBSerializedAudioFlags, Ch1SweepOccurred, 26);
  626. -DECL_BIT(GBSerializedAudioFlags, Ch3Readable, 27);
  627. -DECL_BIT(GBSerializedAudioFlags, SkipFrame, 28);
  628. -
  629. -DECL_BITFIELD(GBSerializedAudioEnvelope, uint32_t);
  630. -DECL_BITS(GBSerializedAudioEnvelope, Length, 0, 7);
  631. -DECL_BITS(GBSerializedAudioEnvelope, NextStep, 7, 3);
  632. -DECL_BITS(GBSerializedAudioEnvelope, Frequency, 10, 11);
  633. +DECL_BITFIELD(GBSerializedAudioFlags, uint32_t)
  634. +DECL_BITS(GBSerializedAudioFlags, Ch1Volume, 0, 4)
  635. +DECL_BITS(GBSerializedAudioFlags, Ch1Dead, 4, 2)
  636. +DECL_BIT(GBSerializedAudioFlags, Ch1Hi, 6)
  637. +DECL_BITS(GBSerializedAudioFlags, Ch2Volume, 8, 4)
  638. +DECL_BITS(GBSerializedAudioFlags, Ch2Dead, 12, 2)
  639. +DECL_BIT(GBSerializedAudioFlags, Ch2Hi, 14)
  640. +DECL_BITS(GBSerializedAudioFlags, Ch4Volume, 16, 4)
  641. +DECL_BITS(GBSerializedAudioFlags, Ch4Dead, 20, 2)
  642. +DECL_BITS(GBSerializedAudioFlags, Frame, 22, 3)
  643. +DECL_BIT(GBSerializedAudioFlags, Ch1SweepEnabled, 25)
  644. +DECL_BIT(GBSerializedAudioFlags, Ch1SweepOccurred, 26)
  645. +DECL_BIT(GBSerializedAudioFlags, Ch3Readable, 27)
  646. +DECL_BIT(GBSerializedAudioFlags, SkipFrame, 28)
  647. +
  648. +DECL_BITFIELD(GBSerializedAudioEnvelope, uint32_t)
  649. +DECL_BITS(GBSerializedAudioEnvelope, Length, 0, 7)
  650. +DECL_BITS(GBSerializedAudioEnvelope, NextStep, 7, 3)
  651. +DECL_BITS(GBSerializedAudioEnvelope, Frequency, 10, 11)
  652.  
  653.  struct GBSerializedPSGState {
  654.  	struct {
  655. @@ -229,41 +229,41 @@ struct GBSerializedPSGState {
  656.  	} ch4;
  657.  };
  658.  
  659. -DECL_BITFIELD(GBSerializedCpuFlags, uint32_t);
  660. -DECL_BIT(GBSerializedCpuFlags, Condition, 0);
  661. -DECL_BIT(GBSerializedCpuFlags, IrqPending, 1);
  662. -DECL_BIT(GBSerializedCpuFlags, DoubleSpeed, 2);
  663. -DECL_BIT(GBSerializedCpuFlags, EiPending, 3);
  664. -
  665. -DECL_BITFIELD(GBSerializedTimerFlags, uint8_t);
  666. -DECL_BIT(GBSerializedTimerFlags, IrqPending, 0);
  667. -
  668. -DECL_BITFIELD(GBSerializedVideoFlags, uint8_t);
  669. -DECL_BIT(GBSerializedVideoFlags, BcpIncrement, 0);
  670. -DECL_BIT(GBSerializedVideoFlags, OcpIncrement, 1);
  671. -DECL_BITS(GBSerializedVideoFlags, Mode, 2, 2);
  672. -DECL_BIT(GBSerializedVideoFlags, NotModeEventScheduled, 4);
  673. -DECL_BIT(GBSerializedVideoFlags, NotFrameEventScheduled, 5);
  674. -
  675. -DECL_BITFIELD(GBSerializedMBC7Flags, uint8_t);
  676. -DECL_BITS(GBSerializedMBC7Flags, Command, 0, 2);
  677. -DECL_BIT(GBSerializedMBC7Flags, Writable, 2);
  678. -
  679. -DECL_BITFIELD(GBSerializedMemoryFlags, uint16_t);
  680. -DECL_BIT(GBSerializedMemoryFlags, SramAccess, 0);
  681. -DECL_BIT(GBSerializedMemoryFlags, RtcAccess, 1);
  682. -DECL_BIT(GBSerializedMemoryFlags, RtcLatched, 2);
  683. -DECL_BIT(GBSerializedMemoryFlags, Ime, 3);
  684. -DECL_BIT(GBSerializedMemoryFlags, IsHdma, 4);
  685. -DECL_BITS(GBSerializedMemoryFlags, ActiveRtcReg, 5, 3);
  686. -
  687. -DECL_BITFIELD(GBSerializedSGBFlags, uint32_t);
  688. -DECL_BITS(GBSerializedSGBFlags, P1Bits, 0, 2);
  689. -DECL_BITS(GBSerializedSGBFlags, RenderMode, 2, 2);
  690. -DECL_BITS(GBSerializedSGBFlags, BufferIndex, 4, 3);
  691. -DECL_BITS(GBSerializedSGBFlags, CurrentController, 7, 2);
  692. -DECL_BITS(GBSerializedSGBFlags, ReqControllers, 9, 2);
  693. -DECL_BIT(GBSerializedSGBFlags, Increment, 11);
  694. +DECL_BITFIELD(GBSerializedCpuFlags, uint32_t)
  695. +DECL_BIT(GBSerializedCpuFlags, Condition, 0)
  696. +DECL_BIT(GBSerializedCpuFlags, IrqPending, 1)
  697. +DECL_BIT(GBSerializedCpuFlags, DoubleSpeed, 2)
  698. +DECL_BIT(GBSerializedCpuFlags, EiPending, 3)
  699. +
  700. +DECL_BITFIELD(GBSerializedTimerFlags, uint8_t)
  701. +DECL_BIT(GBSerializedTimerFlags, IrqPending, 0)
  702. +
  703. +DECL_BITFIELD(GBSerializedVideoFlags, uint8_t)
  704. +DECL_BIT(GBSerializedVideoFlags, BcpIncrement, 0)
  705. +DECL_BIT(GBSerializedVideoFlags, OcpIncrement, 1)
  706. +DECL_BITS(GBSerializedVideoFlags, Mode, 2, 2)
  707. +DECL_BIT(GBSerializedVideoFlags, NotModeEventScheduled, 4)
  708. +DECL_BIT(GBSerializedVideoFlags, NotFrameEventScheduled, 5)
  709. +
  710. +DECL_BITFIELD(GBSerializedMBC7Flags, uint8_t)
  711. +DECL_BITS(GBSerializedMBC7Flags, Command, 0, 2)
  712. +DECL_BIT(GBSerializedMBC7Flags, Writable, 2)
  713. +
  714. +DECL_BITFIELD(GBSerializedMemoryFlags, uint16_t)
  715. +DECL_BIT(GBSerializedMemoryFlags, SramAccess, 0)
  716. +DECL_BIT(GBSerializedMemoryFlags, RtcAccess, 1)
  717. +DECL_BIT(GBSerializedMemoryFlags, RtcLatched, 2)
  718. +DECL_BIT(GBSerializedMemoryFlags, Ime, 3)
  719. +DECL_BIT(GBSerializedMemoryFlags, IsHdma, 4)
  720. +DECL_BITS(GBSerializedMemoryFlags, ActiveRtcReg, 5, 3)
  721. +
  722. +DECL_BITFIELD(GBSerializedSGBFlags, uint32_t)
  723. +DECL_BITS(GBSerializedSGBFlags, P1Bits, 0, 2)
  724. +DECL_BITS(GBSerializedSGBFlags, RenderMode, 2, 2)
  725. +DECL_BITS(GBSerializedSGBFlags, BufferIndex, 4, 3)
  726. +DECL_BITS(GBSerializedSGBFlags, CurrentController, 7, 2)
  727. +DECL_BITS(GBSerializedSGBFlags, ReqControllers, 9, 2)
  728. +DECL_BIT(GBSerializedSGBFlags, Increment, 11)
  729.  
  730.  #pragma pack(push, 1)
  731.  struct GBSerializedState {
  732. diff --git a/include/mgba/internal/gb/sio.h b/include/mgba/internal/gb/sio.h
  733. index 50d62868b..6744a76ec 100644
  734. --- a/include/mgba/internal/gb/sio.h
  735. +++ b/include/mgba/internal/gb/sio.h
  736. @@ -18,7 +18,7 @@ CXX_GUARD_START
  737.  
  738.  extern const int GBSIOCyclesPerTransfer[2];
  739.  
  740. -mLOG_DECLARE_CATEGORY(GB_SIO);
  741. +mLOG_DECLARE_CATEGORY(GB_SIO)
  742.  
  743.  struct GB;
  744.  struct GBSIODriver;
  745. @@ -35,10 +35,10 @@ struct GBSIO {
  746.  	uint8_t pendingSB;
  747.  };
  748.  
  749. -DECL_BITFIELD(GBRegisterSC, uint8_t);
  750. -DECL_BIT(GBRegisterSC, ShiftClock, 0);
  751. -DECL_BIT(GBRegisterSC, ClockSpeed, 1);
  752. -DECL_BIT(GBRegisterSC, Enable, 7);
  753. +DECL_BITFIELD(GBRegisterSC, uint8_t)
  754. +DECL_BIT(GBRegisterSC, ShiftClock, 0)
  755. +DECL_BIT(GBRegisterSC, ClockSpeed, 1)
  756. +DECL_BIT(GBRegisterSC, Enable, 7)
  757.  
  758.  void GBSIOInit(struct GBSIO* sio);
  759.  void GBSIOReset(struct GBSIO* sio);
  760. diff --git a/include/mgba/internal/gb/timer.h b/include/mgba/internal/gb/timer.h
  761. index b81ff1c34..31f5fb849 100644
  762. --- a/include/mgba/internal/gb/timer.h
  763. +++ b/include/mgba/internal/gb/timer.h
  764. @@ -12,9 +12,9 @@ CXX_GUARD_START
  765.  
  766.  #include <mgba/core/timing.h>
  767.  
  768. -DECL_BITFIELD(GBRegisterTAC, uint8_t);
  769. -DECL_BITS(GBRegisterTAC, Clock, 0, 2);
  770. -DECL_BIT(GBRegisterTAC, Run, 2);
  771. +DECL_BITFIELD(GBRegisterTAC, uint8_t)
  772. +DECL_BITS(GBRegisterTAC, Clock, 0, 2)
  773. +DECL_BIT(GBRegisterTAC, Run, 2)
  774.  
  775.  enum {
  776.  	GB_DMG_DIV_PERIOD = 16
  777. diff --git a/include/mgba/internal/gb/video.h b/include/mgba/internal/gb/video.h
  778. index 69a3b0420..56c6cda0f 100644
  779. --- a/include/mgba/internal/gb/video.h
  780. +++ b/include/mgba/internal/gb/video.h
  781. @@ -37,20 +37,20 @@ enum {
  782.  	SGB_SIZE_ATF_RAM = 0x1000
  783.  };
  784.  
  785. -DECL_BITFIELD(GBObjAttributes, uint8_t);
  786. -DECL_BITS(GBObjAttributes, CGBPalette, 0, 3);
  787. -DECL_BIT(GBObjAttributes, Bank, 3);
  788. -DECL_BIT(GBObjAttributes, Palette, 4);
  789. -DECL_BIT(GBObjAttributes, XFlip, 5);
  790. -DECL_BIT(GBObjAttributes, YFlip, 6);
  791. -DECL_BIT(GBObjAttributes, Priority, 7);
  792. -
  793. -DECL_BITFIELD(SGBBgAttributes, uint16_t);
  794. -DECL_BITS(SGBBgAttributes, Tile, 0, 10);
  795. -DECL_BITS(SGBBgAttributes, Palette, 10, 3);
  796. -DECL_BIT(SGBBgAttributes, Priority, 13);
  797. -DECL_BIT(SGBBgAttributes, XFlip, 14);
  798. -DECL_BIT(SGBBgAttributes, YFlip, 15);
  799. +DECL_BITFIELD(GBObjAttributes, uint8_t)
  800. +DECL_BITS(GBObjAttributes, CGBPalette, 0, 3)
  801. +DECL_BIT(GBObjAttributes, Bank, 3)
  802. +DECL_BIT(GBObjAttributes, Palette, 4)
  803. +DECL_BIT(GBObjAttributes, XFlip, 5)
  804. +DECL_BIT(GBObjAttributes, YFlip, 6)
  805. +DECL_BIT(GBObjAttributes, Priority, 7)
  806. +
  807. +DECL_BITFIELD(SGBBgAttributes, uint16_t)
  808. +DECL_BITS(SGBBgAttributes, Tile, 0, 10)
  809. +DECL_BITS(SGBBgAttributes, Palette, 10, 3)
  810. +DECL_BIT(SGBBgAttributes, Priority, 13)
  811. +DECL_BIT(SGBBgAttributes, XFlip, 14)
  812. +DECL_BIT(SGBBgAttributes, YFlip, 15)
  813.  
  814.  struct GBObj {
  815.  	uint8_t y;
  816. @@ -98,23 +98,23 @@ struct GBVideoRenderer {
  817.  	bool disableWIN;
  818.  };
  819.  
  820. -DECL_BITFIELD(GBRegisterLCDC, uint8_t);
  821. -DECL_BIT(GBRegisterLCDC, BgEnable, 0);
  822. -DECL_BIT(GBRegisterLCDC, ObjEnable, 1);
  823. -DECL_BIT(GBRegisterLCDC, ObjSize, 2);
  824. -DECL_BIT(GBRegisterLCDC, TileMap, 3);
  825. -DECL_BIT(GBRegisterLCDC, TileData, 4);
  826. -DECL_BIT(GBRegisterLCDC, Window, 5);
  827. -DECL_BIT(GBRegisterLCDC, WindowTileMap, 6);
  828. -DECL_BIT(GBRegisterLCDC, Enable, 7);
  829. -
  830. -DECL_BITFIELD(GBRegisterSTAT, uint8_t);
  831. -DECL_BITS(GBRegisterSTAT, Mode, 0, 2);
  832. -DECL_BIT(GBRegisterSTAT, LYC, 2);
  833. -DECL_BIT(GBRegisterSTAT, HblankIRQ, 3);
  834. -DECL_BIT(GBRegisterSTAT, VblankIRQ, 4);
  835. -DECL_BIT(GBRegisterSTAT, OAMIRQ, 5);
  836. -DECL_BIT(GBRegisterSTAT, LYCIRQ, 6);
  837. +DECL_BITFIELD(GBRegisterLCDC, uint8_t)
  838. +DECL_BIT(GBRegisterLCDC, BgEnable, 0)
  839. +DECL_BIT(GBRegisterLCDC, ObjEnable, 1)
  840. +DECL_BIT(GBRegisterLCDC, ObjSize, 2)
  841. +DECL_BIT(GBRegisterLCDC, TileMap, 3)
  842. +DECL_BIT(GBRegisterLCDC, TileData, 4)
  843. +DECL_BIT(GBRegisterLCDC, Window, 5)
  844. +DECL_BIT(GBRegisterLCDC, WindowTileMap, 6)
  845. +DECL_BIT(GBRegisterLCDC, Enable, 7)
  846. +
  847. +DECL_BITFIELD(GBRegisterSTAT, uint8_t)
  848. +DECL_BITS(GBRegisterSTAT, Mode, 0, 2)
  849. +DECL_BIT(GBRegisterSTAT, LYC, 2)
  850. +DECL_BIT(GBRegisterSTAT, HblankIRQ, 3)
  851. +DECL_BIT(GBRegisterSTAT, VblankIRQ, 4)
  852. +DECL_BIT(GBRegisterSTAT, OAMIRQ, 5)
  853. +DECL_BIT(GBRegisterSTAT, LYCIRQ, 6)
  854.  
  855.  struct GBVideo {
  856.  	struct GB* p;
  857. diff --git a/include/mgba/internal/gba/audio.h b/include/mgba/internal/gba/audio.h
  858. index f08f845b6..2eebdf81b 100644
  859. --- a/include/mgba/internal/gba/audio.h
  860. +++ b/include/mgba/internal/gba/audio.h
  861. @@ -18,7 +18,7 @@ CXX_GUARD_START
  862.  #define MP2K_MAGIC 0x68736D53
  863.  #define MP2K_MAX_SOUND_CHANNELS 12
  864.  
  865. -mLOG_DECLARE_CATEGORY(GBA_AUDIO);
  866. +mLOG_DECLARE_CATEGORY(GBA_AUDIO)
  867.  
  868.  struct GBADMA;
  869.  
  870. @@ -31,22 +31,22 @@ struct GBAAudioFIFO {
  871.  	int8_t sample;
  872.  };
  873.  
  874. -DECL_BITFIELD(GBARegisterSOUNDCNT_HI, uint16_t);
  875. -DECL_BITS(GBARegisterSOUNDCNT_HI, Volume, 0, 2);
  876. -DECL_BIT(GBARegisterSOUNDCNT_HI, VolumeChA, 2);
  877. -DECL_BIT(GBARegisterSOUNDCNT_HI, VolumeChB, 3);
  878. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChARight, 8);
  879. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChALeft, 9);
  880. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChATimer, 10);
  881. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChAReset, 11);
  882. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChBRight, 12);
  883. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChBLeft, 13);
  884. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChBTimer, 14);
  885. -DECL_BIT(GBARegisterSOUNDCNT_HI, ChBReset, 15);
  886. -
  887. -DECL_BITFIELD(GBARegisterSOUNDBIAS, uint16_t);
  888. -DECL_BITS(GBARegisterSOUNDBIAS, Bias, 0, 10);
  889. -DECL_BITS(GBARegisterSOUNDBIAS, Resolution, 14, 2);
  890. +DECL_BITFIELD(GBARegisterSOUNDCNT_HI, uint16_t)
  891. +DECL_BITS(GBARegisterSOUNDCNT_HI, Volume, 0, 2)
  892. +DECL_BIT(GBARegisterSOUNDCNT_HI, VolumeChA, 2)
  893. +DECL_BIT(GBARegisterSOUNDCNT_HI, VolumeChB, 3)
  894. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChARight, 8)
  895. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChALeft, 9)
  896. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChATimer, 10)
  897. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChAReset, 11)
  898. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChBRight, 12)
  899. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChBLeft, 13)
  900. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChBTimer, 14)
  901. +DECL_BIT(GBARegisterSOUNDCNT_HI, ChBReset, 15)
  902. +
  903. +DECL_BITFIELD(GBARegisterSOUNDBIAS, uint16_t)
  904. +DECL_BITS(GBARegisterSOUNDBIAS, Bias, 0, 10)
  905. +DECL_BITS(GBARegisterSOUNDBIAS, Resolution, 14, 2)
  906.  
  907.  struct GBAAudioMixer;
  908.  struct GBAAudio {
  909. diff --git a/include/mgba/internal/gba/bios.h b/include/mgba/internal/gba/bios.h
  910. index a89edfd68..efa2a1025 100644
  911. --- a/include/mgba/internal/gba/bios.h
  912. +++ b/include/mgba/internal/gba/bios.h
  913. @@ -12,7 +12,7 @@ CXX_GUARD_START
  914.  
  915.  #include <mgba/core/log.h>
  916.  
  917. -mLOG_DECLARE_CATEGORY(GBA_BIOS);
  918. +mLOG_DECLARE_CATEGORY(GBA_BIOS)
  919.  
  920.  struct ARMCore;
  921.  void GBASwi16(struct ARMCore* cpu, int immediate);
  922. diff --git a/include/mgba/internal/gba/dma.h b/include/mgba/internal/gba/dma.h
  923. index 6f880c971..815077f8d 100644
  924. --- a/include/mgba/internal/gba/dma.h
  925. +++ b/include/mgba/internal/gba/dma.h
  926. @@ -24,15 +24,15 @@ enum GBADMATiming {
  927.  	GBA_DMA_TIMING_CUSTOM = 3
  928.  };
  929.  
  930. -DECL_BITFIELD(GBADMARegister, uint16_t);
  931. -DECL_BITS(GBADMARegister, DestControl, 5, 2);
  932. -DECL_BITS(GBADMARegister, SrcControl, 7, 2);
  933. -DECL_BIT(GBADMARegister, Repeat, 9);
  934. -DECL_BIT(GBADMARegister, Width, 10);
  935. -DECL_BIT(GBADMARegister, DRQ, 11);
  936. -DECL_BITS(GBADMARegister, Timing, 12, 2);
  937. -DECL_BIT(GBADMARegister, DoIRQ, 14);
  938. -DECL_BIT(GBADMARegister, Enable, 15);
  939. +DECL_BITFIELD(GBADMARegister, uint16_t)
  940. +DECL_BITS(GBADMARegister, DestControl, 5, 2)
  941. +DECL_BITS(GBADMARegister, SrcControl, 7, 2)
  942. +DECL_BIT(GBADMARegister, Repeat, 9)
  943. +DECL_BIT(GBADMARegister, Width, 10)
  944. +DECL_BIT(GBADMARegister, DRQ, 11)
  945. +DECL_BITS(GBADMARegister, Timing, 12, 2)
  946. +DECL_BIT(GBADMARegister, DoIRQ, 14)
  947. +DECL_BIT(GBADMARegister, Enable, 15)
  948.  
  949.  struct GBADMA {
  950.  	GBADMARegister reg;
  951. diff --git a/include/mgba/internal/gba/gba.h b/include/mgba/internal/gba/gba.h
  952. index fffd46936..343ed6f10 100644
  953. --- a/include/mgba/internal/gba/gba.h
  954. +++ b/include/mgba/internal/gba/gba.h
  955. @@ -55,12 +55,12 @@ struct GBA;
  956.  struct Patch;
  957.  struct VFile;
  958.  
  959. -mLOG_DECLARE_CATEGORY(GBA);
  960. -mLOG_DECLARE_CATEGORY(GBA_DEBUG);
  961. +mLOG_DECLARE_CATEGORY(GBA)
  962. +mLOG_DECLARE_CATEGORY(GBA_DEBUG)
  963.  
  964. -DECL_BITFIELD(GBADebugFlags, uint16_t);
  965. -DECL_BITS(GBADebugFlags, Level, 0, 3);
  966. -DECL_BIT(GBADebugFlags, Send, 8);
  967. +DECL_BITFIELD(GBADebugFlags, uint16_t)
  968. +DECL_BITS(GBADebugFlags, Level, 0, 3)
  969. +DECL_BIT(GBADebugFlags, Send, 8)
  970.  
  971.  struct GBA {
  972.  	struct mCPUComponent d;
  973. diff --git a/include/mgba/internal/gba/hardware.h b/include/mgba/internal/gba/hardware.h
  974. index fab175538..54b2f5971 100644
  975. --- a/include/mgba/internal/gba/hardware.h
  976. +++ b/include/mgba/internal/gba/hardware.h
  977. @@ -14,7 +14,7 @@ CXX_GUARD_START
  978.  #include <mgba/core/timing.h>
  979.  #include <mgba/gba/interface.h>
  980.  
  981. -mLOG_DECLARE_CATEGORY(GBA_HW);
  982. +mLOG_DECLARE_CATEGORY(GBA_HW)
  983.  
  984.  #define IS_GPIO_REGISTER(reg) ((reg) == GPIO_REG_DATA || (reg) == GPIO_REG_DIRECTION || (reg) == GPIO_REG_CONTROL)
  985.  
  986. @@ -48,10 +48,10 @@ enum GPIODirection {
  987.  	GPIO_READ_WRITE = 1
  988.  };
  989.  
  990. -DECL_BITFIELD(RTCControl, uint32_t);
  991. -DECL_BIT(RTCControl, MinIRQ, 3);
  992. -DECL_BIT(RTCControl, Hour24, 6);
  993. -DECL_BIT(RTCControl, Poweroff, 7);
  994. +DECL_BITFIELD(RTCControl, uint32_t)
  995. +DECL_BIT(RTCControl, MinIRQ, 3)
  996. +DECL_BIT(RTCControl, Hour24, 6)
  997. +DECL_BIT(RTCControl, Poweroff, 7)
  998.  
  999.  enum RTCCommand {
  1000.  	RTC_RESET = 0,
  1001. @@ -61,10 +61,10 @@ enum RTCCommand {
  1002.  	RTC_TIME = 6
  1003.  };
  1004.  
  1005. -DECL_BITFIELD(RTCCommandData, uint32_t);
  1006. -DECL_BITS(RTCCommandData, Magic, 0, 4);
  1007. -DECL_BITS(RTCCommandData, Command, 4, 3);
  1008. -DECL_BIT(RTCCommandData, Reading, 7);
  1009. +DECL_BITFIELD(RTCCommandData, uint32_t)
  1010. +DECL_BITS(RTCCommandData, Magic, 0, 4)
  1011. +DECL_BITS(RTCCommandData, Command, 4, 3)
  1012. +DECL_BIT(RTCCommandData, Reading, 7)
  1013.  
  1014.  #ifndef PYCPARSE
  1015.  #pragma pack(push, 1)
  1016. @@ -93,7 +93,7 @@ struct GBAGBPSIODriver {
  1017.  	struct GBACartridgeHardware* p;
  1018.  };
  1019.  
  1020. -DECL_BITFIELD(GPIOPin, uint16_t);
  1021. +DECL_BITFIELD(GPIOPin, uint16_t)
  1022.  
  1023.  struct GBACartridgeHardware {
  1024.  	struct GBA* p;
  1025. diff --git a/include/mgba/internal/gba/io.h b/include/mgba/internal/gba/io.h
  1026. index 9875061f3..7075e0e9e 100644
  1027. --- a/include/mgba/internal/gba/io.h
  1028. +++ b/include/mgba/internal/gba/io.h
  1029. @@ -159,7 +159,7 @@ enum GBAIORegisters {
  1030.  	REG_DEBUG_ENABLE = 0xFFF780,
  1031.  };
  1032.  
  1033. -mLOG_DECLARE_CATEGORY(GBA_IO);
  1034. +mLOG_DECLARE_CATEGORY(GBA_IO)
  1035.  
  1036.  extern MGBA_EXPORT const char* const GBAIORegisterNames[];
  1037.  
  1038. diff --git a/include/mgba/internal/gba/memory.h b/include/mgba/internal/gba/memory.h
  1039. index f98b7e94a..4c3746ef9 100644
  1040. --- a/include/mgba/internal/gba/memory.h
  1041. +++ b/include/mgba/internal/gba/memory.h
  1042. @@ -88,7 +88,7 @@ enum {
  1043.  	AGB_PRINT_FLUSH_ADDR = 0x01FE209C,
  1044.  };
  1045.  
  1046. -mLOG_DECLARE_CATEGORY(GBA_MEM);
  1047. +mLOG_DECLARE_CATEGORY(GBA_MEM)
  1048.  
  1049.  struct GBAPrintContext {
  1050.  	uint16_t request;
  1051. diff --git a/include/mgba/internal/gba/rr/rr.h b/include/mgba/internal/gba/rr/rr.h
  1052. index b4fc2e627..e8fda37bc 100644
  1053. --- a/include/mgba/internal/gba/rr/rr.h
  1054. +++ b/include/mgba/internal/gba/rr/rr.h
  1055. @@ -15,7 +15,7 @@ CXX_GUARD_START
  1056.  
  1057.  struct VFile;
  1058.  
  1059. -mLOG_DECLARE_CATEGORY(GBA_RR);
  1060. +mLOG_DECLARE_CATEGORY(GBA_RR)
  1061.  
  1062.  enum GBARRInitFrom {
  1063.  	INIT_EX_NIHILO = 0,
  1064. diff --git a/include/mgba/internal/gba/savedata.h b/include/mgba/internal/gba/savedata.h
  1065. index 05cd65963..3fa6813c2 100644
  1066. --- a/include/mgba/internal/gba/savedata.h
  1067. +++ b/include/mgba/internal/gba/savedata.h
  1068. @@ -13,7 +13,7 @@ CXX_GUARD_START
  1069.  #include <mgba/core/log.h>
  1070.  #include <mgba/core/timing.h>
  1071.  
  1072. -mLOG_DECLARE_CATEGORY(GBA_SAVE);
  1073. +mLOG_DECLARE_CATEGORY(GBA_SAVE)
  1074.  
  1075.  struct VFile;
  1076.  
  1077. diff --git a/include/mgba/internal/gba/serialize.h b/include/mgba/internal/gba/serialize.h
  1078. index 3d2e0e69c..83b337b2c 100644
  1079. --- a/include/mgba/internal/gba/serialize.h
  1080. +++ b/include/mgba/internal/gba/serialize.h
  1081. @@ -17,7 +17,7 @@ CXX_GUARD_START
  1082.  extern const uint32_t GBA_SAVESTATE_MAGIC;
  1083.  extern const uint32_t GBA_SAVESTATE_VERSION;
  1084.  
  1085. -mLOG_DECLARE_CATEGORY(GBA_STATE);
  1086. +mLOG_DECLARE_CATEGORY(GBA_STATE)
  1087.  
  1088.  /* Savestate format:
  1089.   * 0x00000 - 0x00003: Version Magic (0x01000001)
  1090. @@ -208,28 +208,28 @@ mLOG_DECLARE_CATEGORY(GBA_STATE);
  1091.   * Total size: 0x61000 (397,312) bytes
  1092.   */
  1093.  
  1094. -DECL_BITFIELD(GBASerializedHWFlags1, uint16_t);
  1095. -DECL_BIT(GBASerializedHWFlags1, ReadWrite, 0);
  1096. -DECL_BIT(GBASerializedHWFlags1, GyroEdge, 1);
  1097. -DECL_BIT(GBASerializedHWFlags1, LightEdge, 2);
  1098. -DECL_BITS(GBASerializedHWFlags1, LightCounter, 4, 12);
  1099. +DECL_BITFIELD(GBASerializedHWFlags1, uint16_t)
  1100. +DECL_BIT(GBASerializedHWFlags1, ReadWrite, 0)
  1101. +DECL_BIT(GBASerializedHWFlags1, GyroEdge, 1)
  1102. +DECL_BIT(GBASerializedHWFlags1, LightEdge, 2)
  1103. +DECL_BITS(GBASerializedHWFlags1, LightCounter, 4, 12)
  1104.  
  1105. -DECL_BITFIELD(GBASerializedHWFlags2, uint8_t);
  1106. -DECL_BITS(GBASerializedHWFlags2, TiltState, 0, 2);
  1107. -DECL_BITS(GBASerializedHWFlags2, GbpInputsPosted, 2, 2);
  1108. -DECL_BITS(GBASerializedHWFlags2, GbpTxPosition, 4, 5);
  1109. +DECL_BITFIELD(GBASerializedHWFlags2, uint8_t)
  1110. +DECL_BITS(GBASerializedHWFlags2, TiltState, 0, 2)
  1111. +DECL_BITS(GBASerializedHWFlags2, GbpInputsPosted, 2, 2)
  1112. +DECL_BITS(GBASerializedHWFlags2, GbpTxPosition, 4, 5)
  1113.  
  1114. -DECL_BITFIELD(GBASerializedHWFlags3, uint16_t);
  1115. +DECL_BITFIELD(GBASerializedHWFlags3, uint16_t)
  1116.  
  1117. -DECL_BITFIELD(GBASerializedSavedataFlags, uint8_t);
  1118. -DECL_BITS(GBASerializedSavedataFlags, FlashState, 0, 2);
  1119. -DECL_BIT(GBASerializedSavedataFlags, FlashBank, 4);
  1120. -DECL_BIT(GBASerializedSavedataFlags, DustSettling, 5);
  1121. +DECL_BITFIELD(GBASerializedSavedataFlags, uint8_t)
  1122. +DECL_BITS(GBASerializedSavedataFlags, FlashState, 0, 2)
  1123. +DECL_BIT(GBASerializedSavedataFlags, FlashBank, 4)
  1124. +DECL_BIT(GBASerializedSavedataFlags, DustSettling, 5)
  1125.  
  1126. -DECL_BITFIELD(GBASerializedMiscFlags, uint32_t);
  1127. -DECL_BIT(GBASerializedMiscFlags, Halted, 0);
  1128. -DECL_BIT(GBASerializedMiscFlags, POSTFLG, 1);
  1129. -DECL_BIT(GBASerializedMiscFlags, IrqPending, 2);
  1130. +DECL_BITFIELD(GBASerializedMiscFlags, uint32_t)
  1131. +DECL_BIT(GBASerializedMiscFlags, Halted, 0)
  1132. +DECL_BIT(GBASerializedMiscFlags, POSTFLG, 1)
  1133. +DECL_BIT(GBASerializedMiscFlags, IrqPending, 2)
  1134.  
  1135.  struct GBASerializedState {
  1136.  	uint32_t versionMagic;
  1137. diff --git a/include/mgba/internal/gba/sio.h b/include/mgba/internal/gba/sio.h
  1138. index 7a4e3ecfb..263def9b8 100644
  1139. --- a/include/mgba/internal/gba/sio.h
  1140. +++ b/include/mgba/internal/gba/sio.h
  1141. @@ -17,7 +17,7 @@ CXX_GUARD_START
  1142.  
  1143.  extern const int GBASIOCyclesPerTransfer[4][MAX_GBAS];
  1144.  
  1145. -mLOG_DECLARE_CATEGORY(GBA_SIO);
  1146. +mLOG_DECLARE_CATEGORY(GBA_SIO)
  1147.  
  1148.  enum {
  1149.  	RCNT_INITIAL = 0x8000
  1150. @@ -33,22 +33,22 @@ enum {
  1151.  	JOYSTAT_RECV_BIT = 2,
  1152.  };
  1153.  
  1154. -DECL_BITFIELD(GBASIONormal, uint16_t);
  1155. -DECL_BIT(GBASIONormal, Sc, 0);
  1156. -DECL_BIT(GBASIONormal, InternalSc, 1);
  1157. -DECL_BIT(GBASIONormal, Si, 2);
  1158. -DECL_BIT(GBASIONormal, IdleSo, 3);
  1159. -DECL_BIT(GBASIONormal, Start, 7);
  1160. -DECL_BIT(GBASIONormal, Length, 12);
  1161. -DECL_BIT(GBASIONormal, Irq, 14);
  1162. -DECL_BITFIELD(GBASIOMultiplayer, uint16_t);
  1163. -DECL_BITS(GBASIOMultiplayer, Baud, 0, 2);
  1164. -DECL_BIT(GBASIOMultiplayer, Slave, 2);
  1165. -DECL_BIT(GBASIOMultiplayer, Ready, 3);
  1166. -DECL_BITS(GBASIOMultiplayer, Id, 4, 2);
  1167. -DECL_BIT(GBASIOMultiplayer, Error, 6);
  1168. -DECL_BIT(GBASIOMultiplayer, Busy, 7);
  1169. -DECL_BIT(GBASIOMultiplayer, Irq, 14);
  1170. +DECL_BITFIELD(GBASIONormal, uint16_t)
  1171. +DECL_BIT(GBASIONormal, Sc, 0)
  1172. +DECL_BIT(GBASIONormal, InternalSc, 1)
  1173. +DECL_BIT(GBASIONormal, Si, 2)
  1174. +DECL_BIT(GBASIONormal, IdleSo, 3)
  1175. +DECL_BIT(GBASIONormal, Start, 7)
  1176. +DECL_BIT(GBASIONormal, Length, 12)
  1177. +DECL_BIT(GBASIONormal, Irq, 14)
  1178. +DECL_BITFIELD(GBASIOMultiplayer, uint16_t)
  1179. +DECL_BITS(GBASIOMultiplayer, Baud, 0, 2)
  1180. +DECL_BIT(GBASIOMultiplayer, Slave, 2)
  1181. +DECL_BIT(GBASIOMultiplayer, Ready, 3)
  1182. +DECL_BITS(GBASIOMultiplayer, Id, 4, 2)
  1183. +DECL_BIT(GBASIOMultiplayer, Error, 6)
  1184. +DECL_BIT(GBASIOMultiplayer, Busy, 7)
  1185. +DECL_BIT(GBASIOMultiplayer, Irq, 14)
  1186.  
  1187.  struct GBASIODriverSet {
  1188.  	struct GBASIODriver* normal;
  1189. diff --git a/include/mgba/internal/gba/timer.h b/include/mgba/internal/gba/timer.h
  1190. index 664842e6b..b10335f72 100644
  1191. --- a/include/mgba/internal/gba/timer.h
  1192. +++ b/include/mgba/internal/gba/timer.h
  1193. @@ -12,11 +12,11 @@ CXX_GUARD_START
  1194.  
  1195.  #include <mgba/core/timing.h>
  1196.  
  1197. -DECL_BITFIELD(GBATimerFlags, uint32_t);
  1198. -DECL_BITS(GBATimerFlags, PrescaleBits, 0, 4);
  1199. -DECL_BIT(GBATimerFlags, CountUp, 4);
  1200. -DECL_BIT(GBATimerFlags, DoIrq, 5);
  1201. -DECL_BIT(GBATimerFlags, Enable, 6);
  1202. +DECL_BITFIELD(GBATimerFlags, uint32_t)
  1203. +DECL_BITS(GBATimerFlags, PrescaleBits, 0, 4)
  1204. +DECL_BIT(GBATimerFlags, CountUp, 4)
  1205. +DECL_BIT(GBATimerFlags, DoIrq, 5)
  1206. +DECL_BIT(GBATimerFlags, Enable, 6)
  1207.  
  1208.  struct GBA;
  1209.  struct GBATimer {
  1210. diff --git a/include/mgba/internal/gba/video.h b/include/mgba/internal/gba/video.h
  1211. index 77ff3cf0e..5cc14c18c 100644
  1212. --- a/include/mgba/internal/gba/video.h
  1213. +++ b/include/mgba/internal/gba/video.h
  1214. @@ -14,7 +14,7 @@ CXX_GUARD_START
  1215.  #include <mgba/core/timing.h>
  1216.  #include <mgba/gba/interface.h>
  1217.  
  1218. -mLOG_DECLARE_CATEGORY(GBA_VIDEO);
  1219. +mLOG_DECLARE_CATEGORY(GBA_VIDEO)
  1220.  
  1221.  enum {
  1222.  	VIDEO_HBLANK_PIXELS = 68,
  1223. @@ -52,27 +52,27 @@ enum GBAVideoBlendEffect {
  1224.  	BLEND_DARKEN = 3
  1225.  };
  1226.  
  1227. -DECL_BITFIELD(GBAObjAttributesA, uint16_t);
  1228. -DECL_BITS(GBAObjAttributesA, Y, 0, 8);
  1229. -DECL_BIT(GBAObjAttributesA, Transformed, 8);
  1230. -DECL_BIT(GBAObjAttributesA, Disable, 9);
  1231. -DECL_BIT(GBAObjAttributesA, DoubleSize, 9);
  1232. -DECL_BITS(GBAObjAttributesA, Mode, 10, 2);
  1233. -DECL_BIT(GBAObjAttributesA, Mosaic, 12);
  1234. -DECL_BIT(GBAObjAttributesA, 256Color, 13);
  1235. -DECL_BITS(GBAObjAttributesA, Shape, 14, 2);
  1236. -
  1237. -DECL_BITFIELD(GBAObjAttributesB, uint16_t);
  1238. -DECL_BITS(GBAObjAttributesB, X, 0, 9);
  1239. -DECL_BITS(GBAObjAttributesB, MatIndex, 9, 5);
  1240. -DECL_BIT(GBAObjAttributesB, HFlip, 12);
  1241. -DECL_BIT(GBAObjAttributesB, VFlip, 13);
  1242. -DECL_BITS(GBAObjAttributesB, Size, 14, 2);
  1243. -
  1244. -DECL_BITFIELD(GBAObjAttributesC, uint16_t);
  1245. -DECL_BITS(GBAObjAttributesC, Tile, 0, 10);
  1246. -DECL_BITS(GBAObjAttributesC, Priority, 10, 2);
  1247. -DECL_BITS(GBAObjAttributesC, Palette, 12, 4);
  1248. +DECL_BITFIELD(GBAObjAttributesA, uint16_t)
  1249. +DECL_BITS(GBAObjAttributesA, Y, 0, 8)
  1250. +DECL_BIT(GBAObjAttributesA, Transformed, 8)
  1251. +DECL_BIT(GBAObjAttributesA, Disable, 9)
  1252. +DECL_BIT(GBAObjAttributesA, DoubleSize, 9)
  1253. +DECL_BITS(GBAObjAttributesA, Mode, 10, 2)
  1254. +DECL_BIT(GBAObjAttributesA, Mosaic, 12)
  1255. +DECL_BIT(GBAObjAttributesA, 256Color, 13)
  1256. +DECL_BITS(GBAObjAttributesA, Shape, 14, 2)
  1257. +
  1258. +DECL_BITFIELD(GBAObjAttributesB, uint16_t)
  1259. +DECL_BITS(GBAObjAttributesB, X, 0, 9)
  1260. +DECL_BITS(GBAObjAttributesB, MatIndex, 9, 5)
  1261. +DECL_BIT(GBAObjAttributesB, HFlip, 12)
  1262. +DECL_BIT(GBAObjAttributesB, VFlip, 13)
  1263. +DECL_BITS(GBAObjAttributesB, Size, 14, 2)
  1264. +
  1265. +DECL_BITFIELD(GBAObjAttributesC, uint16_t)
  1266. +DECL_BITS(GBAObjAttributesC, Tile, 0, 10)
  1267. +DECL_BITS(GBAObjAttributesC, Priority, 10, 2)
  1268. +DECL_BITS(GBAObjAttributesC, Palette, 12, 4)
  1269.  
  1270.  struct GBAObj {
  1271.  	GBAObjAttributesA a;
  1272. @@ -108,68 +108,68 @@ struct GBAVideoWindowRegion {
  1273.  #define GBA_TEXT_MAP_VFLIP(MAP) ((MAP) & 0x0800)
  1274.  #define GBA_TEXT_MAP_PALETTE(MAP) (((MAP) & 0xF000) >> 12)
  1275.  
  1276. -DECL_BITFIELD(GBARegisterDISPCNT, uint16_t);
  1277. -DECL_BITS(GBARegisterDISPCNT, Mode, 0, 3);
  1278. -DECL_BIT(GBARegisterDISPCNT, Cgb, 3);
  1279. -DECL_BIT(GBARegisterDISPCNT, FrameSelect, 4);
  1280. -DECL_BIT(GBARegisterDISPCNT, HblankIntervalFree, 5);
  1281. -DECL_BIT(GBARegisterDISPCNT, ObjCharacterMapping, 6);
  1282. -DECL_BIT(GBARegisterDISPCNT, ForcedBlank, 7);
  1283. -DECL_BIT(GBARegisterDISPCNT, Bg0Enable, 8);
  1284. -DECL_BIT(GBARegisterDISPCNT, Bg1Enable, 9);
  1285. -DECL_BIT(GBARegisterDISPCNT, Bg2Enable, 10);
  1286. -DECL_BIT(GBARegisterDISPCNT, Bg3Enable, 11);
  1287. -DECL_BIT(GBARegisterDISPCNT, ObjEnable, 12);
  1288. -DECL_BIT(GBARegisterDISPCNT, Win0Enable, 13);
  1289. -DECL_BIT(GBARegisterDISPCNT, Win1Enable, 14);
  1290. -DECL_BIT(GBARegisterDISPCNT, ObjwinEnable, 15);
  1291. -
  1292. -DECL_BITFIELD(GBARegisterDISPSTAT, uint16_t);
  1293. -DECL_BIT(GBARegisterDISPSTAT, InVblank, 0);
  1294. -DECL_BIT(GBARegisterDISPSTAT, InHblank, 1);
  1295. -DECL_BIT(GBARegisterDISPSTAT, Vcounter, 2);
  1296. -DECL_BIT(GBARegisterDISPSTAT, VblankIRQ, 3);
  1297. -DECL_BIT(GBARegisterDISPSTAT, HblankIRQ, 4);
  1298. -DECL_BIT(GBARegisterDISPSTAT, VcounterIRQ, 5);
  1299. -DECL_BITS(GBARegisterDISPSTAT, VcountSetting, 8, 8);
  1300. -
  1301. -DECL_BITFIELD(GBARegisterBGCNT, uint16_t);
  1302. -DECL_BITS(GBARegisterBGCNT, Priority, 0, 2);
  1303. -DECL_BITS(GBARegisterBGCNT, CharBase, 2, 2);
  1304. -DECL_BIT(GBARegisterBGCNT, Mosaic, 6);
  1305. -DECL_BIT(GBARegisterBGCNT, 256Color, 7);
  1306. -DECL_BITS(GBARegisterBGCNT, ScreenBase, 8, 5);
  1307. -DECL_BIT(GBARegisterBGCNT, Overflow, 13);
  1308. -DECL_BITS(GBARegisterBGCNT, Size, 14, 2);
  1309. -
  1310. -DECL_BITFIELD(GBARegisterBLDCNT, uint16_t);
  1311. -DECL_BIT(GBARegisterBLDCNT, Target1Bg0, 0);
  1312. -DECL_BIT(GBARegisterBLDCNT, Target1Bg1, 1);
  1313. -DECL_BIT(GBARegisterBLDCNT, Target1Bg2, 2);
  1314. -DECL_BIT(GBARegisterBLDCNT, Target1Bg3, 3);
  1315. -DECL_BIT(GBARegisterBLDCNT, Target1Obj, 4);
  1316. -DECL_BIT(GBARegisterBLDCNT, Target1Bd, 5);
  1317. -DECL_BITS(GBARegisterBLDCNT, Effect, 6, 2);
  1318. -DECL_BIT(GBARegisterBLDCNT, Target2Bg0, 8);
  1319. -DECL_BIT(GBARegisterBLDCNT, Target2Bg1, 9);
  1320. -DECL_BIT(GBARegisterBLDCNT, Target2Bg2, 10);
  1321. -DECL_BIT(GBARegisterBLDCNT, Target2Bg3, 11);
  1322. -DECL_BIT(GBARegisterBLDCNT, Target2Obj, 12);
  1323. -DECL_BIT(GBARegisterBLDCNT, Target2Bd, 13);
  1324. -
  1325. -DECL_BITFIELD(GBAWindowControl, uint8_t);
  1326. -DECL_BIT(GBAWindowControl, Bg0Enable, 0);
  1327. -DECL_BIT(GBAWindowControl, Bg1Enable, 1);
  1328. -DECL_BIT(GBAWindowControl, Bg2Enable, 2);
  1329. -DECL_BIT(GBAWindowControl, Bg3Enable, 3);
  1330. -DECL_BIT(GBAWindowControl, ObjEnable, 4);
  1331. -DECL_BIT(GBAWindowControl, BlendEnable, 5);
  1332. -
  1333. -DECL_BITFIELD(GBAMosaicControl, uint16_t);
  1334. -DECL_BITS(GBAMosaicControl, BgH, 0, 4);
  1335. -DECL_BITS(GBAMosaicControl, BgV, 4, 4);
  1336. -DECL_BITS(GBAMosaicControl, ObjH, 8, 4);
  1337. -DECL_BITS(GBAMosaicControl, ObjV, 12, 4);
  1338. +DECL_BITFIELD(GBARegisterDISPCNT, uint16_t)
  1339. +DECL_BITS(GBARegisterDISPCNT, Mode, 0, 3)
  1340. +DECL_BIT(GBARegisterDISPCNT, Cgb, 3)
  1341. +DECL_BIT(GBARegisterDISPCNT, FrameSelect, 4)
  1342. +DECL_BIT(GBARegisterDISPCNT, HblankIntervalFree, 5)
  1343. +DECL_BIT(GBARegisterDISPCNT, ObjCharacterMapping, 6)
  1344. +DECL_BIT(GBARegisterDISPCNT, ForcedBlank, 7)
  1345. +DECL_BIT(GBARegisterDISPCNT, Bg0Enable, 8)
  1346. +DECL_BIT(GBARegisterDISPCNT, Bg1Enable, 9)
  1347. +DECL_BIT(GBARegisterDISPCNT, Bg2Enable, 10)
  1348. +DECL_BIT(GBARegisterDISPCNT, Bg3Enable, 11)
  1349. +DECL_BIT(GBARegisterDISPCNT, ObjEnable, 12)
  1350. +DECL_BIT(GBARegisterDISPCNT, Win0Enable, 13)
  1351. +DECL_BIT(GBARegisterDISPCNT, Win1Enable, 14)
  1352. +DECL_BIT(GBARegisterDISPCNT, ObjwinEnable, 15)
  1353. +
  1354. +DECL_BITFIELD(GBARegisterDISPSTAT, uint16_t)
  1355. +DECL_BIT(GBARegisterDISPSTAT, InVblank, 0)
  1356. +DECL_BIT(GBARegisterDISPSTAT, InHblank, 1)
  1357. +DECL_BIT(GBARegisterDISPSTAT, Vcounter, 2)
  1358. +DECL_BIT(GBARegisterDISPSTAT, VblankIRQ, 3)
  1359. +DECL_BIT(GBARegisterDISPSTAT, HblankIRQ, 4)
  1360. +DECL_BIT(GBARegisterDISPSTAT, VcounterIRQ, 5)
  1361. +DECL_BITS(GBARegisterDISPSTAT, VcountSetting, 8, 8)
  1362. +
  1363. +DECL_BITFIELD(GBARegisterBGCNT, uint16_t)
  1364. +DECL_BITS(GBARegisterBGCNT, Priority, 0, 2)
  1365. +DECL_BITS(GBARegisterBGCNT, CharBase, 2, 2)
  1366. +DECL_BIT(GBARegisterBGCNT, Mosaic, 6)
  1367. +DECL_BIT(GBARegisterBGCNT, 256Color, 7)
  1368. +DECL_BITS(GBARegisterBGCNT, ScreenBase, 8, 5)
  1369. +DECL_BIT(GBARegisterBGCNT, Overflow, 13)
  1370. +DECL_BITS(GBARegisterBGCNT, Size, 14, 2)
  1371. +
  1372. +DECL_BITFIELD(GBARegisterBLDCNT, uint16_t)
  1373. +DECL_BIT(GBARegisterBLDCNT, Target1Bg0, 0)
  1374. +DECL_BIT(GBARegisterBLDCNT, Target1Bg1, 1)
  1375. +DECL_BIT(GBARegisterBLDCNT, Target1Bg2, 2)
  1376. +DECL_BIT(GBARegisterBLDCNT, Target1Bg3, 3)
  1377. +DECL_BIT(GBARegisterBLDCNT, Target1Obj, 4)
  1378. +DECL_BIT(GBARegisterBLDCNT, Target1Bd, 5)
  1379. +DECL_BITS(GBARegisterBLDCNT, Effect, 6, 2)
  1380. +DECL_BIT(GBARegisterBLDCNT, Target2Bg0, 8)
  1381. +DECL_BIT(GBARegisterBLDCNT, Target2Bg1, 9)
  1382. +DECL_BIT(GBARegisterBLDCNT, Target2Bg2, 10)
  1383. +DECL_BIT(GBARegisterBLDCNT, Target2Bg3, 11)
  1384. +DECL_BIT(GBARegisterBLDCNT, Target2Obj, 12)
  1385. +DECL_BIT(GBARegisterBLDCNT, Target2Bd, 13)
  1386. +
  1387. +DECL_BITFIELD(GBAWindowControl, uint8_t)
  1388. +DECL_BIT(GBAWindowControl, Bg0Enable, 0)
  1389. +DECL_BIT(GBAWindowControl, Bg1Enable, 1)
  1390. +DECL_BIT(GBAWindowControl, Bg2Enable, 2)
  1391. +DECL_BIT(GBAWindowControl, Bg3Enable, 3)
  1392. +DECL_BIT(GBAWindowControl, ObjEnable, 4)
  1393. +DECL_BIT(GBAWindowControl, BlendEnable, 5)
  1394. +
  1395. +DECL_BITFIELD(GBAMosaicControl, uint16_t)
  1396. +DECL_BITS(GBAMosaicControl, BgH, 0, 4)
  1397. +DECL_BITS(GBAMosaicControl, BgV, 4, 4)
  1398. +DECL_BITS(GBAMosaicControl, ObjH, 8, 4)
  1399. +DECL_BITS(GBAMosaicControl, ObjV, 12, 4)
  1400.  
  1401.  struct GBAVideoRenderer {
  1402.  	void (*init)(struct GBAVideoRenderer* renderer);
  1403. diff --git a/src/arm/debugger/debugger.c b/src/arm/debugger/debugger.c
  1404. index 7449ece33..8e8f4b523 100644
  1405. --- a/src/arm/debugger/debugger.c
  1406. +++ b/src/arm/debugger/debugger.c
  1407. @@ -12,7 +12,7 @@
  1408.  #include <mgba/internal/arm/debugger/memory-debugger.h>
  1409.  #include <mgba/internal/debugger/parser.h>
  1410.  
  1411. -DEFINE_VECTOR(ARMDebugBreakpointList, struct ARMDebugBreakpoint);
  1412. +DEFINE_VECTOR(ARMDebugBreakpointList, struct ARMDebugBreakpoint)
  1413.  
  1414.  static struct ARMDebugBreakpoint* _lookupBreakpoint(struct ARMDebugBreakpointList* breakpoints, uint32_t address) {
  1415.  	size_t i;
  1416. diff --git a/src/arm/isa-arm.c b/src/arm/isa-arm.c
  1417. index 68a9726dc..46dfb8bae 100644
  1418. --- a/src/arm/isa-arm.c
  1419. +++ b/src/arm/isa-arm.c
  1420. @@ -682,7 +682,7 @@ DEFINE_INSTRUCTION_ARM(MRC, ARM_STUB)
  1421.  
  1422.  // Begin miscellaneous definitions
  1423.  
  1424. -DEFINE_INSTRUCTION_ARM(BKPT, cpu->irqh.bkpt32(cpu, ((opcode >> 4) & 0xFFF0) | (opcode & 0xF))); // Not strictly in ARMv4T, but here for convenience
  1425. +DEFINE_INSTRUCTION_ARM(BKPT, cpu->irqh.bkpt32(cpu, ((opcode >> 4) & 0xFFF0) | (opcode & 0xF))) // Not strictly in ARMv4T, but here for convenience
  1426.  DEFINE_INSTRUCTION_ARM(ILL, ARM_ILL) // Illegal opcode
  1427.  
  1428.  DEFINE_INSTRUCTION_ARM(MSR,
  1429. diff --git a/src/core/cache-set.c b/src/core/cache-set.c
  1430. index a638c786e..f107fca04 100644
  1431. --- a/src/core/cache-set.c
  1432. +++ b/src/core/cache-set.c
  1433. @@ -5,9 +5,9 @@
  1434.   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  1435.  #include <mgba/core/cache-set.h>
  1436.  
  1437. -DEFINE_VECTOR(mMapCacheSet, struct mMapCache);
  1438. -DEFINE_VECTOR(mBitmapCacheSet, struct mBitmapCache);
  1439. -DEFINE_VECTOR(mTileCacheSet, struct mTileCache);
  1440. +DEFINE_VECTOR(mMapCacheSet, struct mMapCache)
  1441. +DEFINE_VECTOR(mBitmapCacheSet, struct mBitmapCache)
  1442. +DEFINE_VECTOR(mTileCacheSet, struct mTileCache)
  1443.  
  1444.  void mCacheSetInit(struct mCacheSet* cache, size_t nMaps, size_t nBitmaps, size_t nTiles) {
  1445.  	mMapCacheSetInit(&cache->maps, nMaps);
  1446. diff --git a/src/core/cheats.c b/src/core/cheats.c
  1447. index acd994393..92b6ff481 100644
  1448. --- a/src/core/cheats.c
  1449. +++ b/src/core/cheats.c
  1450. @@ -14,10 +14,10 @@
  1451.  
  1452.  const uint32_t M_CHEAT_DEVICE_ID = 0xABADC0DE;
  1453.  
  1454. -mLOG_DEFINE_CATEGORY(CHEATS, "Cheats", "core.cheats");
  1455. +mLOG_DEFINE_CATEGORY(CHEATS, "Cheats", "core.cheats")
  1456.  
  1457. -DEFINE_VECTOR(mCheatList, struct mCheat);
  1458. -DEFINE_VECTOR(mCheatSets, struct mCheatSet*);
  1459. +DEFINE_VECTOR(mCheatList, struct mCheat)
  1460. +DEFINE_VECTOR(mCheatSets, struct mCheatSet*)
  1461.  
  1462.  static int32_t _readMem(struct mCore* core, uint32_t address, int width) {
  1463.  	switch (width) {
  1464. diff --git a/src/core/input.c b/src/core/input.c
  1465. index fe24d0822..fab88a50e 100644
  1466. --- a/src/core/input.c
  1467. +++ b/src/core/input.c
  1468. @@ -16,8 +16,8 @@
  1469.  #define KEY_VALUE_MAX 16
  1470.  #define AXIS_INFO_MAX 12
  1471.  
  1472. -DECLARE_VECTOR(mInputHatList, struct mInputHatBindings);
  1473. -DEFINE_VECTOR(mInputHatList, struct mInputHatBindings);
  1474. +DECLARE_VECTOR(mInputHatList, struct mInputHatBindings)
  1475. +DEFINE_VECTOR(mInputHatList, struct mInputHatBindings)
  1476.  
  1477.  struct mInputMapImpl {
  1478.  	int* map;
  1479. diff --git a/src/core/interface.c b/src/core/interface.c
  1480. index 961b83619..e6288e274 100644
  1481. --- a/src/core/interface.c
  1482. +++ b/src/core/interface.c
  1483. @@ -8,7 +8,7 @@
  1484.  #include <mgba/core/core.h>
  1485.  #include <mgba/core/serialize.h>
  1486.  
  1487. -DEFINE_VECTOR(mCoreCallbacksList, struct mCoreCallbacks);
  1488. +DEFINE_VECTOR(mCoreCallbacksList, struct mCoreCallbacks)
  1489.  
  1490.  static void _rtcGenericSample(struct mRTCSource* source) {
  1491.  	struct mRTCGenericSource* rtc = (struct mRTCGenericSource*) source;
  1492. diff --git a/src/core/library.c b/src/core/library.c
  1493. index 60e16592f..61c144a02 100644
  1494. --- a/src/core/library.c
  1495. +++ b/src/core/library.c
  1496. @@ -13,7 +13,7 @@
  1497.  #include <sqlite3.h>
  1498.  #include "feature/sqlite3/no-intro.h"
  1499.  
  1500. -DEFINE_VECTOR(mLibraryListing, struct mLibraryEntry);
  1501. +DEFINE_VECTOR(mLibraryListing, struct mLibraryEntry)
  1502.  
  1503.  struct mLibrary {
  1504.  	sqlite3* db;
  1505. diff --git a/src/core/mem-search.c b/src/core/mem-search.c
  1506. index 7f0c215a1..8ffa540d5 100644
  1507. --- a/src/core/mem-search.c
  1508. +++ b/src/core/mem-search.c
  1509. @@ -8,7 +8,7 @@
  1510.  #include <mgba/core/core.h>
  1511.  #include <mgba/core/interface.h>
  1512.  
  1513. -DEFINE_VECTOR(mCoreMemorySearchResults, struct mCoreMemorySearchResult);
  1514. +DEFINE_VECTOR(mCoreMemorySearchResults, struct mCoreMemorySearchResult)
  1515.  
  1516.  static bool _op(int32_t value, int32_t match, enum mCoreMemorySearchOp op) {
  1517.  	switch (op) {
  1518. diff --git a/src/core/rewind.c b/src/core/rewind.c
  1519. index 3a554ff4e..41a6ce3db 100644
  1520. --- a/src/core/rewind.c
  1521. +++ b/src/core/rewind.c
  1522. @@ -10,7 +10,7 @@
  1523.  #include <mgba-util/patch/fast.h>
  1524.  #include <mgba-util/vfs.h>
  1525.  
  1526. -DEFINE_VECTOR(mCoreRewindPatches, struct PatchFast);
  1527. +DEFINE_VECTOR(mCoreRewindPatches, struct PatchFast)
  1528.  
  1529.  void _rewindDiff(struct mCoreRewindContext* context);
  1530.  
  1531. diff --git a/src/core/serialize.c b/src/core/serialize.c
  1532. index ed99107dd..800076f7b 100644
  1533. --- a/src/core/serialize.c
  1534. +++ b/src/core/serialize.c
  1535. @@ -17,7 +17,7 @@
  1536.  #include <zlib.h>
  1537.  #endif
  1538.  
  1539. -mLOG_DEFINE_CATEGORY(SAVESTATE, "Savestate", "core.serialize");
  1540. +mLOG_DEFINE_CATEGORY(SAVESTATE, "Savestate", "core.serialize")
  1541.  
  1542.  struct mBundledState {
  1543.  	size_t stateSize;
  1544. diff --git a/src/debugger/debugger.c b/src/debugger/debugger.c
  1545. index 675e04698..b894c341a 100644
  1546. --- a/src/debugger/debugger.c
  1547. +++ b/src/debugger/debugger.c
  1548. @@ -20,10 +20,10 @@
  1549.  
  1550.  const uint32_t DEBUGGER_ID = 0xDEADBEEF;
  1551.  
  1552. -mLOG_DEFINE_CATEGORY(DEBUGGER, "Debugger", "core.debugger");
  1553. +mLOG_DEFINE_CATEGORY(DEBUGGER, "Debugger", "core.debugger")
  1554.  
  1555. -DEFINE_VECTOR(mBreakpointList, struct mBreakpoint);
  1556. -DEFINE_VECTOR(mWatchpointList, struct mWatchpoint);
  1557. +DEFINE_VECTOR(mBreakpointList, struct mBreakpoint)
  1558. +DEFINE_VECTOR(mWatchpointList, struct mWatchpoint)
  1559.  
  1560.  static void mDebuggerInit(void* cpu, struct mCPUComponent* component);
  1561.  static void mDebuggerDeinit(struct mCPUComponent* component);
  1562. diff --git a/src/debugger/parser.c b/src/debugger/parser.c
  1563. index 41197b53e..ea94c7600 100644
  1564. --- a/src/debugger/parser.c
  1565. +++ b/src/debugger/parser.c
  1566. @@ -9,7 +9,7 @@
  1567.  #include <mgba/debugger/debugger.h>
  1568.  #include <mgba-util/string.h>
  1569.  
  1570. -DEFINE_VECTOR(LexVector, struct Token);
  1571. +DEFINE_VECTOR(LexVector, struct Token)
  1572.  
  1573.  enum LexState {
  1574.  	LEX_ERROR = -1,
  1575. diff --git a/src/gb/cheats.c b/src/gb/cheats.c
  1576. index 5c202782c..a157e3e28 100644
  1577. --- a/src/gb/cheats.c
  1578. +++ b/src/gb/cheats.c
  1579. @@ -10,7 +10,7 @@
  1580.  #include <mgba/internal/gb/memory.h>
  1581.  #include <mgba-util/string.h>
  1582.  
  1583. -DEFINE_VECTOR(GBCheatPatchList, struct GBCheatPatch);
  1584. +DEFINE_VECTOR(GBCheatPatchList, struct GBCheatPatch)
  1585.  
  1586.  static void _patchROM(struct mCheatDevice* device, struct GBCheatSet* cheats) {
  1587.  	if (!device->p) {
  1588. diff --git a/src/gb/gb.c b/src/gb/gb.c
  1589. index 461b574a6..e34f17d6a 100644
  1590. --- a/src/gb/gb.c
  1591. +++ b/src/gb/gb.c
  1592. @@ -33,7 +33,7 @@ static const uint8_t _knownHeader[4] = { 0xCE, 0xED, 0x66, 0x66};
  1593.  #define SGB2_BIOS_CHECKSUM 0X53D0DD63
  1594.  #define CGB_BIOS_CHECKSUM 0x41884E46
  1595.  
  1596. -mLOG_DEFINE_CATEGORY(GB, "GB", "gb");
  1597. +mLOG_DEFINE_CATEGORY(GB, "GB", "gb")
  1598.  
  1599.  static void GBInit(void* cpu, struct mCPUComponent* component);
  1600.  static void GBDeinit(struct mCPUComponent* component);
  1601. diff --git a/src/gb/io.c b/src/gb/io.c
  1602. index 535e0995a..9e0727b98 100644
  1603. --- a/src/gb/io.c
  1604. +++ b/src/gb/io.c
  1605. @@ -9,7 +9,7 @@
  1606.  #include <mgba/internal/gb/sio.h>
  1607.  #include <mgba/internal/gb/serialize.h>
  1608.  
  1609. -mLOG_DEFINE_CATEGORY(GB_IO, "GB I/O", "gb.io");
  1610. +mLOG_DEFINE_CATEGORY(GB_IO, "GB I/O", "gb.io")
  1611.  
  1612.  MGBA_EXPORT const char* const GBIORegisterNames[] = {
  1613.  	[REG_JOYP] = "JOYP",
  1614. diff --git a/src/gb/mbc.c b/src/gb/mbc.c
  1615. index 6014a200c..333d1e576 100644
  1616. --- a/src/gb/mbc.c
  1617. +++ b/src/gb/mbc.c
  1618. @@ -14,7 +14,7 @@
  1619.  
  1620.  const uint32_t GB_LOGO_HASH = 0x46195417;
  1621.  
  1622. -mLOG_DEFINE_CATEGORY(GB_MBC, "GB MBC", "gb.mbc");
  1623. +mLOG_DEFINE_CATEGORY(GB_MBC, "GB MBC", "gb.mbc")
  1624.  
  1625.  static void _GBMBCNone(struct GB* gb, uint16_t address, uint8_t value) {
  1626.  	UNUSED(gb);
  1627. diff --git a/src/gb/memory.c b/src/gb/memory.c
  1628. index a5c047d0f..5aa3ec204 100644
  1629. --- a/src/gb/memory.c
  1630. +++ b/src/gb/memory.c
  1631. @@ -14,7 +14,7 @@
  1632.  
  1633.  #include <mgba-util/memory.h>
  1634.  
  1635. -mLOG_DEFINE_CATEGORY(GB_MEM, "GB Memory", "gb.memory");
  1636. +mLOG_DEFINE_CATEGORY(GB_MEM, "GB Memory", "gb.memory")
  1637.  
  1638.  static const uint8_t _yankBuffer[] = { 0xFF };
  1639.  
  1640. diff --git a/src/gb/serialize.c b/src/gb/serialize.c
  1641. index 0c1884c67..3568971da 100644
  1642. --- a/src/gb/serialize.c
  1643. +++ b/src/gb/serialize.c
  1644. @@ -11,7 +11,7 @@
  1645.  
  1646.  #include <mgba-util/memory.h>
  1647.  
  1648. -mLOG_DEFINE_CATEGORY(GB_STATE, "GB Savestate", "gb.serialize");
  1649. +mLOG_DEFINE_CATEGORY(GB_STATE, "GB Savestate", "gb.serialize")
  1650.  
  1651.  const uint32_t GB_SAVESTATE_MAGIC = 0x00400000;
  1652.  const uint32_t GB_SAVESTATE_VERSION = 0x00000002;
  1653. diff --git a/src/gb/sio.c b/src/gb/sio.c
  1654. index f2bb20fe8..6ffb98775 100644
  1655. --- a/src/gb/sio.c
  1656. +++ b/src/gb/sio.c
  1657. @@ -9,7 +9,7 @@
  1658.  #include <mgba/internal/gb/io.h>
  1659.  #include <mgba/internal/gb/serialize.h>
  1660.  
  1661. -mLOG_DEFINE_CATEGORY(GB_SIO, "GB Serial I/O", "gb.sio");
  1662. +mLOG_DEFINE_CATEGORY(GB_SIO, "GB Serial I/O", "gb.sio")
  1663.  
  1664.  const int GBSIOCyclesPerTransfer[2] = {
  1665.  	512,
  1666. diff --git a/src/gba/audio.c b/src/gba/audio.c
  1667. index 72f49b7e3..48febf959 100644
  1668. --- a/src/gba/audio.c
  1669. +++ b/src/gba/audio.c
  1670. @@ -20,7 +20,7 @@
  1671.  #define blip_add_delta blip_add_delta_fast
  1672.  #endif
  1673.  
  1674. -mLOG_DEFINE_CATEGORY(GBA_AUDIO, "GBA Audio", "gba.audio");
  1675. +mLOG_DEFINE_CATEGORY(GBA_AUDIO, "GBA Audio", "gba.audio")
  1676.  
  1677.  const unsigned GBA_AUDIO_SAMPLES = 2048;
  1678.  const unsigned GBA_AUDIO_FIFO_SIZE = 8 * sizeof(int32_t);
  1679. diff --git a/src/gba/bios.c b/src/gba/bios.c
  1680. index 0a7982ad5..c9c96d72d 100644
  1681. --- a/src/gba/bios.c
  1682. +++ b/src/gba/bios.c
  1683. @@ -15,7 +15,7 @@
  1684.  const uint32_t GBA_BIOS_CHECKSUM = 0xBAAE187F;
  1685.  const uint32_t GBA_DS_BIOS_CHECKSUM = 0xBAAE1880;
  1686.  
  1687. -mLOG_DEFINE_CATEGORY(GBA_BIOS, "GBA BIOS", "gba.bios");
  1688. +mLOG_DEFINE_CATEGORY(GBA_BIOS, "GBA BIOS", "gba.bios")
  1689.  
  1690.  static void _unLz77(struct GBA* gba, int width);
  1691.  static void _unHuffman(struct GBA* gba);
  1692. @@ -681,10 +681,10 @@ static void _unLz77(struct GBA* gba, int width) {
  1693.  	cpu->gprs[3] = 0;
  1694.  }
  1695.  
  1696. -DECL_BITFIELD(HuffmanNode, uint8_t);
  1697. -DECL_BITS(HuffmanNode, Offset, 0, 6);
  1698. -DECL_BIT(HuffmanNode, RTerm, 6);
  1699. -DECL_BIT(HuffmanNode, LTerm, 7);
  1700. +DECL_BITFIELD(HuffmanNode, uint8_t)
  1701. +DECL_BITS(HuffmanNode, Offset, 0, 6)
  1702. +DECL_BIT(HuffmanNode, RTerm, 6)
  1703. +DECL_BIT(HuffmanNode, LTerm, 7)
  1704.  
  1705.  static void _unHuffman(struct GBA* gba) {
  1706.  	struct ARMCore* cpu = gba->cpu;
  1707. diff --git a/src/gba/dma.c b/src/gba/dma.c
  1708. index 2c112716f..cccff346e 100644
  1709. --- a/src/gba/dma.c
  1710. +++ b/src/gba/dma.c
  1711. @@ -102,7 +102,7 @@ uint16_t GBADMAWriteCNT_HI(struct GBA* gba, int dma, uint16_t control) {
  1712.  	}
  1713.  	// If the DMA has already occurred, this value might have changed since the function started
  1714.  	return currentDma->reg;
  1715. -};
  1716. +}
  1717.  
  1718.  void GBADMASchedule(struct GBA* gba, int number, struct GBADMA* info) {
  1719.  	switch (GBADMARegisterGetTiming(info->reg)) {
  1720. diff --git a/src/gba/extra/battlechip.c b/src/gba/extra/battlechip.c
  1721. index ae8aedff0..1731fb20f 100644
  1722. --- a/src/gba/extra/battlechip.c
  1723. +++ b/src/gba/extra/battlechip.c
  1724. @@ -9,8 +9,8 @@
  1725.  #include <mgba/internal/gba/io.h>
  1726.  #include <mgba/internal/gba/sio.h>
  1727.  
  1728. -mLOG_DECLARE_CATEGORY(GBA_BATTLECHIP);
  1729. -mLOG_DEFINE_CATEGORY(GBA_BATTLECHIP, "GBA BattleChip Gate", "gba.battlechip");
  1730. +mLOG_DECLARE_CATEGORY(GBA_BATTLECHIP)
  1731. +mLOG_DEFINE_CATEGORY(GBA_BATTLECHIP, "GBA BattleChip Gate", "gba.battlechip")
  1732.  
  1733.  enum {
  1734.  	BATTLECHIP_STATE_SYNC = -1,
  1735. diff --git a/src/gba/gba.c b/src/gba/gba.c
  1736. index 07043c8eb..02b7cee16 100644
  1737. --- a/src/gba/gba.c
  1738. +++ b/src/gba/gba.c
  1739. @@ -27,8 +27,8 @@
  1740.  
  1741.  #define GBA_IRQ_DELAY 7
  1742.  
  1743. -mLOG_DEFINE_CATEGORY(GBA, "GBA", "gba");
  1744. -mLOG_DEFINE_CATEGORY(GBA_DEBUG, "GBA Debug", "gba.debug");
  1745. +mLOG_DEFINE_CATEGORY(GBA, "GBA", "gba")
  1746. +mLOG_DEFINE_CATEGORY(GBA_DEBUG, "GBA Debug", "gba.debug")
  1747.  
  1748.  const uint32_t GBA_COMPONENT_MAGIC = 0x1000000;
  1749.  
  1750. diff --git a/src/gba/hardware.c b/src/gba/hardware.c
  1751. index 5ee4c55e8..cb7ac44d6 100644
  1752. --- a/src/gba/hardware.c
  1753. +++ b/src/gba/hardware.c
  1754. @@ -11,7 +11,7 @@
  1755.  #include <mgba-util/formatting.h>
  1756.  #include <mgba-util/hash.h>
  1757.  
  1758. -mLOG_DEFINE_CATEGORY(GBA_HW, "GBA Pak Hardware", "gba.hardware");
  1759. +mLOG_DEFINE_CATEGORY(GBA_HW, "GBA Pak Hardware", "gba.hardware")
  1760.  
  1761.  MGBA_EXPORT const int GBA_LUX_LEVELS[10] = { 5, 11, 18, 27, 42, 62, 84, 109, 139, 183 };
  1762.  
  1763. diff --git a/src/gba/io.c b/src/gba/io.c
  1764. index 209335ec6..5df243b49 100644
  1765. --- a/src/gba/io.c
  1766. +++ b/src/gba/io.c
  1767. @@ -11,7 +11,7 @@
  1768.  #include <mgba/internal/gba/rr/rr.h>
  1769.  #include <mgba/internal/gba/serialize.h>
  1770.  
  1771. -mLOG_DEFINE_CATEGORY(GBA_IO, "GBA I/O", "gba.io");
  1772. +mLOG_DEFINE_CATEGORY(GBA_IO, "GBA I/O", "gba.io")
  1773.  
  1774.  const char* const GBAIORegisterNames[] = {
  1775.  	// Video
  1776. diff --git a/src/gba/memory.c b/src/gba/memory.c
  1777. index d2ba5a419..d2a8e8280 100644
  1778. --- a/src/gba/memory.c
  1779. +++ b/src/gba/memory.c
  1780. @@ -19,7 +19,7 @@
  1781.  
  1782.  #define IDLE_LOOP_THRESHOLD 10000
  1783.  
  1784. -mLOG_DEFINE_CATEGORY(GBA_MEM, "GBA Memory", "gba.memory");
  1785. +mLOG_DEFINE_CATEGORY(GBA_MEM, "GBA Memory", "gba.memory")
  1786.  
  1787.  static void _pristineCow(struct GBA* gba);
  1788.  static void _agbPrintStore(struct GBA* gba, uint32_t address, int16_t value);
  1789. diff --git a/src/gba/savedata.c b/src/gba/savedata.c
  1790. index 39a805725..70b18d93a 100644
  1791. --- a/src/gba/savedata.c
  1792. +++ b/src/gba/savedata.c
  1793. @@ -26,7 +26,7 @@
  1794.  #define EEPROM_SETTLE_CYCLES 115000
  1795.  #define CLEANUP_THRESHOLD 15
  1796.  
  1797. -mLOG_DEFINE_CATEGORY(GBA_SAVE, "GBA Savedata", "gba.savedata");
  1798. +mLOG_DEFINE_CATEGORY(GBA_SAVE, "GBA Savedata", "gba.savedata")
  1799.  
  1800.  static void _flashSwitchBank(struct GBASavedata* savedata, int bank);
  1801.  static void _flashErase(struct GBASavedata* savedata);
  1802. diff --git a/src/gba/serialize.c b/src/gba/serialize.c
  1803. index 6f09e3005..8741d40e8 100644
  1804. --- a/src/gba/serialize.c
  1805. +++ b/src/gba/serialize.c
  1806. @@ -18,7 +18,7 @@
  1807.  const uint32_t GBA_SAVESTATE_MAGIC = 0x01000000;
  1808.  const uint32_t GBA_SAVESTATE_VERSION = 0x00000003;
  1809.  
  1810. -mLOG_DEFINE_CATEGORY(GBA_STATE, "GBA Savestate", "gba.serialize");
  1811. +mLOG_DEFINE_CATEGORY(GBA_STATE, "GBA Savestate", "gba.serialize")
  1812.  
  1813.  struct GBABundledState {
  1814.  	struct GBASerializedState* state;
  1815. diff --git a/src/gba/sio.c b/src/gba/sio.c
  1816. index a153cb1fa..e5cbf97ba 100644
  1817. --- a/src/gba/sio.c
  1818. +++ b/src/gba/sio.c
  1819. @@ -8,7 +8,7 @@
  1820.  #include <mgba/internal/gba/gba.h>
  1821.  #include <mgba/internal/gba/io.h>
  1822.  
  1823. -mLOG_DEFINE_CATEGORY(GBA_SIO, "GBA Serial I/O", "gba.sio");
  1824. +mLOG_DEFINE_CATEGORY(GBA_SIO, "GBA Serial I/O", "gba.sio")
  1825.  
  1826.  const int GBASIOCyclesPerTransfer[4][MAX_GBAS] = {
  1827.  	{ 38326, 73003, 107680, 142356 },
  1828. diff --git a/src/gba/video.c b/src/gba/video.c
  1829. index a05d6a7f0..f3dc99db4 100644
  1830. --- a/src/gba/video.c
  1831. +++ b/src/gba/video.c
  1832. @@ -16,7 +16,7 @@
  1833.  
  1834.  #include <mgba-util/memory.h>
  1835.  
  1836. -mLOG_DEFINE_CATEGORY(GBA_VIDEO, "GBA Video", "gba.video");
  1837. +mLOG_DEFINE_CATEGORY(GBA_VIDEO, "GBA Video", "gba.video")
  1838.  
  1839.  static void GBAVideoDummyRendererInit(struct GBAVideoRenderer* renderer);
  1840.  static void GBAVideoDummyRendererReset(struct GBAVideoRenderer* renderer);
  1841. diff --git a/src/platform/opengl/gles2.c b/src/platform/opengl/gles2.c
  1842. index fbb0fa601..af959d410 100644
  1843. --- a/src/platform/opengl/gles2.c
  1844. +++ b/src/platform/opengl/gles2.c
  1845. @@ -12,8 +12,8 @@
  1846.  #include <mgba-util/vector.h>
  1847.  #include <mgba-util/vfs.h>
  1848.  
  1849. -mLOG_DECLARE_CATEGORY(OPENGL);
  1850. -mLOG_DEFINE_CATEGORY(OPENGL, "OpenGL", "video.ogl");
  1851. +mLOG_DECLARE_CATEGORY(OPENGL)
  1852. +mLOG_DEFINE_CATEGORY(OPENGL, "OpenGL", "video.ogl")
  1853.  
  1854.  #define MAX_PASSES 8
  1855.  
  1856. @@ -626,8 +626,8 @@ static bool _lookupBoolValue(const struct Configuration* config, const char* sec
  1857.  	return true;
  1858.  }
  1859.  
  1860. -DECLARE_VECTOR(mGLES2UniformList, struct mGLES2Uniform);
  1861. -DEFINE_VECTOR(mGLES2UniformList, struct mGLES2Uniform);
  1862. +DECLARE_VECTOR(mGLES2UniformList, struct mGLES2Uniform)
  1863. +DEFINE_VECTOR(mGLES2UniformList, struct mGLES2Uniform)
  1864.  
  1865.  static void _uniformHandler(const char* sectionName, void* user) {
  1866.  	struct mGLES2UniformList* uniforms = user;
  1867. diff --git a/src/platform/sdl/sdl-audio.c b/src/platform/sdl/sdl-audio.c
  1868. index f1666aa4e..85f9d761a 100644
  1869. --- a/src/platform/sdl/sdl-audio.c
  1870. +++ b/src/platform/sdl/sdl-audio.c
  1871. @@ -14,7 +14,7 @@
  1872.  
  1873.  #define BUFFER_SIZE (GBA_AUDIO_SAMPLES >> 2)
  1874.  
  1875. -mLOG_DEFINE_CATEGORY(SDL_AUDIO, "SDL Audio", "platform.sdl.audio");
  1876. +mLOG_DEFINE_CATEGORY(SDL_AUDIO, "SDL Audio", "platform.sdl.audio")
  1877.  
  1878.  static void _mSDLAudioCallback(void* context, Uint8* data, int len);
  1879.  
  1880. diff --git a/src/platform/sdl/sdl-audio.h b/src/platform/sdl/sdl-audio.h
  1881. index 2ae920af4..b131c7d2f 100644
  1882. --- a/src/platform/sdl/sdl-audio.h
  1883. +++ b/src/platform/sdl/sdl-audio.h
  1884. @@ -22,7 +22,7 @@ CXX_GUARD_START
  1885.  #define bool _Bool
  1886.  #endif
  1887.  
  1888. -mLOG_DECLARE_CATEGORY(SDL_AUDIO);
  1889. +mLOG_DECLARE_CATEGORY(SDL_AUDIO)
  1890.  
  1891.  struct mSDLAudio {
  1892.  	// Input
  1893. diff --git a/src/platform/sdl/sdl-events.c b/src/platform/sdl/sdl-events.c
  1894. index c7291ff32..0a4a26310 100644
  1895. --- a/src/platform/sdl/sdl-events.c
  1896. +++ b/src/platform/sdl/sdl-events.c
  1897. @@ -25,9 +25,9 @@
  1898.  #define RUMBLE_PWM 16
  1899.  #define RUMBLE_STEPS 2
  1900.  
  1901. -mLOG_DEFINE_CATEGORY(SDL_EVENTS, "SDL Events", "platform.sdl.events");
  1902. +mLOG_DEFINE_CATEGORY(SDL_EVENTS, "SDL Events", "platform.sdl.events")
  1903.  
  1904. -DEFINE_VECTOR(SDL_JoystickList, struct SDL_JoystickCombo);
  1905. +DEFINE_VECTOR(SDL_JoystickList, struct SDL_JoystickCombo)
  1906.  
  1907.  #if SDL_VERSION_ATLEAST(2, 0, 0)
  1908.  static void _mSDLSetRumble(struct mRumble* rumble, int enable);
  1909. diff --git a/src/platform/sdl/sdl-events.h b/src/platform/sdl/sdl-events.h
  1910. index 8cb1aede2..8998449a2 100644
  1911. --- a/src/platform/sdl/sdl-events.h
  1912. +++ b/src/platform/sdl/sdl-events.h
  1913. @@ -25,7 +25,7 @@ CXX_GUARD_START
  1914.  #define bool _Bool
  1915.  #endif
  1916.  
  1917. -mLOG_DECLARE_CATEGORY(SDL_EVENTS);
  1918. +mLOG_DECLARE_CATEGORY(SDL_EVENTS)
  1919.  
  1920.  #define SDL_BINDING_KEY 0x53444C4BU
  1921.  #define SDL_BINDING_BUTTON 0x53444C42U
  1922. @@ -45,7 +45,7 @@ struct SDL_JoystickCombo {
  1923.  #endif
  1924.  };
  1925.  
  1926. -DECLARE_VECTOR(SDL_JoystickList, struct SDL_JoystickCombo);
  1927. +DECLARE_VECTOR(SDL_JoystickList, struct SDL_JoystickCombo)
  1928.  
  1929.  struct mSDLPlayer;
  1930.  struct mSDLEvents {
  1931. diff --git a/src/sm83/decoder.c b/src/sm83/decoder.c
  1932. index 949a8119a..7d9ae040f 100644
  1933. --- a/src/sm83/decoder.c
  1934. +++ b/src/sm83/decoder.c
  1935. @@ -75,20 +75,20 @@ DEFINE_DECODER_SM83(NOP, info->mnemonic = SM83_MN_NOP;)
  1936.  		info->op1.reg = SM83_REG_ ## NAME; \
  1937.  		return 2;)
  1938.  
  1939. -DEFINE_LD_DECODER_SM83(B);
  1940. -DEFINE_LD_DECODER_SM83(C);
  1941. -DEFINE_LD_DECODER_SM83(D);
  1942. -DEFINE_LD_DECODER_SM83(E);
  1943. -DEFINE_LD_DECODER_SM83(H);
  1944. -DEFINE_LD_DECODER_SM83(L);
  1945. -DEFINE_LD_DECODER_SM83(A);
  1946. -DEFINE_LD_DECODER_SM83_MEM(A, BC);
  1947. -DEFINE_LD_DECODER_SM83_MEM(A, DE);
  1948. -
  1949. -DEFINE_LD_2_DECODER_SM83(BC);
  1950. -DEFINE_LD_2_DECODER_SM83(DE);
  1951. -DEFINE_LD_2_DECODER_SM83(HL);
  1952. -DEFINE_LD_2_DECODER_SM83(SP);
  1953. +DEFINE_LD_DECODER_SM83(B)
  1954. +DEFINE_LD_DECODER_SM83(C)
  1955. +DEFINE_LD_DECODER_SM83(D)
  1956. +DEFINE_LD_DECODER_SM83(E)
  1957. +DEFINE_LD_DECODER_SM83(H)
  1958. +DEFINE_LD_DECODER_SM83(L)
  1959. +DEFINE_LD_DECODER_SM83(A)
  1960. +DEFINE_LD_DECODER_SM83_MEM(A, BC)
  1961. +DEFINE_LD_DECODER_SM83_MEM(A, DE)
  1962. +
  1963. +DEFINE_LD_2_DECODER_SM83(BC)
  1964. +DEFINE_LD_2_DECODER_SM83(DE)
  1965. +DEFINE_LD_2_DECODER_SM83(HL)
  1966. +DEFINE_LD_2_DECODER_SM83(SP)
  1967.  
  1968.  DEFINE_DECODER_SM83(LDHL_, \
  1969.  	info->mnemonic = SM83_MN_LD; \
  1970. @@ -157,16 +157,16 @@ DEFINE_DECODER_SM83(LDIOA, \
  1971.  		return 1;) \
  1972.  	DEFINE_ALU_DECODER_SM83_NOHL(NAME)
  1973.  
  1974. -DEFINE_ALU_DECODER_SM83_NOHL(INC);
  1975. -DEFINE_ALU_DECODER_SM83_NOHL(DEC);
  1976. -DEFINE_ALU_DECODER_SM83(AND);
  1977. -DEFINE_ALU_DECODER_SM83(XOR);
  1978. -DEFINE_ALU_DECODER_SM83(OR);
  1979. -DEFINE_ALU_DECODER_SM83(CP);
  1980. -DEFINE_ALU_DECODER_SM83(ADD);
  1981. -DEFINE_ALU_DECODER_SM83(ADC);
  1982. -DEFINE_ALU_DECODER_SM83(SUB);
  1983. -DEFINE_ALU_DECODER_SM83(SBC);
  1984. +DEFINE_ALU_DECODER_SM83_NOHL(INC)
  1985. +DEFINE_ALU_DECODER_SM83_NOHL(DEC)
  1986. +DEFINE_ALU_DECODER_SM83(AND)
  1987. +DEFINE_ALU_DECODER_SM83(XOR)
  1988. +DEFINE_ALU_DECODER_SM83(OR)
  1989. +DEFINE_ALU_DECODER_SM83(CP)
  1990. +DEFINE_ALU_DECODER_SM83(ADD)
  1991. +DEFINE_ALU_DECODER_SM83(ADC)
  1992. +DEFINE_ALU_DECODER_SM83(SUB)
  1993. +DEFINE_ALU_DECODER_SM83(SBC)
  1994.  
  1995.  #define DEFINE_ALU_DECODER_SM83_ADD_HL(REG) \
  1996.  	DEFINE_DECODER_SM83(ADDHL_ ## REG, info->mnemonic = SM83_MN_ADD; \
  1997. @@ -213,10 +213,10 @@ DEFINE_DECODER_SM83(ADDSP, info->mnemonic = SM83_MN_ADD; \
  1998.  		info->mnemonic = SM83_MN_RET; \
  1999.  		info->condition = CONDITION;)
  2000.  
  2001. -DEFINE_CONDITIONAL_DECODER_SM83(JP);
  2002. -DEFINE_CONDITIONAL_DECODER_SM83(JR);
  2003. -DEFINE_CONDITIONAL_DECODER_SM83(CALL);
  2004. -DEFINE_CONDITIONAL_DECODER_SM83(RET);
  2005. +DEFINE_CONDITIONAL_DECODER_SM83(JP)
  2006. +DEFINE_CONDITIONAL_DECODER_SM83(JR)
  2007. +DEFINE_CONDITIONAL_DECODER_SM83(CALL)
  2008. +DEFINE_CONDITIONAL_DECODER_SM83(RET)
  2009.  
  2010.  DEFINE_DECODER_SM83(JPHL, \
  2011.  	info->mnemonic = SM83_MN_JP; \
  2012. @@ -282,10 +282,10 @@ DEFINE_DECODER_SM83(LDA_DHL, \
  2013.  	DEFINE_DECODER_SM83(INC ## REG, info->mnemonic = SM83_MN_INC; info->op1.reg = SM83_REG_ ## REG) \
  2014.  	DEFINE_DECODER_SM83(DEC ## REG, info->mnemonic = SM83_MN_DEC; info->op1.reg = SM83_REG_ ## REG)
  2015.  
  2016. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(BC);
  2017. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(DE);
  2018. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(HL);
  2019. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(SP);
  2020. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(BC)
  2021. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(DE)
  2022. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(HL)
  2023. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(SP)
  2024.  
  2025.  DEFINE_DECODER_SM83(INC_HL,
  2026.  	info->mnemonic = SM83_MN_INC;
  2027. @@ -310,10 +310,10 @@ DEFINE_DECODER_SM83(DAA, info->mnemonic = SM83_MN_DAA)
  2028.  		info->mnemonic = SM83_MN_PUSH; \
  2029.  		info->op1.reg = SM83_REG_ ## REG;) \
  2030.  
  2031. -DEFINE_POPPUSH_DECODER_SM83(BC);
  2032. -DEFINE_POPPUSH_DECODER_SM83(DE);
  2033. -DEFINE_POPPUSH_DECODER_SM83(HL);
  2034. -DEFINE_POPPUSH_DECODER_SM83(AF);
  2035. +DEFINE_POPPUSH_DECODER_SM83(BC)
  2036. +DEFINE_POPPUSH_DECODER_SM83(DE)
  2037. +DEFINE_POPPUSH_DECODER_SM83(HL)
  2038. +DEFINE_POPPUSH_DECODER_SM83(AF)
  2039.  
  2040.  #define DEFINE_CB_OP_DECODER_SM83(NAME, BODY, OP) \
  2041.  	DEFINE_DECODER_SM83(NAME ## B, info->OP.reg = SM83_REG_B; BODY) \
  2042. @@ -369,14 +369,14 @@ DEFINE_DECODER_SM83(STOP, info->mnemonic = SM83_MN_STOP; return 1)
  2043.  #define DEFINE_RST_DECODER_SM83(VEC) \
  2044.  	DEFINE_DECODER_SM83(RST ## VEC, info->op1.immediate = 0x ## VEC;)
  2045.  
  2046. -DEFINE_RST_DECODER_SM83(00);
  2047. -DEFINE_RST_DECODER_SM83(08);
  2048. -DEFINE_RST_DECODER_SM83(10);
  2049. -DEFINE_RST_DECODER_SM83(18);
  2050. -DEFINE_RST_DECODER_SM83(20);
  2051. -DEFINE_RST_DECODER_SM83(28);
  2052. -DEFINE_RST_DECODER_SM83(30);
  2053. -DEFINE_RST_DECODER_SM83(38);
  2054. +DEFINE_RST_DECODER_SM83(00)
  2055. +DEFINE_RST_DECODER_SM83(08)
  2056. +DEFINE_RST_DECODER_SM83(10)
  2057. +DEFINE_RST_DECODER_SM83(18)
  2058. +DEFINE_RST_DECODER_SM83(20)
  2059. +DEFINE_RST_DECODER_SM83(28)
  2060. +DEFINE_RST_DECODER_SM83(30)
  2061. +DEFINE_RST_DECODER_SM83(38)
  2062.  
  2063.  DEFINE_DECODER_SM83(CB, return 1)
  2064.  
  2065. diff --git a/src/sm83/isa-sm83.c b/src/sm83/isa-sm83.c
  2066. index 8599d2af2..4085b3553 100644
  2067. --- a/src/sm83/isa-sm83.c
  2068. +++ b/src/sm83/isa-sm83.c
  2069. @@ -44,7 +44,7 @@ static inline void SM83WriteDE(struct SM83Core* cpu, uint16_t de) {
  2070.  		BODY; \
  2071.  	}
  2072.  
  2073. -DEFINE_INSTRUCTION_SM83(NOP,);
  2074. +DEFINE_INSTRUCTION_SM83(NOP,)
  2075.  
  2076.  #define DEFINE_CONDITIONAL_ONLY_INSTRUCTION_SM83(NAME) \
  2077.  	DEFINE_ ## NAME ## _INSTRUCTION_SM83(C, cpu->f.c) \
  2078. @@ -74,7 +74,7 @@ DEFINE_INSTRUCTION_SM83(JPDelay,
  2079.  		cpu->instruction = _SM83InstructionJPDelay; \
  2080.  		cpu->condition = CONDITION;)
  2081.  
  2082. -DEFINE_CONDITIONAL_INSTRUCTION_SM83(JP);
  2083. +DEFINE_CONDITIONAL_INSTRUCTION_SM83(JP)
  2084.  
  2085.  DEFINE_INSTRUCTION_SM83(JPHL,
  2086.  	cpu->pc = SM83ReadHL(cpu);
  2087. @@ -93,7 +93,7 @@ DEFINE_INSTRUCTION_SM83(JRFinish,
  2088.  		cpu->instruction = _SM83InstructionJRFinish; \
  2089.  		cpu->condition = CONDITION;)
  2090.  
  2091. -DEFINE_CONDITIONAL_INSTRUCTION_SM83(JR);
  2092. +DEFINE_CONDITIONAL_INSTRUCTION_SM83(JR)
  2093.  
  2094.  DEFINE_INSTRUCTION_SM83(CALLUpdateSPL,
  2095.  	--cpu->index;
  2096. @@ -235,13 +235,13 @@ DEFINE_CONDITIONAL_ONLY_INSTRUCTION_SM83(RET)
  2097.  		cpu->a = OPERAND;)
  2098.  
  2099.  #define DEFINE_ALU_INSTRUCTION_SM83_NOHL(NAME) \
  2100. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(A, cpu->a); \
  2101. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(B, cpu->b); \
  2102. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(C, cpu->c); \
  2103. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(D, cpu->d); \
  2104. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(E, cpu->e); \
  2105. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(H, cpu->h); \
  2106. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(L, cpu->l);
  2107. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(A, cpu->a) \
  2108. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(B, cpu->b) \
  2109. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(C, cpu->c) \
  2110. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(D, cpu->d) \
  2111. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(E, cpu->e) \
  2112. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(H, cpu->h) \
  2113. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(L, cpu->l)
  2114.  
  2115.  DEFINE_INSTRUCTION_SM83(LDHL_Bus, \
  2116.  	cpu->index = SM83ReadHL(cpu); \
  2117. @@ -277,17 +277,17 @@ DEFINE_INSTRUCTION_SM83(LDSP_HL,
  2118.  		cpu->instruction = _SM83Instruction ## NAME ## Bus;)
  2119.  
  2120.  #define DEFINE_ALU_INSTRUCTION_SM83(NAME) \
  2121. -	DEFINE_ ## NAME ## _INSTRUCTION_SM83(Bus, cpu->bus); \
  2122. +	DEFINE_ ## NAME ## _INSTRUCTION_SM83(Bus, cpu->bus) \
  2123.  	DEFINE_ALU_INSTRUCTION_SM83_MEM(NAME, HL) \
  2124.  	DEFINE_INSTRUCTION_SM83(NAME, \
  2125.  		cpu->executionState = SM83_CORE_READ_PC; \
  2126.  		cpu->instruction = _SM83Instruction ## NAME ## Bus;) \
  2127.  	DEFINE_ALU_INSTRUCTION_SM83_NOHL(NAME)
  2128.  
  2129. -DEFINE_ALU_INSTRUCTION_SM83(AND);
  2130. -DEFINE_ALU_INSTRUCTION_SM83(XOR);
  2131. -DEFINE_ALU_INSTRUCTION_SM83(OR);
  2132. -DEFINE_ALU_INSTRUCTION_SM83(CP);
  2133. +DEFINE_ALU_INSTRUCTION_SM83(AND)
  2134. +DEFINE_ALU_INSTRUCTION_SM83(XOR)
  2135. +DEFINE_ALU_INSTRUCTION_SM83(OR)
  2136. +DEFINE_ALU_INSTRUCTION_SM83(CP)
  2137.  
  2138.  static void _SM83InstructionLDB_Bus(struct SM83Core*);
  2139.  static void _SM83InstructionLDC_Bus(struct SM83Core*);
  2140. @@ -334,20 +334,20 @@ static void _SM83InstructionLDA_Bus(struct SM83Core*);
  2141.  		cpu->a = diff; \
  2142.  		cpu->f.z = !cpu->a;)
  2143.  
  2144. -DEFINE_ALU_INSTRUCTION_SM83(LDB_);
  2145. -DEFINE_ALU_INSTRUCTION_SM83(LDC_);
  2146. -DEFINE_ALU_INSTRUCTION_SM83(LDD_);
  2147. -DEFINE_ALU_INSTRUCTION_SM83(LDE_);
  2148. -DEFINE_ALU_INSTRUCTION_SM83(LDH_);
  2149. -DEFINE_ALU_INSTRUCTION_SM83(LDL_);
  2150. -DEFINE_ALU_INSTRUCTION_SM83_NOHL(LDHL_);
  2151. -DEFINE_ALU_INSTRUCTION_SM83(LDA_);
  2152. -DEFINE_ALU_INSTRUCTION_SM83_MEM(LDA_, BC);
  2153. -DEFINE_ALU_INSTRUCTION_SM83_MEM(LDA_, DE);
  2154. -DEFINE_ALU_INSTRUCTION_SM83(ADD);
  2155. -DEFINE_ALU_INSTRUCTION_SM83(ADC);
  2156. -DEFINE_ALU_INSTRUCTION_SM83(SUB);
  2157. -DEFINE_ALU_INSTRUCTION_SM83(SBC);
  2158. +DEFINE_ALU_INSTRUCTION_SM83(LDB_)
  2159. +DEFINE_ALU_INSTRUCTION_SM83(LDC_)
  2160. +DEFINE_ALU_INSTRUCTION_SM83(LDD_)
  2161. +DEFINE_ALU_INSTRUCTION_SM83(LDE_)
  2162. +DEFINE_ALU_INSTRUCTION_SM83(LDH_)
  2163. +DEFINE_ALU_INSTRUCTION_SM83(LDL_)
  2164. +DEFINE_ALU_INSTRUCTION_SM83_NOHL(LDHL_)
  2165. +DEFINE_ALU_INSTRUCTION_SM83(LDA_)
  2166. +DEFINE_ALU_INSTRUCTION_SM83_MEM(LDA_, BC)
  2167. +DEFINE_ALU_INSTRUCTION_SM83_MEM(LDA_, DE)
  2168. +DEFINE_ALU_INSTRUCTION_SM83(ADD)
  2169. +DEFINE_ALU_INSTRUCTION_SM83(ADC)
  2170. +DEFINE_ALU_INSTRUCTION_SM83(SUB)
  2171. +DEFINE_ALU_INSTRUCTION_SM83(SBC)
  2172.  
  2173.  DEFINE_INSTRUCTION_SM83(ADDSPFinish,
  2174.  	cpu->sp = cpu->index;
  2175. @@ -534,9 +534,9 @@ DEFINE_INSTRUCTION_SM83(LDISP,
  2176.  		SM83Write ## REG (cpu, reg - 1); \
  2177.  		cpu->executionState = SM83_CORE_STALL;)
  2178.  
  2179. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(BC);
  2180. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(DE);
  2181. -DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(HL);
  2182. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(BC)
  2183. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(DE)
  2184. +DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(HL)
  2185.  
  2186.  #define DEFINE_ADD_HL_INSTRUCTION_SM83(REG, L, H) \
  2187.  	DEFINE_INSTRUCTION_SM83(ADDHL_ ## REG ## Finish, \
  2188. @@ -552,10 +552,10 @@ DEFINE_INCDEC_WIDE_INSTRUCTION_SM83(HL);
  2189.  		cpu->executionState = SM83_CORE_OP2; \
  2190.  		cpu->instruction = _SM83InstructionADDHL_ ## REG ## Finish;)
  2191.  
  2192. -DEFINE_ADD_HL_INSTRUCTION_SM83(BC, cpu->c, cpu->b);
  2193. -DEFINE_ADD_HL_INSTRUCTION_SM83(DE, cpu->e, cpu->d);
  2194. -DEFINE_ADD_HL_INSTRUCTION_SM83(HL, cpu->l, cpu->h);
  2195. -DEFINE_ADD_HL_INSTRUCTION_SM83(SP, (cpu->sp & 0xFF), (cpu->sp >> 8));
  2196. +DEFINE_ADD_HL_INSTRUCTION_SM83(BC, cpu->c, cpu->b)
  2197. +DEFINE_ADD_HL_INSTRUCTION_SM83(DE, cpu->e, cpu->d)
  2198. +DEFINE_ADD_HL_INSTRUCTION_SM83(HL, cpu->l, cpu->h)
  2199. +DEFINE_ADD_HL_INSTRUCTION_SM83(SP, (cpu->sp & 0xFF), (cpu->sp >> 8))
  2200.  
  2201.  
  2202.  #define DEFINE_INC_INSTRUCTION_SM83(NAME, OPERAND) \
  2203. @@ -574,8 +574,8 @@ DEFINE_ADD_HL_INSTRUCTION_SM83(SP, (cpu->sp & 0xFF), (cpu->sp >> 8));
  2204.  		cpu->f.n = 1; \
  2205.  		cpu->f.z = !OPERAND;)
  2206.  
  2207. -DEFINE_ALU_INSTRUCTION_SM83_NOHL(INC);
  2208. -DEFINE_ALU_INSTRUCTION_SM83_NOHL(DEC);
  2209. +DEFINE_ALU_INSTRUCTION_SM83_NOHL(INC)
  2210. +DEFINE_ALU_INSTRUCTION_SM83_NOHL(DEC)
  2211.  
  2212.  DEFINE_INSTRUCTION_SM83(INC_HLDelay,
  2213.  	int diff = cpu->bus + 1;
  2214. @@ -680,10 +680,10 @@ DEFINE_INSTRUCTION_SM83(DAA,
  2215.  		cpu->instruction = _SM83InstructionPUSH ## REG ## Delay; \
  2216.  		cpu->executionState = SM83_CORE_MEMORY_STORE;)
  2217.  
  2218. -DEFINE_POPPUSH_INSTRUCTION_SM83(BC, B, b, c);
  2219. -DEFINE_POPPUSH_INSTRUCTION_SM83(DE, D, d, e);
  2220. -DEFINE_POPPUSH_INSTRUCTION_SM83(HL, H, h, l);
  2221. -DEFINE_POPPUSH_INSTRUCTION_SM83(AF, A, a, f.packed);
  2222. +DEFINE_POPPUSH_INSTRUCTION_SM83(BC, B, b, c)
  2223. +DEFINE_POPPUSH_INSTRUCTION_SM83(DE, D, d, e)
  2224. +DEFINE_POPPUSH_INSTRUCTION_SM83(HL, H, h, l)
  2225. +DEFINE_POPPUSH_INSTRUCTION_SM83(AF, A, a, f.packed)
  2226.  
  2227.  #define DEFINE_CB_2_INSTRUCTION_SM83(NAME, WB, BODY) \
  2228.  	DEFINE_INSTRUCTION_SM83(NAME ## B, uint8_t reg = cpu->b; BODY; cpu->b = reg) \
  2229. @@ -765,9 +765,9 @@ DEFINE_INSTRUCTION_SM83(RRCA_,
  2230.  	cpu->f.n = 0;
  2231.  	cpu->f.c = low;)
  2232.  
  2233. -DEFINE_INSTRUCTION_SM83(DI, cpu->irqh.setInterrupts(cpu, false));
  2234. -DEFINE_INSTRUCTION_SM83(EI, cpu->irqh.setInterrupts(cpu, true));
  2235. -DEFINE_INSTRUCTION_SM83(HALT, cpu->irqh.halt(cpu));
  2236. +DEFINE_INSTRUCTION_SM83(DI, cpu->irqh.setInterrupts(cpu, false))
  2237. +DEFINE_INSTRUCTION_SM83(EI, cpu->irqh.setInterrupts(cpu, true))
  2238. +DEFINE_INSTRUCTION_SM83(HALT, cpu->irqh.halt(cpu))
  2239.  
  2240.  #define DEFINE_RST_INSTRUCTION_SM83(VEC) \
  2241.  	DEFINE_INSTRUCTION_SM83(RST ## VEC ## UpdateSPL, \
  2242. @@ -788,18 +788,18 @@ DEFINE_INSTRUCTION_SM83(HALT, cpu->irqh.halt(cpu));
  2243.  		cpu->executionState = SM83_CORE_OP2; \
  2244.  		cpu->instruction = _SM83InstructionRST ## VEC ## UpdateSPH;)
  2245.  
  2246. -DEFINE_RST_INSTRUCTION_SM83(00);
  2247. -DEFINE_RST_INSTRUCTION_SM83(08);
  2248. -DEFINE_RST_INSTRUCTION_SM83(10);
  2249. -DEFINE_RST_INSTRUCTION_SM83(18);
  2250. -DEFINE_RST_INSTRUCTION_SM83(20);
  2251. -DEFINE_RST_INSTRUCTION_SM83(28);
  2252. -DEFINE_RST_INSTRUCTION_SM83(30);
  2253. -DEFINE_RST_INSTRUCTION_SM83(38);
  2254. +DEFINE_RST_INSTRUCTION_SM83(00)
  2255. +DEFINE_RST_INSTRUCTION_SM83(08)
  2256. +DEFINE_RST_INSTRUCTION_SM83(10)
  2257. +DEFINE_RST_INSTRUCTION_SM83(18)
  2258. +DEFINE_RST_INSTRUCTION_SM83(20)
  2259. +DEFINE_RST_INSTRUCTION_SM83(28)
  2260. +DEFINE_RST_INSTRUCTION_SM83(30)
  2261. +DEFINE_RST_INSTRUCTION_SM83(38)
  2262.  
  2263. -DEFINE_INSTRUCTION_SM83(ILL, cpu->irqh.hitIllegal(cpu));
  2264. +DEFINE_INSTRUCTION_SM83(ILL, cpu->irqh.hitIllegal(cpu))
  2265.  
  2266. -DEFINE_INSTRUCTION_SM83(STOP2, cpu->irqh.stop(cpu));
  2267. +DEFINE_INSTRUCTION_SM83(STOP2, cpu->irqh.stop(cpu))
  2268.  
  2269.  DEFINE_INSTRUCTION_SM83(STOP, \
  2270.  	cpu->executionState = SM83_CORE_READ_PC; \
  2271. diff --git a/src/util/elf-read.c b/src/util/elf-read.c
  2272. index 520c01ca3..138290eee 100644
  2273. --- a/src/util/elf-read.c
  2274. +++ b/src/util/elf-read.c
  2275. @@ -9,8 +9,8 @@
  2276.  
  2277.  #include <mgba-util/vfs.h>
  2278.  
  2279. -DEFINE_VECTOR(ELFProgramHeaders, Elf32_Phdr);
  2280. -DEFINE_VECTOR(ELFSectionHeaders, Elf32_Shdr);
  2281. +DEFINE_VECTOR(ELFProgramHeaders, Elf32_Phdr)
  2282. +DEFINE_VECTOR(ELFSectionHeaders, Elf32_Shdr)
  2283.  
  2284.  static bool _elfInit = false;
  2285.  
  2286. diff --git a/src/util/patch-fast.c b/src/util/patch-fast.c
  2287. index 81b3aa45a..8fcd87436 100644
  2288. --- a/src/util/patch-fast.c
  2289. +++ b/src/util/patch-fast.c
  2290. @@ -5,7 +5,7 @@
  2291.   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  2292.  #include <mgba-util/patch/fast.h>
  2293.  
  2294. -DEFINE_VECTOR(PatchFastExtents, struct PatchFastExtent);
  2295. +DEFINE_VECTOR(PatchFastExtents, struct PatchFastExtent)
  2296.  
  2297.  size_t _fastOutputSize(struct Patch* patch, size_t inSize);
  2298.  bool _fastApplyPatch(struct Patch* patch, const void* in, size_t inSize, void* out, size_t outSize);
  2299. diff --git a/src/util/string.c b/src/util/string.c
  2300. index 46e52fba7..69112a0cd 100644
  2301. --- a/src/util/string.c
  2302. +++ b/src/util/string.c
  2303. @@ -9,7 +9,7 @@
  2304.  
  2305.  #include <string.h>
  2306.  
  2307. -DEFINE_VECTOR(StringList, char*);
  2308. +DEFINE_VECTOR(StringList, char*)
  2309.  
  2310.  #ifndef HAVE_STRNDUP
  2311.  char* strndup(const char* start, size_t len) {
  2312. -- 
  2313. 2.29.2