mirror/rabbitizer
1
0
Fork 0
mirror of https://github.com/Decompollaborate/rabbitizer.git synced 2024-12-29 09:22:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return an actual register enum for Instruction .rs, .rd and rt

Browse Source 
Also check if the instuction references that register and raise an exception if it doesn't
This commit is contained in:
angie 2022-07-05 12:08:37 -04:00
parent c8ecfb600e
commit 440546699c
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rabbitizer/rabbitizer.pyi
View File

@ -10,9 +10,9 @@ from .InstrCategory import InstrCategory
class Instruction: class Instruction:
rs: int rs: Enum
rt: int rt: Enum
rd: int rd: Enum
sa: int sa: int
uniqueId: Enum uniqueId: Enum

47
rabbitizer/rabbitizer_type_Instruction.c
View File

@ -4,6 +4,7 @@
#include "rabbitizer_module.h" #include "rabbitizer_module.h"
#include "instructions/RabbitizerInstructionRsp.h" #include "instructions/RabbitizerInstructionRsp.h"
#include "common/RabbitizerConfig.h"
static void rabbitizer_type_Instruction_dealloc(PyRabbitizerInstruction *self) { static void rabbitizer_type_Instruction_dealloc(PyRabbitizerInstruction *self) {
@ -64,9 +65,41 @@ static PyMemberDef rabbitizer_type_Instruction_members[] = {
return PyLong_FromUnsignedLong(RAB_INSTR_GET_##name(&self->instr)); \ return PyLong_FromUnsignedLong(RAB_INSTR_GET_##name(&self->instr)); \
} }
DEF_MEMBER_GET_UINT(rs) #define DEF_MEMBER_GET_REGGPR(name) \
DEF_MEMBER_GET_UINT(rt) static PyObject *rabbitizer_type_Instruction_member_get_##name(PyRabbitizerInstruction *self, UNUSED PyObject *closure) { \
DEF_MEMBER_GET_UINT(rd) uint32_t reg; \
PyObject *enumInstance = NULL; \
\
if (!RabbitizerInstruction_hasOperandAlias(&self->instr, RABBITIZER_OPERAND_TYPE_##name)) { \
PyErr_Format(PyExc_RuntimeError, "'%s' instruction does not reference register '" #name "'", RabbitizerInstrId_getOpcodeName(self->instr.uniqueId)); \
return NULL; \
} \
\
reg = RAB_INSTR_GET_##name(&self->instr); \
switch (RabbitizerConfig_Cfg.regNames.gprAbiNames) { \
case RABBITIZER_ABI_N32: \
case RABBITIZER_ABI_N64: \
enumInstance = rabbitizer_enum_RegGprN32_enumvalues[reg].instance; \
break; \
\
default: \
enumInstance = rabbitizer_enum_RegGprO32_enumvalues[reg].instance; \
break; \
} \
\
if (enumInstance == NULL) { \
PyErr_SetString(PyExc_RuntimeError, "Internal error: invalid RegGpr enum value"); \
return NULL; \
} \
\
Py_INCREF(enumInstance); \
return enumInstance; \
}
DEF_MEMBER_GET_REGGPR(rs)
DEF_MEMBER_GET_REGGPR(rt)
DEF_MEMBER_GET_REGGPR(rd)
DEF_MEMBER_GET_UINT(sa) DEF_MEMBER_GET_UINT(sa)
static PyObject *rabbitizer_type_Instruction_member_get_uniqueId(PyRabbitizerInstruction *self, PyObject *Py_UNUSED(ignored)) { static PyObject *rabbitizer_type_Instruction_member_get_uniqueId(PyRabbitizerInstruction *self, PyObject *Py_UNUSED(ignored)) {
@ -87,10 +120,10 @@ static PyObject *rabbitizer_type_Instruction_member_get_uniqueId(PyRabbitizerIns
static PyGetSetDef Instr_getsetters[] = { static PyGetSetDef Instr_getsetters[] = {
MEMBER_GET(rs, "", NULL), // todo: deprecate MEMBER_GET(rs, "", NULL),
MEMBER_GET(rt, "", NULL), // todo: deprecate MEMBER_GET(rt, "", NULL),
MEMBER_GET(rd, "", NULL), // todo: deprecate MEMBER_GET(rd, "", NULL),
MEMBER_GET(sa, "", NULL), // todo: deprecate MEMBER_GET(sa, "", NULL),
MEMBER_GET(uniqueId, "", NULL), MEMBER_GET(uniqueId, "", NULL),
{ 0 } { 0 }