JavaScriptCore-1218.tar.gz

[apple/javascriptcore.git] / debugger / DebuggerCallFrame.cpp

diff --git a/debugger/DebuggerCallFrame.cpp b/debugger/DebuggerCallFrame.cpp
index 27b824cd3f14e604e64c234d2ebd13a89148218a..a5d045cb90631dab6edb74241247e338a5ab590e 100644 (file)
--- a/debugger/DebuggerCallFrame.cpp
+++ b/debugger/DebuggerCallFrame.cpp
@@ -32,19 +32,36 @@
 #include "JSFunction.h"
 #include "CodeBlock.h"
 #include "Interpreter.h"
 #include "JSFunction.h"
 #include "CodeBlock.h"
 #include "Interpreter.h"

+#include "Operations.h"

 #include "Parser.h"
 
 namespace JSC {
 
 #include "Parser.h"
 
 namespace JSC {
 

-const UString* DebuggerCallFrame::functionName() const
+String DebuggerCallFrame::functionName() const

 {
     if (!m_callFrame->codeBlock())
 {
     if (!m_callFrame->codeBlock())

-        return 0;
+        return String();
+
+    if (!m_callFrame->callee())
+        return String();
+
+    JSObject* function = m_callFrame->callee();
+    if (!function || !function->inherits(&JSFunction::s_info))
+        return String();
+    return jsCast<JSFunction*>(function)->name(m_callFrame);
+}
+    
+String DebuggerCallFrame::calculatedFunctionName() const
+{
+    if (!m_callFrame->codeBlock())
+        return String();
+
+    JSObject* function = m_callFrame->callee();

 
 

-    JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());

     if (!function)
     if (!function)

-        return 0;
-    return &function->name(&m_callFrame->globalData());
+        return String();
+
+    return getCalculatedDisplayName(m_callFrame, function);

 }
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const
 }
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const


@@ -57,25 +74,36 @@ DebuggerCallFrame::Type DebuggerCallFrame::type() const
 
 JSObject* DebuggerCallFrame::thisObject() const
 {
 
 JSObject* DebuggerCallFrame::thisObject() const
 {

-    if (!m_callFrame->codeBlock())
+    CodeBlock* codeBlock = m_callFrame->codeBlock();
+    if (!codeBlock)

         return 0;
 
         return 0;
 

-    return asObject(m_callFrame->thisValue());
+    JSValue thisValue = m_callFrame->uncheckedR(codeBlock->thisRegister()).jsValue();
+    if (!thisValue.isObject())
+        return 0;
+
+    return asObject(thisValue);

 }
 
 }
 

-JSValuePtr DebuggerCallFrame::evaluate(const UString& script, JSValuePtr& exception) const
+JSValue DebuggerCallFrame::evaluate(const String& script, JSValue& exception) const

 {
     if (!m_callFrame->codeBlock())
 {
     if (!m_callFrame->codeBlock())

-        return noValue();
-
-    int errLine;
-    UString errMsg;
-    SourceCode source = makeSource(script);
-    RefPtr<EvalNode> evalNode = m_callFrame->scopeChain()->globalData->parser->parse<EvalNode>(m_callFrame, m_callFrame->dynamicGlobalObject()->debugger(), source, &errLine, &errMsg);
-    if (!evalNode)
-        return Error::create(m_callFrame, SyntaxError, errMsg, errLine, source.provider()->asID(), source.provider()->url());
+        return JSValue();
+    
+    VM& vm = m_callFrame->vm();
+    EvalExecutable* eval = EvalExecutable::create(m_callFrame, m_callFrame->codeBlock()->unlinkedCodeBlock()->codeCacheForEval(), makeSource(script), m_callFrame->codeBlock()->isStrictMode());
+    if (vm.exception) {
+        exception = vm.exception;
+        vm.exception = JSValue();
+    }

 
 

-    return m_callFrame->scopeChain()->globalData->interpreter->execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame->scopeChain(), &exception);
+    JSValue result = vm.interpreter->execute(eval, m_callFrame, thisObject(), m_callFrame->scope());
+    if (vm.exception) {
+        exception = vm.exception;
+        vm.exception = JSValue();
+    }
+    ASSERT(result);
+    return result;

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC