christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

import-trace: fixes for build on amd64

Browse Source 
"std::vector<T>::size_type" is compatible to "unsigned int" on ia32,
but not on amd64.

Change-Id: I7d0f96780f7c17757dcfd015a1b3f9d5a3947f1a
This commit is contained in:
Horst Schirmeier
2013-09-18 17:11:50 +02:00
parent ee6ffef828
commit 3307828690
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/import-trace/AdvancedMemoryImporter.cc
View File

@ -64,11 +64,12 @@ void AdvancedMemoryImporter::insert_delayed_entries(bool finalizing)
(it->branches_before + BRANCH_WINDOW_SIZE <= branches_taken.size() || (it->branches_before + BRANCH_WINDOW_SIZE <= branches_taken.size() ||
finalizing); finalizing);
it = delayed_entries.erase(it)) { it = delayed_entries.erase(it)) {
// determine branche decisions before / after this mem event // determine branch decisions before / after this mem event
if (it->branches_before != last_branches_before) { if (it->branches_before != last_branches_before) {
branchmask = 0; branchmask = 0;
int pos = std::max(-(signed)BRANCH_WINDOW_SIZE, - (signed) it->branches_before); int pos = std::max(-(signed)BRANCH_WINDOW_SIZE, - (signed) it->branches_before);
int maxpos = std::min(BRANCH_WINDOW_SIZE, branches_taken.size() - it->branches_before); int maxpos = std::min((signed)BRANCH_WINDOW_SIZE,
(signed)branches_taken.size() - (signed)it->branches_before);
for (; pos < maxpos; ++pos) { for (; pos < maxpos; ++pos) {
branchmask |= branchmask |=
((unsigned) branches_taken[it->branches_before + pos]) ((unsigned) branches_taken[it->branches_before + pos])
@ -155,7 +156,7 @@ bool AdvancedMemoryImporter::handle_mem_event(fail::simtime_t curtime, instructi
{ {
const LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap(); const LLVMDisassembler::InstrMap &instr_map = disas->getInstrMap();
const LLVMDisassembler::Instr &opcode = instr_map.at(ev.ip()); const LLVMDisassembler::Instr &opcode = instr_map.at(ev.ip());
DelayedTraceEntry entry = { curtime, instr, ev, opcode.opcode, branches_taken.size() }; DelayedTraceEntry entry = { curtime, instr, ev, opcode.opcode, (unsigned) branches_taken.size() };
delayed_entries.push_back(entry); delayed_entries.push_back(entry);
// delay upcall to handle_mem_event until we know enough future branch decisions // delay upcall to handle_mem_event until we know enough future branch decisions