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

Side by Side Diff: src/x64/lithium-codegen-x64.cc

Issue 9187003: Merge r10380, r10381 from the bleeding_edge to the 3.7 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.7/
Patch Set: Created 8 years, 11 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/x64/code-stubs-x64.cc ('k') | test/cctest/test-heap.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 1874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1885 __ JumpIfSmi(object, &false_result); 1885 __ JumpIfSmi(object, &false_result);
1886 1886
1887 // This is the inlined call site instanceof cache. The two occurences of the 1887 // This is the inlined call site instanceof cache. The two occurences of the
1888 // hole value will be patched to the last map/result pair generated by the 1888 // hole value will be patched to the last map/result pair generated by the
1889 // instanceof stub. 1889 // instanceof stub.
1890 Label cache_miss; 1890 Label cache_miss;
1891 // Use a temp register to avoid memory operands with variable lengths. 1891 // Use a temp register to avoid memory operands with variable lengths.
1892 Register map = ToRegister(instr->TempAt(0)); 1892 Register map = ToRegister(instr->TempAt(0));
1893 __ movq(map, FieldOperand(object, HeapObject::kMapOffset)); 1893 __ movq(map, FieldOperand(object, HeapObject::kMapOffset));
1894 __ bind(deferred->map_check()); // Label for calculating code patching. 1894 __ bind(deferred->map_check()); // Label for calculating code patching.
1895 __ movq(kScratchRegister, factory()->the_hole_value(), 1895 Handle<JSGlobalPropertyCell> cache_cell =
1896 RelocInfo::EMBEDDED_OBJECT); 1896 factory()->NewJSGlobalPropertyCell(factory()->the_hole_value());
1897 __ cmpq(map, kScratchRegister); // Patched to cached map. 1897 __ movq(kScratchRegister, cache_cell, RelocInfo::GLOBAL_PROPERTY_CELL);
1898 __ cmpq(map, Operand(kScratchRegister, 0));
1898 __ j(not_equal, &cache_miss, Label::kNear); 1899 __ j(not_equal, &cache_miss, Label::kNear);
1899 // Patched to load either true or false. 1900 // Patched to load either true or false.
1900 __ LoadRoot(ToRegister(instr->result()), Heap::kTheHoleValueRootIndex); 1901 __ LoadRoot(ToRegister(instr->result()), Heap::kTheHoleValueRootIndex);
1901 #ifdef DEBUG 1902 #ifdef DEBUG
1902 // Check that the code size between patch label and patch sites is invariant. 1903 // Check that the code size between patch label and patch sites is invariant.
1903 Label end_of_patched_code; 1904 Label end_of_patched_code;
1904 __ bind(&end_of_patched_code); 1905 __ bind(&end_of_patched_code);
1905 ASSERT(true); 1906 ASSERT(true);
1906 #endif 1907 #endif
1907 __ jmp(&done); 1908 __ jmp(&done);
(...skipping 2404 matching lines...) Expand 10 before | Expand all | Expand 10 after
4312 RegisterEnvironmentForDeoptimization(environment, Safepoint::kNoLazyDeopt); 4313 RegisterEnvironmentForDeoptimization(environment, Safepoint::kNoLazyDeopt);
4313 ASSERT(osr_pc_offset_ == -1); 4314 ASSERT(osr_pc_offset_ == -1);
4314 osr_pc_offset_ = masm()->pc_offset(); 4315 osr_pc_offset_ = masm()->pc_offset();
4315 } 4316 }
4316 4317
4317 #undef __ 4318 #undef __
4318 4319
4319 } } // namespace v8::internal 4320 } } // namespace v8::internal
4320 4321
4321 #endif // V8_TARGET_ARCH_X64 4322 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | test/cctest/test-heap.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698