From af07db4c2aca040b26896e6cde984f16613d3c2b Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 17 May 2019 12:58:21 +0000
Subject: [PATCH] avoiding warnings on some compilers, and code cleanup
---
irdb-libs/libIRDB-core/src/decode_csx86.cpp | 15 +++++++--------
irdb-libs/libMEDSannotation/src/MEDS_Register.cpp | 1 +
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/irdb-libs/libIRDB-core/src/decode_csx86.cpp b/irdb-libs/libIRDB-core/src/decode_csx86.cpp
index dc6844c57..792b42ae7 100644
--- a/irdb-libs/libIRDB-core/src/decode_csx86.cpp
+++ b/irdb-libs/libIRDB-core/src/decode_csx86.cpp
@@ -574,17 +574,17 @@ uint32_t DecodedInstructionCapstoneX86_t::getPrefixCount() const
IRDB_SDK::VirtualOffset_t DecodedInstructionCapstoneX86_t::getMemoryDisplacementOffset(const IRDB_SDK::DecodedOperand_t* p_t, const IRDB_SDK::Instruction_t* insn) const
{
- auto &t = *p_t;
+ const auto &t = *p_t;
if(!valid()) throw std::logic_error(string("Called ")+__FUNCTION__+" on invalid instruction");
- const auto the_insn=static_cast<cs_insn*>(my_insn.get());
+ const auto the_insn = static_cast<cs_insn*>(my_insn.get());
//const auto encoding_size=t.getMemoryDisplacementEncodingSize();
//const auto x86 = &(the_insn->detail->x86);
- const auto imm_count = cs_op_count(cs_handle->getHandle(), the_insn, X86_OP_IMM);
- const auto disp_size=t.getMemoryDisplacementEncodingSize();
- const auto imm=getImmediate();
- const auto disp=t.getMemoryDisplacement();
+ const auto imm_count = cs_op_count(cs_handle->getHandle(), the_insn, X86_OP_IMM);
+ const auto disp_size = t.getMemoryDisplacementEncodingSize();
+ const auto imm = getImmediate();
+ const auto disp = t.getMemoryDisplacement();
if(string((char*)the_insn->detail->x86.opcode)=="\x0f\xc2") // CMPPD, CMPSS
{
@@ -633,8 +633,7 @@ IRDB_SDK::VirtualOffset_t DecodedInstructionCapstoneX86_t::getMemoryDisplacement
}
assert(0);
-
-
+ abort();
}
diff --git a/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp b/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
index 36741f094..fe6ba053c 100644
--- a/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
+++ b/irdb-libs/libMEDSannotation/src/MEDS_Register.cpp
@@ -444,6 +444,7 @@ string Register::readRegisterSet(const string &in, RegisterSet_t &out)
}
assert(0 && "No terminator found for register list");
+ abort(); // needed for avoiding errors
}
RegisterName Register::promoteTo64(const RegisterName p_reg)
--
GitLab