Changeset 48938 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 30, 2009, 11:26:28 AM (16 years ago)

Author:

[email protected]

Message:

Buildfix for platforms using JSVALUE32.
​https://bugs.webkit.org/show_bug.cgi?id=29915

Patch by Csaba Osztrogonac <​[email protected]> on 2009-09-30
Reviewed by Geoffrey Garen.

After ​http://trac.webkit.org/changeset/48905 the build broke in JSVALUE32 case.
Also removed unreachable code.

• jit/JITArithmetic.cpp:

(JSC::JIT::emit_op_add):

• Declaration of "OperandTypes types" moved before first use.
• Typos fixed: dst modified to result, regT2 added.
• Unreachable code removed.

(JSC::JIT::emitSlow_op_add):

• Missing declaration of "OperandTypes types" added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITArithmetic.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-30  Csaba Osztrogonac  <[email protected]>
+
+        Reviewed by Geoffrey Garen.
+
+        Buildfix for platforms using JSVALUE32.
+        https://bugs.webkit.org/show_bug.cgi?id=29915
+
+        After http://trac.webkit.org/changeset/48905 the build broke in JSVALUE32 case.
+        Also removed unreachable code.
+
+        * jit/JITArithmetic.cpp:
+        (JSC::JIT::emit_op_add):
+         - Declaration of "OperandTypes types" moved before first use.
+         - Typos fixed: dst modified to result, regT2 added.
+         - Unreachable code removed.
+        (JSC::JIT::emitSlow_op_add):
+         - Missing declaration of "OperandTypes types" added.
+
 2009-09-30  Janne Koskinen  <[email protected]> 
 

trunk/JavaScriptCore/jit/JITArithmetic.cpp

@@ -2413 +2413 @@
     unsigned op1 = currentInstruction[2].u.operand;
     unsigned op2 = currentInstruction[3].u.operand;
+    OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
 
     if (!types.first().mightBeNumber() || !types.second().mightBeNumber()) {
         JITStubCall stubCall(this, cti_op_add);
-        stubCall.addArgument(op1);
-        stubCall.addArgument(op2);
-        stubCall.call(dst);
+        stubCall.addArgument(op1, regT2);
+        stubCall.addArgument(op2, regT2);
+        stubCall.call(result);
         return;
     }
@@ -2435 +2436 @@
         emitPutVirtualRegister(result);
     } else {
-        OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
-        if (types.first().mightBeNumber() && types.second().mightBeNumber())
-            compileBinaryArithOp(op_add, result, op1, op2, OperandTypes::fromInt(currentInstruction[4].u.operand));
-        else {
-            JITStubCall stubCall(this, cti_op_add);
-            stubCall.addArgument(op1, regT2);
-            stubCall.addArgument(op2, regT2);
-            stubCall.call(result);
-        }
+        compileBinaryArithOp(op_add, result, op1, op2, OperandTypes::fromInt(currentInstruction[4].u.operand));
     }
 }
@@ -2453 +2446 @@
     unsigned op2 = currentInstruction[3].u.operand;
 
+    OperandTypes types = OperandTypes::fromInt(currentInstruction[4].u.operand);
     if (!types.first().mightBeNumber() || !types.second().mightBeNumber())
         return;