Title: [120860] trunk/Source/_javascript_Core
Revision
120860
Author
[email protected]
Date
2012-06-20 14:07:33 -0700 (Wed, 20 Jun 2012)

Log Message

build-webkit failure due to illegal 32-bit integer constants in code
generated by offlineasm
https://bugs.webkit.org/show_bug.cgi?id=89347

Reviewed by Geoffrey Garen.

The offending constants are the magic numbers used by offlineasm to find
offsets in the generated machine code. Added code to turn them into what
the C++ compiler will believe to be valid 32-bit values.

* offlineasm/offsets.rb:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (120859 => 120860)


--- trunk/Source/_javascript_Core/ChangeLog	2012-06-20 21:04:16 UTC (rev 120859)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-06-20 21:07:33 UTC (rev 120860)
@@ -1,3 +1,17 @@
+2012-06-20  Filip Pizlo  <[email protected]>
+
+        build-webkit failure due to illegal 32-bit integer constants in code
+        generated by offlineasm
+        https://bugs.webkit.org/show_bug.cgi?id=89347
+
+        Reviewed by Geoffrey Garen.
+        
+        The offending constants are the magic numbers used by offlineasm to find
+        offsets in the generated machine code. Added code to turn them into what
+        the C++ compiler will believe to be valid 32-bit values.
+
+        * offlineasm/offsets.rb:
+
 2012-06-19  Geoffrey Garen  <[email protected]>
 
         Made the incremental sweeper more aggressive

Modified: trunk/Source/_javascript_Core/offlineasm/offsets.rb (120859 => 120860)


--- trunk/Source/_javascript_Core/offlineasm/offsets.rb	2012-06-20 21:04:16 UTC (rev 120859)
+++ trunk/Source/_javascript_Core/offlineasm/offsets.rb	2012-06-20 21:07:33 UTC (rev 120860)
@@ -23,9 +23,16 @@
 
 require "ast"
 
-OFFSET_HEADER_MAGIC_NUMBERS = [ 0x9e43fd66, 0x4379bfba ]
-OFFSET_MAGIC_NUMBERS = [ 0xec577ac7, 0x0ff5e755 ]
+def to32Bit(value)
+    if value > 0x7fffffff
+        value -= 1 << 32
+    end
+    value
+end
 
+OFFSET_HEADER_MAGIC_NUMBERS = [ to32Bit(0x9e43fd66), to32Bit(0x4379bfba) ]
+OFFSET_MAGIC_NUMBERS = [ to32Bit(0xec577ac7), to32Bit(0x0ff5e755) ]
+
 #
 # MissingMagicValuesException
 #
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to