X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/ba379fdc102753d6be2c4d937058fe40257329fe..81345200c95645a1b0d2635520f96ad55dfde63f:/debugger/DebuggerCallFrame.cpp?ds=inline

diff --git a/debugger/DebuggerCallFrame.cpp b/debugger/DebuggerCallFrame.cpp
index cd8702b..83fb67f 100644
--- a/debugger/DebuggerCallFrame.cpp
+++ b/debugger/DebuggerCallFrame.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -29,64 +29,188 @@
 #include "config.h"
 #include "DebuggerCallFrame.h"
 
-#include "JSFunction.h"
 #include "CodeBlock.h"
 #include "Interpreter.h"
+#include "JSActivation.h"
+#include "JSFunction.h"
+#include "JSCInlines.h"
 #include "Parser.h"
+#include "StackVisitor.h"
 
 namespace JSC {
 
-const UString* DebuggerCallFrame::functionName() const
+class LineAndColumnFunctor {
+public:
+    StackVisitor::Status operator()(StackVisitor& visitor)
+    {
+        visitor->computeLineAndColumn(m_line, m_column);
+        return StackVisitor::Done;
+    }
+
+    unsigned line() const { return m_line; }
+    unsigned column() const { return m_column; }
+
+private:
+    unsigned m_line;
+    unsigned m_column;
+};
+
+DebuggerCallFrame::DebuggerCallFrame(CallFrame* callFrame)
+    : m_callFrame(callFrame)
+{
+    m_position = positionForCallFrame(m_callFrame);
+}
+
+PassRefPtr<DebuggerCallFrame> DebuggerCallFrame::callerFrame()
 {
-    if (!m_callFrame->codeBlock())
+    ASSERT(isValid());
+    if (!isValid())
         return 0;
 
-    JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
-    if (!function)
+    if (m_caller)
+        return m_caller;
+
+    CallFrame* callerFrame = m_callFrame->callerFrameSkippingVMEntrySentinel();
+    if (!callerFrame)
         return 0;
-    return &function->name(&m_callFrame->globalData());
+
+    m_caller = DebuggerCallFrame::create(callerFrame);
+    return m_caller;
 }
-    
-UString DebuggerCallFrame::calculatedFunctionName() const
+
+JSC::JSGlobalObject* DebuggerCallFrame::vmEntryGlobalObject() const
 {
-    if (!m_callFrame->codeBlock())
+    ASSERT(isValid());
+    if (!isValid())
         return 0;
-    
-    JSFunction* function = static_cast<JSFunction*>(m_callFrame->callee());
+    return m_callFrame->vmEntryGlobalObject();
+}
+
+SourceID DebuggerCallFrame::sourceID() const
+{
+    ASSERT(isValid());
+    if (!isValid())
+        return noSourceID;
+    return sourceIDForCallFrame(m_callFrame);
+}
+
+String DebuggerCallFrame::functionName() const
+{
+    ASSERT(isValid());
+    if (!isValid())
+        return String();
+    JSObject* function = m_callFrame->callee();
     if (!function)
+        return String();
+
+    return getCalculatedDisplayName(m_callFrame, function);
+}
+
+JSScope* DebuggerCallFrame::scope() const
+{
+    ASSERT(isValid());
+    if (!isValid())
         return 0;
-    return function->calculatedDisplayName(&m_callFrame->globalData());
+
+    CodeBlock* codeBlock = m_callFrame->codeBlock();
+    if (codeBlock && codeBlock->needsActivation() && !m_callFrame->hasActivation()) {
+        JSActivation* activation = JSActivation::create(*codeBlock->vm(), m_callFrame, codeBlock);
+        m_callFrame->setActivation(activation);
+        m_callFrame->setScope(activation);
+    }
+
+    return m_callFrame->scope();
 }
 
 DebuggerCallFrame::Type DebuggerCallFrame::type() const
 {
+    ASSERT(isValid());
+    if (!isValid())
+        return ProgramType;
+
     if (m_callFrame->callee())
         return FunctionType;
 
     return ProgramType;
 }
 
-JSObject* DebuggerCallFrame::thisObject() const
+JSValue DebuggerCallFrame::thisValue() const
 {
-    if (!m_callFrame->codeBlock())
-        return 0;
-
-    return asObject(m_callFrame->thisValue());
+    ASSERT(isValid());
+    return thisValueForCallFrame(m_callFrame);
 }
 
-JSValue DebuggerCallFrame::evaluate(const UString& script, JSValue& exception) const
+// Evaluate some JavaScript code in the scope of this frame.
+JSValue DebuggerCallFrame::evaluate(const String& script, JSValue& exception)
 {
-    if (!m_callFrame->codeBlock())
+    ASSERT(isValid());
+    CallFrame* callFrame = m_callFrame;
+    if (!callFrame)
+        return jsNull();
+
+    JSLockHolder lock(callFrame);
+
+    if (!callFrame->codeBlock())
         return JSValue();
+    
+    VM& vm = callFrame->vm();
+    EvalExecutable* eval = EvalExecutable::create(callFrame, makeSource(script), callFrame->codeBlock()->isStrictMode());
+    if (vm.exception()) {
+        exception = vm.exception();
+        vm.clearException();
+        return jsUndefined();
+    }
+
+    JSValue thisValue = thisValueForCallFrame(callFrame);
+    JSValue result = vm.interpreter->execute(eval, callFrame, thisValue, scope());
+    if (vm.exception()) {
+        exception = vm.exception();
+        vm.clearException();
+    }
+    ASSERT(result);
+    return result;
+}
 
-    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());
+void DebuggerCallFrame::invalidate()
+{
+    m_callFrame = nullptr;
+    RefPtr<DebuggerCallFrame> frame = m_caller.release();
+    while (frame) {
+        frame->m_callFrame = nullptr;
+        frame = frame->m_caller.release();
+    }
+}
+
+TextPosition DebuggerCallFrame::positionForCallFrame(CallFrame* callFrame)
+{
+    if (!callFrame)
+        return TextPosition();
+
+    LineAndColumnFunctor functor;
+    callFrame->iterate(functor);
+    return TextPosition(OrdinalNumber::fromOneBasedInt(functor.line()), OrdinalNumber::fromOneBasedInt(functor.column()));
+}
+
+SourceID DebuggerCallFrame::sourceIDForCallFrame(CallFrame* callFrame)
+{
+    ASSERT(callFrame);
+    CodeBlock* codeBlock = callFrame->codeBlock();
+    if (!codeBlock)
+        return noSourceID;
+    return codeBlock->ownerExecutable()->sourceID();
+}
+
+JSValue DebuggerCallFrame::thisValueForCallFrame(CallFrame* callFrame)
+{
+    if (!callFrame)
+        return jsNull();
 
-    return m_callFrame->scopeChain()->globalData->interpreter->execute(evalNode.get(), m_callFrame, thisObject(), m_callFrame->scopeChain(), &exception);
+    ECMAMode ecmaMode = NotStrictMode;
+    CodeBlock* codeBlock = callFrame->codeBlock();
+    if (codeBlock && codeBlock->isStrictMode())
+        ecmaMode = StrictMode;
+    JSValue thisValue = callFrame->thisValue().toThis(callFrame, ecmaMode);
+    return thisValue;
 }
 
 } // namespace JSC