From 43a42f108af6bcbd91f2672731c3047c26213af1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Oct 2012 15:40:17 +0200 Subject: Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets --- Source/JavaScriptCore/assembler/MacroAssembler.h | 26 ++++++++---------------- 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'Source/JavaScriptCore/assembler/MacroAssembler.h') diff --git a/Source/JavaScriptCore/assembler/MacroAssembler.h b/Source/JavaScriptCore/assembler/MacroAssembler.h index 4d4a960d3..642b5ca6b 100644 --- a/Source/JavaScriptCore/assembler/MacroAssembler.h +++ b/Source/JavaScriptCore/assembler/MacroAssembler.h @@ -728,16 +728,6 @@ public: return store64WithAddressOffsetPatch(src, address); } - void movePtrToDouble(RegisterID src, FPRegisterID dest) - { - move64ToDouble(src, dest); - } - - void moveDoubleToPtr(FPRegisterID src, RegisterID dest) - { - moveDoubleTo64(src, dest); - } - void comparePtr(RelationalCondition cond, RegisterID left, TrustedImm32 right, RegisterID dest) { compare64(cond, left, right, dest); @@ -895,14 +885,6 @@ public: default: { if (value <= 0xff) return false; - JSValue jsValue = JSValue::decode(reinterpret_cast(value)); - if (jsValue.isInt32()) - return shouldBlind(Imm32(jsValue.asInt32())); - if (jsValue.isDouble() && !shouldBlindDouble(jsValue.asDouble())) - return false; - - if (!shouldBlindDouble(bitwise_cast(value))) - return false; } } return shouldBlindForSpecificArch(value); @@ -956,6 +938,14 @@ public: default: { if (value <= 0xff) return false; + JSValue jsValue = JSValue::decode(value); + if (jsValue.isInt32()) + return shouldBlind(Imm32(jsValue.asInt32())); + if (jsValue.isDouble() && !shouldBlindDouble(jsValue.asDouble())) + return false; + + if (!shouldBlindDouble(bitwise_cast(value))) + return false; } } return shouldBlindForSpecificArch(value); -- cgit v1.2.1