Changeset 39371 in webkit for trunk/JavaScriptCore/wrec/WRECGenerator.cpp

Timestamp:

Dec 17, 2008, 11:02:29 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-17 Gavin Barraclough <​[email protected]>

Reviewed by Cameron Zwarich.

Fixes for Sunspider failures with the JIT enabled on x86-64.

• assembler/MacroAssembler.h:

Switch the order of the RegisterID & Address form of je32, to keep it consistent with jne32.

• jit/JIT.cpp:
• jit/JIT.h:
• jit/JITInlineMethods.h:

Port the m_ctiVirtualCall tramopline generation to use the MacroAssembler interface.

• jit/JITCall.cpp:

Fix bug in the non-optimizing code path, vptr check should have been to the memory address pointer
to by the register, not to the register itself.

• wrec/WRECGenerator.cpp:

See assembler/MacroAssembler.h, above.

File:

• trunk/JavaScriptCore/wrec/WRECGenerator.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wrec/WRECGenerator.cpp

@@ -146 +146 @@
 
     load32(Address(output, (2 * subpatternId) * sizeof(int)), character);
-    Jump skipIfEmpty = je32(character, Address(output, ((2 * subpatternId) + 1) * sizeof(int)));
+    Jump skipIfEmpty = je32(Address(output, ((2 * subpatternId) + 1) * sizeof(int)), character);
 
     ASSERT(quantifierType == Quantifier::Greedy || quantifierType == Quantifier::NonGreedy);
@@ -626 +626 @@
 
     // check if we're at the end of backref (if we are, success!)
-    Jump endOfBackRef = je32(repeatCount, Address(output, ((2 * subpatternId) + 1) * sizeof(int)));
-    
+    Jump endOfBackRef = je32(Address(output, ((2 * subpatternId) + 1) * sizeof(int)), repeatCount);
+
     load16(BaseIndex(input, repeatCount, MacroAssembler::TimesTwo), character);
-    
+
     // check if we've run out of input (this would be a can o'fail)
     Jump endOfInput = je32(length, index);
 
     je16(character, BaseIndex(input, index, TimesTwo), topOfLoop);
-    
+
     endOfInput.link(this);
 
@@ -641 +641 @@
     pop(index);
     failures.append(jump());
-    
+
     // Success
     endOfBackRef.link(this);