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

Unified Diff: third_party/WebKit/JavaScriptCore/assembler/MacroAssemblerX86_64.h

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/JavaScriptCore/assembler/MacroAssemblerX86_64.h
===================================================================
--- third_party/WebKit/JavaScriptCore/assembler/MacroAssemblerX86_64.h (revision 11154)
+++ third_party/WebKit/JavaScriptCore/assembler/MacroAssemblerX86_64.h (working copy)
@@ -244,8 +244,13 @@
void storePtr(ImmPtr imm, ImplicitAddress address)
{
- move(imm, scratchRegister);
- storePtr(scratchRegister, address);
+ intptr_t ptr = imm.asIntptr();
+ if (CAN_SIGN_EXTEND_32_64(ptr))
+ m_assembler.movq_i32m(static_cast<int>(ptr), address.offset, address.base);
+ else {
+ move(imm, scratchRegister);
+ storePtr(scratchRegister, address);
+ }
}
DataLabel32 storePtrWithAddressOffsetPatch(RegisterID src, Address address)
« no previous file with comments | « third_party/WebKit/JavaScriptCore/ChangeLog ('k') | third_party/WebKit/JavaScriptCore/assembler/X86Assembler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698