summaryrefslogtreecommitdiff
path: root/src/virtualmachine/VirtualMachine.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-09-13 10:01:09 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-13 10:01:09 (GMT)
commit3e0fcc904e48bc36c1fd51f24638a1227bec860a (patch)
tree04d410c166a55c263908db222b10263389583a95 /src/virtualmachine/VirtualMachine.h
parentacf652595c7df69adab683a5a9b29e3881cc42be (diff)
downloadpowder-3e0fcc904e48bc36c1fd51f24638a1227bec860a.zip
powder-3e0fcc904e48bc36c1fd51f24638a1227bec860a.tar.gz
Disable JIT for now
Diffstat (limited to 'src/virtualmachine/VirtualMachine.h')
-rw-r--r--src/virtualmachine/VirtualMachine.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/virtualmachine/VirtualMachine.h b/src/virtualmachine/VirtualMachine.h
index 287e9aa..1f5b088 100644
--- a/src/virtualmachine/VirtualMachine.h
+++ b/src/virtualmachine/VirtualMachine.h
@@ -123,6 +123,7 @@ namespace vm
int syscall(int programCounter);
//Used by the JIT
+ #ifdef VMJIT
int constant4();
int constant1();
void emit1(int v);
@@ -133,9 +134,14 @@ namespace vm
void emitMovEAXEDI();
bool emitMovEBXEDI(int andit);
static int hex(int c);
+ #endif
public:
+ #ifdef VMJIT
static void callFromCompiled();
static void callSyscall();
+ bool Compile();
+ int CallCompiled(int address);
+ #endif
Simulation * sim;
Renderer * ren;
@@ -146,11 +152,9 @@ public:
VirtualMachine(int hunkMbytes);
virtual ~VirtualMachine();
- bool Compile();
int LoadProgram(char * filename);
int Run();
int CallInterpreted(int address);
- int CallCompiled(int address);
void End();
void Marshal(int address, word element)
{