X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;fp=src%2Floader%2FInterpreter.cpp;h=4b0f5e0ae1228e34680a72991a3d24efd858b874;hb=0bbc2eda56eba3ea195c2043370ff4d3fd29ca79;hp=5adb08e237f20b42c4fb6b9bf4cdf7cfa462d981;hpb=3a86cc937e9fce68384efc08edb6d6ba101d12eb;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 5adb08e..4b0f5e0 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -355,7 +355,7 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 		} else if ((*i)->GetType() != ScriptToken::COMMAND) {
 			throw Error("unexpected script token");
 		}
-		++size;
+		size += sizeof(Script::Code);
 		const string &cmd((*i)->CommandName());
 		if (cmd == "move") {
 			++i;
@@ -363,59 +363,66 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 				throw Error("unexpected script end after move");
 			}
 			const string &reg((*i)->RegisterName());
-			switch (reg[0]) {
-				case 'a':
-					size += sizeof(void *);
-					break;
-				case 'i':
-					size += sizeof(int);
-					break;
-				case 'v':
-					size += sizeof(Vector<int>);
-					break;
-				default:
-					throw Error("unknown register " + reg);
+			if (reg.size() != 2) {
+				throw Error("invalid register name " + reg);
 			}
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after move");
 			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				switch (reg[0]) {
+					case 'a':
+						size += sizeof(void *);
+						break;
+					case 'i':
+						size += sizeof(int);
+						break;
+					case 'v':
+						size += sizeof(Vector<int>);
+						break;
+					default:
+						throw Error("unknown register " + reg);
+				}
+			}
 		} else if (cmd == "add") {
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after add");
 			}
 			const string &reg((*i)->RegisterName());
-			switch (reg[0]) {
-				case 'i':
-					size += sizeof(int);
-					break;
-				case 'v':
-					size += sizeof(Vector<int>);
-					break;
-				default:
-					throw Error("expected register after add " + reg);
+			if (reg.size() != 2) {
+				throw Error("invalid register name " + reg);
 			}
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after add");
 			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				switch (reg[0]) {
+					case 'i':
+						size += sizeof(int);
+						break;
+					case 'v':
+						size += sizeof(Vector<int>);
+						break;
+					default:
+						throw Error("expected register after add " + reg);
+				}
+			}
 		} else if (cmd == "mod") {
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after mod");
 			}
-			size += sizeof(int);
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after mod");
 			}
-		} else if (cmd == "rand") {
-			++i;
-			if (i == end) {
-				throw Error("unexpected script end after rand");
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
 			}
-			size += sizeof(int);
+		} else if (cmd == "rand") {
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after rand");
@@ -425,11 +432,16 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			if (i == end) {
 				throw Error("unexpected script end after cmp");
 			}
-			size += sizeof(int);
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
+			}
 			++i;
 			if (i == end) {
 				throw Error("unexpected script end after cmp");
 			}
+			if ((*i)->GetType() != ScriptToken::REGISTER) {
+				size += sizeof(int);
+			}
 		} else if (cmd == "jmp") {
 			size += sizeof(int);
 			++i;
@@ -479,7 +491,7 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 		}
 	}
 
-	unsigned char *text(reinterpret_cast<unsigned char *>(alloc.Alloc(size)));
+	char *text(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) {
@@ -490,123 +502,187 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 		}
 		const string &cmd((*i)->CommandName());
 		if (cmd == "move") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_MOVE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
 			++i;
 			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'a':
+					code.type = Script::TYPE_ADDRESS;
+					break;
+				case 'i':
+					code.type = Script::TYPE_INTEGER;
+					break;
+				case 'v':
+					code.type = Script::TYPE_VECTOR;
+					break;
+				default:
+					throw Error("invalid register " + reg);
+			}
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
 			++i;
-			if (reg == "a0") {
-				text[cursor] = Script::CODE_MOVE_A0;
-				++cursor;
-				ReadScriptAddress(**i, text + cursor);
-				cursor += sizeof(void *);
-			} else if (reg == "a1") {
-				text[cursor] = Script::CODE_MOVE_A1;
-				++cursor;
-				ReadScriptAddress(**i, text + cursor);
-				cursor += sizeof(void *);
-			} else if (reg == "i0") {
-				text[cursor] = Script::CODE_MOVE_I0;
-				++cursor;
-				ReadScriptInteger(**i, text + cursor);
-				cursor += sizeof(int);
-			} else if (reg == "i1") {
-				text[cursor] = Script::CODE_MOVE_I1;
-				++cursor;
-				ReadScriptInteger(**i, text + cursor);
-				cursor += sizeof(int);
-			} else if (reg == "v0") {
-				text[cursor] = Script::CODE_MOVE_V0;
-				++cursor;
-				ReadScriptVector(**i, text + cursor);
-				cursor += sizeof(Vector<int>);
-			} else if (reg == "v1") {
-				text[cursor] = Script::CODE_MOVE_V1;
-				++cursor;
-				ReadScriptVector(**i, text + cursor);
-				cursor += sizeof(Vector<int>);
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register " + reg2);
+				}
+				code.reg2 = reg2num;
 			} else {
-				throw Error("unknown register " + reg);
+				code.reg2 = 7;
+				switch (code.type) {
+					case Script::TYPE_ADDRESS:
+						ReadScriptAddress(**i, text + cursor);
+						cursor += sizeof(void *);
+						break;
+					case Script::TYPE_INTEGER:
+						ReadScriptInteger(**i, text + cursor);
+						cursor += sizeof(int);
+						break;
+					case Script::TYPE_VECTOR:
+						ReadScriptVector(**i, text + cursor);
+						cursor += sizeof(Vector<int>);
+						break;
+				}
 			}
 		} else if (cmd == "add") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_ADD, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
 			++i;
 			const string &reg((*i)->RegisterName());
+			switch (reg[0]) {
+				case 'i':
+					code.type = Script::TYPE_INTEGER;
+					break;
+				case 'v':
+					code.type = Script::TYPE_VECTOR;
+					break;
+				default:
+					throw Error("invalid register " + reg);
+			}
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
 			++i;
-			if (reg == "i0") {
-				text[cursor] = Script::CODE_ADD_I0;
-				++cursor;
-				ReadScriptInteger(**i, text + cursor);
-				cursor += sizeof(int);
-			} else if (reg == "i1") {
-				text[cursor] = Script::CODE_ADD_I1;
-				++cursor;
-				ReadScriptInteger(**i, text + cursor);
-				cursor += sizeof(int);
-			} else if (reg == "v0") {
-				text[cursor] = Script::CODE_ADD_V0;
-				++cursor;
-				ReadScriptVector(**i, text + cursor);
-				cursor += sizeof(Vector<int>);
-			} else if (reg == "v1") {
-				text[cursor] = Script::CODE_ADD_V1;
-				++cursor;
-				ReadScriptVector(**i, text + cursor);
-				cursor += sizeof(Vector<int>);
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
 			} else {
-				throw Error("unexpected register " + reg);
+				code.reg2 = 7;
+				switch (code.type) {
+					case Script::TYPE_INTEGER:
+						ReadScriptInteger(**i, text + cursor);
+						cursor += sizeof(int);
+						break;
+					case Script::TYPE_VECTOR:
+						ReadScriptVector(**i, text + cursor);
+						cursor += sizeof(Vector<int>);
+						break;
+				}
 			}
 		} else if (cmd == "mod") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_MOD, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
 			++i;
 			const string &reg((*i)->RegisterName());
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
+			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
 			++i;
-			if (reg == "i0") {
-				text[cursor] = Script::CODE_MOD_I0;
-				++cursor;
-				ReadScriptInteger(**i, text + cursor);
-				cursor += sizeof(int);
-			} else if (reg == "i1") {
-				text[cursor] = Script::CODE_MOD_I1;
-				++cursor;
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
+				}
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
 				ReadScriptInteger(**i, text + cursor);
 				cursor += sizeof(int);
-			} else {
-				throw Error("unexpected register " + reg);
 			}
 		} else if (cmd == "rand") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_RAND, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			const string &reg((*i)->RegisterName());
-			if (reg == "i0") {
-				text[cursor] = Script::CODE_RAND_I0;
-				++cursor;
-			} else if (reg == "i1") {
-				text[cursor] = Script::CODE_RAND_I1;
-				++cursor;
-			} else {
-				throw Error("unexpected register " + reg);
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
 			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
 		} else if (cmd == "cmp") {
+			Script::Code &code(CreateScriptCode(Script::COMMAND_CMP, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 2;
 			++i;
 			const string &reg((*i)->RegisterName());
+			if (reg[0] != 'i') {
+				throw Error("invalid register " + reg);
+			}
+			code.type = Script::TYPE_INTEGER;
+			int regnum(reg[1] - '0');
+			if (regnum < 0 || regnum > 6) {
+				throw Error("invalid register " + reg);
+			}
+			code.reg1 = regnum;
 			++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);
+
+			if ((*i)->GetType() == ScriptToken::REGISTER) {
+				string reg2((*i)->RegisterName());
+				if (reg[0] != reg2[0]) {
+					throw Error("mixed-type commands not allowed");
 				}
-			} else if (reg == "i1") {
-				text[cursor] = Script::CODE_CMP_I1;
-				++cursor;
+				int reg2num(reg[1] - '0');
+				if (reg2num < 0 || reg2num > 6) {
+					throw Error("invalid register name " + reg2);
+				}
+				code.reg2 = reg2num;
+			} else {
+				code.reg2 = 7;
 				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;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JMP, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -614,8 +690,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jeq") {
-			text[cursor] = Script::CODE_JUMP_EQUAL;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JEQ, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -623,8 +700,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jne") {
-			text[cursor] = Script::CODE_JUMP_NOT_EQUAL;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JNE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -632,8 +710,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jl") {
-			text[cursor] = Script::CODE_JUMP_LESS;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JL, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -641,8 +720,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jle") {
-			text[cursor] = Script::CODE_JUMP_LESS_EQUAL;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JLE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -650,8 +730,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jg") {
-			text[cursor] = Script::CODE_JUMP_GREATER;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JG, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -659,8 +740,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "jge") {
-			text[cursor] = Script::CODE_JUMP_GREATER_EQUAL;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_JGE, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 1;
 			++i;
 			if (!labels.count((*i)->Identifier())) {
 				throw Error("use of undefined label " + (*i)->Identifier());
@@ -668,8 +750,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 			*reinterpret_cast<int *>(text + cursor) = labels[(*i)->Identifier()];
 			cursor += sizeof(int);
 		} else if (cmd == "sysc") {
-			text[cursor] = Script::CODE_SYSCALL;
-			++cursor;
+			Script::Code &code(CreateScriptCode(Script::COMMAND_SYSC, text + cursor));
+			cursor += sizeof(Script::Code);
+			code.numParams = 0;
 		} else {
 			throw Error("unknown command " + cmd);
 		}
@@ -687,7 +770,17 @@ char *Interpreter::ReadScript(const vector<ScriptToken *> &s) {
 	return mem;
 }
 
-void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
+Script::Code &Interpreter::CreateScriptCode(Script::Command c, char *dest) {
+	Script::Code &code(*reinterpret_cast<Script::Code *>(dest));
+	code.command = c;
+	code.numParams = 0;
+	code.type = Script::TYPE_NONE;
+	code.reg1 = 7;
+	code.reg2 = 7;
+	return code;
+}
+
+void Interpreter::ReadScriptAddress(const ScriptToken &t, char *dest) {
 	if (t.GetType() != ScriptToken::IDENTIFIER) {
 		throw Error("expected identifier for address");
 	}
@@ -700,7 +793,7 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 	}
 }
 
-void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
+void Interpreter::ReadScriptInteger(const ScriptToken &t, char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
 		if (source.IsDefined(t.Identifier())) {
 			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.Identifier()));
@@ -715,7 +808,7 @@ void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 	}
 }
 
-void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
+void Interpreter::ReadScriptVector(const ScriptToken &t, char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
 		if (source.IsDefined(t.Identifier())) {
 			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.Identifier()));