ACTIONSCRIPT: Add stacked registers

xoreos · Feb 23, 2019 · 406a565 · 406a565
1 parent c63240c
commit 406a565
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/aurora/actionscript/avm.cpp b/src/aurora/actionscript/avm.cpp
@@ -41,6 +41,9 @@ namespace ActionScript {
 
 AVM::AVM() {
 	_registers.resize(256);
+	for (size_t i = 0; i < _registers.size(); ++i)
+		_registers[i].push(Variable());
+
 	_stopFlag = false;
 
 	_variables["_global"] = ObjectPtr(new Object());
@@ -66,12 +69,24 @@ void AVM::setFSCommandCallback(FSCommandFunction fscommand) {
 	_fscommand = fscommand;
 }
 
+void AVM::pushRegisters(uint8 n) {
+	for (unsigned int i = 1; i < n; ++i) {
+		_registers[i].push(Variable());
+	}
+}
+
+void AVM::popRegisters(uint8 n) {
+	for (unsigned int i = 1; i < n; ++i) {
+		_registers[i].pop();
+	}
+}
+
 void AVM::storeRegister(Variable value, byte index) {
-	_registers[index] = value;
+	_registers[index].top() = value;
 }
 
 Variable AVM::getRegister(byte index) {
-	return _registers[index];
+	return _registers[index].top();
 }
 
 void AVM::fsCommand(const Common::UString &name, const Common::UString &value) {

diff --git a/src/aurora/actionscript/avm.h b/src/aurora/actionscript/avm.h
@@ -25,6 +25,8 @@
 #ifndef AURORA_ACTIONSCRIPT_AVM_H
 #define AURORA_ACTIONSCRIPT_AVM_H
 
+#include <stack>
+
 #include <boost/function.hpp>
 
 #include "src/common/ustring.h"
@@ -61,6 +63,9 @@ class AVM {
 	 */
 	void fsCommand(const Common::UString &name, const Common::UString &value);
 
+	void pushRegisters(uint8 n);
+	void popRegisters(uint8 n);
+
 	void storeRegister(Variable value, byte index);
 	Variable getRegister(byte index);
 
@@ -85,7 +90,7 @@ class AVM {
 	RegisterClassFunction _registerClass;
 	FSCommandFunction _fscommand;
 
-	std::vector<Variable> _registers;
+	std::vector<std::stack<Variable>> _registers;
 	std::map<Common::UString, Variable> _variables;
 
 	bool _stopFlag;