From 3f4e240bfcc92009fe34d16578aa9f886e862533 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sun, 12 Oct 2025 02:43:44 +0300 Subject: [PATCH] Vendor and update Capstone --- .gitmodules | 6 +++--- third_party/capstone | 2 +- third_party/host_memory/host_memory.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1d9f8c3f..fa3785a6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -58,9 +58,6 @@ [submodule "third_party/Catch2"] path = third_party/Catch2 url = https://github.com/catchorg/Catch2.git -[submodule "third_party/capstone"] - path = third_party/capstone - url = https://github.com/capstone-engine/capstone [submodule "third_party/hips"] path = third_party/hips url = https://github.com/wheremyfoodat/Hips @@ -80,3 +77,6 @@ path = third_party/SDL2 url = https://github.com/libsdl-org/SDL branch = SDL2 +[submodule "third_party/capstone"] + path = third_party/capstone + url = https://github.com/Panda3DS-emu/capstone diff --git a/third_party/capstone b/third_party/capstone index eb4fc2d7..8b0f54b1 160000 --- a/third_party/capstone +++ b/third_party/capstone @@ -1 +1 @@ -Subproject commit eb4fc2d7612db10379adf7aeb287a7923dcc0fc7 +Subproject commit 8b0f54b1ff88f636a9c40bb2cce74408b13bc0c7 diff --git a/third_party/host_memory/host_memory.cpp b/third_party/host_memory/host_memory.cpp index e7f08192..29c24d39 100644 --- a/third_party/host_memory/host_memory.cpp +++ b/third_party/host_memory/host_memory.cpp @@ -481,7 +481,7 @@ namespace Common { long page_size = sysconf(_SC_PAGESIZE); if (page_size != 0x1000) { - Helpers::warn("page size {:#x} is incompatible with 4K paging", page_size); + Helpers::warn("Page size %X is incompatible with 4K paging", page_size); throw std::bad_alloc{}; }