Merge commit 'dcd2c021a5ac91d38187d397914e5f51e2fc8819'

Conflicts:
	tools/import-trace/RegisterImporter.cc

Change-Id: I4f49c976bd60badba73c15746aa03c420cb9f77b

src/core/util/llvmdisassembler/LLVMDisassembler.cpp

@@ -105,6 +105,7 @@ void LLVMDisassembler::disassemble()
 					instr_info.opcode = Inst.getOpcode();
 					instr_info.length = Size;
 					instr_info.address = SectionAddr + Index;
+					instr_info.conditional_branch = desc.isConditionalBranch();
 
 					unsigned int  pos = 0;
 					for (MCInst::iterator it = Inst.begin(); it != Inst.end(); ++it) {

src/core/util/llvmdisassembler/LLVMDisassembler.hpp

@@ -42,6 +42,7 @@ public:
 		unsigned int opcode;
 		unsigned int address;
 		unsigned char length;
+		bool conditional_branch;
 		std::vector<register_t> reg_uses;
 		std::vector<register_t> reg_defs;
 	};

src/core/util/llvmdisassembler/testing/llvmDisTest.cc

@@ -62,6 +62,10 @@ int main(int argc, char* argv[]) {
 			 it != instr.reg_defs.end(); ++it) {
 			std::cout << reg_info.getName(*it) << "(" << *it << ") ";
 		}
+
+		if (instr.conditional_branch) {
+			std::cout << "(conditional branch)";
+		}
 		std::cout << std::endl;
 	}
 }