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

Side by Side Diff: src/runtime.cc

Issue 19248002: Fix unaligned accesses in back_edge tables. (Closed) Base URL: https://github.com/v8/v8.git@gbl
Patch Set: Fixed nit. Created 7 years, 5 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 | « src/objects.cc ('k') | 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 8526 matching lines...) Expand 10 before | Expand all | Expand 10 after
8537 ASSERT(frame->LookupCode() == *unoptimized); 8537 ASSERT(frame->LookupCode() == *unoptimized);
8538 ASSERT(unoptimized->contains(frame->pc())); 8538 ASSERT(unoptimized->contains(frame->pc()));
8539 8539
8540 // Use linear search of the unoptimized code's back edge table to find 8540 // Use linear search of the unoptimized code's back edge table to find
8541 // the AST id matching the PC. 8541 // the AST id matching the PC.
8542 Address start = unoptimized->instruction_start(); 8542 Address start = unoptimized->instruction_start();
8543 unsigned target_pc_offset = static_cast<unsigned>(frame->pc() - start); 8543 unsigned target_pc_offset = static_cast<unsigned>(frame->pc() - start);
8544 Address table_cursor = start + unoptimized->back_edge_table_offset(); 8544 Address table_cursor = start + unoptimized->back_edge_table_offset();
8545 uint32_t table_length = Memory::uint32_at(table_cursor); 8545 uint32_t table_length = Memory::uint32_at(table_cursor);
8546 table_cursor += kIntSize; 8546 table_cursor += kIntSize;
8547 uint8_t loop_depth = 0; 8547 uint32_t loop_depth = 0;
8548 for (unsigned i = 0; i < table_length; ++i) { 8548 for (unsigned i = 0; i < table_length; ++i) {
8549 // Table entries are (AST id, pc offset) pairs. 8549 // Table entries are (AST id, pc offset) pairs.
8550 uint32_t pc_offset = Memory::uint32_at(table_cursor + kIntSize); 8550 uint32_t pc_offset = Memory::uint32_at(table_cursor + kIntSize);
8551 if (pc_offset == target_pc_offset) { 8551 if (pc_offset == target_pc_offset) {
8552 ast_id = BailoutId(static_cast<int>(Memory::uint32_at(table_cursor))); 8552 ast_id = BailoutId(static_cast<int>(Memory::uint32_at(table_cursor)));
8553 loop_depth = Memory::uint8_at(table_cursor + 2 * kIntSize); 8553 loop_depth = Memory::uint32_at(table_cursor + 2 * kIntSize);
8554 break; 8554 break;
8555 } 8555 }
8556 table_cursor += FullCodeGenerator::kBackEdgeEntrySize; 8556 table_cursor += FullCodeGenerator::kBackEdgeEntrySize;
8557 } 8557 }
8558 ASSERT(!ast_id.IsNone()); 8558 ASSERT(!ast_id.IsNone());
8559 if (FLAG_trace_osr) { 8559 if (FLAG_trace_osr) {
8560 PrintF("[replacing on-stack at AST id %d, loop depth %d in ", 8560 PrintF("[replacing on-stack at AST id %d, loop depth %d in ",
8561 ast_id.ToInt(), loop_depth); 8561 ast_id.ToInt(), loop_depth);
8562 function->PrintName(); 8562 function->PrintName();
8563 PrintF("]\n"); 8563 PrintF("]\n");
(...skipping 5421 matching lines...) Expand 10 before | Expand all | Expand 10 after
13985 // Handle last resort GC and make sure to allow future allocations 13985 // Handle last resort GC and make sure to allow future allocations
13986 // to grow the heap without causing GCs (if possible). 13986 // to grow the heap without causing GCs (if possible).
13987 isolate->counters()->gc_last_resort_from_js()->Increment(); 13987 isolate->counters()->gc_last_resort_from_js()->Increment();
13988 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags, 13988 isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags,
13989 "Runtime::PerformGC"); 13989 "Runtime::PerformGC");
13990 } 13990 }
13991 } 13991 }
13992 13992
13993 13993
13994 } } // namespace v8::internal 13994 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/objects.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698