From 6e0fdcb6ec28e417989deb9f7d70dac3129665ec Mon Sep 17 00:00:00 2001 From: "cwzwarich@webkit.org" Date: Fri, 17 Oct 2008 10:46:38 +0000 Subject: [PATCH] 2008-10-17 Cameron Zwarich Reviewed by Maciej Stachowiak. Remove some C style casts. * masm/X86Assembler.h: (JSC::JITCodeBuffer::putIntUnchecked): (JSC::X86Assembler::link): (JSC::X86Assembler::linkAbsoluteAddress): (JSC::X86Assembler::getRelocatedAddress): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@37652 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- JavaScriptCore/ChangeLog | 12 ++++++++++++ JavaScriptCore/masm/X86Assembler.h | 12 ++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog index 1b93261605fb..5a505e6db603 100644 --- a/JavaScriptCore/ChangeLog +++ b/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2008-10-17 Cameron Zwarich + + Reviewed by Maciej Stachowiak. + + Remove some C style casts. + + * masm/X86Assembler.h: + (JSC::JITCodeBuffer::putIntUnchecked): + (JSC::X86Assembler::link): + (JSC::X86Assembler::linkAbsoluteAddress): + (JSC::X86Assembler::getRelocatedAddress): + 2008-10-17 Cameron Zwarich Rubber-stamped by Maciej Stachowiak. diff --git a/JavaScriptCore/masm/X86Assembler.h b/JavaScriptCore/masm/X86Assembler.h index a836c1624574..6112df88d632 100644 --- a/JavaScriptCore/masm/X86Assembler.h +++ b/JavaScriptCore/masm/X86Assembler.h @@ -86,7 +86,7 @@ public: void putIntUnchecked(int value) { - *(int*)(&m_buffer[m_index]) = value; + *reinterpret_cast(&m_buffer[m_index]) = value; m_index += 4; } @@ -1012,7 +1012,7 @@ public: ASSERT(to.m_offset != -1); ASSERT(from.m_offset != -1); - ((int*)(((ptrdiff_t)(m_buffer->start())) + from.m_offset))[-1] = to.m_offset - from.m_offset; + reinterpret_cast(reinterpret_cast(m_buffer->start()) + from.m_offset)[-1] = to.m_offset - from.m_offset; } static void linkAbsoluteAddress(void* code, JmpDst useOffset, JmpDst address) @@ -1020,24 +1020,24 @@ public: ASSERT(useOffset.m_offset != -1); ASSERT(address.m_offset != -1); - ((int*)(((ptrdiff_t)code) + useOffset.m_offset))[-1] = ((ptrdiff_t)code) + address.m_offset; + reinterpret_cast(reinterpret_cast(code) + useOffset.m_offset)[-1] = reinterpret_cast(code) + address.m_offset; } static void link(void* code, JmpSrc from, void* to) { ASSERT(from.m_offset != -1); - ((int*)((ptrdiff_t)code + from.m_offset))[-1] = (ptrdiff_t)to - ((ptrdiff_t)code + from.m_offset); + reinterpret_cast(reinterpret_cast(code) + from.m_offset)[-1] = reinterpret_cast(to) - (reinterpret_cast(code) + from.m_offset); } static void* getRelocatedAddress(void* code, JmpSrc jump) { - return reinterpret_cast((ptrdiff_t)code + jump.m_offset); + return reinterpret_cast(reinterpret_cast(code) + jump.m_offset); } static void* getRelocatedAddress(void* code, JmpDst jump) { - return reinterpret_cast((ptrdiff_t)code + jump.m_offset); + return reinterpret_cast(reinterpret_cast(code) + jump.m_offset); } static int getDifferenceBetweenLabels(JmpDst src, JmpDst dst) -- 2.36.0