summaryrefslogtreecommitdiff
path: root/arch/armv7/arch_armv7.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'arch/armv7/arch_armv7.cpp')
-rw-r--r--arch/armv7/arch_armv7.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/armv7/arch_armv7.cpp b/arch/armv7/arch_armv7.cpp
index f9fc250e..9f7831a2 100644
--- a/arch/armv7/arch_armv7.cpp
+++ b/arch/armv7/arch_armv7.cpp
@@ -884,12 +884,10 @@ protected:
const InstructionOperand& op,
vector<InstructionTextToken>& result)
{
- const char* reg = NULL;
- reg = GetRegisterName((enum Register)op.reg).c_str();
- if (reg == NULL)
+ auto reg = GetRegisterName((enum Register)op.reg);
+ if (reg.empty())
return FAILED_TO_DISASSEMBLE_REGISTER;
-
result.emplace_back(RegisterToken, reg);
tokenize_shift(op, result);
return DISASM_SUCCESS;