qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/src/v4/moth/qv4vme_moth.cpp

488 lines
18 KiB
C++
Raw Normal View History

Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#include "qv4vme_moth_p.h"
#include "qv4instr_moth_p.h"
return results directly instead of using the context The result variable in the context is not really required, as we can return results directly in the return value register. Change-Id: I12554c228500aa24625ef82e31fd7f72989a71bb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-18 23:00:50 +00:00
#include "qmljs_value.h"
Add some debugging infrastructure to the interpreter. This currently mainly intended to be useful in a C++ debugger. The infrastructure makes it a lot easier to access (parent) contexts, find function names, etc. Change-Id: I0493d3a3bd4bf5c3a03379c1a2b545ed76862cd5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-29 13:41:26 +00:00
#include "debugging.h"
#include <iostream>
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
Fix alloca usage on Windows On Windows it's _alloca, so provide a wrapping macro in qv4alloca_p.h and use that instead. Change-Id: I675cb7fd09bab3c84c44e56819c0f17a42b3c211 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-08 08:30:40 +00:00
#include "qv4alloca_p.h"
Change the interpreter's stack frame to be allocated with alloca. Change-Id: Ia02ad1af3bb0f429a6078029bf7aaee5a17f3413 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-19 10:21:06 +00:00
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
#ifdef DO_TRACE_INSTR
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
# define TRACE_INSTR(I) fprintf(stderr, "executing a %s\n", #I);
Add utility function to print stack traces from lldb/gdb. Change-Id: I81315a1cd6900dbecfc9a39d9dc4256461163921 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-04 09:31:31 +00:00
# define TRACE(n, str, ...) { char buf[4096]; snprintf(buf, 4096, str, __VA_ARGS__); fprintf(stderr, " %s : %s\n", #n, buf); }
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
#else
# define TRACE_INSTR(I)
# define TRACE(n, str, ...)
#endif // DO_TRACE_INSTR
Add tracing for runtime methods. Change-Id: I540297e83e3e297d0724c3e08e5780eee0d2fac8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:31:02 +00:00
using namespace QQmlJS;
using namespace QQmlJS::Moth;
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
class FunctionState: public Debugging::FunctionState
{
public:
FunctionState(QQmlJS::VM::ExecutionContext *context, const uchar **code)
: Debugging::FunctionState(context)
, stack(0)
, stackSize(0)
, code(code)
{}
virtual VM::Value *temp(unsigned idx) { return stack + idx; }
void setStack(VM::Value *stack, unsigned stackSize)
{ this->stack = stack; this->stackSize = stackSize; }
private:
VM::Value *stack;
unsigned stackSize;
const uchar **code;
};
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#define MOTH_BEGIN_INSTR_COMMON(I) { \
const InstrMeta<(int)Instr::I>::DataType &instr = InstrMeta<(int)Instr::I>::data(*genericInstr); \
code += InstrMeta<(int)Instr::I>::Size; \
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
Q_UNUSED(instr); \
TRACE_INSTR(I)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
# define MOTH_BEGIN_INSTR(I) op_##I: \
MOTH_BEGIN_INSTR_COMMON(I)
# define MOTH_NEXT_INSTR(I) { \
genericInstr = reinterpret_cast<const Instr *>(code); \
goto *genericInstr->common.code; \
}
# define MOTH_END_INSTR(I) } \
genericInstr = reinterpret_cast<const Instr *>(code); \
goto *genericInstr->common.code; \
#else
# define MOTH_BEGIN_INSTR(I) \
case Instr::I: \
MOTH_BEGIN_INSTR_COMMON(I)
# define MOTH_NEXT_INSTR(I) { \
break; \
}
# define MOTH_END_INSTR(I) } \
break;
#endif
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
static inline VM::Value *getValueRef(QQmlJS::VM::ExecutionContext *context,
VM::Value* stack,
const Instr::Param &param
#if !defined(QT_NO_DEBUG)
, unsigned stackSize
#endif
)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
{
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
#ifdef DO_TRACE_INSTR
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
if (param.isValue()) {
fprintf(stderr, " value\n");
} else if (param.isArgument()) {
fprintf(stderr, " argument %d\n", param.index);
} else if (param.isLocal()) {
fprintf(stderr, " local %d\n", param.index);
} else if (param.isTemp()) {
fprintf(stderr, " temp %d\n", param.index);
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
} else {
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(!"INVALID");
Remove the tempRegister from moth by loading/storing values directly. Change-Id: I51982d5852db2e10234620d63c235484c5b8a573 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-13 11:25:23 +00:00
}
#endif // DO_TRACE_INSTR
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
if (param.isValue()) {
return const_cast<VM::Value *>(&param.value);
} else if (param.isArgument()) {
const unsigned arg = param.index;
Fix debug code and add some asserts. Change-Id: I947a72ff43190d15fd4a2857ed97b75cc510db66 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-20 09:08:14 +00:00
Q_ASSERT(arg >= 0);
Remove the DeclarativeEnvironment class again The class is a specification detail that we can implement in a more performant way. ExecutionContext now contains everything needed again. Change-Id: Ideb5f04eeeecaf2b8543676c626e3943e4d6d7a1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-01 13:05:07 +00:00
Q_ASSERT((unsigned) arg < context->argumentCount);
Q_ASSERT(context->arguments);
return context->arguments + arg;
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
} else if (param.isLocal()) {
const unsigned index = param.index;
Fix debug code and add some asserts. Change-Id: I947a72ff43190d15fd4a2857ed97b75cc510db66 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-20 09:08:14 +00:00
Q_ASSERT(index >= 0);
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(index < context->variableCount());
Remove the DeclarativeEnvironment class again The class is a specification detail that we can implement in a more performant way. ExecutionContext now contains everything needed again. Change-Id: Ideb5f04eeeecaf2b8543676c626e3943e4d6d7a1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-01 13:05:07 +00:00
Q_ASSERT(context->locals);
return context->locals + index;
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
} else if (param.isTemp()) {
Q_ASSERT(param.index < stackSize);
return stack + param.index;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
} else {
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_UNIMPLEMENTED();
return 0;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
}
}
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
#if defined(QT_NO_DEBUG)
# define VALUE(param) *getValueRef(context, stack, param)
# define VALUEPTR(param) getValueRef(context, stack, param)
#else
# define VALUE(param) *getValueRef(context, stack, param, stackSize)
# define VALUEPTR(param) getValueRef(context, stack, param, stackSize)
#endif
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
return results directly instead of using the context The result variable in the context is not really required, as we can return results directly in the return value register. Change-Id: I12554c228500aa24625ef82e31fd7f72989a71bb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-18 23:00:50 +00:00
VM::Value VME::operator()(QQmlJS::VM::ExecutionContext *context, const uchar *code
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
, void ***storeJumpTable
#endif
)
{
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
#ifdef DO_TRACE_INSTR
qDebug("Starting VME with context=%p and code=%p", context, code);
#endif // DO_TRACE_INSTR
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
if (storeJumpTable) {
#define MOTH_INSTR_ADDR(I, FMT) &&op_##I,
static void *jumpTable[] = {
FOR_EACH_MOTH_INSTR(MOTH_INSTR_ADDR)
};
#undef MOTH_INSTR_ADDR
*storeJumpTable = jumpTable;
return results directly instead of using the context The result variable in the context is not really required, as we can return results directly in the return value register. Change-Id: I12554c228500aa24625ef82e31fd7f72989a71bb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-18 23:00:50 +00:00
return VM::Value::undefinedValue();
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
}
#endif
Add a MemoryManager, which does GC for the interpreter. Todo: - stack walking for MASM - fix all TODOs/FIXMEs and hidden treasures (bugs). Change-Id: I36f8cdc3a545df7287ce1df17b3570a9c017865e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-04 12:40:18 +00:00
VM::Value *stack = 0;
unsigned stackSize = 0;
FunctionState state(context, &code);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
const Instr *genericInstr = reinterpret_cast<const Instr *>(code);
goto *genericInstr->common.code;
#else
for (;;) {
const Instr *genericInstr = reinterpret_cast<const Instr *>(code);
switch (genericInstr->common.instructionType) {
#endif
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(MoveTemp)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = VALUE(instr.source);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(MoveTemp)
Merged Value load instructions. Change-Id: I45601d9618f8f569ff5705693fbea383d73c031d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-04 09:55:01 +00:00
MOTH_BEGIN_INSTR(LoadValue)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
// TRACE(value, "%s", instr.value.toString(context)->toQString().toUtf8().constData());
VALUE(instr.result) = VALUE(instr.value);
Moved callBuiltin into the common super class. Now the backends do not need to duplicate the tedious switch, but can just implement the specific methods. It also prevents backends from missing out on cases. Change-Id: I45a25c6955af584f60b6e69cf6a616ca3e2dc640 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-16 14:49:42 +00:00
MOTH_END_INSTR(LoadValue)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(LoadClosure)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = __qmljs_init_closure(instr.value, context);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(LoadClosure)
MOTH_BEGIN_INSTR(LoadName)
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
TRACE(inline, "property name = %s", instr.name->toQString().toUtf8().constData());
Change activition property calls to be pointer based After longer discussions, we actually found out that passing Values by reference (ie. as pointers) is most likely quite a bit more efficient then passing them by value. This is esp. true on 32bit platforms. So change the runtime back to a pointer based calling convention. Change-Id: I948d361b6876109d77fc58f11ceb47109cf631d1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 13:15:08 +00:00
__qmljs_get_activation_property(context, VALUEPTR(instr.result), instr.name);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(LoadName)
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_BEGIN_INSTR(StoreName)
TRACE(inline, "property name = %s", instr.name->toQString().toUtf8().constData());
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_set_activation_property(context, instr.name, VALUE(instr.source));
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_END_INSTR(StoreName)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(LoadElement)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = __qmljs_get_element(context, VALUE(instr.base), VALUE(instr.index));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(LoadElement)
MOTH_BEGIN_INSTR(StoreElement)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
__qmljs_set_element(context, VALUE(instr.base), VALUE(instr.index), VALUE(instr.source));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(StoreElement)
MOTH_BEGIN_INSTR(LoadProperty)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_get_property(context, VALUEPTR(instr.result), VALUE(instr.base), instr.name);
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(LoadProperty)
MOTH_BEGIN_INSTR(StoreProperty)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_set_property(context, VALUE(instr.base), instr.name, VALUE(instr.source));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(StoreProperty)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Push)
Add tracing for runtime methods. Change-Id: I540297e83e3e297d0724c3e08e5780eee0d2fac8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:31:02 +00:00
TRACE(inline, "stack size: %u", instr.value);
Add a MemoryManager, which does GC for the interpreter. Todo: - stack walking for MASM - fix all TODOs/FIXMEs and hidden treasures (bugs). Change-Id: I36f8cdc3a545df7287ce1df17b3570a9c017865e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-04 12:40:18 +00:00
stackSize = instr.value;
Change the interpreter's stack frame to be allocated with alloca. Change-Id: Ia02ad1af3bb0f429a6078029bf7aaee5a17f3413 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-19 10:21:06 +00:00
stack = static_cast<VM::Value *>(alloca(stackSize * sizeof(VM::Value)));
Add a MemoryManager, which does GC for the interpreter. Todo: - stack walking for MASM - fix all TODOs/FIXMEs and hidden treasures (bugs). Change-Id: I36f8cdc3a545df7287ce1df17b3570a9c017865e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-04 12:40:18 +00:00
state.setStack(stack, stackSize);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Push)
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_BEGIN_INSTR(CallValue)
Fix outgoing argument start position. Change-Id: Ie1b86746dc578ce479f5c072e2e1190826a7739c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-29 13:35:18 +00:00
#ifdef DO_TRACE_INSTR
if (Debugging::Debugger *debugger = context->engine->debugger) {
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
if (VM::FunctionObject *o = (VALUE(instr.dest)).asFunctionObject()) {
Fix outgoing argument start position. Change-Id: Ie1b86746dc578ce479f5c072e2e1190826a7739c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-29 13:35:18 +00:00
if (Debugging::FunctionDebugInfo *info = debugger->debugInfo(o)) {
QString n = debugger->name(o);
std::cerr << "*** Call to \"" << (n.isNull() ? "<no name>" : qPrintable(n)) << "\" defined @" << info->startLine << ":" << info->startColumn << std::endl;
}
}
}
#endif // DO_TRACE_INSTR
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Converted calling runtime functions to new calling convention Change-Id: I03837e9b392957bd64a6710c1b85b4429556ba06 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 12:28:49 +00:00
__qmljs_call_value(context, VALUEPTR(instr.result), /*thisObject*/0, VALUE(instr.dest), args, instr.argc);
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_END_INSTR(CallValue)
MOTH_BEGIN_INSTR(CallProperty)
MOTH: have the VM::Function hold on to regexps. When regexps were created, they were not added to the VM::Function's generatedValues, resulting in premature collection. Change-Id: Idac2202e3040c6311c6f1ceead641e51a8de9729 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-03 11:19:15 +00:00
TRACE(property name, "%s, args=%u, argc=%u", qPrintable(instr.name->toQString()), instr.args, instr.argc);
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Converted calling runtime functions to new calling convention Change-Id: I03837e9b392957bd64a6710c1b85b4429556ba06 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 12:28:49 +00:00
__qmljs_call_property(context, VALUEPTR(instr.result), VALUE(instr.base), instr.name, args, instr.argc);
Implemented calls in the interpreter. Change-Id: Iafc9b04a1aa39272ab8aac24fb410a23df02a756 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 15:04:29 +00:00
MOTH_END_INSTR(CallProperty)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
Fix call expressions with a subscript Call expressions such as foo[bar]() where wrongly converted to a temporary and then called by value. This made the call have the wrong this argument, as the reference was resolved in the assignment to the temporary. Change-Id: Id6044f833dfcf9ee8fa4f9ec0602a929abdc2c48 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 21:39:01 +00:00
MOTH_BEGIN_INSTR(CallElement)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Converted calling runtime functions to new calling convention Change-Id: I03837e9b392957bd64a6710c1b85b4429556ba06 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 12:28:49 +00:00
__qmljs_call_element(context, VALUEPTR(instr.result), VALUE(instr.base), VALUE(instr.index), args, instr.argc);
Fix call expressions with a subscript Call expressions such as foo[bar]() where wrongly converted to a temporary and then called by value. This made the call have the wrong this argument, as the reference was resolved in the assignment to the temporary. Change-Id: Id6044f833dfcf9ee8fa4f9ec0602a929abdc2c48 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 21:39:01 +00:00
MOTH_END_INSTR(CallProperty)
Fix callBuiltinInvalid for the interpreter. Change-Id: Ifde12261a7c66a7b268129d5fae4ae626e16a00f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 12:21:09 +00:00
MOTH_BEGIN_INSTR(CallActivationProperty)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Change activition property calls to be pointer based After longer discussions, we actually found out that passing Values by reference (ie. as pointers) is most likely quite a bit more efficient then passing them by value. This is esp. true on 32bit platforms. So change the runtime back to a pointer based calling convention. Change-Id: I948d361b6876109d77fc58f11ceb47109cf631d1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 13:15:08 +00:00
__qmljs_call_activation_property(context, VALUEPTR(instr.result), instr.name, args, instr.argc);
Fix callBuiltinInvalid for the interpreter. Change-Id: Ifde12261a7c66a7b268129d5fae4ae626e16a00f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 12:21:09 +00:00
MOTH_END_INSTR(CallActivationProperty)
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_BEGIN_INSTR(CallBuiltinThrow)
Ported run-time exception throwing functions to new calling convention Change-Id: Icc05eb78deb6d087a06f77d28b71fd49c9705e4c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:15:19 +00:00
__qmljs_builtin_throw(context, VALUE(instr.arg));
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_END_INSTR(CallBuiltinThrow)
MOTH_BEGIN_INSTR(CallBuiltinCreateExceptionHandler)
void *buf = __qmljs_create_exception_handler(context);
// The result is the only value we need from the instr to
// continue execution when an exception is caught.
VM::Value *result = getValueRef(context, stack, instr.result
#if !defined(QT_NO_DEBUG)
, stackSize
#endif
);
Restore the context pointer after returning from setjmp Change-Id: I68682400c80cf9a8f28d11d8031681d6d92f590b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-06 12:15:10 +00:00
VM::ExecutionContext *oldContext = context;
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
int didThrow = setjmp(* static_cast<jmp_buf *>(buf));
Restore the context pointer after returning from setjmp Change-Id: I68682400c80cf9a8f28d11d8031681d6d92f590b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-06 12:15:10 +00:00
context = oldContext;
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
// Two ways to come here: after a create, or after a throw.
if (didThrow)
// At this point, the interpreter state can be anything but
// valid, so first restore the state.
restoreState(context, result, code);
else
// Save the state and any variables we need when catching an
// exception, so we can restore the state at that point.
saveState(context, result, code);
*result = VM::Value::fromInt32(didThrow);
MOTH_END_INSTR(CallBuiltinCreateExceptionHandler)
MOTH_BEGIN_INSTR(CallBuiltinDeleteExceptionHandler)
__qmljs_delete_exception_handler(context);
MOTH_END_INSTR(CallBuiltinDeleteExceptionHandler)
MOTH_BEGIN_INSTR(CallBuiltinGetException)
Ported built-in exception getter to new calling convention Change-Id: Ica14229cfa280afba2003b3b50930c2986aa2f23 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:04:15 +00:00
__qmljs_get_exception(context, VALUEPTR(instr.result));
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_END_INSTR(CallBuiltinGetException)
MOTH_BEGIN_INSTR(CallBuiltinPushScope)
context = __qmljs_builtin_push_with_scope(VALUE(instr.arg), context);
MOTH_END_INSTR(CallBuiltinPushScope)
Fix scoping for catch blocks Based on Lars' idea, done together with Erik. For proper scoping of the exception variable in catch blocks, it is necessary to define the new scope (ExecutionContext for us) at run-time, it cannot be determined at compile time. This patch implements the necessary logic to create the new execution context when entering a try block and re-uses the existing pop_scope infrastructure for destroying it again. Within the catch scope it is necessary to do all lookups by name, so the existing _function->insideWith variable was re-used and renamed to _function->insideWithOrCatch. Additionally the new context also stores the name and value of the separately scoped exception variable that shadows any existing equally named variables in outter scopes. CodeGen::unwindException also had a bug that it would generate the finally code with the wrong _function->insideWithOrCatch level, resulting in name lookups inside finally instead of local index lookups. Change-Id: I5616af38c3558e553e971a6a894ce5239ccb8422 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-08 12:33:50 +00:00
MOTH_BEGIN_INSTR(CallBuiltinPushCatchScope)
context = __qmljs_builtin_push_catch_scope(instr.varName, context);
MOTH_END_INSTR(CallBuiltinPushCatchScope)
Split CallBuitin variants into separate instructions. This saves space by removing (sometimes) unused parameters, and the need to store and switch over another enum to determine which of the various built-in instructions is called. Change-Id: Ie59c49608bf445a07d406b45fd48cfb94bbfc919 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-27 08:59:37 +00:00
MOTH_BEGIN_INSTR(CallBuiltinPopScope)
context = __qmljs_builtin_pop_scope(context);
MOTH_END_INSTR(CallBuiltinPopScope)
Added calls to built-ins to moth. Change-Id: I277b1136ed3b073a9fc85726dc714ef68109fbfa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-25 08:08:22 +00:00
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_BEGIN_INSTR(CallBuiltinForeachIteratorObject)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = __qmljs_foreach_iterator_object(VALUE(instr.arg), context);
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_END_INSTR(CallBuiltinForeachIteratorObject)
MOTH_BEGIN_INSTR(CallBuiltinForeachNextPropertyName)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = __qmljs_foreach_next_property_name(VALUE(instr.arg));
Split off 2 builtins into their own instruction. The foreach-iterator-object and foreach-next-property-name now have their own interpreter instructions. Also cleaned up the parameter passing helper methods. Change-Id: I3f375ba29e1ae914e707039b157fa011878b88b6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-23 09:11:05 +00:00
MOTH_END_INSTR(CallBuiltinForeachNextPropertyName)
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDeleteMember)
Convert property deletion runtime functions to new calling convention Change-Id: I312ccbd65d9aad5e8db349af94c00bed0fd73544 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:02:40 +00:00
__qmljs_delete_member(context, VALUEPTR(instr.result), VALUE(instr.base), instr.member);
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteMember)
MOTH_BEGIN_INSTR(CallBuiltinDeleteSubscript)
Convert property deletion runtime functions to new calling convention Change-Id: I312ccbd65d9aad5e8db349af94c00bed0fd73544 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:02:40 +00:00
__qmljs_delete_subscript(context, VALUEPTR(instr.result), VALUE(instr.base), VALUE(instr.index));
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteSubscript)
MOTH_BEGIN_INSTR(CallBuiltinDeleteName)
Convert property deletion runtime functions to new calling convention Change-Id: I312ccbd65d9aad5e8db349af94c00bed0fd73544 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:02:40 +00:00
__qmljs_delete_name(context, VALUEPTR(instr.result), instr.name);
Added more builtins to moth. - delete member - delete subscript - delete name - delete value - foreach-iterator-object - foreach-next-property-name Change-Id: I639a3c3a293ea88019e2f69e1f51ce2264a68bcc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-12 13:31:05 +00:00
MOTH_END_INSTR(CallBuiltinDeleteName)
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_BEGIN_INSTR(CallBuiltinTypeofMember)
Convert builtin typeof to the new calling convention Change-Id: I40f268c53dacf2ee188b3d1df9391df3e5e812f8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 11:16:30 +00:00
__qmljs_builtin_typeof_member(context, VALUEPTR(instr.result), VALUE(instr.base), instr.member);
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
MOTH_BEGIN_INSTR(CallBuiltinTypeofSubscript)
Convert builtin type of functions to new calling convention Change-Id: Ie0c9300eead2171c899bca54635e6fdf301385d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 11:56:05 +00:00
__qmljs_builtin_typeof_element(context, VALUEPTR(instr.result), VALUE(instr.base), VALUE(instr.index));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofSubscript)
MOTH_BEGIN_INSTR(CallBuiltinTypeofName)
Convert builtin type of functions to new calling convention Change-Id: Ie0c9300eead2171c899bca54635e6fdf301385d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 11:56:05 +00:00
__qmljs_builtin_typeof_name(context, VALUEPTR(instr.result), instr.name);
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofName)
MOTH_BEGIN_INSTR(CallBuiltinTypeofValue)
Convert builtin type of functions to new calling convention Change-Id: Ie0c9300eead2171c899bca54635e6fdf301385d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 11:56:05 +00:00
__qmljs_builtin_typeof(context, VALUEPTR(instr.result), VALUE(instr.value));
Fix moth isel for typeof. Change-Id: If5b5a91a69d6b6bf0fd3eaf4c21a42c575839be2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-12-18 09:59:26 +00:00
MOTH_END_INSTR(CallBuiltinTypeofValue)
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_BEGIN_INSTR(CallBuiltinPostIncMember)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_builtin_post_increment_member(context, VALUEPTR(instr.result), VALUE(instr.base), instr.member);
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
MOTH_BEGIN_INSTR(CallBuiltinPostIncSubscript)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_builtin_post_increment_element(context, VALUEPTR(instr.result), VALUE(instr.base), VALUEPTR(instr.index));
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofSubscript)
MOTH_BEGIN_INSTR(CallBuiltinPostIncName)
Convert post inc/dev operators to new calling convention Change-Id: Idbfa6852d308337076a1aa18cdeb43460fb5bed6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 21:13:53 +00:00
__qmljs_builtin_post_increment_name(context, VALUEPTR(instr.result), instr.name);
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofName)
MOTH_BEGIN_INSTR(CallBuiltinPostIncValue)
Convert post inc/dev operators to new calling convention Change-Id: Idbfa6852d308337076a1aa18cdeb43460fb5bed6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 21:13:53 +00:00
__qmljs_builtin_post_increment(context, VALUEPTR(instr.result), VALUEPTR(instr.value));
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofValue)
MOTH_BEGIN_INSTR(CallBuiltinPostDecMember)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_builtin_post_decrement_member(context, VALUEPTR(instr.result), VALUE(instr.base), instr.member);
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofMember)
MOTH_BEGIN_INSTR(CallBuiltinPostDecSubscript)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
__qmljs_builtin_post_decrement_element(context, VALUEPTR(instr.result), VALUE(instr.base), VALUE(instr.index));
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofSubscript)
MOTH_BEGIN_INSTR(CallBuiltinPostDecName)
Convert post inc/dev operators to new calling convention Change-Id: Idbfa6852d308337076a1aa18cdeb43460fb5bed6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 21:13:53 +00:00
__qmljs_builtin_post_decrement_name(context, VALUEPTR(instr.result), instr.name);
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofName)
MOTH_BEGIN_INSTR(CallBuiltinPostDecValue)
Convert post inc/dev operators to new calling convention Change-Id: Idbfa6852d308337076a1aa18cdeb43460fb5bed6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 21:13:53 +00:00
__qmljs_builtin_post_decrement(context, VALUEPTR(instr.result), VALUEPTR(instr.value));
Properly working post increment/decrement operators This required some larger changes in our infrastructure. Unfortunately the post increment/decrement operators don't return the old value unmodified, but return toNumber(oldValue). At the same time they need to properly store the new value into the referenced expression. The only way to solve this (as we can't have two return values) is to pass a proper reference into runtime methods. Change-Id: I0e0c2cc011ab22d5d4b27924abc8c18372c104a5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-01-27 20:16:09 +00:00
MOTH_END_INSTR(CallBuiltinTypeofValue)
Add more built-ins to the interpreter. Change-Id: I6a1656a8a2042b0a02d6e3bb8e59c9db52f6fd5d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-27 11:17:19 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDeclareVar)
__qmljs_builtin_declare_var(context, instr.isDeletable, instr.varName);
Moved callBuiltin into the common super class. Now the backends do not need to duplicate the tedious switch, but can just implement the specific methods. It also prevents backends from missing out on cases. Change-Id: I45a25c6955af584f60b6e69cf6a616ca3e2dc640 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-16 14:49:42 +00:00
MOTH_END_INSTR(CallBuiltinDeclareVar)
Add more built-ins to the interpreter. Change-Id: I6a1656a8a2042b0a02d6e3bb8e59c9db52f6fd5d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-27 11:17:19 +00:00
moth: add builtin_define_getter_setter and builtin_define_property. Change-Id: Iffd8c79dbc99f9563235b440fa18e446cedabf0c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-08 15:09:48 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDefineGetterSetter)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
__qmljs_builtin_define_getter_setter(VALUE(instr.object), instr.name, VALUE(instr.getter), VALUE(instr.setter), context);
moth: add builtin_define_getter_setter and builtin_define_property. Change-Id: Iffd8c79dbc99f9563235b440fa18e446cedabf0c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-08 15:09:48 +00:00
MOTH_END_INSTR(CallBuiltinDefineGetterSetter)
MOTH_BEGIN_INSTR(CallBuiltinDefineProperty)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
__qmljs_builtin_define_property(VALUE(instr.object), instr.name, VALUE(instr.value), context);
moth: add builtin_define_getter_setter and builtin_define_property. Change-Id: Iffd8c79dbc99f9563235b440fa18e446cedabf0c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-08 15:09:48 +00:00
MOTH_END_INSTR(CallBuiltinDefineProperty)
Fix properties of literal array initialisers Array entries defined in such a way need to be own properties. To avoid calling builtin_define_property with the integer index converted to a string for each property, this patch also introduces a builtin_define_array_property that takes an integer index instead. Change-Id: Ib21f99a555b3237753a7930a7edc70bfcd49ac18 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-24 11:53:47 +00:00
MOTH_BEGIN_INSTR(CallBuiltinDefineArrayProperty)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
__qmljs_builtin_define_array_property(VALUE(instr.object), instr.index, VALUE(instr.value), context);
Fix properties of literal array initialisers Array entries defined in such a way need to be own properties. To avoid calling builtin_define_property with the integer index converted to a string for each property, this patch also introduces a builtin_define_array_property that takes an integer index instead. Change-Id: Ib21f99a555b3237753a7930a7edc70bfcd49ac18 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-24 11:53:47 +00:00
MOTH_END_INSTR(CallBuiltinDefineArrayProperty)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(CreateValue)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Convert construct runtime functions to new calling convention Change-Id: I063508ff780d2f6371f77eca7138a09d78e1a45e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 14:47:06 +00:00
__qmljs_construct_value(context, VALUEPTR(instr.result), VALUE(instr.func), args, instr.argc);
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateValue)
MOTH_BEGIN_INSTR(CreateProperty)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Convert construct runtime functions to new calling convention Change-Id: I063508ff780d2f6371f77eca7138a09d78e1a45e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 14:47:06 +00:00
__qmljs_construct_property(context, VALUEPTR(instr.result), VALUE(instr.base), instr.name, args, instr.argc);
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateProperty)
MOTH_BEGIN_INSTR(CreateActivationProperty)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
TRACE(inline, "property name = %s, args = %d, argc = %d", instr.name->toQString().toUtf8().constData(), instr.args, instr.argc);
Q_ASSERT(instr.args + instr.argc < stackSize);
VM::Value *args = stack + instr.args;
Change activition property calls to be pointer based After longer discussions, we actually found out that passing Values by reference (ie. as pointers) is most likely quite a bit more efficient then passing them by value. This is esp. true on 32bit platforms. So change the runtime back to a pointer based calling convention. Change-Id: I948d361b6876109d77fc58f11ceb47109cf631d1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 13:15:08 +00:00
__qmljs_construct_activation_property(context, VALUEPTR(instr.result), instr.name, args, instr.argc);
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(CreateActivationProperty)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Jump)
Fix bug in jump logic Make the jump relative to the offset value in the instruction stream.
2012-06-12 17:26:29 +00:00
code = ((uchar *)&instr.offset) + instr.offset;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Jump)
MOTH_BEGIN_INSTR(CJump)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
uint cond = __qmljs_to_boolean(VALUE(instr.condition), context);
TRACE(condition, "%s", cond ? "TRUE" : "FALSE");
if (cond)
Fix bug in jump logic Make the jump relative to the offset value in the instruction stream.
2012-06-12 17:26:29 +00:00
code = ((uchar *)&instr.offset) + instr.offset;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(CJump)
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(Unop)
Fix argument order of unary ops Change-Id: Id108c4b74f03cac8181a9308413b69e6bf1ef83e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 15:11:16 +00:00
instr.alu(context, VALUEPTR(instr.result), VALUE(instr.source));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(Unop)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_BEGIN_INSTR(Binop)
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
instr.alu(context, VALUEPTR(instr.result), VALUE(instr.lhs), VALUE(instr.rhs));
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Binop)
MOTH_BEGIN_INSTR(Ret)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VM::Value &result = VALUE(instr.result);
Add utility function to print stack traces from lldb/gdb. Change-Id: I81315a1cd6900dbecfc9a39d9dc4256461163921 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-12-04 09:31:31 +00:00
// TRACE(Ret, "returning value %s", result.toString(context)->toQString().toUtf8().constData());
Fixed temp compression and added a whole lot of debug info. Unlike the variables (locals), the return value did not have a fixed temp. So by pinning it, it won't move around. Change-Id: Ib35024e2baa60b64fcb05ca4aa7f49acad89e7cb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-22 15:28:13 +00:00
return result;
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
MOTH_END_INSTR(Ret)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_BEGIN_INSTR(LoadThis)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
VALUE(instr.result) = __qmljs_get_thisObject(context);
Added loading of "this" and renamed "ActivateProperty" to "StoreName". Change-Id: I033abe53368a815a9e3d036021429732f5526ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-24 11:45:43 +00:00
MOTH_END_INSTR(LoadThis)
Added property activation to the interpreter. Change-Id: Icbc900f8d617c8736a5663d19f5691f336bedb30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2012-10-23 14:06:52 +00:00
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_BEGIN_INSTR(InplaceElementOp)
Convert inplace binops to pointer based calling convention Change-Id: Ie39fb9160573c79ea765466fc9750e2f50b52ab3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 20:14:17 +00:00
instr.alu(context,
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
VALUE(instr.base),
VALUE(instr.index),
VALUE(instr.source));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(InplaceElementOp)
MOTH_BEGIN_INSTR(InplaceMemberOp)
Convert inplace binops to pointer based calling convention Change-Id: Ie39fb9160573c79ea765466fc9750e2f50b52ab3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-02-13 20:14:17 +00:00
instr.alu(context,
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
VALUE(instr.base),
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
instr.member,
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
VALUE(instr.source));
Added more instruction selection to moth to get crypto.js through. Change-Id: Ic9582ea3241d97ef619304ece9f18c7eaae90407 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-06 11:54:20 +00:00
MOTH_END_INSTR(InplaceMemberOp)
Fixed/added name handling in expressions for moth. Change-Id: I6dc2faed00a465b74735d23e4c0bda9498dc7bd9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-07 15:31:10 +00:00
MOTH_BEGIN_INSTR(InplaceNameOp)
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
TRACE(name, "%s", instr.name->toQString().toUtf8().constData());
Convert run-time functions that take a Value * for arguments to use a Value reference This keeps the C++ implementation code simpler while still providing the same (pointer based) calling convention. Change-Id: Ib72acf1dfdf4638f6d109a0771fdafc921a544d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-02-14 09:45:49 +00:00
instr.alu(context, instr.name, VALUE(instr.source));
Fixed/added name handling in expressions for moth. Change-Id: I6dc2faed00a465b74735d23e4c0bda9498dc7bd9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-07 15:31:10 +00:00
MOTH_END_INSTR(InplaceNameOp)
Add skeleton moth vme
2012-06-11 16:58:52 +00:00
#ifdef MOTH_THREADED_INTERPRETER
// nothing to do
#else
default:
qFatal("QQmlJS::Moth::VME: Internal error - unknown instruction %d", genericInstr->common.instructionType);
break;
}
}
#endif
}
#ifdef MOTH_THREADED_INTERPRETER
void **VME::instructionJumpTable()
{
static void **jumpTable = 0;
if (!jumpTable) {
VME dummy;
dummy(0, 0, &jumpTable);
}
return jumpTable;
}
#endif
return results directly instead of using the context The result variable in the context is not really required, as we can return results directly in the return value register. Change-Id: I12554c228500aa24625ef82e31fd7f72989a71bb Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-18 23:00:50 +00:00
VM::Value VME::exec(VM::ExecutionContext *ctxt, const uchar *code)
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
{
VME vme;
Actually return the return value from the interpreter. Change-Id: I38cb4bc431f1bab796f08fc217747e06070a2c78 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-20 08:48:11 +00:00
return vme(ctxt, code);
Begin to implement moth vm
2012-06-12 17:13:55 +00:00
}
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
void VME::restoreState(VM::ExecutionContext *context, VM::Value *&target, const uchar *&code)
Fix interpreter exception handling. The stack frame of the interpreting function is restored, but all the datastructures live on the heap. So, save them out on handler creation, and restore them afterwards. Change-Id: I84b84007cc9944b56926bf0387c2798f7841cd2a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-14 09:15:19 +00:00
{
Do not save/restore interpreter stack for exceptions. Only the instruction pointer and targetTempIndex are needed. Change-Id: I21279d68e74dac42d875e3ced9004e9d3c42c29d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-15 15:29:47 +00:00
VM::ExecutionEngine::ExceptionHandler &handler = context->engine->unwindStack.last();
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
target = handler.target;
Do not save/restore interpreter stack for exceptions. Only the instruction pointer and targetTempIndex are needed. Change-Id: I21279d68e74dac42d875e3ced9004e9d3c42c29d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-15 15:29:47 +00:00
code = handler.code;
Fix interpreter exception handling. The stack frame of the interpreting function is restored, but all the datastructures live on the heap. So, save them out on handler creation, and restore them afterwards. Change-Id: I84b84007cc9944b56926bf0387c2798f7841cd2a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-14 09:15:19 +00:00
}
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
void VME::saveState(VM::ExecutionContext *context, VM::Value *target, const uchar *code)
Fix interpreter exception handling. The stack frame of the interpreting function is restored, but all the datastructures live on the heap. So, save them out on handler creation, and restore them afterwards. Change-Id: I84b84007cc9944b56926bf0387c2798f7841cd2a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-14 09:15:19 +00:00
{
Do not save/restore interpreter stack for exceptions. Only the instruction pointer and targetTempIndex are needed. Change-Id: I21279d68e74dac42d875e3ced9004e9d3c42c29d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-15 15:29:47 +00:00
VM::ExecutionEngine::ExceptionHandler &handler = context->engine->unwindStack.last();
Change TEMP handling in the interpreter. By introducing the Param struct, and moving the ValueOrTemp into it too, the parameter decoding for instructions is cleaner and less error-prone: it de-couples the HIR/MIR representation from the interpreter representation, and allows for proper handling of the with-context. Change-Id: I0bc8f72bc7ce62b8efa298cbea5711adac4a4d34 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-01-25 18:32:30 +00:00
handler.target = target;
Do not save/restore interpreter stack for exceptions. Only the instruction pointer and targetTempIndex are needed. Change-Id: I21279d68e74dac42d875e3ced9004e9d3c42c29d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-15 15:29:47 +00:00
handler.code = code;
Fix interpreter exception handling. The stack frame of the interpreting function is restored, but all the datastructures live on the heap. So, save them out on handler creation, and restore them afterwards. Change-Id: I84b84007cc9944b56926bf0387c2798f7841cd2a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-11-14 09:15:19 +00:00
}