Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppc: use MCInst_insert0() instead of MCInst_insert() to avoid malloc/free

This commit is contained in:
Nguyen Anh Quynh 2014-06-16 14:47:43 +08:00
parent d06f3d662b
commit 215e76b223
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MCInst.c
View File

@ -27,21 +27,6 @@ void MCInst_clear(MCInst *inst)
inst->size = 0; inst->size = 0;
} }
// NOTE: this will free @Op argument
void MCInst_insert(MCInst *inst, int index, MCOperand *Op)
{
int i;
for(i = inst->size; i > index; i--)
//memcpy(&(inst->Operands[i]), &(inst->Operands[i-1]), sizeof(MCOperand));
inst->Operands[i] = inst->Operands[i-1];
inst->Operands[index] = *Op;
inst->size++;
cs_mem_free(Op);
}
// do not free @Op // do not free @Op
void MCInst_insert0(MCInst *inst, int index, MCOperand *Op) void MCInst_insert0(MCInst *inst, int index, MCOperand *Op)
{ {

3
MCInst.h
View File

@ -115,9 +115,6 @@ void MCInst_Init(cs_struct *handle, MCInst *inst);
void MCInst_clear(MCInst *inst); void MCInst_clear(MCInst *inst);
// free operand after inserting
void MCInst_insert(MCInst *inst, int index, MCOperand *Op);
// do not free operand after inserting // do not free operand after inserting
void MCInst_insert0(MCInst *inst, int index, MCOperand *Op); void MCInst_insert0(MCInst *inst, int index, MCOperand *Op);

4
arch/PowerPC/PPCDisassembler.c
View File

@ -224,7 +224,7 @@ static DecodeStatus decodeMemRIOperands(MCInst *Inst, uint64_t Imm,
case PPC_STWU: case PPC_STWU:
case PPC_STFSU: case PPC_STFSU:
case PPC_STFDU: case PPC_STFDU:
MCInst_insert(Inst, 0, MCOperand_CreateReg(GP0Regs[Base])); MCInst_insert0(Inst, 0, MCOperand_CreateReg1(Inst, GP0Regs[Base]));
break; break;
} }
@ -248,7 +248,7 @@ static DecodeStatus decodeMemRIXOperands(MCInst *Inst, uint64_t Imm,
// Add the tied output operand. // Add the tied output operand.
MCOperand_CreateReg0(Inst, GP0Regs[Base]); MCOperand_CreateReg0(Inst, GP0Regs[Base]);
else if (MCInst_getOpcode(Inst) == PPC_STDU) else if (MCInst_getOpcode(Inst) == PPC_STDU)
MCInst_insert(Inst, 0, MCOperand_CreateReg(GP0Regs[Base])); MCInst_insert0(Inst, 0, MCOperand_CreateReg1(Inst, GP0Regs[Base]));
MCOperand_CreateImm0(Inst, SignExtend64(Disp << 2, 16)); MCOperand_CreateImm0(Inst, SignExtend64(Disp << 2, 16));
MCOperand_CreateReg0(Inst, GP0Regs[Base]); MCOperand_CreateReg0(Inst, GP0Regs[Base]);