diff --git a/.gitmodules b/.gitmodules
index b79ccd4..f96be2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "app/src/main/cpp/Dobby"]
path = app/src/main/cpp/Dobby
url = https://github.com/jmpews/Dobby.git
+[submodule "app/src/main/cpp/libcxx"]
+ path = app/src/main/cpp/libcxx
+ url = https://github.com/topjohnwu/libcxx.git
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index aa851fd..6680155 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,6 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4bb579a..4d097bd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
applicationId = "es.chiteroman.playintegrityfix"
minSdk = 26
targetSdk = 34
- versionCode = 15400
- versionName = "v15.4"
+ versionCode = 15500
+ versionName = "v15.5"
buildFeatures {
prefab = true
@@ -23,23 +23,16 @@ android {
jniLibs {
excludes += "**/liblog.so"
excludes += "**/libdobby.so"
+ excludes += "**/libshadowhook.so"
}
}
externalNativeBuild {
- cmake {
- arguments += "-DANDROID_STL=none"
- arguments += "-DCMAKE_BUILD_TYPE=MinSizeRel"
- arguments += "-DPlugin.Android.BionicLinkerUtil=ON"
+ ndk {
+ abiFilters += "arm64-v8a"
+ abiFilters += "armeabi-v7a"
- cFlags += "-fvisibility=hidden"
- cFlags += "-fvisibility-inlines-hidden"
-
- cppFlags += "-std=c++20"
- cppFlags += "-fno-exceptions"
- cppFlags += "-fno-rtti"
- cppFlags += "-fvisibility=hidden"
- cppFlags += "-fvisibility-inlines-hidden"
+ jobs = Runtime.getRuntime().availableProcessors()
}
}
}
@@ -48,9 +41,7 @@ android {
release {
isMinifyEnabled = true
isShrinkResources = true
- proguardFiles(
- getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
- )
+ proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
@@ -60,17 +51,12 @@ android {
}
externalNativeBuild {
- cmake {
- path = file("src/main/cpp/CMakeLists.txt")
- version = "3.22.1"
+ ndkBuild {
+ path = file("src/main/cpp/Android.mk")
}
}
}
-dependencies {
- implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
-}
-
tasks.register("updateModuleProp") {
doLast {
val versionName = project.android.defaultConfig.versionName
@@ -93,10 +79,8 @@ tasks.register("copyFiles") {
doLast {
val moduleFolder = project.rootDir.resolve("module")
- val dexFile =
- project.layout.buildDirectory.get().asFile.resolve("intermediates/dex/release/minifyReleaseWithR8/classes.dex")
- val soDir =
- project.layout.buildDirectory.get().asFile.resolve("intermediates/stripped_native_libs/release/out/lib")
+ val dexFile = project.layout.buildDirectory.get().asFile.resolve("intermediates/dex/release/minifyReleaseWithR8/classes.dex")
+ val soDir = project.layout.buildDirectory.get().asFile.resolve("intermediates/stripped_native_libs/release/out/lib")
dexFile.copyTo(moduleFolder.resolve("classes.dex"), overwrite = true)
@@ -119,4 +103,4 @@ tasks.register("zip") {
afterEvaluate {
tasks["assembleRelease"].finalizedBy("updateModuleProp", "copyFiles", "zip")
-}
+}
\ No newline at end of file
diff --git a/app/src/main/cpp/Android.mk b/app/src/main/cpp/Android.mk
new file mode 100644
index 0000000..832591c
--- /dev/null
+++ b/app/src/main/cpp/Android.mk
@@ -0,0 +1,31 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := playintegrityfix
+LOCAL_SRC_FILES := $(LOCAL_PATH)/main.cpp
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/shadowhook/*.c)
+LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/shadowhook/common/*.c)
+LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/shadowhook/third_party/xdl/*.c)
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/common
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/include
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/third_party/bsd
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/third_party/lss
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/third_party/xdl
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/shadowhook/arch/arm/*.c)
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/arch/arm
+else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+ LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/shadowhook/arch/arm64/*.c)
+ LOCAL_C_INCLUDES += $(LOCAL_PATH)/shadowhook/arch/arm64
+endif
+
+LOCAL_STATIC_LIBRARIES := libcxx
+LOCAL_LDLIBS := -llog
+include $(BUILD_SHARED_LIBRARY)
+
+include $(LOCAL_PATH)/libcxx/Android.mk
\ No newline at end of file
diff --git a/app/src/main/cpp/Application.mk b/app/src/main/cpp/Application.mk
new file mode 100644
index 0000000..b8c2fbf
--- /dev/null
+++ b/app/src/main/cpp/Application.mk
@@ -0,0 +1,8 @@
+APP_STL := none
+APP_ABI := armeabi-v7a arm64-v8a
+APP_CFLAGS := -Oz -flto -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -fno-threadsafe-statics -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-stack-protector
+APP_CPPFLAGS := -std=c++2b -fno-exceptions -fno-rtti
+APP_CONLYFLAGS := -std=c2x
+APP_LDFLAGS := -Oz -flto -Wl,--exclude-libs,ALL -Wl,--gc-sections
+APP_PLATFORM := android-26
+APP_THIN_ARCHIVE := true
\ No newline at end of file
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
deleted file mode 100644
index 302790a..0000000
--- a/app/src/main/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 3.22.1)
-
-project("playintegrityfix")
-
-find_package(cxx REQUIRED CONFIG)
-
-link_libraries(cxx::cxx)
-
-add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp)
-
-add_subdirectory(Dobby)
-
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log dobby_static)
\ No newline at end of file
diff --git a/app/src/main/cpp/Dobby b/app/src/main/cpp/Dobby
deleted file mode 160000
index b0176de..0000000
--- a/app/src/main/cpp/Dobby
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0176de574104726bb68dff3b77ee666300fc338
diff --git a/app/src/main/cpp/libcxx b/app/src/main/cpp/libcxx
new file mode 160000
index 0000000..12c8f4e
--- /dev/null
+++ b/app/src/main/cpp/libcxx
@@ -0,0 +1 @@
+Subproject commit 12c8f4e93f196a700137e983dcceeac43cf807f2
diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index fda3602..81830d6 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -1,10 +1,9 @@
#include
#include
-#include
-#include
+#include
#include "zygisk.hpp"
#include "json.hpp"
-#include "dobby.h"
+#include "shadowhook.h"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, "PIF", __VA_ARGS__)
@@ -12,43 +11,9 @@
#define PIF_JSON "/data/adb/pif.json"
-static JavaVM *jvm = nullptr;
+#define PIF_JSON_DEFAULT "/data/adb/modules/playintegrityfix/pif.json"
-static jclass entryPointClass = nullptr;
-
-static jmethodID spoofFieldsMethod = nullptr;
-
-static void spoofFields() {
-
- if (jvm == nullptr) return;
-
- bool need_detach = false;
-
- JNIEnv *env;
- if (jvm->GetEnv(reinterpret_cast(&env), JNI_VERSION_1_6) == JNI_EDETACHED) {
- if (jvm->AttachCurrentThread(&env, nullptr) == JNI_OK) {
- need_detach = true;
- } else {
- LOGD("Couldn't get JNIEnv :(");
- return;
- }
- }
-
- if (entryPointClass == nullptr || spoofFieldsMethod == nullptr) return;
-
- env->CallStaticVoidMethod(entryPointClass, spoofFieldsMethod);
-
- LOGD("[Zygisk] Call Java spoofFields!");
-
- if (env->ExceptionCheck()) {
- env->ExceptionDescribe();
- env->ExceptionClear();
- }
-
- if (need_detach) jvm->DetachCurrentThread();
-}
-
-static std::string FIRST_API_LEVEL, SECURITY_PATCH, BUILD_ID, KERNEL;
+static std::string FIRST_API_LEVEL, SECURITY_PATCH, BUILD_ID;
typedef void (*T_Callback)(void *, const char *, const char *, uint32_t);
@@ -65,6 +30,7 @@ static void modify_callback(void *cookie, const char *name, const char *value, u
if (!SECURITY_PATCH.empty()) {
value = SECURITY_PATCH.c_str();
+ LOGD("[%s] -> %s", name, value);
}
} else if (prop.ends_with("api_level")) {
@@ -72,6 +38,7 @@ static void modify_callback(void *cookie, const char *name, const char *value, u
if (!FIRST_API_LEVEL.empty()) {
value = FIRST_API_LEVEL.c_str();
+ LOGD("[%s] -> %s", name, value);
}
} else if (prop.ends_with("build.id")) {
@@ -79,17 +46,12 @@ static void modify_callback(void *cookie, const char *name, const char *value, u
if (!BUILD_ID.empty()) {
value = BUILD_ID.c_str();
+ LOGD("[%s] -> %s", name, value);
}
} else if (prop == "sys.usb.state") {
value = "none";
- }
-
- if (prop == "ro.product.first_api_level") spoofFields();
-
- if (!prop.starts_with("debug") && !prop.starts_with("cache") && !prop.starts_with("persist")) {
-
LOGD("[%s] -> %s", name, value);
}
@@ -107,43 +69,15 @@ my_system_property_read_callback(const void *pi, T_Callback callback, void *cook
return o_system_property_read_callback(pi, modify_callback, cookie);
}
-static int (*o_uname)(struct utsname *);
-
-static int my_uname(struct utsname *buff) {
-
- auto ret = o_uname(buff);
-
- if (buff && ret == 0) {
-
- if (!KERNEL.empty() && KERNEL.size() < SYS_NMLN) {
- LOGD("Spoofing kernel release! Original value: %s", buff->release);
- strncpy(buff->release, KERNEL.c_str(), KERNEL.size());
- }
-
- LOGD("DroidGuard got kernel name: %s", buff->release);
- }
-
- return ret;
-}
-
static void doHook() {
- void *handle = DobbySymbolResolver("libc.so", "__system_property_read_callback");
+ void *handle = shadowhook_hook_sym_name("libc.so", "__system_property_read_callback",
+ reinterpret_cast(my_system_property_read_callback),
+ reinterpret_cast(&o_system_property_read_callback));
if (handle == nullptr) {
- LOGD("Couldn't find '__system_property_read_callback' handle. Report to @chiteroman");
+ LOGD("Couldn't hook '__system_property_read_callback'. Report to @chiteroman");
return;
}
- LOGD("Found '__system_property_read_callback' handle at %p", handle);
- DobbyHook(handle, reinterpret_cast(my_system_property_read_callback),
- reinterpret_cast(&o_system_property_read_callback));
-
- void *unameHandle = DobbySymbolResolver("libc.so", "uname");
- if (unameHandle == nullptr) {
- LOGD("Couldn't find 'uname' handle. Report to @chiteroman");
- return;
- }
- LOGD("Found 'uname' handle at %p", unameHandle);
- DobbyHook(unameHandle, reinterpret_cast(my_uname),
- reinterpret_cast(&o_uname));
+ LOGD("Found and hooked '__system_property_read_callback' at %p", handle);
}
class PlayIntegrityFix : public zygisk::ModuleBase {
@@ -155,21 +89,16 @@ public:
void preAppSpecialize(zygisk::AppSpecializeArgs *args) override {
- if (args == nullptr || args->nice_name == nullptr || args->app_data_dir == nullptr) {
+ auto dir = env->GetStringUTFChars(args->app_data_dir, nullptr);
+
+ if (dir == nullptr) {
api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
return;
}
- auto rawDir = env->GetStringUTFChars(args->app_data_dir, nullptr);
+ bool isGms = std::string_view(dir).ends_with("/com.google.android.gms");
- if (rawDir == nullptr) {
- api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
- return;
- }
-
- bool isGms = std::string_view(rawDir).ends_with("/com.google.android.gms");
-
- env->ReleaseStringUTFChars(args->app_data_dir, rawDir);
+ env->ReleaseStringUTFChars(args->app_data_dir, dir);
if (!isGms) {
api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
@@ -180,11 +109,6 @@ public:
auto name = env->GetStringUTFChars(args->nice_name, nullptr);
- if (name == nullptr) {
- api->setOption(zygisk::DLCLOSE_MODULE_LIBRARY);
- return;
- }
-
bool isGmsUnstable = strcmp(name, "com.google.android.gms.unstable") == 0;
env->ReleaseStringUTFChars(args->nice_name, name);
@@ -235,14 +159,12 @@ public:
void postAppSpecialize(const zygisk::AppSpecializeArgs *args) override {
if (vector.empty() || json.empty()) return;
- if (env->GetJavaVM(&jvm) != JNI_OK) {
- json["SPOOF_FIELDS_IN_JAVA"] = true;
- }
-
- injectDex();
+ shadowhook_init(SHADOWHOOK_MODE_UNIQUE, false);
doHook();
+ injectDex();
+
vector.clear();
json.clear();
}
@@ -277,8 +199,7 @@ private:
auto entryClassName = env->NewStringUTF("es.chiteroman.playintegrityfix.EntryPoint");
auto entryClassObj = env->CallObjectMethod(dexCl, loadClass, entryClassName);
- entryPointClass = (jclass) entryClassObj;
- spoofFieldsMethod = env->GetStaticMethodID(entryPointClass, "spoofFields", "()V");
+ auto entryPointClass = (jclass) entryClassObj;
LOGD("call init");
auto entryInit = env->GetStaticMethodID(entryPointClass, "init", "(Ljava/lang/String;)V");
@@ -348,35 +269,40 @@ private:
LOGD("JSON file doesn't contain ID/BUILD_ID keys :(");
}
-
- if (json.contains("KERNEL")) {
-
- if (json["KERNEL"].is_string()) {
-
- KERNEL = json["KERNEL"].get();
- }
-
- json.erase("KERNEL");
-
- } else {
-
- LOGD("JSON file doesn't contain KERNEL key :(");
- }
}
};
static void companion(int fd) {
- std::ifstream dexFile(CLASSES_DEX, std::ios::binary);
- std::ifstream jsonFile(PIF_JSON);
+ long dexSize = 0, jsonSize = 0;
+ std::vector dexVector, jsonVector;
- std::vector dexVector((std::istreambuf_iterator(dexFile)),
- std::istreambuf_iterator());
- std::vector jsonVector((std::istreambuf_iterator(jsonFile)),
- std::istreambuf_iterator());
+ FILE *dexFile = fopen(CLASSES_DEX, "rb");
- long dexSize = dexVector.size();
- long jsonSize = jsonVector.size();
+ if (dexFile) {
+ fseek(dexFile, 0, SEEK_END);
+ dexSize = ftell(dexFile);
+ fseek(dexFile, 0, SEEK_SET);
+
+ dexVector.resize(dexSize);
+ fread(dexVector.data(), 1, dexSize, dexFile);
+
+ fclose(dexFile);
+ }
+
+ FILE *jsonFile = fopen(PIF_JSON, "rb");
+ if (jsonFile == nullptr) jsonFile = fopen(PIF_JSON_DEFAULT, "rb");
+
+ if (jsonFile) {
+ fseek(jsonFile, 0, SEEK_END);
+ jsonSize = ftell(jsonFile);
+ fseek(jsonFile, 0, SEEK_SET);
+
+ jsonVector.resize(jsonSize);
+ fread(jsonVector.data(), 1, jsonSize, jsonFile);
+
+ fclose(jsonFile);
+ }
write(fd, &dexSize, sizeof(long));
write(fd, &jsonSize, sizeof(long));
diff --git a/app/src/main/cpp/shadowhook/arch/arm/sh_a32.c b/app/src/main/cpp/shadowhook/arch/arm/sh_a32.c
new file mode 100644
index 0000000..d71e4f8
--- /dev/null
+++ b/app/src/main/cpp/shadowhook/arch/arm/sh_a32.c
@@ -0,0 +1,446 @@
+// Copyright (c) 2021-2022 ByteDance Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+
+// Created by Kelun Cai (caikelun@bytedance.com) on 2021-04-11.
+
+#include "sh_a32.h"
+
+#include
+#include
+#include
+
+#include "sh_log.h"
+
+// https://developer.arm.com/documentation/ddi0406/latest
+// https://developer.arm.com/documentation/ddi0597/latest
+
+typedef enum {
+ IGNORED = 0,
+ B_A1,
+ BX_A1,
+ BL_IMM_A1,
+ BLX_IMM_A2,
+ ADD_REG_A1,
+ ADD_REG_PC_A1,
+ SUB_REG_A1,
+ SUB_REG_PC_A1,
+ ADR_A1,
+ ADR_A2,
+ MOV_REG_A1,
+ MOV_REG_PC_A1,
+ LDR_LIT_A1,
+ LDR_LIT_PC_A1,
+ LDRB_LIT_A1,
+ LDRD_LIT_A1,
+ LDRH_LIT_A1,
+ LDRSB_LIT_A1,
+ LDRSH_LIT_A1,
+ LDR_REG_A1,
+ LDR_REG_PC_A1,
+ LDRB_REG_A1,
+ LDRD_REG_A1,
+ LDRH_REG_A1,
+ LDRSB_REG_A1,
+ LDRSH_REG_A1
+} sh_a32_type_t;
+
+static sh_a32_type_t sh_a32_get_type(uint32_t inst) {
+ if (((inst & 0x0F000000u) == 0x0A000000) && ((inst & 0xF0000000) != 0xF0000000))
+ return B_A1;
+ else if (((inst & 0x0FFFFFFFu) == 0x012FFF1F) && ((inst & 0xF0000000) != 0xF0000000))
+ return BX_A1;
+ else if (((inst & 0x0F000000u) == 0x0B000000) && ((inst & 0xF0000000) != 0xF0000000))
+ return BL_IMM_A1;
+ else if ((inst & 0xFE000000) == 0xFA000000)
+ return BLX_IMM_A2;
+ else if (((inst & 0x0FE00010u) == 0x00800000) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x0010F000u) != 0x0010F000) && ((inst & 0x000F0000u) != 0x000D0000) &&
+ (((inst & 0x000F0000u) == 0x000F0000) || ((inst & 0x0000000Fu) == 0x0000000F)))
+ return ((inst & 0x0000F000u) == 0x0000F000) ? ADD_REG_PC_A1 : ADD_REG_A1;
+ else if (((inst & 0x0FE00010u) == 0x00400000) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x0010F000u) != 0x0010F000) && ((inst & 0x000F0000u) != 0x000D0000) &&
+ (((inst & 0x000F0000u) == 0x000F0000) || ((inst & 0x0000000Fu) == 0x0000000F)))
+ return ((inst & 0x0000F000u) == 0x0000F000) ? SUB_REG_PC_A1 : SUB_REG_A1;
+ else if (((inst & 0x0FFF0000u) == 0x028F0000) && ((inst & 0xF0000000) != 0xF0000000))
+ return ADR_A1;
+ else if (((inst & 0x0FFF0000u) == 0x024F0000) && ((inst & 0xF0000000) != 0xF0000000))
+ return ADR_A2;
+ else if (((inst & 0x0FEF001Fu) == 0x01A0000F) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x0010F000u) != 0x0010F000) &&
+ (!(((inst & 0x0000F000u) == 0x0000F000) && ((inst & 0x00000FF0u) != 0x00000000))))
+ return ((inst & 0x0000F000u) == 0x0000F000) ? MOV_REG_PC_A1 : MOV_REG_A1;
+ else if (((inst & 0x0F7F0000u) == 0x051F0000) && ((inst & 0xF0000000) != 0xF0000000))
+ return ((inst & 0x0000F000u) == 0x0000F000) ? LDR_LIT_PC_A1 : LDR_LIT_A1;
+ else if (((inst & 0x0F7F0000u) == 0x055F0000) && ((inst & 0xF0000000) != 0xF0000000))
+ return LDRB_LIT_A1;
+ else if (((inst & 0x0F7F00F0u) == 0x014F00D0) && ((inst & 0xF0000000) != 0xF0000000))
+ return LDRD_LIT_A1;
+ else if (((inst & 0x0F7F00F0u) == 0x015F00B0) && ((inst & 0xF0000000) != 0xF0000000))
+ return LDRH_LIT_A1;
+ else if (((inst & 0x0F7F00F0u) == 0x015F00D0) && ((inst & 0xF0000000) != 0xF0000000))
+ return LDRSB_LIT_A1;
+ else if (((inst & 0x0F7F00F0u) == 0x015F00F0) && ((inst & 0xF0000000) != 0xF0000000))
+ return LDRSH_LIT_A1;
+ else if (((inst & 0x0E5F0010u) == 0x061F0000) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return ((inst & 0x0000F000u) == 0x0000F000) ? LDR_REG_PC_A1 : LDR_REG_A1;
+ else if (((inst & 0x0E5F0010u) == 0x065F0000) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return LDRB_REG_A1;
+ else if (((inst & 0x0E5F0FF0u) == 0x000F00D0) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return LDRD_REG_A1;
+ else if (((inst & 0x0E5F0FF0u) == 0x001F00B0) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return LDRH_REG_A1;
+ else if (((inst & 0x0E5F0FF0u) == 0x001F00D0) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return LDRSB_REG_A1;
+ else if (((inst & 0x0E5F0FF0u) == 0x001F00F0) && ((inst & 0xF0000000) != 0xF0000000) &&
+ ((inst & 0x01200000u) != 0x00200000))
+ return LDRSH_REG_A1;
+ else
+ return IGNORED;
+}
+
+size_t sh_a32_get_rewrite_inst_len(uint32_t inst) {
+ static uint8_t map[] = {
+ 4, // IGNORED
+ 12, // B_A1
+ 12, // BX_A1
+ 16, // BL_IMM_A1
+ 16, // BLX_IMM_A2
+ 32, // ADD_REG_A1
+ 32, // ADD_REG_PC_A1
+ 32, // SUB_REG_A1
+ 32, // SUB_REG_PC_A1
+ 12, // ADR_A1
+ 12, // ADR_A2
+ 32, // MOV_REG_A1
+ 12, // MOV_REG_PC_A1
+ 24, // LDR_LIT_A1
+ 36, // LDR_LIT_PC_A1
+ 24, // LDRB_LIT_A1
+ 24, // LDRD_LIT_A1
+ 24, // LDRH_LIT_A1
+ 24, // LDRSB_LIT_A1
+ 24, // LDRSH_LIT_A1
+ 32, // LDR_REG_A1
+ 36, // LDR_REG_PC_A1
+ 32, // LDRB_REG_A1
+ 32, // LDRD_REG_A1
+ 32, // LDRH_REG_A1
+ 32, // LDRSB_REG_A1
+ 32 // LDRSH_REG_A1
+ };
+
+ return (size_t)(map[sh_a32_get_type(inst)]);
+}
+
+static bool sh_a32_is_addr_need_fix(uintptr_t addr, sh_a32_rewrite_info_t *rinfo) {
+ return (rinfo->overwrite_start_addr <= addr && addr < rinfo->overwrite_end_addr);
+}
+
+static uintptr_t sh_a32_fix_addr(uintptr_t addr, sh_a32_rewrite_info_t *rinfo) {
+ if (rinfo->overwrite_start_addr <= addr && addr < rinfo->overwrite_end_addr) {
+ uintptr_t cursor_addr = rinfo->overwrite_start_addr;
+ size_t offset = 0;
+ for (size_t i = 0; i < rinfo->rewrite_inst_lens_cnt; i++) {
+ if (cursor_addr >= addr) break;
+ cursor_addr += 4;
+ offset += rinfo->rewrite_inst_lens[i];
+ }
+ uintptr_t fixed_addr = (uintptr_t)rinfo->rewrite_buf + offset;
+ SH_LOG_INFO("a32 rewrite: fix addr %" PRIxPTR " -> %" PRIxPTR, addr, fixed_addr);
+ return fixed_addr;
+ }
+
+ return addr;
+}
+
+static size_t sh_a32_rewrite_b(uint32_t *buf, uint32_t inst, uintptr_t pc, sh_a32_type_t type,
+ sh_a32_rewrite_info_t *rinfo) {
+ uint32_t cond;
+ if (type == B_A1 || type == BL_IMM_A1 || type == BX_A1)
+ cond = SH_UTIL_GET_BITS_32(inst, 31, 28);
+ else
+ // type == BLX_IMM_A2
+ cond = 0xE; // 1110 None (AL)
+
+ uint32_t addr;
+ if (type == B_A1 || type == BL_IMM_A1) {
+ uint32_t imm24 = SH_UTIL_GET_BITS_32(inst, 23, 0);
+ uint32_t imm32 = SH_UTIL_SIGN_EXTEND_32(imm24 << 2u, 26u);
+ addr = pc + imm32; // arm -> arm
+ } else if (type == BLX_IMM_A2) {
+ uint32_t h = SH_UTIL_GET_BIT_32(inst, 24);
+ uint32_t imm24 = SH_UTIL_GET_BITS_32(inst, 23, 0);
+ uint32_t imm32 = SH_UTIL_SIGN_EXTEND_32((imm24 << 2u) | (h << 1u), 26u);
+ addr = SH_UTIL_SET_BIT0(pc + imm32); // arm -> thumb
+ } else {
+ // type == BX_A1
+ // BX PC
+ // PC must be even, and the "arm" instruction must be at a 4-byte aligned address,
+ // so the instruction set must keep "arm" unchanged.
+ addr = pc; // arm -> arm
+ }
+ addr = sh_a32_fix_addr(addr, rinfo);
+
+ size_t idx = 0;
+ if (type == BL_IMM_A1 || type == BLX_IMM_A2) {
+ buf[idx++] = 0x028FE008u | (cond << 28u); // ADD LR, PC, #8
+ }
+ buf[idx++] = 0x059FF000u | (cond << 28u); // LDR PC, [PC, #0]
+ buf[idx++] = 0xEA000000; // B #0
+ buf[idx++] = addr;
+ return idx * 4; // 12 or 16
+}
+
+static size_t sh_a32_rewrite_add_or_sub(uint32_t *buf, uint32_t inst, uintptr_t pc) {
+ // ADD{S} , , PC{, } or ADD{S} , PC, {, }
+ // SUB{S} , , PC{, } or SUB{S} , PC, {, }
+ uint32_t cond = SH_UTIL_GET_BITS_32(inst, 31, 28);
+ uint32_t rn = SH_UTIL_GET_BITS_32(inst, 19, 16);
+ uint32_t rm = SH_UTIL_GET_BITS_32(inst, 3, 0);
+ uint32_t rd = SH_UTIL_GET_BITS_32(inst, 15, 12);
+
+ uint32_t rx; // r0 - r3
+ for (rx = 3;; --rx)
+ if (rx != rn && rx != rm && rx != rd) break;
+
+ if (rd == 0xF) // Rd == PC
+ {
+ uint32_t ry; // r0 - r4
+ for (ry = 4;; --ry)
+ if (ry != rn && ry != rm && ry != rd && ry != rx) break;
+
+ buf[0] = 0x0A000000u | (cond << 28u); // B #0
+ buf[1] = 0xEA000005; // B #20
+ buf[2] = 0xE92D8000 | (1u << rx) | (1u << ry); // PUSH {Rx, Ry, PC}
+ buf[3] = 0xE59F0008 | (rx << 12u); // LDR Rx, [PC, #8]
+ if (rn == 0xF)
+ // Rn == PC
+ buf[4] =
+ (inst & 0x0FF00FFFu) | 0xE0000000 | (ry << 12u) | (rx << 16u); // ADD/SUB Ry, Rx, Rm{, }
+ else
+ // Rm == PC
+ buf[4] = (inst & 0x0FFF0FF0u) | 0xE0000000 | (ry << 12u) | rx; // ADD/SUB Ry, Rn, Rx{, }
+ buf[5] = 0xE58D0008 | (ry << 12u); // STR Ry, [SP, #8]
+ buf[6] = 0xE8BD8000 | (1u << rx) | (1u << ry); // POP {Rx, Ry, PC}
+ buf[7] = pc;
+ return 32;
+ } else {
+ buf[0] = 0x0A000000u | (cond << 28u); // B #0
+ buf[1] = 0xEA000005; // B #20
+ buf[2] = 0xE52D0004 | (rx << 12u); // PUSH {Rx}
+ buf[3] = 0xE59F0008 | (rx << 12u); // LDR Rx, [PC, #8]
+ if (rn == 0xF)
+ // Rn == PC
+ buf[4] = (inst & 0x0FF0FFFFu) | 0xE0000000 | (rx << 16u); // ADD/SUB{S} Rd, Rx, Rm{, }
+ else
+ // Rm == PC
+ buf[4] = (inst & 0x0FFFFFF0u) | 0xE0000000 | rx; // ADD/SUB{S} Rd, Rn, Rx{, }
+ buf[5] = 0xE49D0004 | (rx << 12u); // POP {Rx}
+ buf[6] = 0xEA000000; // B #0
+ buf[7] = pc;
+ return 32;
+ }
+}
+
+static size_t sh_a32_rewrite_adr(uint32_t *buf, uint32_t inst, uintptr_t pc, sh_a32_type_t type,
+ sh_a32_rewrite_info_t *rinfo) {
+ uint32_t cond = SH_UTIL_GET_BITS_32(inst, 31, 28);
+ uint32_t rd = SH_UTIL_GET_BITS_32(inst, 15, 12); // r0 - r15
+ uint32_t imm12 = SH_UTIL_GET_BITS_32(inst, 11, 0);
+ uint32_t imm32 = sh_util_arm_expand_imm(imm12);
+ uint32_t addr = (type == ADR_A1 ? (SH_UTIL_ALIGN_4(pc) + imm32) : (SH_UTIL_ALIGN_4(pc) - imm32));
+ if (sh_a32_is_addr_need_fix(addr, rinfo)) return 0; // rewrite failed
+
+ buf[0] = 0x059F0000u | (cond << 28u) | (rd << 12u); // LDR Rd, [PC, #0]
+ buf[1] = 0xEA000000; // B #0
+ buf[2] = addr;
+ return 12;
+}
+
+static size_t sh_a32_rewrite_mov(uint32_t *buf, uint32_t inst, uintptr_t pc) {
+ // MOV{S} , PC
+ uint32_t cond = SH_UTIL_GET_BITS_32(inst, 31, 28);
+ uint32_t rd = SH_UTIL_GET_BITS_32(inst, 15, 12);
+ uint32_t rx = (rd == 0) ? 1 : 0;
+
+ if (rd == 0xF) // Rd == PC (MOV PC, PC)
+ {
+ buf[0] = 0x059FF000u | (cond << 28u); // LDR PC, [PC, #0]
+ buf[1] = 0xEA000000; // B #0
+ buf[2] = pc;
+ return 12;
+ } else {
+ buf[0] = 0x0A000000u | (cond << 28u); // B #0
+ buf[1] = 0xEA000005; // B #20
+ buf[2] = 0xE52D0004 | (rx << 12u); // PUSH {Rx}
+ buf[3] = 0xE59F0008 | (rx << 12u); // LDR Rx, [PC, #8]
+ buf[4] = (inst & 0x0FFFFFF0u) | 0xE0000000 | rx; // MOV{S} Rd, Rx{, #/RRX}
+ buf[5] = 0xE49D0004 | (rx << 12u); // POP {Rx}
+ buf[6] = 0xEA000000; // B #0
+ buf[7] = pc;
+ return 32;
+ }
+}
+
+static size_t sh_a32_rewrite_ldr_lit(uint32_t *buf, uint32_t inst, uintptr_t pc, sh_a32_type_t type,
+ sh_a32_rewrite_info_t *rinfo) {
+ uint32_t cond = SH_UTIL_GET_BITS_32(inst, 31, 28);
+ uint32_t u = SH_UTIL_GET_BIT_32(inst, 23);
+ uint32_t rt = SH_UTIL_GET_BITS_16(inst, 15, 12);
+
+ uint32_t imm32;
+ if (type == LDR_LIT_A1 || type == LDR_LIT_PC_A1 || type == LDRB_LIT_A1)
+ imm32 = SH_UTIL_GET_BITS_32(inst, 11, 0);
+ else
+ imm32 = (SH_UTIL_GET_BITS_32(inst, 11, 8) << 4u) + SH_UTIL_GET_BITS_32(inst, 3, 0);
+ uint32_t addr = (u ? (SH_UTIL_ALIGN_4(pc) + imm32) : (SH_UTIL_ALIGN_4(pc) - imm32));
+ if (sh_a32_is_addr_need_fix(addr, rinfo)) return 0; // rewrite failed
+
+ if (type == LDR_LIT_PC_A1 && rt == 0xF) {
+ // Rt == PC
+ buf[0] = 0x0A000000u | (cond << 28u); // B #0
+ buf[1] = 0xEA000006; // B #24
+ buf[2] = 0xE92D0003; // PUSH {R0, R1}
+ buf[3] = 0xE59F0000; // LDR R0, [PC, #0]
+ buf[4] = 0xEA000000; // B #0
+ buf[5] = addr; //
+ buf[6] = 0xE5900000; // LDR R0, [R0]
+ buf[7] = 0xE58D0004; // STR R0, [SP, #4]
+ buf[8] = 0xE8BD8001; // POP {R0, PC}
+ return 36;
+ } else {
+ buf[0] = 0x0A000000u | (cond << 28u); // B #0
+ buf[1] = 0xEA000003; // B #12
+ buf[2] = 0xE59F0000 | (rt << 12u); // LDR Rt, [PC, #0]
+ buf[3] = 0xEA000000; // B #0
+ buf[4] = addr; //
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch"
+ switch (type) {
+ case LDR_LIT_A1:
+ buf[5] = 0xE5900000 | (rt << 16u) | (rt << 12u); // LDR Rt, [Rt]
+ break;
+ case LDRB_LIT_A1:
+ buf[5] = 0xE5D00000 | (rt << 16u) | (rt << 12u); // LDRB Rt, [Rt]
+ break;
+ case LDRD_LIT_A1:
+ buf[5] = 0xE1C000D0 | (rt << 16u) | (rt << 12u); // LDRD Rt, [Rt]
+ break;
+ case LDRH_LIT_A1:
+ buf[5] = 0xE1D000B0 | (rt << 16u) | (rt << 12u); // LDRH Rt, [Rt]
+ break;
+ case LDRSB_LIT_A1:
+ buf[5] = 0xE1D000D0 | (rt << 16u) | (rt << 12u); // LDRSB Rt, [Rt]
+ break;
+ case LDRSH_LIT_A1:
+ buf[5] = 0xE1D000F0 | (rt << 16u) | (rt << 12u); // LDRSH Rt, [Rt]
+ break;
+ }
+#pragma clang diagnostic pop
+ return 24;
+ }
+}
+
+static size_t sh_a32_rewrite_ldr_reg(uint32_t *buf, uint32_t inst, uintptr_t pc, sh_a32_type_t type) {
+ // LDR