Unverified Commit 74883690 authored by ganyao114's avatar ganyao114 Committed by GitHub

Merge pull request #25 from ganyao114/short_method

Short method
parents 49ddfce5 faef936f
...@@ -252,7 +252,7 @@ void T16_MOV_REG::Disassemble() { ...@@ -252,7 +252,7 @@ void T16_MOV_REG::Disassemble() {
} }
void T16_MOV_REG::Assemble() { void T16_MOV_REG::Assemble() {
SET_BASE_OPCODE(DATA_PROC); SET_BASE_OPCODE(SPDIABE);
SET_OPCODE(MOV_REG); SET_OPCODE(MOV_REG);
ENCODE_RM; ENCODE_RM;
Get()->rd = BITS(rd->Code(), 0, 2); Get()->rd = BITS(rd->Code(), 0, 2);
......
...@@ -120,6 +120,10 @@ Off T32_LDR_LIT::GetImmPCOffset() { ...@@ -120,6 +120,10 @@ Off T32_LDR_LIT::GetImmPCOffset() {
return Get()->U == add ? Get()->imm12 : -Get()->imm12; return Get()->U == add ? Get()->imm12 : -Get()->imm12;
} }
Addr T32_LDR_LIT::GetImmPCOffsetTarget() {
return ALIGN((Addr) GetPC() + offset, 4);
}
void T32_LDR_LIT::OnOffsetApply(Off offset) { void T32_LDR_LIT::OnOffsetApply(Off offset) {
this->offset = offset; this->offset = offset;
if (offset >= 0) { if (offset >= 0) {
...@@ -153,7 +157,6 @@ void T32_LDR_LIT::Assemble() { ...@@ -153,7 +157,6 @@ void T32_LDR_LIT::Assemble() {
} }
T32_MOV_MOVT_IMM::T32_MOV_MOVT_IMM(void *inst) : InstructionT32(inst) { T32_MOV_MOVT_IMM::T32_MOV_MOVT_IMM(void *inst) : InstructionT32(inst) {
} }
......
...@@ -199,6 +199,8 @@ namespace SandHook { ...@@ -199,6 +199,8 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
Addr GetImmPCOffsetTarget() override;
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassemble() override; void Disassemble() override;
......
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