2008-06-17 Cameron Zwarich <cwzwarich@uwaterloo.ca>

        Reviewed by Oliver.

        Reduce code duplication in emitReadModifyAssignment().

        * kjs/nodes.cpp:
        (KJS::emitReadModifyAssignment):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@34620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d669e2b666d77791d00acfcdc8bbbadaef6e3584..3790de208ab4c804aa6c0caef73f7bdb0938a22d 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
+
+        Reviewed by Oliver.
+
+        Reduce code duplication in emitReadModifyAssignment().
+
+        * kjs/nodes.cpp:
+        (KJS::emitReadModifyAssignment):
+
 2008-06-17  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 
         Reviewed by Oliver.

diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 6066c168cfef1cd58c34e48ed5c0d3f0591af7cf..02536b7b2d46cea1c2e4df94644a0a9f7ec2aae3 100644 (file)
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -814,34 +814,47 @@ RegisterID* ConditionalNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 // FIXME: should this be moved to be a method on CodeGenerator?
 static ALWAYS_INLINE RegisterID* emitReadModifyAssignment(CodeGenerator& generator, RegisterID* dst, RegisterID* src1, RegisterID* src2, Operator oper)
 {
+    OpcodeID opcode;
     switch (oper) {
         case OpMultEq:
-            return generator.emitBinaryOp(op_mul, dst, src1, src2);
+            opcode = op_mul;
+            break;
         case OpDivEq:
-            return generator.emitBinaryOp(op_div, dst, src1, src2);
+            opcode = op_div;
+            break;
         case OpPlusEq:
-            return generator.emitBinaryOp(op_add, dst, src1, src2);
+            opcode = op_add;
+            break;
         case OpMinusEq:
-            return generator.emitBinaryOp(op_sub, dst, src1, src2);
+            opcode = op_sub;
+            break;
         case OpLShift:
-            return generator.emitBinaryOp(op_lshift, dst, src1, src2);
+            opcode = op_lshift;
+            break;
         case OpRShift:
-            return generator.emitBinaryOp(op_rshift, dst, src1, src2);
+            opcode = op_rshift;
+            break;
         case OpURShift:
-            return generator.emitBinaryOp(op_urshift, dst, src1, src2);
+            opcode = op_urshift;
+            break;
         case OpAndEq:
-            return generator.emitBinaryOp(op_bitand, dst, src1, src2);
+            opcode = op_bitand;
+            break;
         case OpXOrEq:
-            return generator.emitBinaryOp(op_bitxor, dst, src1, src2);
+            opcode = op_bitxor;
+            break;
         case OpOrEq:
-            return generator.emitBinaryOp(op_bitor, dst, src1, src2);
+            opcode = op_bitor;
+            break;
         case OpModEq:
-            return generator.emitBinaryOp(op_mod, dst, src1, src2);
+            opcode = op_mod;
+            break;
         default:
             ASSERT_NOT_REACHED();
+            return dst;
     }
-
-    return dst;
+    
+    return generator.emitBinaryOp(opcode, dst, src1, src2);
 }
 
 RegisterID* ReadModifyResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)