From: Christoph Egger <Christoph.Egger@fau.de>
Date: Fri, 20 Mar 2015 12:50:28 +0000 (+0100)
Subject: Remove whitespace around printed instruction
X-Git-Tag: v0.1~27
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=8a8a4cc33fa1b7ed7028c335156c05731f6ba2d1;p=frida%2Ffrida.git

Remove whitespace around printed instruction

Also fixes display of calls where the whole string was replaced by the
called function name instead of just the address
---

diff --git a/src/disassembler/llvm/LLVMDisassembler.cxx b/src/disassembler/llvm/LLVMDisassembler.cxx
index 990ed4f..b97f93f 100644
--- a/src/disassembler/llvm/LLVMDisassembler.cxx
+++ b/src/disassembler/llvm/LLVMDisassembler.cxx
@@ -3,6 +3,7 @@
 #include "core/InformationManager.hxx"
 #include "core/Function.hxx"
 #include "core/BasicBlock.hxx"
+#include <boost/algorithm/string.hpp>
 
 #include <stack>
 #include <algorithm>
@@ -563,7 +564,7 @@ std::vector<Instruction> LLVMDisassembler<ELFT>::getInstructions(const BasicBloc
 				stream << std::hex << (base_address + jmptarget);
 				ref = stream.str();
 			}
-			result.push_back(Instruction(current_address + base_address, s.str(),
+			result.push_back(Instruction(current_address + base_address, boost::algorithm::trim_copy(s.str()),
 			                             std::vector<uint8_t>(bytes, bytes+inst_size), ref));
 		} else {
 			LOG4CXX_WARN(logger, "Invalid byte at" << std::hex << current_address + base_address);