diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-14 21:03:14 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-14 21:03:14 (GMT) |
| commit | 486b34ebe581cf41b67145911a64ce2ea7b8932a (patch) | |
| tree | 6752bc0bb7245bbd5009061b504f03b02790b58b /src/virtualmachine/VirtualMachine.h | |
| parent | 685be24ffa1eba28aa378b8a9b4fd52dbe238756 (diff) | |
| download | powder-486b34ebe581cf41b67145911a64ce2ea7b8932a.zip powder-486b34ebe581cf41b67145911a64ce2ea7b8932a.tar.gz | |
Fixes invalid text pasting, Adds API to VM, allow program loading in Lua and assigning to update function
Diffstat (limited to 'src/virtualmachine/VirtualMachine.h')
| -rw-r--r-- | src/virtualmachine/VirtualMachine.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/virtualmachine/VirtualMachine.h b/src/virtualmachine/VirtualMachine.h index 1f5b088..04dd400 100644 --- a/src/virtualmachine/VirtualMachine.h +++ b/src/virtualmachine/VirtualMachine.h @@ -117,8 +117,9 @@ namespace vm }; #undef OPDEF - int readByte(FILE *qvmfile); - int readInt(FILE *qvmfile); + int readProgram(std::istream & input); + int readByte(std::istream & input); + int readInt(std::istream & input); int opcodeParameterSize(int opcode); int syscall(int programCounter); @@ -153,6 +154,7 @@ public: virtual ~VirtualMachine(); int LoadProgram(char * filename); + int LoadProgram(std::vector<char> fileData); int Run(); int CallInterpreted(int address); void End(); |