Format

Author: b1llow

.clang-format

@@ -13,9 +13,11 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Left
+AlignEscapedNewlines: DontAlign
 AlignOperands: true
-AlignTrailingComments: false
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 2
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
@@ -116,4 +118,3 @@ SpacesInSquareBrackets: false
 Standard: Cpp03
 TabWidth: 8
 UseTab: Always
-...

MCInst.h

@@ -31,13 +31,13 @@ typedef struct MCOperand MCOperand;
 /// This is a simple discriminated union.
 struct MCOperand {
 	enum {
-		kInvalid = 0, ///< Uninitialized.
-		kRegister, ///< Register operand.
-		kImmediate, ///< Immediate operand.
-		kFPImmediate, ///< Floating-point immediate operand.
+		kInvalid = 0,  ///< Uninitialized.
+		kRegister,     ///< Register operand.
+		kImmediate,    ///< Immediate operand.
+		kFPImmediate,  ///< Floating-point immediate operand.
 		kDFPImmediate, ///< Double-Floating-point immediate operand.
-		kExpr, ///< Relocatable immediate operand.
-		kInst ///< Sub-instruction operand.
+		kExpr,	       ///< Relocatable immediate operand.
+		kInst	       ///< Sub-instruction operand.
 
 	} MachineOperandType;
 	unsigned char Kind;
@@ -119,7 +119,7 @@ struct MCInst {
 	// This is copied from cs_x86 struct
 	uint8_t x86_prefix[4];
 	uint8_t imm_size;	// immediate size for X86_OP_IMM operand
-	bool writeback; // writeback for ARM
+	bool writeback;		// writeback for ARM
 	int8_t tied_op_idx
 		[MAX_MC_OPS]; ///< Tied operand indices. Index = Src op; Value: Dest op
 	// operand access index for list of registers sharing the same access right (for ARM)

Mapping.c

@@ -239,14 +239,14 @@ const cs_ac_type mapping_get_op_access(MCInst *MI, unsigned OpNum,
 
 /// Returns the operand at detail->arch.operands[op_count + offset]
 /// Or NULL if detail is not set.
-#define DEFINE_get_detail_op(arch, ARCH)                                   \
-	cs_##arch##_op *ARCH##_get_detail_op(MCInst *MI, int offset)       \
-	{                                                                  \
-		if (!MI->flat_insn->detail)                                \
-			return NULL;                                       \
+#define DEFINE_get_detail_op(arch, ARCH) \
+	cs_##arch##_op *ARCH##_get_detail_op(MCInst *MI, int offset) \
+	{ \
+		if (!MI->flat_insn->detail) \
+			return NULL; \
 		int OpIdx = MI->flat_insn->detail->arch.op_count + offset; \
-		assert(OpIdx >= 0 && OpIdx < MAX_MC_OPS);                  \
-		return &MI->flat_insn->detail->arch.operands[OpIdx];       \
+		assert(OpIdx >= 0 && OpIdx < MAX_MC_OPS); \
+		return &MI->flat_insn->detail->arch.operands[OpIdx]; \
 	}
 
 DEFINE_get_detail_op(arm, ARM);

Mapping.h

@@ -17,17 +17,17 @@
 
 // map instruction to its characteristics
 typedef struct insn_map {
-	unsigned short id; // The LLVM instruction id
-	unsigned short mapid; // The Capstone instruction id
+	unsigned short id;		    // The LLVM instruction id
+	unsigned short mapid;		    // The Capstone instruction id
 #ifndef CAPSTONE_DIET
 	uint16_t regs_use[MAX_IMPL_R_REGS]; ///< list of implicit registers used by
-		///< this instruction
+					    ///< this instruction
 	uint16_t regs_mod[MAX_IMPL_W_REGS]; ///< list of implicit registers modified
-		///< by this instruction
+					    ///< by this instruction
 	unsigned char groups
 		[MAX_NUM_GROUPS]; ///< list of group this instruction belong to
-	bool branch; // branch instruction?
-	bool indirect_branch; // indirect branch instruction?
+	bool branch;		  // branch instruction?
+	bool indirect_branch;	  // indirect branch instruction?
 #endif
 } insn_map;
 
@@ -43,11 +43,11 @@ unsigned int find_cs_id(unsigned MC_Opcode, const insn_map *imap,
 
 ///< A LLVM<->CS Mapping entry of an MCOperand.
 typedef struct {
-	uint8_t /* cs_op_type */ type; ///< Operand type (e.g.: reg, imm, mem)
+	uint8_t /* cs_op_type */ type;	 ///< Operand type (e.g.: reg, imm, mem)
 	uint8_t /* cs_ac_type */ access; ///< The access type (read, write)
-	uint8_t /* cs_data_type */
+	uint8_t				 /* cs_data_type */
 		dtypes[MAX_NO_DATA_TYPES]; ///< List of op types. Terminated by
-	///< CS_DATA_TYPE_LAST
+					   ///< CS_DATA_TYPE_LAST
 } mapping_op;
 
 #define MAX_NO_INSN_MAP_OPS 16
@@ -71,16 +71,16 @@ const cs_ac_type mapping_get_op_access(MCInst *MI, unsigned OpNum,
 /// Macro for easier access of operand types from the map.
 /// Assumes the istruction operands map is called "insn_operands"
 /// Only usable by `auto-sync` archs!
-#define map_get_op_type(MI, OpNum)                                          \
+#define map_get_op_type(MI, OpNum) \
 	mapping_get_op_type(MI, OpNum, (const map_insn_ops *)insn_operands, \
 			    sizeof(insn_operands) / sizeof(insn_operands[0]))
 
 /// Macro for easier access of operand access flags from the map.
 /// Assumes the istruction operands map is called "insn_operands"
 /// Only usable by `auto-sync` archs!
-#define map_get_op_access(MI, OpNum)                                          \
+#define map_get_op_access(MI, OpNum) \
 	mapping_get_op_access(MI, OpNum, (const map_insn_ops *)insn_operands, \
-			      sizeof(insn_operands) /                         \
+			      sizeof(insn_operands) / \
 				      sizeof(insn_operands[0]))
 
 ///< Map for ids to their string
@@ -115,17 +115,17 @@ DECL_get_detail_op(ppc, PPC);
 DECL_get_detail_op(tricore, TriCore);
 
 /// Increments the detail->arch.op_count by one.
-#define DEFINE_inc_detail_op_count(arch, ARCH)             \
+#define DEFINE_inc_detail_op_count(arch, ARCH) \
 	static inline void ARCH##_inc_op_count(MCInst *MI) \
-	{                                                  \
-		MI->flat_insn->detail->arch.op_count++;    \
+	{ \
+		MI->flat_insn->detail->arch.op_count++; \
 	}
 
 /// Decrements the detail->arch.op_count by one.
-#define DEFINE_dec_detail_op_count(arch, ARCH)             \
+#define DEFINE_dec_detail_op_count(arch, ARCH) \
 	static inline void ARCH##_dec_op_count(MCInst *MI) \
-	{                                                  \
-		MI->flat_insn->detail->arch.op_count--;    \
+	{ \
+		MI->flat_insn->detail->arch.op_count--; \
 	}
 
 DEFINE_inc_detail_op_count(arm, ARM);
@@ -148,11 +148,11 @@ static inline void set_doing_mem(const MCInst *MI, bool status)
 }
 
 /// Returns detail->arch
-#define DEFINE_get_arch_detail(arch, ARCH)                            \
-	static inline cs_##arch *ARCH##_get_detail(const MCInst *MI)  \
-	{                                                             \
+#define DEFINE_get_arch_detail(arch, ARCH) \
+	static inline cs_##arch *ARCH##_get_detail(const MCInst *MI) \
+	{ \
 		assert(MI && MI->flat_insn && MI->flat_insn->detail); \
-		return &MI->flat_insn->detail->arch;                  \
+		return &MI->flat_insn->detail->arch; \
 	}
 
 DEFINE_get_arch_detail(arm, ARM);

arch/TriCore/TriCoreMapping.c

@@ -125,9 +125,9 @@ const char *TriCore_group_name(csh handle, unsigned int id)
 #ifndef CAPSTONE_DIET
 /// A LLVM<->CS Mapping entry of an operand.
 typedef struct insn_op {
-	uint8_t /* cs_op_type */ type; ///< Operand type (e.g.: reg, imm, mem)
+	uint8_t /* cs_op_type */ type;	 ///< Operand type (e.g.: reg, imm, mem)
 	uint8_t /* cs_ac_type */ access; ///< The access type (read, write)
-	uint8_t /* cs_data_type */
+	uint8_t				 /* cs_data_type */
 		dtypes[10]; ///< List of op types. Terminated by CS_DATA_TYPE_LAST
 } insn_op;