From 646d96a216a799a94337f28dd312bfd72a682280 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 26 Dec 2016 19:15:34 -0500
Subject: [PATCH] DSPEmitter: Convert defines into typed constants

Also moves them into more qualified scopes where possible.
---
 Source/Core/Core/DSP/Jit/DSPEmitter.cpp | 5 +++--
 Source/Core/Core/DSP/Jit/DSPEmitter.h   | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
index b68b8e33ea..b2b0c8d9c7 100644
--- a/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPEmitter.cpp
@@ -18,8 +18,9 @@
 #include "Core/DSP/DSPMemoryMap.h"
 #include "Core/DSP/DSPTables.h"
 
-#define MAX_BLOCK_SIZE 250
-#define DSP_IDLE_SKIP_CYCLES 0x1000
+constexpr size_t COMPILED_CODE_SIZE = 2097152;
+constexpr size_t MAX_BLOCK_SIZE = 250;
+constexpr u16 DSP_IDLE_SKIP_CYCLES = 0x1000;
 
 using namespace Gen;
 
diff --git a/Source/Core/Core/DSP/Jit/DSPEmitter.h b/Source/Core/Core/DSP/Jit/DSPEmitter.h
index 3db25eef1a..9ddcfa3980 100644
--- a/Source/Core/Core/DSP/Jit/DSPEmitter.h
+++ b/Source/Core/Core/DSP/Jit/DSPEmitter.h
@@ -4,24 +4,25 @@
 
 #pragma once
 
+#include <cstddef>
 #include <list>
 #include <vector>
 
+#include "Common/CommonTypes.h"
 #include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
 
 #include "Core/DSP/DSPCommon.h"
 #include "Core/DSP/Jit/DSPJitRegCache.h"
 
-#define COMPILED_CODE_SIZE 2097152
-#define MAX_BLOCKS 0x10000
-
 typedef u32 (*DSPCompiledCode)();
 typedef const u8* Block;
 
 class DSPEmitter : public Gen::X64CodeBlock
 {
 public:
+  static constexpr size_t MAX_BLOCKS = 0x10000;
+
   DSPEmitter();
   ~DSPEmitter();