Changeset 440 for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

08/18/08 11:14:49 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35814

Files:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (3 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -463 +463 @@
-PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
-{
-
+ && !target->isForwardLabel()
-        int dstIndex;
-        int src1Index;
@@ -472 +472 @@
-        if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
-            rewindBinaryOp();
-target->isForwardLabel() ? op_jless : 
+
-            instructions().append(src1Index);
-            instructions().append(src2Index);
@@ -658 +658 @@
-    instructions().append(dst->index());
-    instructions().append(addUnexpectedConstant(jsBoolean(b)));
+    return dst;
+}
+
+RegisterID* CodeGenerator::emitUnexpectedLoad(RegisterID* dst, double d)
+{
+    emitOpcode(op_unexpected_load);
+    instructions().append(dst->index());
+    instructions().append(addUnexpectedConstant(jsNumber(globalExec(), d)));
-    return dst;
-}