christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

revert out-of-l4sys change

Browse Source 
Change-Id: I86b27aae6fa30992b485af79e767ec23949d1e62
This commit is contained in:
Bjoern Doebel
2013-10-21 15:38:15 +02:00
parent a65c64791e
commit d97e3dfa8f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,8 @@ void AdvancedMemoryImporter::insert_delayed_entries(bool finalizing)
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((signed)BRANCH_WINDOW_SIZE, (signed)(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])