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

Side by Side Diff: src/arm/deoptimizer-arm.cc

Issue 7988007: Fix arm compilation, missing isolate pointer (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 3 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 | « no previous file | src/x64/deoptimizer-x64.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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // Destroy the code which is not supposed to be run again. 105 // Destroy the code which is not supposed to be run again.
106 int instructions = 106 int instructions =
107 (code->safepoint_table_offset() - last_pc_offset) / Assembler::kInstrSize; 107 (code->safepoint_table_offset() - last_pc_offset) / Assembler::kInstrSize;
108 CodePatcher destroyer(code->instruction_start() + last_pc_offset, 108 CodePatcher destroyer(code->instruction_start() + last_pc_offset,
109 instructions); 109 instructions);
110 for (int x = 0; x < instructions; x++) { 110 for (int x = 0; x < instructions; x++) {
111 destroyer.masm()->bkpt(0); 111 destroyer.masm()->bkpt(0);
112 } 112 }
113 #endif 113 #endif
114 114
115 Isolate* isolate = code->GetIsolate();
116
115 // Add the deoptimizing code to the list. 117 // Add the deoptimizing code to the list.
116 DeoptimizingCodeListNode* node = new DeoptimizingCodeListNode(code); 118 DeoptimizingCodeListNode* node = new DeoptimizingCodeListNode(code);
117 DeoptimizerData* data = code->GetIsolate()->deoptimizer_data(); 119 DeoptimizerData* data = isolate->deoptimizer_data();
118 node->set_next(data->deoptimizing_code_list_); 120 node->set_next(data->deoptimizing_code_list_);
119 data->deoptimizing_code_list_ = node; 121 data->deoptimizing_code_list_ = node;
120 122
121 // We might be in the middle of incremental marking with compaction. 123 // We might be in the middle of incremental marking with compaction.
122 // Tell collector to treat this code object in a special way and 124 // Tell collector to treat this code object in a special way and
123 // ignore all slots that might have been recorded on it. 125 // ignore all slots that might have been recorded on it.
124 isolate->heap()->mark_compact_collector()->InvalidateCode(code); 126 isolate->heap()->mark_compact_collector()->InvalidateCode(code);
125 127
126 // Set the code for the function to non-optimized version. 128 // Set the code for the function to non-optimized version.
127 function->ReplaceCode(function->shared()->code()); 129 function->ReplaceCode(function->shared()->code());
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 __ push(ip); 789 __ push(ip);
788 __ b(&done); 790 __ b(&done);
789 ASSERT(masm()->pc_offset() - start == table_entry_size_); 791 ASSERT(masm()->pc_offset() - start == table_entry_size_);
790 } 792 }
791 __ bind(&done); 793 __ bind(&done);
792 } 794 }
793 795
794 #undef __ 796 #undef __
795 797
796 } } // namespace v8::internal 798 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/x64/deoptimizer-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698