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

Merge pull request #669 from zachriggle/next-mips 

Add MIPS_GRP_INT and MIPS_GRP_CALL
This commit is contained in:
Nguyen Anh Quynh 2016-05-14 09:36:49 +08:00
parent 27500352ae fcc30cfcd2
commit 820d7d02c7
7 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/Mips/MipsMapping.c
View File

@ -902,6 +902,11 @@ static name_map group_name_maps[] = {
// generic groups
{ MIPS_GRP_INVALID, NULL },
{ MIPS_GRP_JUMP, "jump" },
{ MIPS_GRP_CALL, "call" },
{ MIPS_GRP_RET, "ret" },
{ MIPS_GRP_INT, "int" },
{ MIPS_GRP_IRET, "iret" },
{ MIPS_GRP_PRIVILEGE, "privileged" },
// architecture-specific groups
{ MIPS_GRP_BITCOUNT, "bitcount" },

20
arch/Mips/MipsMappingInsn.inc
View File

@ -4720,43 +4720,43 @@
{
Mips_JALR, MIPS_INS_JALR,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_STDENC, MIPS_GRP_NOTINMICROMIPS, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_STDENC, MIPS_GRP_NOTINMICROMIPS, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
Mips_JALR16_MM, MIPS_INS_JALR,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
Mips_JALR64, MIPS_INS_JALR,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_STDENC, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_STDENC, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
Mips_JALRS16_MM, MIPS_INS_JALRS16,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
Mips_JALRS_MM, MIPS_INS_JALRS,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
Mips_JALR_HB, MIPS_INS_JALR_HB,
#ifndef CAPSTONE_DIET
{ 0 }, { 0 }, { MIPS_GRP_STDENC, MIPS_GRP_MIPS32, 0 }, 0, 1
{ 0 }, { 0 }, { MIPS_GRP_STDENC, MIPS_GRP_MIPS32, MIPS_GRP_CALL, 0 }, 0, 1
#endif
},
{
Mips_JALR_MM, MIPS_INS_JALR,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MICROMIPS, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
@ -4876,7 +4876,7 @@
{
Mips_JumpLinkReg16, MIPS_INS_JALRC,
#ifndef CAPSTONE_DIET
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MIPS16MODE, 0 }, 0, 0
{ 0 }, { MIPS_REG_RA, 0 }, { MIPS_GRP_MIPS16MODE, MIPS_GRP_CALL, 0 }, 0, 0
#endif
},
{
@ -8812,13 +8812,13 @@
{
Mips_SYSCALL, MIPS_INS_SYSCALL,
#ifndef CAPSTONE_DIET
{ 0 }, { 0 }, { MIPS_GRP_STDENC, 0 }, 0, 0
{ 0 }, { 0 }, { MIPS_GRP_STDENC, MIPS_GRP_INT, 0 }, 0, 0
#endif
},
{
Mips_SYSCALL_MM, MIPS_INS_SYSCALL,
#ifndef CAPSTONE_DIET
{ 0 }, { 0 }, { MIPS_GRP_MICROMIPS, 0 }, 0, 0
{ 0 }, { 0 }, { MIPS_GRP_MICROMIPS, MIPS_GRP_INT, 0 }, 0, 0
#endif
},
{

5
bindings/java/capstone/Mips_const.java
View File

@ -844,6 +844,11 @@ public class Mips_const {
// Generic groups
public static final int MIPS_GRP_JUMP = 1;
public static final int MIPS_GRP_CALL = 2;
public static final int MIPS_GRP_RET = 3;
public static final int MIPS_GRP_INT = 4;
public static final int MIPS_GRP_IRET = 5;
public static final int MIPS_GRP_PRIVILEGE = 6;
// Architecture-specific groups
public static final int MIPS_GRP_BITCOUNT = 128;

5
bindings/ocaml/mips_const.ml
View File

@ -841,6 +841,11 @@ let _MIPS_GRP_INVALID = 0;;
(* Generic groups *)
let _MIPS_GRP_JUMP = 1;;
let _MIPS_GRP_CALL = 2;;
let _MIPS_GRP_RET = 3;;
let _MIPS_GRP_INT = 4;;
let _MIPS_GRP_IRET = 5;;
let _MIPS_GRP_PRIVILEGE = 6;;
(* Architecture-specific groups *)
let _MIPS_GRP_BITCOUNT = 128;;

5
bindings/python/capstone/mips_const.py
View File

@ -841,6 +841,11 @@ MIPS_GRP_INVALID = 0
# Generic groups
MIPS_GRP_JUMP = 1
MIPS_GRP_CALL = 2
MIPS_GRP_RET = 3
MIPS_GRP_INT = 4
MIPS_GRP_IRET = 5
MIPS_GRP_PRIVILEGE = 6
# Architecture-specific groups
MIPS_GRP_BITCOUNT = 128

10
include/capstone/mips.h
View File

@ -898,6 +898,16 @@ typedef enum mips_insn_group {
//> Generic groups
// all jump instructions (conditional+direct+indirect jumps)
MIPS_GRP_JUMP, // = CS_GRP_JUMP
// all call instructions
MIPS_GRP_CALL, // = CS_GRP_CALL
// all return instructions
MIPS_GRP_RET, // = CS_GRP_RET
// all interrupt instructions (int+syscall)
MIPS_GRP_INT, // = CS_GRP_INT
// all interrupt return instructions
MIPS_GRP_IRET, // = CS_GRP_IRET
// all privileged instructions
MIPS_GRP_PRIVILEGE, // = CS_GRP_PRIVILEGE
//> Architecture-specific groups
MIPS_GRP_BITCOUNT = 128,

5
suite/test_group_name.py
View File

@ -83,6 +83,11 @@ arm64_dict = {
mips_dict = {
MIPS_GRP_JUMP: "jump",
MIPS_GRP_CALL: "call",
MIPS_GRP_RET: "ret",
MIPS_GRP_INT: "int",
MIPS_GRP_IRET: "iret",
MIPS_GRP_PRIVILEGE: "privilege",
MIPS_GRP_BITCOUNT: "bitcount",
MIPS_GRP_DSP: "dsp",
MIPS_GRP_DSPR2: "dspr2",