Merge commit '16a2cf3873e00fa08e587d1b05c9132d98c24f50' into back-to-imgui
This commit is contained in:
14
external/capstone/arch/Sparc/SparcModule.c
vendored
14
external/capstone/arch/Sparc/SparcModule.c
vendored
@@ -5,8 +5,6 @@
|
||||
|
||||
#include "../../utils.h"
|
||||
#include "../../MCRegisterInfo.h"
|
||||
#include "SparcDisassembler.h"
|
||||
#include "SparcInstPrinter.h"
|
||||
#include "SparcMapping.h"
|
||||
#include "SparcModule.h"
|
||||
|
||||
@@ -15,12 +13,12 @@ cs_err Sparc_global_init(cs_struct *ud)
|
||||
MCRegisterInfo *mri;
|
||||
mri = cs_mem_malloc(sizeof(*mri));
|
||||
|
||||
Sparc_init(mri);
|
||||
ud->printer = Sparc_printInst;
|
||||
Sparc_init_mri(mri);
|
||||
ud->printer = Sparc_printer;
|
||||
ud->printer_info = mri;
|
||||
ud->getinsn_info = mri;
|
||||
ud->disasm = Sparc_getInstruction;
|
||||
ud->post_printer = Sparc_post_printer;
|
||||
ud->post_printer = NULL;
|
||||
|
||||
ud->reg_name = Sparc_reg_name;
|
||||
ud->insn_id = Sparc_get_insn_id;
|
||||
@@ -36,7 +34,11 @@ cs_err Sparc_option(cs_struct *handle, cs_opt_type type, size_t value)
|
||||
handle->syntax = (int) value;
|
||||
|
||||
if (type == CS_OPT_MODE) {
|
||||
handle->mode = (cs_mode)value;
|
||||
handle->mode |= (cs_mode)value;
|
||||
if (value & CS_MODE_V9 || value & CS_MODE_64) {
|
||||
// V9 implies 64bit.
|
||||
handle->mode |= (CS_MODE_64 | CS_MODE_V9);
|
||||
}
|
||||
}
|
||||
|
||||
return CS_ERR_OK;
|
||||
|
||||
Reference in New Issue
Block a user