diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-11 19:05:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-11 19:08:28 +0200 |
| commit | 89402e0ef69da3c954a540510e8b4e8501bc1ce3 (patch) | |
| tree | cf97d95e1ac837e5d439f2be9125e0a104b5bbce /src/qml/compiler/qv4isel_moth_p.h | |
| parent | 0cce947449fa502fd4bf2aec95fa490c8417cdeb (diff) | |
| parent | 262d7261033df7650938c38401112a4767d926ff (diff) | |
Merge branch 'dev' of qtdeclarative into wip/v4
Conflicts:
src/qml/jsruntime/qv4script.cpp
Change-Id: I20136cab29d86862b5bd9208003200bc24bcdacf
Diffstat (limited to 'src/qml/compiler/qv4isel_moth_p.h')
| -rw-r--r-- | src/qml/compiler/qv4isel_moth_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/compiler/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h index c33c58b627..cf7d1f43e9 100644 --- a/src/qml/compiler/qv4isel_moth_p.h +++ b/src/qml/compiler/qv4isel_moth_p.h @@ -161,11 +161,12 @@ private: } void simpleMove(V4IR::Move *); - void prepareCallArgs(V4IR::ExprList *, quint32 &, quint32 &); + void prepareCallArgs(V4IR::ExprList *, quint32 &, quint32 * = 0); - int outgoingArgumentTempStart() const { return _function->tempCount; } - int scratchTempIndex() const { return outgoingArgumentTempStart() + _function->maxNumberOfArguments; } - int frameSize() const { return scratchTempIndex() + 1; } + int scratchTempIndex() const { return _function->tempCount; } + int callDataStart() const { return scratchTempIndex() + 1; } + int outgoingArgumentTempStart() const { return callDataStart() + offsetof(QV4::CallData, args)/sizeof(QV4::Value); } + int frameSize() const { return outgoingArgumentTempStart() + _function->maxNumberOfArguments; } template <int Instr> inline ptrdiff_t addInstruction(const InstrData<Instr> &data); |