Cleanup.

svn-id: r40480

2 files changed, 75 insertions, 75 deletions

diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp
index 09a9caf4ca..8a031b3fde 100644
--- a/engines/kyra/script.cpp
+++ b/engines/kyra/script.cpp
@@ -34,35 +34,35 @@
 
 namespace Kyra {
 EMCInterpreter::EMCInterpreter(KyraEngine_v1 *vm) : _vm(vm) {
-#define COMMAND(x) { &EMCInterpreter::x, #x }
-	static const CommandEntry commandProcs[] = {
+#define OPCODE(x) { &EMCInterpreter::x, #x }
+	static const OpcodeEntry opcodes[] = {
 		// 0x00
-		COMMAND(cmd_jmpTo),
-		COMMAND(cmd_setRetValue),
-		COMMAND(cmd_pushRetOrPos),
-		COMMAND(cmd_push),
+		OPCODE(op_jmp),
+		OPCODE(op_setRetValue),
+		OPCODE(op_pushRetOrPos),
+		OPCODE(op_push),
 		// 0x04
-		COMMAND(cmd_push),
-		COMMAND(cmd_pushReg),
-		COMMAND(cmd_pushBPNeg),
-		COMMAND(cmd_pushBPAdd),
+		OPCODE(op_push),
+		OPCODE(op_pushReg),
+		OPCODE(op_pushBPNeg),
+		OPCODE(op_pushBPAdd),
 		// 0x08
-		COMMAND(cmd_popRetOrPos),
-		COMMAND(cmd_popReg),
-		COMMAND(cmd_popBPNeg),
-		COMMAND(cmd_popBPAdd),
+		OPCODE(op_popRetOrPos),
+		OPCODE(op_popReg),
+		OPCODE(op_popBPNeg),
+		OPCODE(op_popBPAdd),
 		// 0x0C
-		COMMAND(cmd_addSP),
-		COMMAND(cmd_subSP),
-		COMMAND(cmd_execOpcode),
-		COMMAND(cmd_ifNotJmp),
+		OPCODE(op_addSP),
+		OPCODE(op_subSP),
+		OPCODE(op_sysCall),
+		OPCODE(op_ifNotJmp),
 		// 0x10
-		COMMAND(cmd_negate),
-		COMMAND(cmd_eval),
-		COMMAND(cmd_setRetAndJmp)
+		OPCODE(op_negate),
+		OPCODE(op_eval),
+		OPCODE(op_setRetAndJmp)
 	};
-	_commands = commandProcs;
-#undef COMMAND
+	_opcodes = opcodes;
+#undef OPCODE
 }
 
 bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Common::Array<const Opcode*> *opcodes) {
@@ -130,7 +130,7 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo
 	while (chunkSize--)
 		scriptData->data[chunkSize] = READ_BE_UINT16(&scriptData->data[chunkSize]);
 
-	scriptData->opcodes = opcodes;
+	scriptData->sysFuncs = opcodes;
 
 	strncpy(scriptData->filename, filename, 13);
 
@@ -207,10 +207,10 @@ bool EMCInterpreter::run(EMCState *script) {
 	}
 
 	if (opcode > 18) {
-		error("Script unknown command: %d in file '%s' at offset 0x%.08X", opcode, script->dataPtr->filename, instOffset);
+		error("Unknown script opcode: %d in file '%s' at offset 0x%.08X", opcode, script->dataPtr->filename, instOffset);
 	} else {
-		debugC(5, kDebugLevelScript, "[0x%.08X] EMCInterpreter::%s([%d/%u])", instOffset, _commands[opcode].desc, _parameter, (uint)_parameter);
-		(this->*(_commands[opcode].proc))(script);
+		debugC(5, kDebugLevelScript, "[0x%.08X] EMCInterpreter::%s([%d/%u])", instOffset, _opcodes[opcode].desc, _parameter, (uint)_parameter);
+		(this->*(_opcodes[opcode].proc))(script);
 	}
 
 	return (script->ip != 0);
@@ -297,15 +297,15 @@ bool IFFParser::loadBlock(const uint32 chunkName, void *loadTo, uint32 ptrSize)
 #pragma mark - Command implementations
 #pragma mark -
 
-void EMCInterpreter::cmd_jmpTo(EMCState* script) {
+void EMCInterpreter::op_jmp(EMCState* script) {
 	script->ip = script->dataPtr->data + _parameter;
 }
 
-void EMCInterpreter::cmd_setRetValue(EMCState* script) {
+void EMCInterpreter::op_setRetValue(EMCState* script) {
 	script->retValue = _parameter;
 }
 
-void EMCInterpreter::cmd_pushRetOrPos(EMCState* script) {
+void EMCInterpreter::op_pushRetOrPos(EMCState* script) {
 	switch (_parameter) {
 	case 0:
 		script->stack[--script->sp] = script->retValue;
@@ -323,23 +323,23 @@ void EMCInterpreter::cmd_pushRetOrPos(EMCState* script) {
 	}
 }
 
-void EMCInterpreter::cmd_push(EMCState* script) {
+void EMCInterpreter::op_push(EMCState* script) {
 	script->stack[--script->sp] = _parameter;
 }
 
-void EMCInterpreter::cmd_pushReg(EMCState* script) {
+void EMCInterpreter::op_pushReg(EMCState* script) {
 	script->stack[--script->sp] = script->regs[_parameter];
 }
 
-void EMCInterpreter::cmd_pushBPNeg(EMCState* script) {
+void EMCInterpreter::op_pushBPNeg(EMCState* script) {
 	script->stack[--script->sp] = script->stack[(-(int32)(_parameter + 2)) + script->bp];
 }
 
-void EMCInterpreter::cmd_pushBPAdd(EMCState* script) {
+void EMCInterpreter::op_pushBPAdd(EMCState* script) {
 	script->stack[--script->sp] = script->stack[(_parameter - 1) + script->bp];
 }
 
-void EMCInterpreter::cmd_popRetOrPos(EMCState* script) {
+void EMCInterpreter::op_popRetOrPos(EMCState* script) {
 	switch (_parameter) {
 	case 0:
 		script->retValue = script->stack[script->sp++];
@@ -360,48 +360,48 @@ void EMCInterpreter::cmd_popRetOrPos(EMCState* script) {
 	}
 }
 
-void EMCInterpreter::cmd_popReg(EMCState* script) {
+void EMCInterpreter::op_popReg(EMCState* script) {
 	script->regs[_parameter] = script->stack[script->sp++];
 }
 
-void EMCInterpreter::cmd_popBPNeg(EMCState* script) {
+void EMCInterpreter::op_popBPNeg(EMCState* script) {
 	script->stack[(-(int32)(_parameter + 2)) + script->bp] = script->stack[script->sp++];
 }
 
-void EMCInterpreter::cmd_popBPAdd(EMCState* script) {
+void EMCInterpreter::op_popBPAdd(EMCState* script) {
 	script->stack[(_parameter - 1) + script->bp] = script->stack[script->sp++];
 }
 
-void EMCInterpreter::cmd_addSP(EMCState* script) {
+void EMCInterpreter::op_addSP(EMCState* script) {
 	script->sp += _parameter;
 }
 
-void EMCInterpreter::cmd_subSP(EMCState* script) {
+void EMCInterpreter::op_subSP(EMCState* script) {
 	script->sp -= _parameter;
 }
 
-void EMCInterpreter::cmd_execOpcode(EMCState* script) {
-	uint8 opcode = _parameter;
+void EMCInterpreter::op_sysCall(EMCState* script) {
+	const uint8 id = _parameter;
 
-	assert(script->dataPtr->opcodes);
-	assert(opcode < script->dataPtr->opcodes->size());
+	assert(script->dataPtr->sysFuncs);
+	assert(id < script->dataPtr->sysFuncs->size());
 
-	if ((*script->dataPtr->opcodes)[opcode] && ((*script->dataPtr->opcodes)[opcode])->isValid()) {
-		script->retValue = (*(*script->dataPtr->opcodes)[opcode])(script);
+	if ((*script->dataPtr->sysFuncs)[id] && ((*script->dataPtr->sysFuncs)[id])->isValid()) {
+		script->retValue = (*(*script->dataPtr->sysFuncs)[id])(script);
 	} else {
 		script->retValue = 0;
-		warning("Calling unimplemented opcode(0x%.02X/%d) from file '%s'", opcode, opcode, script->dataPtr->filename);
+		warning("Unimplemented system call 0x%.02X/%d used in file '%s'", id, id, script->dataPtr->filename);
 	}
 }
 
-void EMCInterpreter::cmd_ifNotJmp(EMCState* script) {
+void EMCInterpreter::op_ifNotJmp(EMCState* script) {
 	if (!script->stack[script->sp++]) {
 		_parameter &= 0x7FFF;
 		script->ip = script->dataPtr->data + _parameter;
 	}
 }
 
-void EMCInterpreter::cmd_negate(EMCState* script) {
+void EMCInterpreter::op_negate(EMCState* script) {
 	int16 value = script->stack[script->sp];
 	switch (_parameter) {
 	case 0:
@@ -426,7 +426,7 @@ void EMCInterpreter::cmd_negate(EMCState* script) {
 	}
 }
 
-void EMCInterpreter::cmd_eval(EMCState* script) {
+void EMCInterpreter::op_eval(EMCState* script) {
 	int16 ret = 0;
 	bool error = false;
 
@@ -518,7 +518,7 @@ void EMCInterpreter::cmd_eval(EMCState* script) {
 		script->stack[--script->sp] = ret;
 }
 
-void EMCInterpreter::cmd_setRetAndJmp(EMCState* script) {
+void EMCInterpreter::op_setRetAndJmp(EMCState* script) {
 	if (script->sp >= EMCState::kStackLastEntry) {
 		script->ip = 0;
 	} else {
diff --git a/engines/kyra/script.h b/engines/kyra/script.h
index b65dee0398..da229d7e2a 100644
--- a/engines/kyra/script.h
+++ b/engines/kyra/script.h
@@ -43,7 +43,7 @@ struct EMCData {
 	uint16 *ordr;
 	uint16 dataSize;
 
-	const Common::Array<const Opcode*> *opcodes;
+	const Common::Array<const Opcode*> *sysFuncs;
 };
 
 struct EMCState {
@@ -98,7 +98,7 @@ class EMCInterpreter {
 public:
 	EMCInterpreter(KyraEngine_v1 *vm);
 
-	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode*> *opcodes);
+	bool load(const char *filename, EMCData *data, const Common::Array<const Opcode *> *opcodes);
 	void unload(EMCData *data);
 
 	void init(EMCState *scriptState, const EMCData *data);
@@ -111,32 +111,32 @@ protected:
 	KyraEngine_v1 *_vm;
 	int16 _parameter;
 
-	typedef void (EMCInterpreter::*CommandProc)(EMCState*);
-	struct CommandEntry {
-		CommandProc proc;
+	typedef void (EMCInterpreter::*OpcodeProc)(EMCState *);
+	struct OpcodeEntry {
+		OpcodeProc proc;
 		const char *desc;
 	};
 
-	const CommandEntry *_commands;
+	const OpcodeEntry *_opcodes;
 private:
-	void cmd_jmpTo(EMCState*);
-	void cmd_setRetValue(EMCState*);
-	void cmd_pushRetOrPos(EMCState*);
-	void cmd_push(EMCState*);
-	void cmd_pushReg(EMCState*);
-	void cmd_pushBPNeg(EMCState*);
-	void cmd_pushBPAdd(EMCState*);
-	void cmd_popRetOrPos(EMCState*);
-	void cmd_popReg(EMCState*);
-	void cmd_popBPNeg(EMCState*);
-	void cmd_popBPAdd(EMCState*);
-	void cmd_addSP(EMCState*);
-	void cmd_subSP(EMCState*);
-	void cmd_execOpcode(EMCState*);
-	void cmd_ifNotJmp(EMCState*);
-	void cmd_negate(EMCState*);
-	void cmd_eval(EMCState*);
-	void cmd_setRetAndJmp(EMCState*);
+	void op_jmp(EMCState*);
+	void op_setRetValue(EMCState*);
+	void op_pushRetOrPos(EMCState*);
+	void op_push(EMCState*);
+	void op_pushReg(EMCState*);
+	void op_pushBPNeg(EMCState*);
+	void op_pushBPAdd(EMCState*);
+	void op_popRetOrPos(EMCState*);
+	void op_popReg(EMCState*);
+	void op_popBPNeg(EMCState*);
+	void op_popBPAdd(EMCState*);
+	void op_addSP(EMCState*);
+	void op_subSP(EMCState*);
+	void op_sysCall(EMCState*);
+	void op_ifNotJmp(EMCState*);
+	void op_negate(EMCState*);
+	void op_eval(EMCState*);
+	void op_setRetAndJmp(EMCState*);
 };
 } // end of namespace Kyra