From 0dd472e8ee9a93ea463d9008acf6d5c7c09d5966 Mon Sep 17 00:00:00 2001
From: River City Ransomware <richyateswebdesign@gmail.com>
Date: Thu, 18 Jan 2018 23:38:05 -0500
Subject: [PATCH] Converted casts to uint32_t to u32

---
 src/core/arm/dynarmic/arm_dynarmic.cpp | 4 ++--
 src/core/gdbstub/gdbstub.cpp           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 3c8901f888..72c54f9840 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -163,9 +163,9 @@ void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) {
     jit.SetRegisters(ctx.cpu_registers);
     jit.SetSP(ctx.sp);
     jit.SetPC(ctx.pc);
-    jit.SetPstate(static_cast<uint32_t>(ctx.cpsr));
+    jit.SetPstate(static_cast<u32>(ctx.cpsr));
     jit.SetVectors(ctx.fpu_registers);
-    jit.SetFpcr(static_cast<uint32_t>(ctx.fpscr));
+    jit.SetFpcr(static_cast<u32>(ctx.fpscr));
     cb->tpidrr0_el0 = ctx.tls_address;
 }
 
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index 5900d0ee8e..d6678e5cfc 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -299,17 +299,17 @@ static std::map<u32, Breakpoint>& GetBreakpointList(BreakpointType type) {
 static void RemoveBreakpoint(BreakpointType type, PAddr addr) {
     std::map<u32, Breakpoint>& p = GetBreakpointList(type);
 
-    auto bp = p.find(static_cast<uint32_t>(addr));
+    auto bp = p.find(static_cast<u32>(addr));
     if (bp != p.end()) {
         LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: %08x bytes at %08x of type %d\n",
                   bp->second.len, bp->second.addr, type);
-        p.erase(static_cast<uint32_t>(addr));
+        p.erase(static_cast<u32>(addr));
     }
 }
 
 BreakpointAddress GetNextBreakpointFromAddress(PAddr addr, BreakpointType type) {
     std::map<u32, Breakpoint>& p = GetBreakpointList(type);
-    auto next_breakpoint = p.lower_bound(static_cast<uint32_t>(addr));
+    auto next_breakpoint = p.lower_bound(static_cast<u32>(addr));
     BreakpointAddress breakpoint;
 
     if (next_breakpoint != p.end()) {
@@ -330,7 +330,7 @@ bool CheckBreakpoint(PAddr addr, BreakpointType type) {
 
     std::map<u32, Breakpoint>& p = GetBreakpointList(type);
 
-    auto bp = p.find(static_cast<uint32_t>(addr));
+    auto bp = p.find(static_cast<u32>(addr));
     if (bp != p.end()) {
         u32 len = bp->second.len;