Changeset 50537 in webkit for trunk/JavaScriptCore/bytecode/CodeBlock.h

Timestamp:

Nov 4, 2009, 6:22:08 PM (16 years ago)

Author:

[email protected]

Message:

Fix dumping of constants in bytecode so that they aren't printed as large positive register numbers.

Reviewed by Sam Weinig.

We do this by having the registerName function return information about the constant if the register
number corresponds to a constant. This requires that registerName, and several functions that call it,
be converted to member functions of CodeBlock so that the constant value can be retrieved. The
ExecState also needs to be threaded down through these functions so that it can be passed on to
constantName when needed.

• bytecode/CodeBlock.cpp:

(JSC::constantName):
(JSC::CodeBlock::registerName):
(JSC::CodeBlock::printUnaryOp):
(JSC::CodeBlock::printBinaryOp):
(JSC::CodeBlock::printConditionalJump):
(JSC::CodeBlock::printGetByIdOp):
(JSC::CodeBlock::printPutByIdOp):
(JSC::CodeBlock::dump):

• bytecode/CodeBlock.h:

(JSC::CodeBlock::isConstantRegisterIndex):

File:

• trunk/JavaScriptCore/bytecode/CodeBlock.h (modified) (2 diffs)

trunk/JavaScriptCore/bytecode/CodeBlock.h

@@ -439 +439 @@
         void addConstantRegister(const Register& r) { return m_constantRegisters.append(r); }
         Register& constantRegister(int index) { return m_constantRegisters[index - FirstConstantRegisterIndex]; }
-        ALWAYS_INLINE bool isConstantRegisterIndex(int index) { return index >= FirstConstantRegisterIndex; }
+        ALWAYS_INLINE bool isConstantRegisterIndex(int index) const { return index >= FirstConstantRegisterIndex; }
         ALWAYS_INLINE JSValue getConstant(int index) const { return m_constantRegisters[index - FirstConstantRegisterIndex].jsValue(); }
 
@@ -483 +483 @@
 #if !defined(NDEBUG) || ENABLE(OPCODE_SAMPLING)
         void dump(ExecState*, const Vector<Instruction>::const_iterator& begin, Vector<Instruction>::const_iterator&) const;
+
+        CString registerName(ExecState*, int r) const;
+        void printUnaryOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
+        void printBinaryOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
+        void printConditionalJump(ExecState*, const Vector<Instruction>::const_iterator&, Vector<Instruction>::const_iterator&, int location, const char* op) const;
+        void printGetByIdOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
+        void printPutByIdOp(ExecState*, int location, Vector<Instruction>::const_iterator&, const char* op) const;
 #endif