Changeset 41051 in webkit for trunk/JavaScriptCore

Timestamp:

Feb 17, 2009, 7:36:03 PM (16 years ago)

Author:

[email protected]

Message:

Add assertion to guard against oversized pc relative calls.

Reviewed by Geoff Garen

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/X86Assembler.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-02-17  Oliver Hunt  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        Add assertion to guard against oversized pc relative calls.
+
+        * assembler/X86Assembler.h:
+        (JSC::X86Assembler::link):
+
 2009-02-17  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/assembler/X86Assembler.h

@@ -1243 +1243 @@
     {
         ASSERT(from.m_offset != -1);
-        
-        reinterpret_cast<int*>(reinterpret_cast<ptrdiff_t>(code) + from.m_offset)[-1] = reinterpret_cast<ptrdiff_t>(to) - (reinterpret_cast<ptrdiff_t>(code) + from.m_offset);
+        ptrdiff_t linkOffset = reinterpret_cast<ptrdiff_t>(to) - (reinterpret_cast<ptrdiff_t>(code) + from.m_offset);
+        ASSERT(linkOffset == static_cast<int>(linkOffset));
+        reinterpret_cast<int*>(reinterpret_cast<ptrdiff_t>(code) + from.m_offset)[-1] = linkOffset;
     }