From b297e0fa5c217c9467033b7c8b46891a52870120 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 16 Oct 2012 14:56:46 +0200 Subject: Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :( --- Source/JavaScriptCore/assembler/MacroAssembler.h | 26 +----------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'Source/JavaScriptCore/assembler/MacroAssembler.h') diff --git a/Source/JavaScriptCore/assembler/MacroAssembler.h b/Source/JavaScriptCore/assembler/MacroAssembler.h index f5bafe27d..1a9af2989 100644 --- a/Source/JavaScriptCore/assembler/MacroAssembler.h +++ b/Source/JavaScriptCore/assembler/MacroAssembler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008, 2012 Apple Inc. All rights reserved. + * Copyright (C) 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,8 +26,6 @@ #ifndef MacroAssembler_h #define MacroAssembler_h -#include - #if ENABLE(ASSEMBLER) #if CPU(ARM_THUMB2) @@ -91,8 +89,6 @@ public: using MacroAssemblerBase::xor32; #endif - static const double twoToThe32; // This is super useful for some double code. - // Utilities used by the DFG JIT. #if ENABLE(DFG_JIT) using MacroAssemblerBase::invert; @@ -234,11 +230,6 @@ public: } #if !CPU(ARM_THUMB2) - PatchableJump patchableBranchPtr(RelationalCondition cond, Address left, TrustedImmPtr right = TrustedImmPtr(0)) - { - return PatchableJump(branchPtr(cond, left, right)); - } - PatchableJump patchableBranchPtrWithPatch(RelationalCondition cond, Address left, DataLabelPtr& dataLabel, TrustedImmPtr initialRightValue = TrustedImmPtr(0)) { return PatchableJump(branchPtrWithPatch(cond, left, dataLabel, initialRightValue)); @@ -248,16 +239,6 @@ public: { return PatchableJump(jump()); } - - PatchableJump patchableBranchTest32(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1)) - { - return PatchableJump(branchTest32(cond, reg, mask)); - } - - PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm) - { - return PatchableJump(branch32(cond, reg, imm)); - } #endif void jump(Label target) @@ -505,11 +486,6 @@ public: return branch32(cond, left, TrustedImm32(right)); } - Jump branchSubPtr(ResultCondition cond, RegisterID src, RegisterID dest) - { - return branchSub32(cond, src, dest); - } - Jump branchTestPtr(ResultCondition cond, RegisterID reg, RegisterID mask) { return branchTest32(cond, reg, mask); -- cgit v1.2.1