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

Side by Side Diff: src/mark-compact.cc

Issue 267116: Fix X64 build in the case that debugger support is disabled. Change function... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 2 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/ia32/debug-ia32.cc ('k') | src/objects.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 IC::Clear(rinfo->pc()); 272 IC::Clear(rinfo->pc());
273 // Please note targets for cleared inline cached do not have to be 273 // Please note targets for cleared inline cached do not have to be
274 // marked since they are contained in Heap::non_monomorphic_cache(). 274 // marked since they are contained in Heap::non_monomorphic_cache().
275 } else { 275 } else {
276 MarkCompactCollector::MarkObject(code); 276 MarkCompactCollector::MarkObject(code);
277 } 277 }
278 } 278 }
279 279
280 void VisitDebugTarget(RelocInfo* rinfo) { 280 void VisitDebugTarget(RelocInfo* rinfo) {
281 ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) && 281 ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) &&
282 rinfo->IsCallInstruction()); 282 rinfo->IsPatchedReturnSequence());
283 HeapObject* code = Code::GetCodeFromTargetAddress(rinfo->call_address()); 283 HeapObject* code = Code::GetCodeFromTargetAddress(rinfo->call_address());
284 MarkCompactCollector::MarkObject(code); 284 MarkCompactCollector::MarkObject(code);
285 } 285 }
286 286
287 private: 287 private:
288 // Mark object pointed to by p. 288 // Mark object pointed to by p.
289 void MarkObjectByPointer(Object** p) { 289 void MarkObjectByPointer(Object** p) {
290 if (!(*p)->IsHeapObject()) return; 290 if (!(*p)->IsHeapObject()) return;
291 HeapObject* object = ShortCircuitConsString(p); 291 HeapObject* object = ShortCircuitConsString(p);
292 MarkCompactCollector::MarkObject(object); 292 MarkCompactCollector::MarkObject(object);
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 1375
1376 void VisitCodeTarget(RelocInfo* rinfo) { 1376 void VisitCodeTarget(RelocInfo* rinfo) {
1377 ASSERT(RelocInfo::IsCodeTarget(rinfo->rmode())); 1377 ASSERT(RelocInfo::IsCodeTarget(rinfo->rmode()));
1378 Object* target = Code::GetCodeFromTargetAddress(rinfo->target_address()); 1378 Object* target = Code::GetCodeFromTargetAddress(rinfo->target_address());
1379 VisitPointer(&target); 1379 VisitPointer(&target);
1380 rinfo->set_target_address( 1380 rinfo->set_target_address(
1381 reinterpret_cast<Code*>(target)->instruction_start()); 1381 reinterpret_cast<Code*>(target)->instruction_start());
1382 } 1382 }
1383 1383
1384 void VisitDebugTarget(RelocInfo* rinfo) { 1384 void VisitDebugTarget(RelocInfo* rinfo) {
1385 ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) && rinfo->IsCallInstruction()); 1385 ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) &&
1386 rinfo->IsPatchedReturnSequence());
1386 Object* target = Code::GetCodeFromTargetAddress(rinfo->call_address()); 1387 Object* target = Code::GetCodeFromTargetAddress(rinfo->call_address());
1387 VisitPointer(&target); 1388 VisitPointer(&target);
1388 rinfo->set_call_address( 1389 rinfo->set_call_address(
1389 reinterpret_cast<Code*>(target)->instruction_start()); 1390 reinterpret_cast<Code*>(target)->instruction_start());
1390 } 1391 }
1391 1392
1392 private: 1393 private:
1393 void UpdatePointer(Object** p) { 1394 void UpdatePointer(Object** p) {
1394 if (!(*p)->IsHeapObject()) return; 1395 if (!(*p)->IsHeapObject()) return;
1395 1396
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 1807
1807 void MarkCompactCollector::RebuildRSets() { 1808 void MarkCompactCollector::RebuildRSets() {
1808 #ifdef DEBUG 1809 #ifdef DEBUG
1809 ASSERT(state_ == RELOCATE_OBJECTS); 1810 ASSERT(state_ == RELOCATE_OBJECTS);
1810 state_ = REBUILD_RSETS; 1811 state_ = REBUILD_RSETS;
1811 #endif 1812 #endif
1812 Heap::RebuildRSets(); 1813 Heap::RebuildRSets();
1813 } 1814 }
1814 1815
1815 } } // namespace v8::internal 1816 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/ia32/debug-ia32.cc ('k') | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698