From aea0d8d6b34025976e67c77e5b1d7e088e874619 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Thu, 20 Jun 2019 13:07:04 -0700 Subject: [PATCH 1/4] [third_party] Update capstone to latest stable --- .gitmodules | 7 ++++--- src/xenia/cpu/backend/x64/x64_assembler.cc | 4 ++-- src/xenia/cpu/backend/x64/x64_backend.cc | 4 ++-- src/xenia/debug/ui/debug_window.cc | 4 ++-- third_party/capstone | 2 +- third_party/capstone.lua | 1 - 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5474a9e62..81dd602e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "third_party/binutils-ppc-cygwin"] path = third_party/binutils-ppc-cygwin url = https://github.com/benvanik/binutils-ppc-cygwin -[submodule "third_party/capstone"] - path = third_party/capstone - url = https://github.com/xenia-project/capstone.git [submodule "third_party/libav"] path = third_party/libav url = https://github.com/xenia-project/libav.git @@ -43,3 +40,7 @@ [submodule "third_party/aes_128"] path = third_party/aes_128 url = https://github.com/openluopworld/aes_128.git +[submodule "third_party/capstone"] + path = third_party/capstone + url = https://github.com/aquynh/capstone.git + branch = master diff --git a/src/xenia/cpu/backend/x64/x64_assembler.cc b/src/xenia/cpu/backend/x64/x64_assembler.cc index a72a2e711..bf9ce1c52 100644 --- a/src/xenia/cpu/backend/x64/x64_assembler.cc +++ b/src/xenia/cpu/backend/x64/x64_assembler.cc @@ -11,8 +11,8 @@ #include -#include "third_party/capstone/include/capstone.h" -#include "third_party/capstone/include/x86.h" +#include "third_party/capstone/include/capstone/capstone.h" +#include "third_party/capstone/include/capstone/x86.h" #include "xenia/base/profiling.h" #include "xenia/base/reset_scope.h" #include "xenia/cpu/backend/x64/x64_backend.h" diff --git a/src/xenia/cpu/backend/x64/x64_backend.cc b/src/xenia/cpu/backend/x64/x64_backend.cc index 28a530759..27a6ea8f4 100644 --- a/src/xenia/cpu/backend/x64/x64_backend.cc +++ b/src/xenia/cpu/backend/x64/x64_backend.cc @@ -11,8 +11,8 @@ #include -#include "third_party/capstone/include/capstone.h" -#include "third_party/capstone/include/x86.h" +#include "third_party/capstone/include/capstone/capstone.h" +#include "third_party/capstone/include/capstone/x86.h" #include "xenia/base/exception_handler.h" #include "xenia/base/logging.h" diff --git a/src/xenia/debug/ui/debug_window.cc b/src/xenia/debug/ui/debug_window.cc index 8db24092b..0e74a1670 100644 --- a/src/xenia/debug/ui/debug_window.cc +++ b/src/xenia/debug/ui/debug_window.cc @@ -15,8 +15,8 @@ #include #include -#include "third_party/capstone/include/capstone.h" -#include "third_party/capstone/include/x86.h" +#include "third_party/capstone/include/capstone/capstone.h" +#include "third_party/capstone/include/capstone/x86.h" #include "third_party/imgui/imgui.h" #include "third_party/imgui/imgui_internal.h" #include "third_party/yaml-cpp/include/yaml-cpp/yaml.h" diff --git a/third_party/capstone b/third_party/capstone index 121057635..f9c6a9048 160000 --- a/third_party/capstone +++ b/third_party/capstone @@ -1 +1 @@ -Subproject commit 121057635173f4da4ce26dd676c7470aef7bddce +Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9 diff --git a/third_party/capstone.lua b/third_party/capstone.lua index 5a1b278f8..647aaaa3b 100644 --- a/third_party/capstone.lua +++ b/third_party/capstone.lua @@ -30,7 +30,6 @@ project("capstone") "capstone/MCInstrDesc.h", "capstone/MCRegisterInfo.c", "capstone/MCRegisterInfo.h", - "capstone/myinttypes.h", "capstone/SStream.c", "capstone/SStream.h", "capstone/utils.c", From 083f811f7a6de94fa842f1fb633642d50554ee90 Mon Sep 17 00:00:00 2001 From: gibbed Date: Fri, 2 Aug 2019 11:12:46 -0500 Subject: [PATCH 2/4] Update discord-rpc, rapidjson. --- third_party/discord-rpc | 2 +- third_party/rapidjson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/discord-rpc b/third_party/discord-rpc index ba9fe00c4..eff23a770 160000 --- a/third_party/discord-rpc +++ b/third_party/discord-rpc @@ -1 +1 @@ -Subproject commit ba9fe00c4de1d680cdc56605d9c0d2b4cf8e7a07 +Subproject commit eff23a770a07c3574cb48f299736c461c576286b diff --git a/third_party/rapidjson b/third_party/rapidjson index af223d44f..d87b698d0 160000 --- a/third_party/rapidjson +++ b/third_party/rapidjson @@ -1 +1 @@ -Subproject commit af223d44f4e8d3772cb1ac0ce8bc2a132b51717f +Subproject commit d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5 From c8715e3aaa89e6be7daa4bb732a1c1d2f39d8407 Mon Sep 17 00:00:00 2001 From: gibbed Date: Fri, 2 Aug 2019 11:17:44 -0500 Subject: [PATCH 3/4] Fix Capstone submodule. --- .gitmodules | 3 +-- third_party/capstone | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 415bb8c08..868632298 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,5 +48,4 @@ url = https://github.com/openluopworld/aes_128.git [submodule "third_party/capstone"] path = third_party/capstone - url = https://github.com/aquynh/capstone.git - branch = master + url = https://github.com/xenia-project/capstone.git diff --git a/third_party/capstone b/third_party/capstone index f9c6a9048..d63216984 160000 --- a/third_party/capstone +++ b/third_party/capstone @@ -1 +1 @@ -Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9 +Subproject commit d63216984796af0b4ef8a36dd90172c81bdca9b9 From 3bcd1fb744952c2f7d241816f4ead87e81814597 Mon Sep 17 00:00:00 2001 From: gibbed Date: Fri, 2 Aug 2019 11:24:03 -0500 Subject: [PATCH 4/4] Oops. Move Capstone back to 4.0.1. --- third_party/capstone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/capstone b/third_party/capstone index d63216984..f9c6a9048 160000 --- a/third_party/capstone +++ b/third_party/capstone @@ -1 +1 @@ -Subproject commit d63216984796af0b4ef8a36dd90172c81bdca9b9 +Subproject commit f9c6a90489be7b3637ff1c7298e45efafe7cf1b9