From 231afab8b0ba6c8c9eff879681c52724b6688c18 Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Mon, 3 Dec 2018 22:20:28 -0500 Subject: Commonize all InstructionTextToken generation --- basicblock.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'basicblock.cpp') diff --git a/basicblock.cpp b/basicblock.cpp index c0ab0c9c..ae92a55d 100644 --- a/basicblock.cpp +++ b/basicblock.cpp @@ -295,20 +295,7 @@ vector BasicBlock::GetDisassemblyText(DisassemblySettings* line.addr = lines[i].addr; line.instrIndex = lines[i].instrIndex; line.highlight = lines[i].highlight; - line.tokens.reserve(lines[i].count); - for (size_t j = 0; j < lines[i].count; j++) - { - InstructionTextToken token; - token.type = lines[i].tokens[j].type; - token.text = lines[i].tokens[j].text; - token.value = lines[i].tokens[j].value; - token.size = lines[i].tokens[j].size; - token.operand = lines[i].tokens[j].operand; - token.context = lines[i].tokens[j].context; - token.confidence = lines[i].tokens[j].confidence; - token.address = lines[i].tokens[j].address; - line.tokens.push_back(token); - } + line.tokens = InstructionTextToken::ConvertAndFreeInstructionTextTokenList(lines[i].tokens, lines[i].count); result.push_back(line); } -- cgit v1.3.1