aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-03-03 12:13:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-03 20:23:28 +0100
commita6fc7588418e429e654ef899f7d3d2b8ba140c6d (patch)
tree084f7e8689a9d63e152f47e2a3d1ec24175da758 /src/qml/jsruntime
parent292fdc90865e8603e11bbbe3f2870004caeb0e35 (diff)
Remove unused codeSizes
Change-Id: I13c7d9dda7cd1e771079f6fdaa175008b3a3e0e5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r--src/qml/jsruntime/qv4engine.cpp44
-rw-r--r--src/qml/jsruntime/qv4engine_p.h2
-rw-r--r--src/qml/jsruntime/qv4function.cpp3
-rw-r--r--src/qml/jsruntime/qv4function_p.h3
4 files changed, 2 insertions, 50 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 4bf6c89f26..321e821e26 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -895,50 +895,6 @@ void ExecutionEngine::markObjects()
(*it)->markObjects(this);
}
-namespace {
- struct FindHelper
- {
- bool operator()(Function *function, quintptr pc)
- {
- return reinterpret_cast<quintptr>(function->code) < pc
- && (reinterpret_cast<quintptr>(function->code) + function->codeSize) < pc;
- }
-
- bool operator()(quintptr pc, Function *function)
- {
- return pc < reinterpret_cast<quintptr>(function->code);
- }
- };
-}
-
-Function *ExecutionEngine::functionForProgramCounter(quintptr pc) const
-{
- // ### Use this code path instead of the "else" when the number of compilation units went down to
- // one per (qml) file.
-#if 0
- for (QSet<QV4::CompiledData::CompilationUnit*>::ConstIterator unitIt = compilationUnits.constBegin(), unitEnd = compilationUnits.constEnd();
- unitIt != unitEnd; ++unitIt) {
- const QVector<Function*> &functions = (*unitIt)->runtimeFunctionsSortedByAddress;
- QVector<Function*>::ConstIterator it = qBinaryFind(functions.constBegin(),
- functions.constEnd(),
- pc, FindHelper());
- if (it != functions.constEnd())
- return *it;
- }
- return 0;
-#else
- QMap<quintptr, Function*>::ConstIterator it = allFunctions.lowerBound(pc);
- if (it != allFunctions.begin() && allFunctions.count() > 0)
- --it;
- if (it == allFunctions.end())
- return 0;
-
- if (pc < it.key() || pc >= it.key() + (*it)->codeSize)
- return 0;
- return *it;
-#endif
-}
-
QmlExtensions *ExecutionEngine::qmlExtensions()
{
if (!m_qmlExtensions)
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 4bf95c4868..8a48afbcd8 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -353,8 +353,6 @@ public:
InternalClass *newClass(const InternalClass &other);
- Function *functionForProgramCounter(quintptr pc) const;
-
QmlExtensions *qmlExtensions();
bool recheckCStackLimits();
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp
index 550c359772..e01febcfa3 100644
--- a/src/qml/jsruntime/qv4function.cpp
+++ b/src/qml/jsruntime/qv4function.cpp
@@ -51,12 +51,11 @@ QT_BEGIN_NAMESPACE
using namespace QV4;
Function::Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
- ReturnedValue (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize)
+ ReturnedValue (*codePtr)(ExecutionContext *, const uchar *))
: compiledFunction(function)
, compilationUnit(unit)
, code(codePtr)
, codeData(0)
- , codeSize(_codeSize)
{
Q_UNUSED(engine);
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 530d67e3c8..553c7484b8 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -86,13 +86,12 @@ struct Function {
ReturnedValue (*code)(ExecutionContext *, const uchar *);
const uchar *codeData;
- quint32 codeSize;
// first nArguments names in internalClass are the actual arguments
InternalClass *internalClass;
Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
- ReturnedValue (*codePtr)(ExecutionContext *, const uchar *), quint32 _codeSize);
+ ReturnedValue (*codePtr)(ExecutionContext *, const uchar *));
~Function();
inline StringRef name() {