Changeset 43481 in webkit for trunk/JavaScriptCore

Timestamp:

May 10, 2009, 11:06:30 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-10 Maciej Stachowiak <​[email protected]>

Reviewed by Geoff Garen.

• fixed REGRESSION(r43432): Many JavaScriptCore tests crash in 64-bit ​https://bugs.webkit.org/show_bug.cgi?id=25680

Accound for the 64-bit instruction prefix when rewriting mov to lea on 64-bit.

• jit/JIT.h:
• jit/JITPropertyAccess.cpp: (JSC::JIT::patchGetByIdSelf): (JSC::JIT::patchPutByIdReplace):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JIT.h (modified) (4 diffs)
• jit/JITPropertyAccess.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-05-10  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Geoff Garen.
+        
+        - fixed REGRESSION(r43432): Many JavaScriptCore tests crash in 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=25680
+
+        Accound for the 64-bit instruction prefix when rewriting mov to lea on 64-bit.
+        
+        * jit/JIT.h:
+        * jit/JITPropertyAccess.cpp:
+        (JSC::JIT::patchGetByIdSelf):
+        (JSC::JIT::patchPutByIdReplace):
+
 2009-05-10  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/jit/JIT.h

@@ -229 +229 @@
         static const int patchOffsetPutByIdExternalLoad = 20;
         static const int patchLengthPutByIdExternalLoad = 4;
+        static const int patchLengthPutByIdExternalLoadPrefix = 1;
         static const int patchOffsetPutByIdPropertyMapOffset = 31;
         // These architecture specific value are used to enable patching - see comment on op_get_by_id.
@@ -235 +236 @@
         static const int patchOffsetGetByIdExternalLoad = 20;
         static const int patchLengthGetByIdExternalLoad = 4;
+        static const int patchLengthGetByIdExternalLoadPrefix = 1;
         static const int patchOffsetGetByIdPropertyMapOffset = 31;
         static const int patchOffsetGetByIdPutResult = 31;
@@ -248 +250 @@
         static const int patchOffsetPutByIdExternalLoad = 13;
         static const int patchLengthPutByIdExternalLoad = 3;
+        static const int patchLengthPutByIdExternalLoadPrefix = 0;
         static const int patchOffsetPutByIdPropertyMapOffset = 22;
         // These architecture specific value are used to enable patching - see comment on op_get_by_id.
@@ -254 +257 @@
         static const int patchOffsetGetByIdExternalLoad = 13;
         static const int patchLengthGetByIdExternalLoad = 3;
+        static const int patchLengthGetByIdExternalLoadPrefix = 0;
         static const int patchOffsetGetByIdPropertyMapOffset = 22;
         static const int patchOffsetGetByIdPutResult = 22;

trunk/JavaScriptCore/jit/JITPropertyAccess.cpp

@@ -331 +331 @@
     // and makes the subsequent load's offset automatically correct
     if (structure->isUsingInlineStorage())
-        stubInfo->hotPathBegin.instructionAtOffset(patchOffsetGetByIdExternalLoad).patchLoadToLEA();
+        stubInfo->hotPathBegin.instructionAtOffset(patchOffsetGetByIdExternalLoad + patchLengthGetByIdExternalLoadPrefix).patchLoadToLEA();
 
     // Patch the offset into the propoerty map to load from, then patch the Structure to look for.
@@ -349 +349 @@
     // and makes the subsequent load's offset automatically correct
     if (structure->isUsingInlineStorage())
-        stubInfo->hotPathBegin.instructionAtOffset(patchOffsetGetByIdExternalLoad).patchLoadToLEA();
+        stubInfo->hotPathBegin.instructionAtOffset(patchOffsetPutByIdExternalLoad + patchLengthPutByIdExternalLoadPrefix).patchLoadToLEA();
 
     // Patch the offset into the propoerty map to load from, then patch the Structure to look for.