aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4instr_moth_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-24 14:18:01 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-28 13:18:40 +0000
commit7ea183a1125df153082f116eaa5e73fb9a68088e (patch)
tree82c4441f9347b369bce57bd0927cdd32bec71fa3 /src/qml/compiler/qv4instr_moth_p.h
parenta4f8b9ae6dfacf9ad5c190cde6098ebf13102f41 (diff)
Rename the Common instruction to Nop
And add Wide and XWide instructions that will get used as prefixes later on. Change-Id: I993865395ee2ac7d30eba2e41e7b437bfdb54391 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4instr_moth_p.h')
-rw-r--r--src/qml/compiler/qv4instr_moth_p.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 6af80689a6..022009eab5 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -70,7 +70,9 @@ QT_BEGIN_NAMESPACE
#define INSTRUCTION(op, name, nargs, ...) \
op##_INSTRUCTION(name, nargs, __VA_ARGS__)
-#define INSTR_Common(op) INSTRUCTION(op, Common, 0)
+#define INSTR_Nop(op) INSTRUCTION(op, Nop, 0)
+#define INSTR_Wide(op) INSTRUCTION(op, Wide, 0)
+#define INSTR_XWide(op) INSTRUCTION(op, XWide, 0)
#define INSTR_Ret(op) INSTRUCTION(op, Ret, 0)
#define INSTR_Debug(op) INSTRUCTION(op, Debug, 0)
#define INSTR_LoadConst(op) INSTRUCTION(op, LoadConst, 1, index)
@@ -183,7 +185,9 @@ QT_BEGIN_NAMESPACE
#define FOR_EACH_MOTH_INSTR(F) \
- F(Common) \
+ F(Nop) \
+ F(Wide) \
+ F(XWide) \
F(Ret) \
F(Debug) \
F(LoadConst) \
@@ -452,9 +456,9 @@ QT_WARNING_DISABLE_GCC("-Wuninitialized")
static const DataType &data(const Instr &instr) { return instr.I; } \
static void setData(Instr &instr, const DataType &v) { instr.I = v; } \
static void setDataNoCommon(Instr &instr, const DataType &v) \
- { memcpy(reinterpret_cast<char *>(&instr.I) + sizeof(Instr::instr_Common), \
- reinterpret_cast<const char *>(&v) + sizeof(Instr::instr_Common), \
- Size - sizeof(Instr::instr_Common)); } \
+ { memcpy(reinterpret_cast<char *>(&instr.I) + sizeof(Instr::instr_Nop), \
+ reinterpret_cast<const char *>(&v) + sizeof(Instr::instr_Nop), \
+ Size - sizeof(Instr::instr_Nop)); } \
};
FOR_EACH_MOTH_INSTR(MOTH_INSTR_META_TEMPLATE);
#undef MOTH_INSTR_META_TEMPLATE