Merge branch 'master' into x86
diff --git a/cs.c b/cs.c
index e363403..bf8f3d6 100644
--- a/cs.c
+++ b/cs.c
@@ -335,16 +335,6 @@
return NULL;
}
- // x86 flags register must be specially handled
- if ((handle->arch == CS_ARCH_X86) && (reg == X86_REG_FLAGS)) {
- if (handle->mode & CS_MODE_64)
- return "rflags";
- if (handle->mode & CS_MODE_32)
- return "eflags";
- if (handle->mode & CS_MODE_16)
- return "flags";
- }
-
return handle->reg_name(reg);
}
diff --git a/include/capstone.h b/include/capstone.h
index f6df708..0a22260 100644
--- a/include/capstone.h
+++ b/include/capstone.h
@@ -185,7 +185,7 @@
Return friendly name of regiser in a string
Find the instruction id from header file of corresponding architecture (arm.h for ARM, x86.h for X86, ...)
- @handle: handle returned by cs_open(), or one of architecture type CS_ARCH_*
+ @handle: handle returned by cs_open()
@reg: register id
@return: string name of the register, or NULL if @reg_id is invalid.
*/
@@ -195,7 +195,7 @@
Return friendly name of an instruction in a string
Find the instruction id from header file of corresponding architecture (arm.h for ARM, x86.h for X86, ...)
- @handle: handle returned by cs_open(), or one of architecture type CS_ARCH_*
+ @handle: handle returned by cs_open()
@insn: instruction id
@return: string name of the instruction, or NULL if @insn_id is invalid.
@@ -243,7 +243,7 @@
Count the number of operands of a given type.
Find the operand type in header file of corresponding architecture (arm.h for ARM, x86.h for X86, ...)
- @handle: handle returned by cs_open(), or one of architecture type CS_ARCH_*
+ @handle: handle returned by cs_open()
@insn: disassembled instruction structure received from cs_disasm() or cs_disasm_dyn()
@op_type: Operand type to be found.
@@ -257,7 +257,7 @@
Later, the operand can be accessed using the returned position.
Find the operand type in header file of corresponding architecture (arm.h for ARM, x86.h for X86, ...)
- @handle: handle returned by cs_open(), or one of architecture type CS_ARCH_*
+ @handle: handle returned by cs_open()
@insn: disassembled instruction structure received from cs_disasm() or cs_disasm_dyn()
@op_type: Operand type to be found.
@position: position of the operand to be found. This must be in the range