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/jit/JSInterfaceJIT.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Source/JavaScriptCore/jit/JSInterfaceJIT.h') diff --git a/Source/JavaScriptCore/jit/JSInterfaceJIT.h b/Source/JavaScriptCore/jit/JSInterfaceJIT.h index 8d9a0c800..d2a91ba0a 100644 --- a/Source/JavaScriptCore/jit/JSInterfaceJIT.h +++ b/Source/JavaScriptCore/jit/JSInterfaceJIT.h @@ -270,36 +270,36 @@ namespace JSC { #if USE(JSVALUE64) ALWAYS_INLINE JSInterfaceJIT::Jump JSInterfaceJIT::emitJumpIfImmediateNumber(RegisterID reg) { - return branchTestPtr(NonZero, reg, tagTypeNumberRegister); + return branchTest64(NonZero, reg, tagTypeNumberRegister); } ALWAYS_INLINE JSInterfaceJIT::Jump JSInterfaceJIT::emitJumpIfNotImmediateNumber(RegisterID reg) { - return branchTestPtr(Zero, reg, tagTypeNumberRegister); + return branchTest64(Zero, reg, tagTypeNumberRegister); } inline JSInterfaceJIT::Jump JSInterfaceJIT::emitLoadJSCell(unsigned virtualRegisterIndex, RegisterID dst) { - loadPtr(addressFor(virtualRegisterIndex), dst); - return branchTestPtr(NonZero, dst, tagMaskRegister); + load64(addressFor(virtualRegisterIndex), dst); + return branchTest64(NonZero, dst, tagMaskRegister); } inline JSInterfaceJIT::Jump JSInterfaceJIT::emitLoadInt32(unsigned virtualRegisterIndex, RegisterID dst) { - loadPtr(addressFor(virtualRegisterIndex), dst); - Jump result = branchPtr(Below, dst, tagTypeNumberRegister); + load64(addressFor(virtualRegisterIndex), dst); + Jump result = branch64(Below, dst, tagTypeNumberRegister); zeroExtend32ToPtr(dst, dst); return result; } inline JSInterfaceJIT::Jump JSInterfaceJIT::emitLoadDouble(unsigned virtualRegisterIndex, FPRegisterID dst, RegisterID scratch) { - loadPtr(addressFor(virtualRegisterIndex), scratch); + load64(addressFor(virtualRegisterIndex), scratch); Jump notNumber = emitJumpIfNotImmediateNumber(scratch); - Jump notInt = branchPtr(Below, scratch, tagTypeNumberRegister); + Jump notInt = branch64(Below, scratch, tagTypeNumberRegister); convertInt32ToDouble(scratch, dst); Jump done = jump(); notInt.link(this); - addPtr(tagTypeNumberRegister, scratch); - movePtrToDouble(scratch, dst); + add64(tagTypeNumberRegister, scratch); + move64ToDouble(scratch, dst); done.link(this); return notNumber; } -- cgit v1.2.1