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

Side by Side Diff: src/disassembler.cc

Issue 6873076: Revert revisions 7644 and 7632, they are causing assertion failures in interactive_ui_tests debug... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « src/assembler.cc ('k') | src/full-codegen.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 out.AddFormatted("argc = %d", argc); 275 out.AddFormatted("argc = %d", argc);
276 break; 276 break;
277 } 277 }
278 default: 278 default:
279 out.AddFormatted("minor: %d", minor_key); 279 out.AddFormatted("minor: %d", minor_key);
280 } 280 }
281 } 281 }
282 } else { 282 } else {
283 out.AddFormatted(" %s", Code::Kind2String(kind)); 283 out.AddFormatted(" %s", Code::Kind2String(kind));
284 } 284 }
285 if (rmode == RelocInfo::CODE_TARGET_WITH_ID) {
286 out.AddFormatted(" (id = %d)", static_cast<int>(relocinfo.data()));
287 }
288 } else if (rmode == RelocInfo::RUNTIME_ENTRY && 285 } else if (rmode == RelocInfo::RUNTIME_ENTRY &&
289 Isolate::Current()->deoptimizer_data() != NULL) { 286 Isolate::Current()->deoptimizer_data() != NULL) {
290 // A runtime entry reloinfo might be a deoptimization bailout. 287 // A runtime entry reloinfo might be a deoptimization bailout.
291 Address addr = relocinfo.target_address(); 288 Address addr = relocinfo.target_address();
292 int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER); 289 int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER);
293 if (id == Deoptimizer::kNotDeoptimizationEntry) { 290 if (id == Deoptimizer::kNotDeoptimizationEntry) {
294 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); 291 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode));
295 } else { 292 } else {
296 out.AddFormatted(" ;; deoptimization bailout %d", id); 293 out.AddFormatted(" ;; deoptimization bailout %d", id);
297 } 294 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 331
335 #else // ENABLE_DISASSEMBLER 332 #else // ENABLE_DISASSEMBLER
336 333
337 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {} 334 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {}
338 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; } 335 int Disassembler::Decode(FILE* f, byte* begin, byte* end) { return 0; }
339 void Disassembler::Decode(FILE* f, Code* code) {} 336 void Disassembler::Decode(FILE* f, Code* code) {}
340 337
341 #endif // ENABLE_DISASSEMBLER 338 #endif // ENABLE_DISASSEMBLER
342 339
343 } } // namespace v8::internal 340 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/assembler.cc ('k') | src/full-codegen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698