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
5d6a9540
Commit
5d6a9540
authored
May 17, 2019
by
swift_gan
Committed by
swift_gan
May 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NativeHook]fix push
parent
b41514d8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
10 deletions
+11
-10
assembler_a64.cpp
.../src/main/cpp/archs/arm/arm64/assembler/assembler_a64.cpp
+4
-4
decoder_arm64.cpp
...ok/src/main/cpp/archs/arm/arm64/decoder/decoder_arm64.cpp
+1
-1
inst_arm64.cpp
nativehook/src/main/cpp/archs/arm/arm64/inst/inst_arm64.cpp
+4
-4
inst_arm64.h
nativehook/src/main/cpp/archs/arm/arm64/inst/inst_arm64.h
+2
-1
No files found.
nativehook/src/main/cpp/archs/arm/arm64/assembler/assembler_a64.cpp
View file @
5d6a9540
...
@@ -176,17 +176,17 @@ void AssemblerA64::Ldrsw(XRegister &rt, const MemOperand& memOperand) {
...
@@ -176,17 +176,17 @@ void AssemblerA64::Ldrsw(XRegister &rt, const MemOperand& memOperand) {
void
AssemblerA64
::
Pop
(
RegisterA64
&
rd
)
{
void
AssemblerA64
::
Pop
(
RegisterA64
&
rd
)
{
if
(
rd
.
isX
())
{
if
(
rd
.
isX
())
{
Ldr
(
rd
,
MemOperand
(
&
SP
,
-
1
*
rd
.
getWideInBytes
(),
Pre
Index
));
Ldr
(
rd
,
MemOperand
(
&
SP
,
rd
.
getWideInBytes
(),
Post
Index
));
}
else
{
}
else
{
Ldr
(
rd
,
MemOperand
(
&
WSP
,
-
1
*
rd
.
getWideInBytes
(),
Pre
Index
));
Ldr
(
rd
,
MemOperand
(
&
WSP
,
rd
.
getWideInBytes
(),
Post
Index
));
}
}
}
}
void
AssemblerA64
::
Push
(
RegisterA64
&
rt
)
{
void
AssemblerA64
::
Push
(
RegisterA64
&
rt
)
{
if
(
rt
.
isX
())
{
if
(
rt
.
isX
())
{
Str
(
rt
,
MemOperand
(
&
SP
,
-
1
*
rt
.
getWideInBytes
(),
PreIndex
));
Str
(
rt
,
MemOperand
(
&
SP
,
-
rt
.
getWideInBytes
(),
PreIndex
));
}
else
{
}
else
{
Str
(
rt
,
MemOperand
(
&
WSP
,
-
1
*
rt
.
getWideInBytes
(),
PreIndex
));
Str
(
rt
,
MemOperand
(
&
WSP
,
-
rt
.
getWideInBytes
(),
PreIndex
));
}
}
}
}
...
...
nativehook/src/main/cpp/archs/arm/arm64/decoder/decoder_arm64.cpp
View file @
5d6a9540
...
@@ -28,8 +28,8 @@ void Arm64Decoder::decode(void *codeStart, Addr codeLen, InstVisitor &visitor) {
...
@@ -28,8 +28,8 @@ void Arm64Decoder::decode(void *codeStart, Addr codeLen, InstVisitor &visitor) {
CASE
(
LDR_UIMM
)
CASE
(
LDR_UIMM
)
CASE
(
LDRSW_IMM
)
CASE
(
LDRSW_IMM
)
CASE
(
LDRSW_UIMM
)
CASE
(
LDRSW_UIMM
)
CASE
(
STR_IMM
)
CASE
(
STR_UIMM
)
CASE
(
STR_UIMM
)
CASE
(
STR_IMM
)
CASE
(
B_BL
)
CASE
(
B_BL
)
CASE
(
B_COND
)
CASE
(
B_COND
)
CASE
(
BR_BLR_RET
)
CASE
(
BR_BLR_RET
)
...
...
nativehook/src/main/cpp/archs/arm/arm64/inst/inst_arm64.cpp
View file @
5d6a9540
...
@@ -395,8 +395,8 @@ void A64_STR_IMM::decode(STRUCT_A64(STR_IMM) *inst) {
...
@@ -395,8 +395,8 @@ void A64_STR_IMM::decode(STRUCT_A64(STR_IMM) *inst) {
operand
.
addr_mode
=
AddrMode
::
PreIndex
;
operand
.
addr_mode
=
AddrMode
::
PreIndex
;
break
;
break
;
default
:
default
:
operand
.
addr_mode
=
AddrMode
::
Offset
;
valid
=
false
;
valid
=
false
;
return
;
}
}
scale
=
static_cast
<
U8
>
(
inst
->
size
);
scale
=
static_cast
<
U8
>
(
inst
->
size
);
offset
=
signExtend64
(
9
,
inst
->
imm9
);
offset
=
signExtend64
(
9
,
inst
->
imm9
);
...
@@ -428,8 +428,8 @@ void A64_STR_IMM::assembler() {
...
@@ -428,8 +428,8 @@ void A64_STR_IMM::assembler() {
get
()
->
addrmode
=
PreIndex
;
get
()
->
addrmode
=
PreIndex
;
break
;
break
;
default
:
default
:
get
()
->
addrmode
=
Offset
;
valid
=
false
;
valid
=
false
;
return
;
}
}
}
}
...
@@ -620,8 +620,8 @@ void A64_LDR_IMM::decode(STRUCT_A64(LDR_IMM) *inst) {
...
@@ -620,8 +620,8 @@ void A64_LDR_IMM::decode(STRUCT_A64(LDR_IMM) *inst) {
operand
.
addr_mode
=
AddrMode
::
PreIndex
;
operand
.
addr_mode
=
AddrMode
::
PreIndex
;
break
;
break
;
default
:
default
:
operand
.
addr_mode
=
AddrMode
::
Offset
;
valid
=
false
;
valid
=
false
;
return
;
}
}
scale
=
static_cast
<
U8
>
(
inst
->
size
);
scale
=
static_cast
<
U8
>
(
inst
->
size
);
offset
=
signExtend64
(
9
,
inst
->
imm9
);
offset
=
signExtend64
(
9
,
inst
->
imm9
);
...
@@ -653,8 +653,8 @@ void A64_LDR_IMM::assembler() {
...
@@ -653,8 +653,8 @@ void A64_LDR_IMM::assembler() {
get
()
->
addrmode
=
PreIndex
;
get
()
->
addrmode
=
PreIndex
;
break
;
break
;
default
:
default
:
get
()
->
addrmode
=
Offset
;
valid
=
false
;
valid
=
false
;
return
;
}
}
}
}
...
...
nativehook/src/main/cpp/archs/arm/arm64/inst/inst_arm64.h
View file @
5d6a9540
...
@@ -526,7 +526,8 @@ namespace SandHook {
...
@@ -526,7 +526,8 @@ namespace SandHook {
public
:
public
:
enum
AdMod
{
enum
AdMod
{
PostIndex
=
0
b00
,
Offset
=
0
b00
,
PostIndex
=
0
b01
,
PreIndex
=
0
b11
PreIndex
=
0
b11
};
};
...
...
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