From 00f920f48714385923ee8ebe58b3bbf1166dd48a Mon Sep 17 00:00:00 2001
From: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Date: Thu, 12 Sep 2013 09:52:34 +0200
Subject: [PATCH] merge conflict resolved

... I somehow missed that one, sorry.

Change-Id: I2daf6f9215f34e39090145ff70e70eaf84d0f286
---
 tools/import-trace/RegisterImporter.cc | 29 ++------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/tools/import-trace/RegisterImporter.cc b/tools/import-trace/RegisterImporter.cc
index 381b3d42..45b9d434 100644
--- a/tools/import-trace/RegisterImporter.cc
+++ b/tools/import-trace/RegisterImporter.cc
@@ -74,20 +74,12 @@ bool RegisterImporter::addRegisterTrace(simtime_t curtime, instruction_count_t i
 		// we're currently looking at; the EC is defined by
 		// data_address, dynamic instruction start/end, the absolute PC at
 		// the end, and time start/end
-<<<<<<< HEAD
-		access_info_t access;
-		access.access_type	= access_type; // instruction fetch is always a read
-		access.data_address = data_address;
-		access.data_width	 = chunk_width;
-		if (!add_trace_event(left_margin, right_margin, access)) {
-=======
 
 		// pass through potentially available extended trace information
-		ev.set_width(1); // exactly one byte
+		ev.set_width(chunk_width);
 		ev.set_memaddr(data_address);
 		ev.set_accesstype(access_type == 'R' ? ev.READ : ev.WRITE);
 		if (!add_trace_event(left_margin, right_margin, ev)) {
->>>>>>> dcd2c021a5ac91d38187d397914e5f51e2fc8819
 			LOG << "add_trace_event failed" << std::endl;
 			return false;
 		}
@@ -110,27 +102,10 @@ bool RegisterImporter::handle_ip_event(fail::simtime_t curtime, instruction_coun
 			std::cerr << "Error parsing arguments." << std::endl;
 			return false;
 		}
-<<<<<<< HEAD
-
-		// Read FROM memory file
-		if (cmd[NO_GP].count() > 0) {
-			do_gp = false;
-		}
-		if (cmd[FLAGS].count() > 0) {
-			do_flags = true;
-		}
-		if (cmd[IP].count() > 0) {
-			do_ip = true;
-		}
-		if (cmd[NO_SPLIT].count() > 0) {
-			do_split_registers = false;
-		}
-
-=======
 		do_gp = !cmd[NO_GP];
 		do_flags = cmd[FLAGS];
 		do_ip = cmd[IP];
->>>>>>> dcd2c021a5ac91d38187d397914e5f51e2fc8819
+		do_split_registers = !cmd[NO_SPLIT];
 
 		/* Disassemble the binary if necessary */
 		llvm::InitializeAllTargetInfos();