aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4isel_masm.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-10-28 17:02:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-31 18:55:14 +0100
commitf0ad3a5943804e9eb8e03434a4584eaafa5c5aea (patch)
tree8d2cb4402d63ced4e89c6c610fc839e0260d8e92 /src/qml/compiler/qv4isel_masm.cpp
parentb0afac3daf1cbb9daacbeac0183ef6254de6cc95 (diff)
Implement loading of resolved imported scripts
We can resolve the use of names that refer to imported scripts at compile time and load them at run-time by index through context->importedScripts. Change-Id: I681b19e7d68dbf3b9a68af00b4cea2a9254c2d78 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4isel_masm.cpp')
-rw-r--r--src/qml/compiler/qv4isel_masm.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index ecfe7dd0a0..7162fe905e 100644
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
@@ -948,11 +948,16 @@ void InstructionSelection::loadThisObject(V4IR::Temp *temp)
#endif
}
-void InstructionSelection::loadIdObject(int id, V4IR::Temp *temp)
+void InstructionSelection::loadQmlIdObject(int id, V4IR::Temp *temp)
{
generateFunctionCall(temp, __qmljs_get_id_object, Assembler::ContextRegister, Assembler::TrustedImm32(id));
}
+void InstructionSelection::loadQmlImportedScript(int index, V4IR::Temp *temp)
+{
+ generateFunctionCall(temp, __qmljs_get_imported_script, Assembler::ContextRegister, Assembler::TrustedImm32(index));
+}
+
void InstructionSelection::loadQmlContextObject(V4IR::Temp *temp)
{
generateFunctionCall(temp, __qmljs_get_context_object, Assembler::ContextRegister);