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

Side by Side Diff: src/assembler.cc

Issue 561049: Using RelocInfo instead of DebuggerStatementStub (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years, 10 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.h ('k') | src/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 (c) 1994-2006 Sun Microsystems Inc. 1 // Copyright (c) 1994-2006 Sun Microsystems Inc.
2 // All Rights Reserved. 2 // All Rights Reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // - Redistributions of source code must retain the above copyright notice, 8 // - Redistributions of source code must retain the above copyright notice,
9 // this list of conditions and the following disclaimer. 9 // this list of conditions and the following disclaimer.
10 // 10 //
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 case RelocInfo::NONE: 423 case RelocInfo::NONE:
424 return "no reloc"; 424 return "no reloc";
425 case RelocInfo::EMBEDDED_OBJECT: 425 case RelocInfo::EMBEDDED_OBJECT:
426 return "embedded object"; 426 return "embedded object";
427 case RelocInfo::EMBEDDED_STRING: 427 case RelocInfo::EMBEDDED_STRING:
428 return "embedded string"; 428 return "embedded string";
429 case RelocInfo::CONSTRUCT_CALL: 429 case RelocInfo::CONSTRUCT_CALL:
430 return "code target (js construct call)"; 430 return "code target (js construct call)";
431 case RelocInfo::CODE_TARGET_CONTEXT: 431 case RelocInfo::CODE_TARGET_CONTEXT:
432 return "code target (context)"; 432 return "code target (context)";
433 case RelocInfo::DEBUG_BREAK:
434 #ifndef ENABLE_DEBUGGER_SUPPORT
435 UNREACHABLE();
436 #endif
437 return "debug break";
433 case RelocInfo::CODE_TARGET: 438 case RelocInfo::CODE_TARGET:
434 return "code target"; 439 return "code target";
435 case RelocInfo::RUNTIME_ENTRY: 440 case RelocInfo::RUNTIME_ENTRY:
436 return "runtime entry"; 441 return "runtime entry";
437 case RelocInfo::JS_RETURN: 442 case RelocInfo::JS_RETURN:
438 return "js return"; 443 return "js return";
439 case RelocInfo::COMMENT: 444 case RelocInfo::COMMENT:
440 return "comment"; 445 return "comment";
441 case RelocInfo::POSITION: 446 case RelocInfo::POSITION:
442 return "position"; 447 return "position";
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 } 483 }
479 #endif // ENABLE_DISASSEMBLER 484 #endif // ENABLE_DISASSEMBLER
480 485
481 486
482 #ifdef DEBUG 487 #ifdef DEBUG
483 void RelocInfo::Verify() { 488 void RelocInfo::Verify() {
484 switch (rmode_) { 489 switch (rmode_) {
485 case EMBEDDED_OBJECT: 490 case EMBEDDED_OBJECT:
486 Object::VerifyPointer(target_object()); 491 Object::VerifyPointer(target_object());
487 break; 492 break;
493 case DEBUG_BREAK:
494 #ifndef ENABLE_DEBUGGER_SUPPORT
495 UNREACHABLE();
496 break;
497 #endif
488 case CONSTRUCT_CALL: 498 case CONSTRUCT_CALL:
489 case CODE_TARGET_CONTEXT: 499 case CODE_TARGET_CONTEXT:
490 case CODE_TARGET: { 500 case CODE_TARGET: {
491 // convert inline target address to code object 501 // convert inline target address to code object
492 Address addr = target_address(); 502 Address addr = target_address();
493 ASSERT(addr != NULL); 503 ASSERT(addr != NULL);
494 // Check that we can find the right code object. 504 // Check that we can find the right code object.
495 Code* code = Code::GetCodeFromTargetAddress(addr); 505 Code* code = Code::GetCodeFromTargetAddress(addr);
496 Object* found = Heap::FindCodeObject(addr); 506 Object* found = Heap::FindCodeObject(addr);
497 ASSERT(found->IsCode()); 507 ASSERT(found->IsCode());
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 return ExternalReference(Redirect(FUNCTION_ADDR(Debug::Break))); 773 return ExternalReference(Redirect(FUNCTION_ADDR(Debug::Break)));
764 } 774 }
765 775
766 776
767 ExternalReference ExternalReference::debug_step_in_fp_address() { 777 ExternalReference ExternalReference::debug_step_in_fp_address() {
768 return ExternalReference(Debug::step_in_fp_addr()); 778 return ExternalReference(Debug::step_in_fp_addr());
769 } 779 }
770 #endif 780 #endif
771 781
772 } } // namespace v8::internal 782 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/assembler.h ('k') | src/codegen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698