Chiebot-Mirror
/
capstone
mirror of https://gitee.com/mirrors/capstone.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

more fixes on C coding style

Browse Source
_v3_old
Nguyen Anh Quynh 11 years ago
parent 2e79ba8996
commit aa078a1c4a
3 changed files with 62 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      arch/AArch64/AArch64Module.c
  2. 48
      arch/ARM/ARMDisassembler.c
  3. 74
      arch/ARM/ARMInstPrinter.c

2
arch/AArch64/AArch64Module.c
Unescape View File

@ -11,7 +11,7 @@ void enable_arm64() {}
static cs_err init(cs_struct *ud) static cs_err init(cs_struct *ud)
{ {
MCRegisterInfo *mri; MCRegisterInfo *mri;
// verify if requested mode is valid // verify if requested mode is valid
if (ud->mode & ~(CS_MODE_LITTLE_ENDIAN | CS_MODE_ARM | CS_MODE_BIG_ENDIAN)) if (ud->mode & ~(CS_MODE_LITTLE_ENDIAN | CS_MODE_ARM | CS_MODE_BIG_ENDIAN))

48
arch/ARM/ARMDisassembler.c
Unescape View File

@ -379,16 +379,16 @@ static uint64_t getFeatureBits(int mode)
// some features are mutually exclusive // some features are mutually exclusive
if (mode & CS_MODE_THUMB) { if (mode & CS_MODE_THUMB) {
//Bits &= ~ARM_HasV6Ops; //Bits &= ~ARM_HasV6Ops;
//Bits &= ~ARM_FeatureCRC; //Bits &= ~ARM_FeatureCRC;
//Bits &= ~ARM_HasV5TEOps; //Bits &= ~ARM_HasV5TEOps;
//Bits &= ~ARM_HasV4TOps; //Bits &= ~ARM_HasV4TOps;
//Bits &= ~ARM_HasV6T2Ops; //Bits &= ~ARM_HasV6T2Ops;
//Bits &= ~ARM_FeatureDB; //Bits &= ~ARM_FeatureDB;
//Bits &= ~ARM_FeatureHWDivARM; //Bits &= ~ARM_FeatureHWDivARM;
//Bits &= ~ARM_FeatureNaClTrap; //Bits &= ~ARM_FeatureNaClTrap;
//Bits &= ~ARM_FeatureMClass; //Bits &= ~ARM_FeatureMClass;
// ArmV8 // ArmV8
} else { // ARM mode } else { // ARM mode
Bits &= ~ARM_ModeThumb; Bits &= ~ARM_ModeThumb;
Bits &= ~ARM_FeatureThumb2; Bits &= ~ARM_FeatureThumb2;
@ -425,7 +425,7 @@ void ARM_init(MCRegisterInfo *MRI)
ARMRegUnitRoots, 77, ARMRegDiffLists, ARMRegStrings, ARMRegUnitRoots, 77, ARMRegDiffLists, ARMRegStrings,
ARMSubRegIdxLists, 57, ARMSubRegIdxLists, 57,
ARMSubRegIdxRanges, ARMRegEncodingTable); ARMSubRegIdxRanges, ARMRegEncodingTable);
*/ */
MCRegisterInfo_InitMCRegisterInfo(MRI, ARMRegDesc, 289, MCRegisterInfo_InitMCRegisterInfo(MRI, ARMRegDesc, 289,
0, 0, 0, 0,
@ -564,9 +564,9 @@ static void AddThumb1SBit(MCInst *MI, bool InITBlock)
static DecodeStatus AddThumbPredicate(cs_struct *ud, MCInst *MI) static DecodeStatus AddThumbPredicate(cs_struct *ud, MCInst *MI)
{ {
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
MCOperandInfo *OpInfo; MCOperandInfo *OpInfo;
unsigned short NumOps; unsigned short NumOps;
unsigned int i; unsigned int i;
// A few instructions actually have predicates encoded in them. Don't // A few instructions actually have predicates encoded in them. Don't
// try to overwrite it if we're seeing one of those. // try to overwrite it if we're seeing one of those.
@ -643,9 +643,9 @@ static DecodeStatus AddThumbPredicate(cs_struct *ud, MCInst *MI)
static void UpdateThumbVFPPredicate(cs_struct *ud, MCInst *MI) static void UpdateThumbVFPPredicate(cs_struct *ud, MCInst *MI)
{ {
unsigned CC; unsigned CC;
unsigned short NumOps; unsigned short NumOps;
MCOperandInfo *OpInfo; MCOperandInfo *OpInfo;
unsigned i; unsigned i;
CC = ITStatus_getITCC(&(ud->ITBlock)); CC = ITStatus_getITCC(&(ud->ITBlock));
if (ITStatus_instrInITBlock(&(ud->ITBlock))) if (ITStatus_instrInITBlock(&(ud->ITBlock)))
@ -1132,7 +1132,7 @@ static DecodeStatus DecodeSORegImmOperand(MCInst *Inst, unsigned Val,
uint64_t Address, const void *Decoder) uint64_t Address, const void *Decoder)
{ {
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
ARM_AM_ShiftOpc Shift; ARM_AM_ShiftOpc Shift;
unsigned Rm = fieldFromInstruction_4(Val, 0, 4); unsigned Rm = fieldFromInstruction_4(Val, 0, 4);
unsigned type = fieldFromInstruction_4(Val, 5, 2); unsigned type = fieldFromInstruction_4(Val, 5, 2);
@ -1171,7 +1171,7 @@ static DecodeStatus DecodeSORegRegOperand(MCInst *Inst, unsigned Val,
uint64_t Address, const void *Decoder) uint64_t Address, const void *Decoder)
{ {
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
ARM_AM_ShiftOpc Shift; ARM_AM_ShiftOpc Shift;
unsigned Rm = fieldFromInstruction_4(Val, 0, 4); unsigned Rm = fieldFromInstruction_4(Val, 0, 4);
unsigned type = fieldFromInstruction_4(Val, 5, 2); unsigned type = fieldFromInstruction_4(Val, 5, 2);
@ -1306,7 +1306,7 @@ static DecodeStatus DecodeBitfieldMaskOperand(MCInst *Inst, unsigned Val,
// create the final mask. // create the final mask.
unsigned msb = fieldFromInstruction_4(Val, 5, 5); unsigned msb = fieldFromInstruction_4(Val, 5, 5);
unsigned lsb = fieldFromInstruction_4(Val, 0, 5); unsigned lsb = fieldFromInstruction_4(Val, 0, 5);
uint32_t lsb_mask; uint32_t lsb_mask;
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
if (lsb > msb) { if (lsb > msb) {
@ -1474,8 +1474,8 @@ static DecodeStatus DecodeAddrMode2IdxInstruction(MCInst *Inst, unsigned Insn,
uint64_t Address, const void *Decoder) uint64_t Address, const void *Decoder)
{ {
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
ARM_AM_AddrOpc Op; ARM_AM_AddrOpc Op;
ARM_AM_ShiftOpc Opc; ARM_AM_ShiftOpc Opc;
unsigned Rn = fieldFromInstruction_4(Insn, 16, 4); unsigned Rn = fieldFromInstruction_4(Insn, 16, 4);
unsigned Rt = fieldFromInstruction_4(Insn, 12, 4); unsigned Rt = fieldFromInstruction_4(Insn, 12, 4);
@ -1582,7 +1582,7 @@ static DecodeStatus DecodeSORegMemOperand(MCInst *Inst, unsigned Val,
uint64_t Address, const void *Decoder) uint64_t Address, const void *Decoder)
{ {
DecodeStatus S = MCDisassembler_Success; DecodeStatus S = MCDisassembler_Success;
ARM_AM_ShiftOpc ShOp; ARM_AM_ShiftOpc ShOp;
unsigned Rn = fieldFromInstruction_4(Val, 13, 4); unsigned Rn = fieldFromInstruction_4(Val, 13, 4);
unsigned Rm = fieldFromInstruction_4(Val, 0, 4); unsigned Rm = fieldFromInstruction_4(Val, 0, 4);
@ -4904,7 +4904,7 @@ static DecodeStatus DecodeT2ShifterImmOperand(MCInst *Inst, uint32_t Val,
static DecodeStatus DecodeSwap(MCInst *Inst, unsigned Insn, static DecodeStatus DecodeSwap(MCInst *Inst, unsigned Insn,
uint64_t Address, const void *Decoder) uint64_t Address, const void *Decoder)
{ {
DecodeStatus S; DecodeStatus S;
unsigned Rt = fieldFromInstruction_4(Insn, 12, 4); unsigned Rt = fieldFromInstruction_4(Insn, 12, 4);
unsigned Rt2 = fieldFromInstruction_4(Insn, 0, 4); unsigned Rt2 = fieldFromInstruction_4(Insn, 0, 4);

74
arch/ARM/ARMInstPrinter.c
Unescape View File

@ -505,30 +505,30 @@ void ARM_printInst(MCInst *MI, SStream *O, void *Info)
case ARM_STREXD: case ARM_STREXD:
case ARM_LDAEXD: case ARM_LDAEXD:
case ARM_STLEXD: { case ARM_STLEXD: {
MCRegisterClass* MRC = MCRegisterInfo_getRegClass(MRI, ARM_GPRRegClassID); MCRegisterClass* MRC = MCRegisterInfo_getRegClass(MRI, ARM_GPRRegClassID);
bool isStore = Opcode == ARM_STREXD || Opcode == ARM_STLEXD; bool isStore = Opcode == ARM_STREXD || Opcode == ARM_STLEXD;
unsigned Reg = MCOperand_getReg(MCInst_getOperand(MI, isStore ? 1 : 0)); unsigned Reg = MCOperand_getReg(MCInst_getOperand(MI, isStore ? 1 : 0));
if (MCRegisterClass_contains(MRC, Reg)) { if (MCRegisterClass_contains(MRC, Reg)) {
MCInst NewMI; MCInst NewMI;
MCOperand *NewReg; MCOperand *NewReg;
MCInst_setOpcode(&NewMI, Opcode); MCInst_setOpcode(&NewMI, Opcode);
if (isStore) if (isStore)
MCInst_addOperand2(&NewMI, MCInst_getOperand(MI, 0)); MCInst_addOperand2(&NewMI, MCInst_getOperand(MI, 0));
NewReg = MCOperand_CreateReg(MCRegisterInfo_getMatchingSuperReg(MRI, Reg, ARM_gsub_0, NewReg = MCOperand_CreateReg(MCRegisterInfo_getMatchingSuperReg(MRI, Reg, ARM_gsub_0,
MCRegisterInfo_getRegClass(MRI, ARM_GPRPairRegClassID))); MCRegisterInfo_getRegClass(MRI, ARM_GPRPairRegClassID)));
MCInst_addOperand2(&NewMI, NewReg); MCInst_addOperand2(&NewMI, NewReg);
cs_mem_free(NewReg); cs_mem_free(NewReg);
// Copy the rest operands into NewMI. // Copy the rest operands into NewMI.
unsigned i; unsigned i;
for(i= isStore ? 3 : 2; i < MCInst_getNumOperands(MI); ++i) for(i= isStore ? 3 : 2; i < MCInst_getNumOperands(MI); ++i)
MCInst_addOperand2(&NewMI, MCInst_getOperand(MI, i)); MCInst_addOperand2(&NewMI, MCInst_getOperand(MI, i));
printInstruction(&NewMI, O, MRI); printInstruction(&NewMI, O, MRI);
return; return;
}
} }
}
} }
//if (printAliasInstr(MI, O, MRI)) //if (printAliasInstr(MI, O, MRI))
@ -854,7 +854,7 @@ static void printAM3PostIndexOp(MCInst *MI, unsigned Op, SStream *O)
if (op) if (op)
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = ImmOffs; MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = ImmOffs;
else else
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = -(int)ImmOffs; MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = -(int)ImmOffs;
MI->flat_insn.arm.op_count++; MI->flat_insn.arm.op_count++;
} }
@ -1277,7 +1277,7 @@ static void printMSRMaskOperand(MCInst *MI, unsigned OpNum, SStream *O)
// FIXME: FeatureMClass becomes mode?? // FIXME: FeatureMClass becomes mode??
//if (ARM_getFeatureBits(MI->csh->mode) & ARM_FeatureMClass) { //if (ARM_getFeatureBits(MI->csh->mode) & ARM_FeatureMClass) {
//if (true) //if (true)
{ {
unsigned SYSm = (unsigned int)MCOperand_getImm(Op); unsigned SYSm = (unsigned int)MCOperand_getImm(Op);
unsigned Opcode = MCInst_getOpcode(MI); unsigned Opcode = MCInst_getOpcode(MI);
// For reads of the special registers ignore the "mask encoding" bits // For reads of the special registers ignore the "mask encoding" bits
@ -1422,7 +1422,7 @@ static void printCImmediate(MCInst *MI, unsigned OpNum, SStream *O)
SStream_concat(O, "c%u", MCOperand_getImm(MCInst_getOperand(MI, OpNum))); SStream_concat(O, "c%u", MCOperand_getImm(MCInst_getOperand(MI, OpNum)));
if (MI->csh->detail) { if (MI->csh->detail) {
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].type = ARM_OP_CIMM; MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].type = ARM_OP_CIMM;
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = (unsigned int)MCOperand_getImm(MCInst_getOperand(MI, OpNum)); MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = (unsigned int)MCOperand_getImm(MCInst_getOperand(MI, OpNum));
MI->flat_insn.arm.op_count++; MI->flat_insn.arm.op_count++;
} }
} }
@ -1481,11 +1481,11 @@ static void printThumbS4ImmOperand(MCInst *MI, unsigned OpNum, SStream *O)
SStream_concat(O, "%s#0x%x", markup("<imm:"), tmp); SStream_concat(O, "%s#0x%x", markup("<imm:"), tmp);
else else
SStream_concat(O, "%s#%u", markup("<imm:"), tmp); SStream_concat(O, "%s#%u", markup("<imm:"), tmp);
if (MI->csh->detail) { if (MI->csh->detail) {
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].type = ARM_OP_IMM; MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].type = ARM_OP_IMM;
MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = tmp; MI->flat_insn.arm.operands[MI->flat_insn.arm.op_count].imm = tmp;
MI->flat_insn.arm.op_count++; MI->flat_insn.arm.op_count++;
} }
SStream_concat(O, markup(">")); SStream_concat(O, markup(">"));
} }
@ -1636,8 +1636,8 @@ static void printAddrModeImm12Operand(MCInst *MI, unsigned OpNum,
{ {
MCOperand *MO1 = MCInst_getOperand(MI, OpNum); MCOperand *MO1 = MCInst_getOperand(MI, OpNum);
MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1); MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1);
int32_t OffImm; int32_t OffImm;
bool isSub; bool isSub;
if (!MCOperand_isReg(MO1)) { // FIXME: This is for CP entries, but isn't right. if (!MCOperand_isReg(MO1)) { // FIXME: This is for CP entries, but isn't right.
printOperand(MI, OpNum, O); printOperand(MI, OpNum, O);
@ -1676,8 +1676,8 @@ static void printT2AddrModeImm8Operand(MCInst *MI, unsigned OpNum, SStream *O,
{ {
MCOperand *MO1 = MCInst_getOperand(MI, OpNum); MCOperand *MO1 = MCInst_getOperand(MI, OpNum);
MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1); MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1);
int32_t OffImm; int32_t OffImm;
bool isSub; bool isSub;
SStream_concat(O, "%s[", markup("<mem:")); SStream_concat(O, "%s[", markup("<mem:"));
set_mem_access(MI, true); set_mem_access(MI, true);
@ -1712,8 +1712,8 @@ static void printT2AddrModeImm8s4Operand(MCInst *MI,
{ {
MCOperand *MO1 = MCInst_getOperand(MI, OpNum); MCOperand *MO1 = MCInst_getOperand(MI, OpNum);
MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1); MCOperand *MO2 = MCInst_getOperand(MI, OpNum+1);
int32_t OffImm; int32_t OffImm;
bool isSub; bool isSub;
if (!MCOperand_isReg(MO1)) { // For label symbolic references. if (!MCOperand_isReg(MO1)) { // For label symbolic references.
printOperand(MI, OpNum, O); printOperand(MI, OpNum, O);

Write Preview
Loading…
Cancel
Save