From 0b3dc81d9701aea106543b49bde511a5697cdd6e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 20 Sep 2012 16:13:48 +0200 Subject: Imported WebKit commit 6dbad7b03986b50773637200cddddeeeb92745cc (http://svn.webkit.org/repository/webkit/trunk@129129) Another update that should fix the initial build in the CI system --- Source/JavaScriptCore/ChangeLog | 13 +++++++++++++ Source/JavaScriptCore/assembler/MacroAssemblerARM.h | 7 +++++++ 2 files changed, 20 insertions(+) (limited to 'Source/JavaScriptCore') diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 243e2a887..ca7100e21 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,16 @@ +2012-09-20 Gabor Rapcsanyi + + [Qt] r129045 broke the ARM build + https://bugs.webkit.org/show_bug.cgi?id=97195 + + Reviewed by Zoltan Herczeg. + + Implementing missing store8 function. + + * assembler/MacroAssemblerARM.h: + (JSC::MacroAssemblerARM::store8): + (MacroAssemblerARM): + 2012-09-19 Geoffrey Garen OSR exit sometimes neglects to create the arguments object diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h index c4d6c92a5..298de9793 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h @@ -445,6 +445,13 @@ public: m_assembler.baseIndexTransfer32(ARMAssembler::StoreUint8, src, address.base, address.index, static_cast(address.scale), address.offset); } + void store8(TrustedImm32 imm, void* address) + { + move(TrustedImm32(reinterpret_cast(address)), ARMRegisters::S0); + m_assembler.moveImm(imm.m_value, ARMRegisters::S1); + m_assembler.dtrUp(ARMAssembler::StoreUint8, ARMRegisters::S1, ARMRegisters::S0, 0); + } + void store16(RegisterID src, BaseIndex address) { m_assembler.baseIndexTransfer16(ARMAssembler::StoreUint16, src, address.base, address.index, static_cast(address.scale), address.offset); -- cgit v1.2.1