Commit 612980be authored by swift_gan's avatar swift_gan Committed by swift_gan

[Reconstitution]tweak typo

parent c2a9a03f
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
//} //}
// //
// //
//void A64_STR_IMM::Assembler() { //void A64_STR_IMM::Assemble() {
// INST_DCHECK(condition, Condition::nv) // INST_DCHECK(condition, Condition::nv)
// //
//} //}
\ No newline at end of file
...@@ -25,7 +25,7 @@ namespace SandHook { ...@@ -25,7 +25,7 @@ namespace SandHook {
// //
// void DisAssembler(STRUCT_A64(STR_IMM) *inst) override; // void DisAssembler(STRUCT_A64(STR_IMM) *inst) override;
// //
// void Assembler() override; // void Assemble() override;
// //
// AddrMode getAddrMode() { // AddrMode getAddrMode() {
// return operand.addr_mode_; // return operand.addr_mode_;
......
...@@ -35,11 +35,11 @@ Off T16_B::GetImmPCOffset() { ...@@ -35,11 +35,11 @@ Off T16_B::GetImmPCOffset() {
return DECODE_OFFSET(11, 1); return DECODE_OFFSET(11, 1);
} }
void T16_B::Disassembler() { void T16_B::Disassemble() {
offset = GetImmPCOffset(); offset = GetImmPCOffset();
} }
void T16_B::Assembler() { void T16_B::Assemble() {
SET_OPCODE(B); SET_OPCODE(B);
DECODE_OFFSET(11, 1); DECODE_OFFSET(11, 1);
} }
...@@ -62,12 +62,12 @@ T16_B_COND::T16_B_COND(Condition condition, Label *label) { ...@@ -62,12 +62,12 @@ T16_B_COND::T16_B_COND(Condition condition, Label *label) {
BindLabel(label); BindLabel(label);
} }
void T16_B_COND::Disassembler() { void T16_B_COND::Disassemble() {
DECODE_COND; DECODE_COND;
offset = GetImmPCOffset(); offset = GetImmPCOffset();
} }
void T16_B_COND::Assembler() { void T16_B_COND::Assemble() {
SET_OPCODE(B_COND); SET_OPCODE(B_COND);
ENCODE_COND; ENCODE_COND;
ENCODE_OFFSET(8, 1); ENCODE_OFFSET(8, 1);
...@@ -89,12 +89,12 @@ T16_BX_BLX::T16_BX_BLX(void *inst) : T16_INST_PC_REL(inst) {} ...@@ -89,12 +89,12 @@ T16_BX_BLX::T16_BX_BLX(void *inst) : T16_INST_PC_REL(inst) {}
T16_BX_BLX::T16_BX_BLX(T16_BX_BLX::OP op, RegisterA32 &rm) : op(op), rm(&rm) {} T16_BX_BLX::T16_BX_BLX(T16_BX_BLX::OP op, RegisterA32 &rm) : op(op), rm(&rm) {}
void T16_BX_BLX::Disassembler() { void T16_BX_BLX::Disassemble() {
DECODE_OP; DECODE_OP;
DECODE_RM(Reg); DECODE_RM(Reg);
} }
void T16_BX_BLX::Assembler() { void T16_BX_BLX::Assemble() {
SET_OPCODE_MULTI(BX_BLX, 1); SET_OPCODE_MULTI(BX_BLX, 1);
SET_OPCODE_MULTI(BX_BLX, 2); SET_OPCODE_MULTI(BX_BLX, 2);
ENCODE_OP; ENCODE_OP;
...@@ -116,13 +116,13 @@ Off T16_CBZ_CBNZ::GetImmPCOffset() { ...@@ -116,13 +116,13 @@ Off T16_CBZ_CBNZ::GetImmPCOffset() {
return COMBINE(Get()->i, Get()->imm5, 5) << 2; return COMBINE(Get()->i, Get()->imm5, 5) << 2;
} }
void T16_CBZ_CBNZ::Disassembler() { void T16_CBZ_CBNZ::Disassemble() {
offset = GetImmPCOffset(); offset = GetImmPCOffset();
DECODE_RN(Reg); DECODE_RN(Reg);
DECODE_OP; DECODE_OP;
} }
void T16_CBZ_CBNZ::Assembler() { void T16_CBZ_CBNZ::Assemble() {
SET_OPCODE_MULTI(CBZ_CBNZ, 1); SET_OPCODE_MULTI(CBZ_CBNZ, 1);
SET_OPCODE_MULTI(CBZ_CBNZ, 2); SET_OPCODE_MULTI(CBZ_CBNZ, 2);
SET_OPCODE_MULTI(CBZ_CBNZ, 3); SET_OPCODE_MULTI(CBZ_CBNZ, 3);
...@@ -155,12 +155,12 @@ void T16_LDR_LIT::OnOffsetApply(Off offset) { ...@@ -155,12 +155,12 @@ void T16_LDR_LIT::OnOffsetApply(Off offset) {
ENCODE_OFFSET(8, 2); ENCODE_OFFSET(8, 2);
} }
void T16_LDR_LIT::Disassembler() { void T16_LDR_LIT::Disassemble() {
DECODE_RT(Reg); DECODE_RT(Reg);
offset = GetImmPCOffset(); offset = GetImmPCOffset();
} }
void T16_LDR_LIT::Assembler() { void T16_LDR_LIT::Assemble() {
SET_OPCODE(LDR_LIT); SET_OPCODE(LDR_LIT);
ENCODE_RT; ENCODE_RT;
ENCODE_OFFSET(8, 2); ENCODE_OFFSET(8, 2);
...@@ -174,12 +174,12 @@ T16_ADD_IMM_RDN::T16_ADD_IMM_RDN(void *inst) : InstructionT16(inst) {} ...@@ -174,12 +174,12 @@ T16_ADD_IMM_RDN::T16_ADD_IMM_RDN(void *inst) : InstructionT16(inst) {}
T16_ADD_IMM_RDN::T16_ADD_IMM_RDN(RegisterA32 *rdn, U8 imm8) : rdn(rdn), imm8(imm8) {} T16_ADD_IMM_RDN::T16_ADD_IMM_RDN(RegisterA32 *rdn, U8 imm8) : rdn(rdn), imm8(imm8) {}
void T16_ADD_IMM_RDN::Disassembler() { void T16_ADD_IMM_RDN::Disassemble() {
rdn = Reg(Get()->rdn); rdn = Reg(Get()->rdn);
imm8 = Get()->imm8; imm8 = Get()->imm8;
} }
void T16_ADD_IMM_RDN::Assembler() { void T16_ADD_IMM_RDN::Assemble() {
SET_OPCODE(ADD_IMM_RDN); SET_OPCODE(ADD_IMM_RDN);
Get()->imm8 = imm8; Get()->imm8 = imm8;
Get()->rdn = rdn->Code(); Get()->rdn = rdn->Code();
...@@ -211,13 +211,13 @@ void T16_ADR::OnOffsetApply(Off offset) { ...@@ -211,13 +211,13 @@ void T16_ADR::OnOffsetApply(Off offset) {
Get()->imm8 = (U32)offset >> 2; Get()->imm8 = (U32)offset >> 2;
} }
void T16_ADR::Disassembler() { void T16_ADR::Disassemble() {
offset = GetImmPCOffset(); offset = GetImmPCOffset();
DECODE_RD(Reg); DECODE_RD(Reg);
} }
void T16_ADR::Assembler() { void T16_ADR::Assemble() {
SET_OPCODE(ADR); SET_OPCODE(ADR);
ENCODE_RD; ENCODE_RD;
Get()->imm8 = (U32)offset >> 2; Get()->imm8 = (U32)offset >> 2;
...@@ -228,12 +228,12 @@ T16_CMP_REG::T16_CMP_REG(void *inst) : InstructionT16(inst) {} ...@@ -228,12 +228,12 @@ T16_CMP_REG::T16_CMP_REG(void *inst) : InstructionT16(inst) {}
T16_CMP_REG::T16_CMP_REG(RegisterA32 &rm, RegisterA32 &rn) : rm(&rm), rn(&rn) {} T16_CMP_REG::T16_CMP_REG(RegisterA32 &rm, RegisterA32 &rn) : rm(&rm), rn(&rn) {}
void T16_CMP_REG::Disassembler() { void T16_CMP_REG::Disassemble() {
DECODE_RM(Reg); DECODE_RM(Reg);
DECODE_RN(Reg); DECODE_RN(Reg);
} }
void T16_CMP_REG::Assembler() { void T16_CMP_REG::Assemble() {
SET_BASE_OPCODE(DATA_PROC); SET_BASE_OPCODE(DATA_PROC);
SET_OPCODE(CMP_REG); SET_OPCODE(CMP_REG);
ENCODE_RM; ENCODE_RM;
...@@ -246,12 +246,12 @@ T16_MOV_REG::T16_MOV_REG(void *inst) : InstructionT16(inst) {} ...@@ -246,12 +246,12 @@ T16_MOV_REG::T16_MOV_REG(void *inst) : InstructionT16(inst) {}
T16_MOV_REG::T16_MOV_REG(RegisterA32 &rd, RegisterA32 &rm) : rm(&rm), rd(&rd) {} T16_MOV_REG::T16_MOV_REG(RegisterA32 &rd, RegisterA32 &rm) : rm(&rm), rd(&rd) {}
void T16_MOV_REG::Disassembler() { void T16_MOV_REG::Disassemble() {
DECODE_RM(Reg); DECODE_RM(Reg);
rd = Reg(static_cast<U8>(COMBINE(Get()->D, Get()->rd, 3))); rd = Reg(static_cast<U8>(COMBINE(Get()->D, Get()->rd, 3)));
} }
void T16_MOV_REG::Assembler() { void T16_MOV_REG::Assemble() {
SET_BASE_OPCODE(DATA_PROC); SET_BASE_OPCODE(DATA_PROC);
SET_OPCODE(MOV_REG); SET_OPCODE(MOV_REG);
ENCODE_RM; ENCODE_RM;
...@@ -271,13 +271,13 @@ T16_ADD_REG::T16_ADD_REG(void *inst) : InstructionT16(inst) {} ...@@ -271,13 +271,13 @@ T16_ADD_REG::T16_ADD_REG(void *inst) : InstructionT16(inst) {}
T16_ADD_REG::T16_ADD_REG(RegisterA32 *rd, RegisterA32 *rn, RegisterA32 *rm) : rd(rd), rn(rn), T16_ADD_REG::T16_ADD_REG(RegisterA32 *rd, RegisterA32 *rn, RegisterA32 *rm) : rd(rd), rn(rn),
rm(rm) {} rm(rm) {}
void T16_ADD_REG::Disassembler() { void T16_ADD_REG::Disassemble() {
DECODE_RD(Reg); DECODE_RD(Reg);
DECODE_RN(Reg); DECODE_RN(Reg);
DECODE_RM(Reg); DECODE_RM(Reg);
} }
void T16_ADD_REG::Assembler() { void T16_ADD_REG::Assemble() {
SET_OPCODE(ADD_REG); SET_OPCODE(ADD_REG);
INST_ASSERT(rd->Code() > 7); INST_ASSERT(rd->Code() > 7);
INST_ASSERT(rn->Code() > 7); INST_ASSERT(rn->Code() > 7);
...@@ -293,12 +293,12 @@ T16_CMP_REG_EXT::T16_CMP_REG_EXT(void *inst) : InstructionT16(inst) {} ...@@ -293,12 +293,12 @@ T16_CMP_REG_EXT::T16_CMP_REG_EXT(void *inst) : InstructionT16(inst) {}
T16_CMP_REG_EXT::T16_CMP_REG_EXT(RegisterA32 &rn, RegisterA32 &rm) : rn(&rn), rm(&rm) {} T16_CMP_REG_EXT::T16_CMP_REG_EXT(RegisterA32 &rn, RegisterA32 &rm) : rn(&rn), rm(&rm) {}
void T16_CMP_REG_EXT::Disassembler() { void T16_CMP_REG_EXT::Disassemble() {
rn = Reg(COMBINE(Get()->N, Get()->rn, 3)); rn = Reg(COMBINE(Get()->N, Get()->rn, 3));
DECODE_RM(Reg); DECODE_RM(Reg);
} }
void T16_CMP_REG_EXT::Assembler() { void T16_CMP_REG_EXT::Assemble() {
SET_OPCODE(CMP_REG_EXT); SET_OPCODE(CMP_REG_EXT);
ENCODE_RM; ENCODE_RM;
Get()->rn = BITS(rn->Code(), 0, 2); Get()->rn = BITS(rn->Code(), 0, 2);
...@@ -311,11 +311,11 @@ T16_POP::T16_POP(void *inst) : InstructionT16(inst) {} ...@@ -311,11 +311,11 @@ T16_POP::T16_POP(void *inst) : InstructionT16(inst) {}
T16_POP::T16_POP(const RegisterList &registerList) : registerList(registerList) {} T16_POP::T16_POP(const RegisterList &registerList) : registerList(registerList) {}
void T16_POP::Disassembler() { void T16_POP::Disassemble() {
registerList.SetList(COMBINE(Get()->P << 7, Get()->regs, 8)); registerList.SetList(COMBINE(Get()->P << 7, Get()->regs, 8));
} }
void T16_POP::Assembler() { void T16_POP::Assemble() {
SET_OPCODE(POP); SET_OPCODE(POP);
U16 regs = registerList.GetList(); U16 regs = registerList.GetList();
Get()->regs = BITS(regs, 0, 7); Get()->regs = BITS(regs, 0, 7);
...@@ -328,11 +328,11 @@ T16_PUSH::T16_PUSH(void *inst) : InstructionT16(inst) {} ...@@ -328,11 +328,11 @@ T16_PUSH::T16_PUSH(void *inst) : InstructionT16(inst) {}
T16_PUSH::T16_PUSH(const RegisterList &registerList) : registerList(registerList) {} T16_PUSH::T16_PUSH(const RegisterList &registerList) : registerList(registerList) {}
void T16_PUSH::Disassembler() { void T16_PUSH::Disassemble() {
registerList.SetList(COMBINE(Get()->M << 6, Get()->regs, 8)); registerList.SetList(COMBINE(Get()->M << 6, Get()->regs, 8));
} }
void T16_PUSH::Assembler() { void T16_PUSH::Assemble() {
SET_OPCODE(PUSH); SET_OPCODE(PUSH);
U16 regs = registerList.GetList(); U16 regs = registerList.GetList();
Get()->regs = BITS(regs, 0, 7); Get()->regs = BITS(regs, 0, 7);
...@@ -349,12 +349,12 @@ bool T16_ADD_REG_RDN::PcRelate() { ...@@ -349,12 +349,12 @@ bool T16_ADD_REG_RDN::PcRelate() {
return *rm == PC; return *rm == PC;
} }
void T16_ADD_REG_RDN::Disassembler() { void T16_ADD_REG_RDN::Disassemble() {
DECODE_RM(Reg); DECODE_RM(Reg);
rdn = Reg(Get()->rdn); rdn = Reg(Get()->rdn);
} }
void T16_ADD_REG_RDN::Assembler() { void T16_ADD_REG_RDN::Assemble() {
SET_OPCODE(ADD_REG_RDN); SET_OPCODE(ADD_REG_RDN);
ENCODE_RM; ENCODE_RM;
Get()->rdn = rdn->Code(); Get()->rdn = rdn->Code();
......
...@@ -128,9 +128,9 @@ namespace SandHook { ...@@ -128,9 +128,9 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
Off offset; Off offset;
...@@ -152,9 +152,9 @@ namespace SandHook { ...@@ -152,9 +152,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
Condition condition; Condition condition;
...@@ -176,9 +176,9 @@ namespace SandHook { ...@@ -176,9 +176,9 @@ namespace SandHook {
DEFINE_IS_EXT(BX_BLX, TEST_INST_OPCODE(BX_BLX, 1) && TEST_INST_OPCODE(BX_BLX, 2)) DEFINE_IS_EXT(BX_BLX, TEST_INST_OPCODE(BX_BLX, 1) && TEST_INST_OPCODE(BX_BLX, 2))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -207,9 +207,9 @@ namespace SandHook { ...@@ -207,9 +207,9 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -233,9 +233,9 @@ namespace SandHook { ...@@ -233,9 +233,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
Off offset; Off offset;
...@@ -251,9 +251,9 @@ namespace SandHook { ...@@ -251,9 +251,9 @@ namespace SandHook {
DEFINE_IS(ADD_IMM_RDN) DEFINE_IS(ADD_IMM_RDN)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32 *rdn; RegisterA32 *rdn;
...@@ -277,9 +277,9 @@ namespace SandHook { ...@@ -277,9 +277,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32 *rd; RegisterA32 *rd;
...@@ -298,9 +298,9 @@ namespace SandHook { ...@@ -298,9 +298,9 @@ namespace SandHook {
DEFINE_IS_EXT(CMP_REG, TEST_INST_FIELD(opcode_base, OPCODE_T16(DATA_PROC)) && DEFINE_IS_EXT(CMP_REG, TEST_INST_FIELD(opcode_base, OPCODE_T16(DATA_PROC)) &&
TEST_INST_FIELD(opcode, OPCODE_T16(CMP_REG))) TEST_INST_FIELD(opcode, OPCODE_T16(CMP_REG)))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32 *rm; RegisterA32 *rm;
...@@ -318,9 +318,9 @@ namespace SandHook { ...@@ -318,9 +318,9 @@ namespace SandHook {
DEFINE_IS_EXT(MOV_REG, TEST_INST_FIELD(opcode_base, OPCODE_T16(DATA_PROC)) && DEFINE_IS_EXT(MOV_REG, TEST_INST_FIELD(opcode_base, OPCODE_T16(DATA_PROC)) &&
TEST_INST_FIELD(opcode, OPCODE_T16(MOV_REG))) TEST_INST_FIELD(opcode, OPCODE_T16(MOV_REG)))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
bool PcRelate() override; bool PcRelate() override;
...@@ -339,9 +339,9 @@ namespace SandHook { ...@@ -339,9 +339,9 @@ namespace SandHook {
DEFINE_IS(ADD_REG) DEFINE_IS(ADD_REG)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32 *rd; RegisterA32 *rd;
...@@ -359,9 +359,9 @@ namespace SandHook { ...@@ -359,9 +359,9 @@ namespace SandHook {
DEFINE_IS(CMP_REG_EXT) DEFINE_IS(CMP_REG_EXT)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
...@@ -378,9 +378,9 @@ namespace SandHook { ...@@ -378,9 +378,9 @@ namespace SandHook {
DEFINE_IS(POP) DEFINE_IS(POP)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterList registerList; RegisterList registerList;
...@@ -396,9 +396,9 @@ namespace SandHook { ...@@ -396,9 +396,9 @@ namespace SandHook {
DEFINE_IS(PUSH) DEFINE_IS(PUSH)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterList registerList; RegisterList registerList;
...@@ -417,9 +417,9 @@ namespace SandHook { ...@@ -417,9 +417,9 @@ namespace SandHook {
bool PcRelate() override; bool PcRelate() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32* rdn; RegisterA32* rdn;
......
...@@ -45,13 +45,13 @@ Off T32_B32::GetImmPCOffset() { ...@@ -45,13 +45,13 @@ Off T32_B32::GetImmPCOffset() {
return SignExtend32(25, COMBINE(Si1i2, imm21, 21) << 1); return SignExtend32(25, COMBINE(Si1i2, imm21, 21) << 1);
} }
void T32_B32::Disassembler() { void T32_B32::Disassemble() {
DECODE_OP; DECODE_OP;
x = X(Get()->X); x = X(Get()->X);
offset = GetImmPCOffset(); offset = GetImmPCOffset();
} }
void T32_B32::Assembler() { void T32_B32::Assemble() {
SET_OPCODE(B32); SET_OPCODE(B32);
ENCODE_OP; ENCODE_OP;
Get()->X = x; Get()->X = x;
...@@ -91,14 +91,14 @@ T32_LDR_UIMM::T32_LDR_UIMM(void *inst) : InstructionT32(inst) {} ...@@ -91,14 +91,14 @@ T32_LDR_UIMM::T32_LDR_UIMM(void *inst) : InstructionT32(inst) {}
T32_LDR_UIMM::T32_LDR_UIMM(RegisterA32 &rt, RegisterA32 &rn, U32 offset) : rt(&rt), rn(&rn), T32_LDR_UIMM::T32_LDR_UIMM(RegisterA32 &rt, RegisterA32 &rn, U32 offset) : rt(&rt), rn(&rn),
offset(offset) {} offset(offset) {}
void T32_LDR_UIMM::Disassembler() { void T32_LDR_UIMM::Disassemble() {
DECODE_RN(Reg); DECODE_RN(Reg);
DECODE_RT(Reg); DECODE_RT(Reg);
INST_ASSERT(rn == &PC); INST_ASSERT(rn == &PC);
offset = Get()->imm12; offset = Get()->imm12;
} }
void T32_LDR_UIMM::Assembler() { void T32_LDR_UIMM::Assemble() {
SET_OPCODE(LDR_UIMM); SET_OPCODE(LDR_UIMM);
ENCODE_RN; ENCODE_RN;
ENCODE_RT; ENCODE_RT;
...@@ -131,14 +131,14 @@ void T32_LDR_LIT::OnOffsetApply(Off offset) { ...@@ -131,14 +131,14 @@ void T32_LDR_LIT::OnOffsetApply(Off offset) {
} }
} }
void T32_LDR_LIT::Disassembler() { void T32_LDR_LIT::Disassemble() {
DECODE_OP; DECODE_OP;
DECODE_RT(Reg); DECODE_RT(Reg);
s = S(Get()->S); s = S(Get()->S);
offset = GetImmPCOffset(); offset = GetImmPCOffset();
} }
void T32_LDR_LIT::Assembler() { void T32_LDR_LIT::Assemble() {
SET_OPCODE(LDR_LIT); SET_OPCODE(LDR_LIT);
ENCODE_OP; ENCODE_OP;
ENCODE_RT; ENCODE_RT;
...@@ -161,7 +161,7 @@ T32_MOV_MOVT_IMM::T32_MOV_MOVT_IMM(T32_MOV_MOVT_IMM::OP op, RegisterA32 &rd, U16 ...@@ -161,7 +161,7 @@ T32_MOV_MOVT_IMM::T32_MOV_MOVT_IMM(T32_MOV_MOVT_IMM::OP op, RegisterA32 &rd, U16
rd(&rd), rd(&rd),
imm16(imm16) {} imm16(imm16) {}
void T32_MOV_MOVT_IMM::Disassembler() { void T32_MOV_MOVT_IMM::Disassemble() {
DECODE_OP; DECODE_OP;
DECODE_RD(Reg); DECODE_RD(Reg);
U16 imm4i = COMBINE(Get()->imm4, Get()->i, 1); U16 imm4i = COMBINE(Get()->imm4, Get()->i, 1);
...@@ -169,7 +169,7 @@ void T32_MOV_MOVT_IMM::Disassembler() { ...@@ -169,7 +169,7 @@ void T32_MOV_MOVT_IMM::Disassembler() {
imm16 = COMBINE(imm4i, imm38, 11); imm16 = COMBINE(imm4i, imm38, 11);
} }
void T32_MOV_MOVT_IMM::Assembler() { void T32_MOV_MOVT_IMM::Assemble() {
SET_OPCODE_MULTI(MOV_MOVT_IMM, 1); SET_OPCODE_MULTI(MOV_MOVT_IMM, 1);
SET_OPCODE_MULTI(MOV_MOVT_IMM, 2); SET_OPCODE_MULTI(MOV_MOVT_IMM, 2);
ENCODE_OP; ENCODE_OP;
...@@ -188,7 +188,7 @@ T32_LDR_IMM::T32_LDR_IMM(T32_LDR_IMM::OP op, RegisterA32 &rt, const MemOperand & ...@@ -188,7 +188,7 @@ T32_LDR_IMM::T32_LDR_IMM(T32_LDR_IMM::OP op, RegisterA32 &rt, const MemOperand &
rt(&rt), rt(&rt),
operand(operand) {} operand(operand) {}
void T32_LDR_IMM::Disassembler() { void T32_LDR_IMM::Disassemble() {
DECODE_OP; DECODE_OP;
DECODE_RT(Reg); DECODE_RT(Reg);
operand.rn = Reg(static_cast<U8>(Get()->rn)); operand.rn = Reg(static_cast<U8>(Get()->rn));
...@@ -204,7 +204,7 @@ void T32_LDR_IMM::Disassembler() { ...@@ -204,7 +204,7 @@ void T32_LDR_IMM::Disassembler() {
operand.offset = Get()->U == 0 ? -Get()->imm8 : Get()->imm8; operand.offset = Get()->U == 0 ? -Get()->imm8 : Get()->imm8;
} }
void T32_LDR_IMM::Assembler() { void T32_LDR_IMM::Assemble() {
SET_OPCODE_MULTI(LDR_IMM, 1); SET_OPCODE_MULTI(LDR_IMM, 1);
SET_OPCODE_MULTI(LDR_IMM, 2); SET_OPCODE_MULTI(LDR_IMM, 2);
ENCODE_OP; ENCODE_OP;
......
...@@ -140,9 +140,9 @@ namespace SandHook { ...@@ -140,9 +140,9 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -159,9 +159,9 @@ namespace SandHook { ...@@ -159,9 +159,9 @@ namespace SandHook {
DEFINE_IS(LDR_UIMM) DEFINE_IS(LDR_UIMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA32* rt; RegisterA32* rt;
...@@ -201,9 +201,9 @@ namespace SandHook { ...@@ -201,9 +201,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -227,9 +227,9 @@ namespace SandHook { ...@@ -227,9 +227,9 @@ namespace SandHook {
DEFINE_IS_EXT(MOV_MOVT_IMM, TEST_INST_OPCODE(MOV_MOVT_IMM, 1) && TEST_INST_OPCODE(MOV_MOVT_IMM, 2) && (TEST_INST_FIELD(op, MOV) || TEST_INST_FIELD(op, MOVT))) DEFINE_IS_EXT(MOV_MOVT_IMM, TEST_INST_OPCODE(MOV_MOVT_IMM, 1) && TEST_INST_OPCODE(MOV_MOVT_IMM, 2) && (TEST_INST_FIELD(op, MOV) || TEST_INST_FIELD(op, MOVT)))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -255,9 +255,9 @@ namespace SandHook { ...@@ -255,9 +255,9 @@ namespace SandHook {
DEFINE_IS_EXT(LDR_IMM, TEST_INST_OPCODE(LDR_IMM, 1) && TEST_INST_OPCODE(LDR_IMM, 2)) DEFINE_IS_EXT(LDR_IMM, TEST_INST_OPCODE(LDR_IMM, 1) && TEST_INST_OPCODE(LDR_IMM, 2))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
......
...@@ -50,7 +50,7 @@ void Arm64Decoder::Disassembler(void *codeStart, Addr codeLen, InstVisitor &visi ...@@ -50,7 +50,7 @@ void Arm64Decoder::Disassembler(void *codeStart, Addr codeLen, InstVisitor &visi
if (unit == nullptr) { if (unit == nullptr) {
unit = reinterpret_cast<BaseUnit*>(new INST_A64(UNKNOW)(pc)); unit = reinterpret_cast<BaseUnit*>(new INST_A64(UNKNOW)(pc));
} }
reinterpret_cast<BaseInst*>(unit)->Disassembler(); reinterpret_cast<BaseInst*>(unit)->Disassemble();
if (!visitor.Visit(unit, pc)) { if (!visitor.Visit(unit, pc)) {
break; break;
} }
......
...@@ -217,9 +217,9 @@ namespace SandHook { ...@@ -217,9 +217,9 @@ namespace SandHook {
Addr GetImmPCOffsetTarget() override; Addr GetImmPCOffsetTarget() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -254,9 +254,9 @@ namespace SandHook { ...@@ -254,9 +254,9 @@ namespace SandHook {
DEFINE_IS(MOV_WIDE) DEFINE_IS(MOV_WIDE)
void Assembler() override; void Assemble() override;
void Disassembler() override; void Disassemble() override;
public: public:
//can be 16/32/64/128 //can be 16/32/64/128
...@@ -297,9 +297,9 @@ namespace SandHook { ...@@ -297,9 +297,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
...@@ -328,9 +328,9 @@ namespace SandHook { ...@@ -328,9 +328,9 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -354,9 +354,9 @@ namespace SandHook { ...@@ -354,9 +354,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
Condition condition; Condition condition;
...@@ -385,9 +385,9 @@ namespace SandHook { ...@@ -385,9 +385,9 @@ namespace SandHook {
Off GetImmPCOffset() override; Off GetImmPCOffset() override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -419,9 +419,9 @@ namespace SandHook { ...@@ -419,9 +419,9 @@ namespace SandHook {
void OnOffsetApply(Off offset) override; void OnOffsetApply(Off offset) override;
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -445,9 +445,9 @@ namespace SandHook { ...@@ -445,9 +445,9 @@ namespace SandHook {
DEFINE_IS_EXT(BR_BLR_RET, TEST_INST_OPCODE(BR_BLR_RET, 1) && TEST_INST_OPCODE(BR_BLR_RET, 2) && TEST_INST_OPCODE(BR_BLR_RET,3)) DEFINE_IS_EXT(BR_BLR_RET, TEST_INST_OPCODE(BR_BLR_RET, 1) && TEST_INST_OPCODE(BR_BLR_RET, 2) && TEST_INST_OPCODE(BR_BLR_RET,3))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -496,9 +496,9 @@ namespace SandHook { ...@@ -496,9 +496,9 @@ namespace SandHook {
DEFINE_IS(STR_IMM) DEFINE_IS(STR_IMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
...@@ -512,9 +512,9 @@ namespace SandHook { ...@@ -512,9 +512,9 @@ namespace SandHook {
DEFINE_IS(STR_UIMM) DEFINE_IS(STR_UIMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
...@@ -527,9 +527,9 @@ namespace SandHook { ...@@ -527,9 +527,9 @@ namespace SandHook {
DEFINE_IS_EXT(MOV_REG, TEST_INST_OPCODE(MOV_REG, 1) && TEST_INST_OPCODE(MOV_REG, 2)) DEFINE_IS_EXT(MOV_REG, TEST_INST_OPCODE(MOV_REG, 1) && TEST_INST_OPCODE(MOV_REG, 2))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
RegisterA64* rd; RegisterA64* rd;
...@@ -547,9 +547,9 @@ namespace SandHook { ...@@ -547,9 +547,9 @@ namespace SandHook {
DEFINE_IS_EXT(SUB_EXT_REG, TEST_INST_OPCODE(SUB_EXT_REG, 1) && TEST_INST_OPCODE(SUB_EXT_REG, 2)) DEFINE_IS_EXT(SUB_EXT_REG, TEST_INST_OPCODE(SUB_EXT_REG, 1) && TEST_INST_OPCODE(SUB_EXT_REG, 2))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
...@@ -576,9 +576,9 @@ namespace SandHook { ...@@ -576,9 +576,9 @@ namespace SandHook {
DEFINE_IS_EXT(EXCEPTION_GEN, TEST_INST_OPCODE(EXCEPTION_GEN, 1) && TEST_INST_OPCODE(EXCEPTION_GEN, 2)) DEFINE_IS_EXT(EXCEPTION_GEN, TEST_INST_OPCODE(EXCEPTION_GEN, 1) && TEST_INST_OPCODE(EXCEPTION_GEN, 2))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -608,9 +608,9 @@ namespace SandHook { ...@@ -608,9 +608,9 @@ namespace SandHook {
DEFINE_IS(LDR_IMM) DEFINE_IS(LDR_IMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
...@@ -623,9 +623,9 @@ namespace SandHook { ...@@ -623,9 +623,9 @@ namespace SandHook {
DEFINE_IS(LDR_UIMM) DEFINE_IS(LDR_UIMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
DEFINE_INST_EXT(LDRSW_IMM, LDR_IMM) { DEFINE_INST_EXT(LDRSW_IMM, LDR_IMM) {
...@@ -638,9 +638,9 @@ namespace SandHook { ...@@ -638,9 +638,9 @@ namespace SandHook {
DEFINE_IS_EXT(LDRSW_IMM, TEST_INST_FIELD(opcode, OPCODE_A64(LDRSW_IMM)) && DEFINE_IS_EXT(LDRSW_IMM, TEST_INST_FIELD(opcode, OPCODE_A64(LDRSW_IMM)) &&
TEST_INST_FIELD(size , Size32)) TEST_INST_FIELD(size , Size32))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
...@@ -655,9 +655,9 @@ namespace SandHook { ...@@ -655,9 +655,9 @@ namespace SandHook {
DEFINE_IS_EXT(LDRSW_UIMM, TEST_INST_FIELD(opcode, OPCODE_A64(LDRSW_UIMM)) && DEFINE_IS_EXT(LDRSW_UIMM, TEST_INST_FIELD(opcode, OPCODE_A64(LDRSW_UIMM)) &&
TEST_INST_FIELD(size, Size32)) TEST_INST_FIELD(size, Size32))
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
}; };
...@@ -685,9 +685,9 @@ namespace SandHook { ...@@ -685,9 +685,9 @@ namespace SandHook {
DEFINE_IS(STP_LDP) DEFINE_IS(STP_LDP)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -721,9 +721,9 @@ namespace SandHook { ...@@ -721,9 +721,9 @@ namespace SandHook {
DEFINE_IS(ADD_SUB_IMM) DEFINE_IS(ADD_SUB_IMM)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
...@@ -747,9 +747,9 @@ namespace SandHook { ...@@ -747,9 +747,9 @@ namespace SandHook {
DEFINE_IS(MSR_MRS) DEFINE_IS(MSR_MRS)
void Disassembler() override; void Disassemble() override;
void Assembler() override; void Assemble() override;
public: public:
OP op; OP op;
......
...@@ -85,11 +85,11 @@ namespace SandHook { ...@@ -85,11 +85,11 @@ namespace SandHook {
label->AddBind(this); label->AddBind(this);
} }
virtual void Disassembler() { virtual void Disassemble() {
backup_ = *this->pc_; backup_ = *this->pc_;
} }
virtual void Assembler() { virtual void Assemble() {
*this->pc_ = backup_; *this->pc_ = backup_;
} }
......
...@@ -46,7 +46,7 @@ void CodeContainer::commit() { ...@@ -46,7 +46,7 @@ void CodeContainer::commit() {
(*unit)->Set(reinterpret_cast<Base*>(pcNow)); (*unit)->Set(reinterpret_cast<Base*>(pcNow));
} }
if ((*unit)->UnitType() == UnitInst) { if ((*unit)->UnitType() == UnitInst) {
reinterpret_cast<BaseInst*>(*unit)->Assembler(); reinterpret_cast<BaseInst*>(*unit)->Assemble();
} }
pcNow += (*unit)->Size(); pcNow += (*unit)->Size();
} }
......
...@@ -100,7 +100,7 @@ void breakCallback(REG regs[]) { ...@@ -100,7 +100,7 @@ void breakCallback(REG regs[]) {
class Visitor : public InstVisitor { class Visitor : public InstVisitor {
bool Visit(Unit<Base> *unit, void *pc) override { bool Visit(Unit<Base> *unit, void *pc) override {
BaseInst* instruction = reinterpret_cast<BaseInst *>(unit); BaseInst* instruction = reinterpret_cast<BaseInst *>(unit);
instruction->Assembler(); instruction->Assemble();
return true; return true;
} }
}; };
......
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