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

Side by Side Diff: src/disassembler.cc

Issue 12917002: Pass Isolates explicitly in Deoptimizer-related code. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Cleanup Created 7 years, 9 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/deoptimizer.cc ('k') | src/ia32/lithium-codegen-ia32.cc » ('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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 } else { 279 } else {
280 out.AddFormatted(" %s", Code::Kind2String(kind)); 280 out.AddFormatted(" %s", Code::Kind2String(kind));
281 } 281 }
282 if (rmode == RelocInfo::CODE_TARGET_WITH_ID) { 282 if (rmode == RelocInfo::CODE_TARGET_WITH_ID) {
283 out.AddFormatted(" (id = %d)", static_cast<int>(relocinfo.data())); 283 out.AddFormatted(" (id = %d)", static_cast<int>(relocinfo.data()));
284 } 284 }
285 } else if (RelocInfo::IsRuntimeEntry(rmode) && 285 } else if (RelocInfo::IsRuntimeEntry(rmode) &&
286 isolate->deoptimizer_data() != NULL) { 286 isolate->deoptimizer_data() != NULL) {
287 // A runtime entry reloinfo might be a deoptimization bailout. 287 // A runtime entry reloinfo might be a deoptimization bailout.
288 Address addr = relocinfo.target_address(); 288 Address addr = relocinfo.target_address();
289 int id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::EAGER); 289 int id = Deoptimizer::GetDeoptimizationId(isolate,
290 addr,
291 Deoptimizer::EAGER);
290 if (id == Deoptimizer::kNotDeoptimizationEntry) { 292 if (id == Deoptimizer::kNotDeoptimizationEntry) {
291 id = Deoptimizer::GetDeoptimizationId(addr, Deoptimizer::LAZY); 293 id = Deoptimizer::GetDeoptimizationId(isolate,
294 addr,
295 Deoptimizer::LAZY);
292 if (id == Deoptimizer::kNotDeoptimizationEntry) { 296 if (id == Deoptimizer::kNotDeoptimizationEntry) {
293 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); 297 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode));
294 } else { 298 } else {
295 out.AddFormatted(" ;; lazy deoptimization bailout %d", id); 299 out.AddFormatted(" ;; lazy deoptimization bailout %d", id);
296 } 300 }
297 } else { 301 } else {
298 out.AddFormatted(" ;; deoptimization bailout %d", id); 302 out.AddFormatted(" ;; deoptimization bailout %d", id);
299 } 303 }
300 } else { 304 } else {
301 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode)); 305 out.AddFormatted(" ;; %s", RelocInfo::RelocModeName(rmode));
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 353
350 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {} 354 void Disassembler::Dump(FILE* f, byte* begin, byte* end) {}
351 int Disassembler::Decode(Isolate* isolate, FILE* f, byte* begin, byte* end) { 355 int Disassembler::Decode(Isolate* isolate, FILE* f, byte* begin, byte* end) {
352 return 0; 356 return 0;
353 } 357 }
354 void Disassembler::Decode(FILE* f, Code* code) {} 358 void Disassembler::Decode(FILE* f, Code* code) {}
355 359
356 #endif // ENABLE_DISASSEMBLER 360 #endif // ENABLE_DISASSEMBLER
357 361
358 } } // namespace v8::internal 362 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/deoptimizer.cc ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698