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

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

Issue 7970008: Make newer GCCs happier: Fixed NULL vs. 0 confusion. (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 | « src/mark-compact.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 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 ASSERT(*(call_target_address - 3) == 0x73 && // jae 247 ASSERT(*(call_target_address - 3) == 0x73 && // jae
248 *(call_target_address - 2) == 0x07 && // offset 248 *(call_target_address - 2) == 0x07 && // offset
249 *(call_target_address - 1) == 0xe8); // call 249 *(call_target_address - 1) == 0xe8); // call
250 *(call_target_address - 3) = 0x90; // nop 250 *(call_target_address - 3) = 0x90; // nop
251 *(call_target_address - 2) = 0x90; // nop 251 *(call_target_address - 2) = 0x90; // nop
252 Assembler::set_target_address_at(call_target_address, 252 Assembler::set_target_address_at(call_target_address,
253 replacement_code->entry()); 253 replacement_code->entry());
254 254
255 RelocInfo rinfo(call_target_address, 255 RelocInfo rinfo(call_target_address,
256 RelocInfo::CODE_TARGET, 256 RelocInfo::CODE_TARGET,
257 NULL, 257 0,
258 unoptimized_code); 258 unoptimized_code);
259 unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode( 259 unoptimized_code->GetHeap()->incremental_marking()->RecordWriteIntoCode(
260 unoptimized_code, &rinfo, replacement_code); 260 unoptimized_code, &rinfo, replacement_code);
261 } 261 }
262 262
263 263
264 void Deoptimizer::RevertStackCheckCodeAt(Address pc_after, 264 void Deoptimizer::RevertStackCheckCodeAt(Address pc_after,
265 Code* check_code, 265 Code* check_code,
266 Code* replacement_code) { 266 Code* replacement_code) {
267 Address call_target_address = pc_after - kIntSize; 267 Address call_target_address = pc_after - kIntSize;
(...skipping 586 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 } 854 }
855 __ bind(&done); 855 __ bind(&done);
856 } 856 }
857 857
858 #undef __ 858 #undef __
859 859
860 860
861 } } // namespace v8::internal 861 } } // namespace v8::internal
862 862
863 #endif // V8_TARGET_ARCH_X64 863 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/mark-compact.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698