diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-08-09 17:14:11 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-10 08:20:15 +0000 |
commit | 4acb72bf35e736f222c90e49b3e84e20355d33a7 (patch) | |
tree | 47980e17c8d9b0d7349fe0291872c1e4d7663ecc /src/qml/jsruntime/qv4enginebase_p.h | |
parent | b459c43c5d119507f888ac9ab1ca96f8e7bb6e34 (diff) |
Cleanup naming of Stack frame structures
Change-Id: I0b392040b6726e6d93f237ccccc9f053256ed819
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4enginebase_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4enginebase_p.h | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h index fa07fb6566..00049392af 100644 --- a/src/qml/jsruntime/qv4enginebase_p.h +++ b/src/qml/jsruntime/qv4enginebase_p.h @@ -57,39 +57,16 @@ QT_BEGIN_NAMESPACE namespace QV4 { +struct CppStackFrame; + // Base class for the execution engine #if defined(Q_CC_MSVC) || defined(Q_CC_GNU) #pragma pack(push, 1) #endif struct Q_QML_EXPORT EngineBase { - struct JSStackFrame { - enum Offsets { - JSFunction = 0, - Context = 1, - Accumulator = 2 - }; - // callData is directly before this - Value jsFunction; - Value context; - Value accumulator; // ### - // registers follow - }; - - struct StackFrame { - StackFrame *parent; - Function *v4Function; - JSStackFrame *jsFrame; - int line = -1; - int column = -1; - - QString source() const; - QString function() const; - QV4::ExecutionContext *context() const; - QV4::Heap::CallContext *callContext() const; - }; - StackFrame *currentStackFrame = 0; + CppStackFrame *currentStackFrame = 0; Value *jsStackTop = 0; quint8 hasException = false; |