Commit 8e0774b6 authored by swift_gan's avatar swift_gan

Merge branch 'master' into xposed_compat

parents 74316b18 09c2e9c4
...@@ -102,7 +102,7 @@ namespace SandHook { ...@@ -102,7 +102,7 @@ namespace SandHook {
if (isThumbCode(reinterpret_cast<Size>(codeStart))) { if (isThumbCode(reinterpret_cast<Size>(codeStart))) {
codeStart = Trampoline::getThumbCodeAddress(static_cast<Code>(codeStart)); codeStart = Trampoline::getThumbCodeAddress(static_cast<Code>(codeStart));
Size codeAddr = reinterpret_cast<Size>(codeStart); Size codeAddr = reinterpret_cast<Size>(codeStart);
while (offset <= codeLen) { while (offset < codeLen) {
uint16_t ram16 = *reinterpret_cast<uint16_t*>(codeAddr + offset); uint16_t ram16 = *reinterpret_cast<uint16_t*>(codeAddr + offset);
uint32_t ram32 = *reinterpret_cast<uint32_t*>(codeAddr + offset); uint32_t ram32 = *reinterpret_cast<uint32_t*>(codeAddr + offset);
if (isThumb32(ram16)) { if (isThumb32(ram16)) {
......
...@@ -52,7 +52,7 @@ namespace SandHook { ...@@ -52,7 +52,7 @@ namespace SandHook {
Inst *inst = nullptr; Inst *inst = nullptr;
codeStart = Trampoline::getThumbCodeAddress(static_cast<Code>(codeStart)); codeStart = Trampoline::getThumbCodeAddress(static_cast<Code>(codeStart));
Size codeAddr = reinterpret_cast<Size>(codeStart); Size codeAddr = reinterpret_cast<Size>(codeStart);
while (offset <= codeLen) { while (offset < codeLen) {
uint32_t ram32 = *reinterpret_cast<uint32_t *>(codeAddr + offset); uint32_t ram32 = *reinterpret_cast<uint32_t *>(codeAddr + offset);
inst = new InstArm64(ram32); inst = new InstArm64(ram32);
if (!visitor->visit(inst, offset, codeLen)) { if (!visitor->visit(inst, offset, codeLen)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment