Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: tools/tickprocessor.js

Issue 2928083004: [tickprocessor] fix ASLR slide use (Closed)
Patch Set: removed nm changes Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 prevEntry = funcInfo; 638 prevEntry = funcInfo;
639 } 639 }
640 640
641 while (true) { 641 while (true) {
642 var funcInfo = this.parseNextLine(); 642 var funcInfo = this.parseNextLine();
643 if (funcInfo === null) { 643 if (funcInfo === null) {
644 continue; 644 continue;
645 } else if (funcInfo === false) { 645 } else if (funcInfo === false) {
646 break; 646 break;
647 } 647 }
648 funcInfo.start += libASLRSlide; 648 if (funcInfo.start < libStart - libASLRSlide &&
649 if (funcInfo.start < libStart && funcInfo.start < libEnd - libStart) { 649 funcInfo.start < libEnd - libStart) {
650 funcInfo.start += libStart; 650 funcInfo.start += libStart;
651 } else {
652 funcInfo.start += libASLRSlide;
651 } 653 }
652 if (funcInfo.size) { 654 if (funcInfo.size) {
653 funcInfo.end = funcInfo.start + funcInfo.size; 655 funcInfo.end = funcInfo.start + funcInfo.size;
654 } 656 }
655 addEntry(funcInfo); 657 addEntry(funcInfo);
656 } 658 }
657 addEntry({name: '', start: libEnd}); 659 addEntry({name: '', start: libEnd});
658 }; 660 };
659 661
660 662
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 for (var synArg in this.argsDispatch_) { 970 for (var synArg in this.argsDispatch_) {
969 if (arg !== synArg && dispatch === this.argsDispatch_[synArg]) { 971 if (arg !== synArg && dispatch === this.argsDispatch_[synArg]) {
970 synonyms.push(synArg); 972 synonyms.push(synArg);
971 delete this.argsDispatch_[synArg]; 973 delete this.argsDispatch_[synArg];
972 } 974 }
973 } 975 }
974 print(' ' + padRight(synonyms.join(', '), 20) + " " + dispatch[2]); 976 print(' ' + padRight(synonyms.join(', '), 20) + " " + dispatch[2]);
975 } 977 }
976 quit(2); 978 quit(2);
977 }; 979 };
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698