Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SandHook
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
SandHook
Commits
8e0774b6
Commit
8e0774b6
authored
Feb 12, 2019
by
swift_gan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into xposed_compat
parents
74316b18
09c2e9c4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
insts_arm32.cpp
hooklib/src/main/cpp/inst/insts_arm32.cpp
+1
-1
insts_arm64.cpp
hooklib/src/main/cpp/inst/insts_arm64.cpp
+1
-1
No files found.
hooklib/src/main/cpp/inst/insts_arm32.cpp
View file @
8e0774b6
...
@@ -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
))
{
...
...
hooklib/src/main/cpp/inst/insts_arm64.cpp
View file @
8e0774b6
...
@@ -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
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment