handle compare/jump instructions in script assembler

[l2e.git] / src / loader / Interpreter.cpp

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 0fd2d883fba0a8129b3a896dd56d37f35e4af96f..6bb022f1e4c6c46d354c1afc62fa6710be9da1e3 100644 (file)
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -343,9 +343,16 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 
 
 void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script) {
+       std::map<string, int> labels;
        int size(0);
        for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
-               if ((*i)->GetType() != ScriptToken::COMMAND) {
+               if ((*i)->GetType() == ScriptToken::LABEL) {
+                       if (labels.count((*i)->Label())) {
+                               throw Error("duplicate label " + (*i)->Label());
+                       } else {
+                               labels[(*i)->Label()] = size;
+                       }
+               } else if ((*i)->GetType() != ScriptToken::COMMAND) {
                        throw Error("unexpected script token");
                }
                ++size;
@@ -413,6 +420,58 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
                        if (i == end) {
                                throw Error("unexpected script end after rand");
                        }
+               } else if (cmd == "cmp") {
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jmp") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jeq") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jne") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jl") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jle") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jg") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
+               } else if (cmd == "jge") {
+                       size += sizeof(int);
+                       ++i;
+                       if (i == end) {
+                               throw Error("unexpected script end after cmp");
+                       }
                } else if (cmd == "sysc") {
 
                } else {
@@ -423,6 +482,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
        unsigned char *text(reinterpret_cast<unsigned char *>(alloc.Alloc(size)));
        int cursor(0);
        for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+               if ((*i)->GetType() == ScriptToken::LABEL) {
+                       continue;
+               }
                if ((*i)->GetType() != ScriptToken::COMMAND) {
                        throw Error("unexpected script token");
                }
@@ -520,6 +582,91 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
                        } else {
                                throw Error("unexpected register " + reg);
                        }
+               } else if (cmd == "cmp") {
+                       ++i;
+                       const string &reg((*i)->RegisterName());
+                       ++i;
+                       if (reg == "i0") {
+                               if ((*i)->GetType() == ScriptToken::REGISTER && (*i)->RegisterName() == "i1") {
+                                       text[cursor] = Script::CODE_CMP_I0_I1;
+                                       ++cursor;
+                               } else {
+                                       text[cursor] = Script::CODE_CMP_I0;
+                                       ++cursor;
+                                       ReadScriptInteger(**i, text + cursor);
+                                       cursor += sizeof(int);
+                               }
+                       } else if (reg == "i1") {
+                               text[cursor] = Script::CODE_CMP_I1;
+                               ++cursor;
+                               ReadScriptInteger(**i, text + cursor);
+                               cursor += sizeof(int);
+                       } else {
+                               throw Error("cannot use " + reg + " as lhs for comparison");
+                       }
+               } else if (cmd == "jmp") {
+                       text[cursor] = Script::CODE_JUMP;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jeq") {
+                       text[cursor] = Script::CODE_JUMP_EQUAL;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jne") {
+                       text[cursor] = Script::CODE_JUMP_NOT_EQUAL;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jl") {
+                       text[cursor] = Script::CODE_JUMP_LESS;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jle") {
+                       text[cursor] = Script::CODE_JUMP_LESS_EQUAL;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jg") {
+                       text[cursor] = Script::CODE_JUMP_GREATER;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
+               } else if (cmd == "jge") {
+                       text[cursor] = Script::CODE_JUMP_GREATER_EQUAL;
+                       ++cursor;
+                       ++i;
+                       if (!labels.count((*i)->Identifier())) {
+                               throw Error("use of undefined label " + (*i)->Identifier());
+                       }
+                       *reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
+                       cursor += sizeof(int);
                } else if (cmd == "sysc") {
                        text[cursor] = Script::CODE_SYSCALL;
                        ++cursor;
@@ -544,9 +691,9 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
        if (t.GetType() != ScriptToken::IDENTIFIER) {
                throw Error("expected identifier for address");
        }
-       if (source.IsDefined(t.GetIdentifier())) {
-               const ParsedDefinition &def(GetDefinition(t.GetIdentifier()));
-               void *addr(GetObject(def.type, t.GetIdentifier()));
+       if (source.IsDefined(t.Identifier())) {
+               const ParsedDefinition &def(GetDefinition(t.Identifier()));
+               void *addr(GetObject(def.type, t.Identifier()));
                *reinterpret_cast<void **>(dest) = addr;
        } else {
                throw Error("postponing values in scripts not implemented");
@@ -555,8 +702,8 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
        if (t.GetType() == ScriptToken::IDENTIFIER) {
-               if (source.IsDefined(t.GetIdentifier())) {
-                       void *num(GetObject(TypeDescription::GetTypeId("Number"), t.GetIdentifier()));
+               if (source.IsDefined(t.Identifier())) {
+                       void *num(GetObject(TypeDescription::GetTypeId("Number"), t.Identifier()));
                        *reinterpret_cast<int *>(dest) = *reinterpret_cast<int *>(num);
                } else {
                        throw Error("postponing values in scripts not implemented");
@@ -570,8 +717,8 @@ void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
        if (t.GetType() == ScriptToken::IDENTIFIER) {
-               if (source.IsDefined(t.GetIdentifier())) {
-                       void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.GetIdentifier()));
+               if (source.IsDefined(t.Identifier())) {
+                       void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.Identifier()));
                        *reinterpret_cast<Vector<int> *>(dest) = *reinterpret_cast<Vector<int> *>(vec);
                } else {
                        throw Error("postponing values in scripts not implemented");