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

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

Issue 6853008: Revert GCC compilation fix on 3.1 branch that contained an invalid (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.1/
Patch Set: Created 9 years, 8 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/version.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 8177 matching lines...) Expand 10 before | Expand all | Expand 10 after
8188 // a test rax instruction here. 8188 // a test rax instruction here.
8189 __ nop(); 8189 __ nop();
8190 } else { 8190 } else {
8191 // Inline the inobject property case. 8191 // Inline the inobject property case.
8192 Comment cmnt(masm(), "[ Inlined named property load"); 8192 Comment cmnt(masm(), "[ Inlined named property load");
8193 Result receiver = frame()->Pop(); 8193 Result receiver = frame()->Pop();
8194 receiver.ToRegister(); 8194 receiver.ToRegister();
8195 result = allocator()->Allocate(); 8195 result = allocator()->Allocate();
8196 ASSERT(result.is_valid()); 8196 ASSERT(result.is_valid());
8197 8197
8198 // r12 is now a reserved register, so it cannot be the receiver. 8198 // Cannot use r12 for receiver, because that changes
8199 // If it was, the distance to the fixup location would not be constant. 8199 // the distance between a call and a fixup location,
8200 ASSERT(!receiver.reg().is(r12)); 8200 // due to a special encoding of r12 as r/m in a ModR/M byte.
8201 if (receiver.reg().is(r12)) {
8202 frame()->Spill(receiver.reg()); // It will be overwritten with result.
8203 // Swap receiver and value.
8204 __ movq(result.reg(), receiver.reg());
8205 Result temp = receiver;
8206 receiver = result;
8207 result = temp;
8208 }
8201 8209
8202 DeferredReferenceGetNamedValue* deferred = 8210 DeferredReferenceGetNamedValue* deferred =
8203 new DeferredReferenceGetNamedValue(result.reg(), receiver.reg(), name); 8211 new DeferredReferenceGetNamedValue(result.reg(), receiver.reg(), name);
8204 8212
8205 // Check that the receiver is a heap object. 8213 // Check that the receiver is a heap object.
8206 __ JumpIfSmi(receiver.reg(), deferred->entry_label()); 8214 __ JumpIfSmi(receiver.reg(), deferred->entry_label());
8207 8215
8208 __ bind(deferred->patch_site()); 8216 __ bind(deferred->patch_site());
8209 // This is the map check instruction that will be patched (so we can't 8217 // This is the map check instruction that will be patched (so we can't
8210 // use the double underscore macro that may insert instructions). 8218 // use the double underscore macro that may insert instructions).
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
8818 } 8826 }
8819 8827
8820 #endif 8828 #endif
8821 8829
8822 8830
8823 #undef __ 8831 #undef __
8824 8832
8825 } } // namespace v8::internal 8833 } } // namespace v8::internal
8826 8834
8827 #endif // V8_TARGET_ARCH_X64 8835 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/version.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698