moved to the jit module 72/12672/1
Sylvestre Ledru [Thu, 26 Sep 2013 09:34:23 +0000 (11:34 +0200)]
Change-Id: I8b508dc8a2ff51056314805ce80c1bcfd7e8b8ae

scilab/modules/core/includes/vmkit_core.h [deleted file]
scilab/modules/jit/includes/vmkit_core.h [new file with mode: 0644]

diff --git a/scilab/modules/core/includes/vmkit_core.h b/scilab/modules/core/includes/vmkit_core.h
deleted file mode 100644 (file)
index 689f355..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "MutatorThread.h"
-#include "vmkit/System.h"
-#include "vmkit/Locks.h"
-#include "vmkit/Thread.h"
-#include "vmkit/VirtualMachine.h"
-
-namespace VMKitScilab {
-       class ScilabVM;
-
-       class ScilabThread : public vmkit::MutatorThread {
-       private:
-               int argc, iFileIndex, iLangIndex, ret;
-               char **argv;
-
-       public:
-               void setArgs(int argc, char** argv, int iFileIndex, int iLangIndex);
-               void setret(int ret);
-               int getargc();
-               int getiFileIndex();
-               int getiLangIndex();
-               char **getargv();
-               int getret();
-
-               ScilabThread (ScilabVM* vm);
-               ScilabVM* vm();
-               void execute();
-       };
-
-       class ScilabVM : public vmkit::VirtualMachine {
-       private:
-               int ret;
-
-       public:
-               vmkit::BumpPtrAllocator Alloc;
-               vmkit::CompiledFrames **frames;
-
-               ScilabVM (vmkit::BumpPtrAllocator& Alloc, vmkit::CompiledFrames** frames) : VirtualMachine(Alloc, frames){}
-               ~ScilabVM(){}
-
-               virtual void startCollection(){}
-               virtual void endCollection(){}
-               virtual void scanWeakReferencesQueue(word_t closure){}
-               virtual void scanSoftReferencesQueue(word_t closure){}
-               virtual void scanPhantomReferencesQueue(word_t closure){}
-               virtual void scanFinalizationQueue(word_t closure){}
-               virtual void addFinalizationCandidate(gc* obj){}
-               virtual void finalizeObject(gc* res){}
-               virtual void traceObject(gc* obj, word_t closure){}
-               virtual void setType(gc* header, void* type){}
-               virtual void setType(void* header, void* type){}
-               virtual void* getType(gc* obj){}
-               virtual size_t getObjectSize(gc* obj){}
-               virtual const char* getObjectTypeName(gc* obj){}
-               virtual bool isCorruptedType(gc* header){}
-               virtual void printMethod(vmkit::FrameInfo* FI, word_t ip, word_t addr){}
-               virtual void invokeEnqueueReference(gc* res){}
-               virtual void clearObjectReferent(gc* ref){}
-               virtual gc** getObjectReferentPtr(gc* _obj){}
-               virtual void setObjectReferent(gc* _obj, gc* val){}
-
-               virtual void runApplication(int argc, char** argv){}
-
-               virtual void runApplication(int argc, char**  argv, int iFileIndex, int iLangIndex);
-
-               virtual void nullPointerException(){}
-               virtual void stackOverflowError(){}
-
-               static void mainStart(ScilabThread* thread);
-               int getret();
-               void setret(int ret);
-       };
-}
diff --git a/scilab/modules/jit/includes/vmkit_core.h b/scilab/modules/jit/includes/vmkit_core.h
new file mode 100644 (file)
index 0000000..0af011c
--- /dev/null
@@ -0,0 +1,75 @@
+#include "MutatorThread.h"
+#include "vmkit/System.h"
+#include "vmkit/Locks.h"
+#include "vmkit/Thread.h"
+#include "vmkit/VirtualMachine.h"
+
+namespace VMKitScilab
+{
+class ScilabVM;
+
+class ScilabThread : public vmkit::MutatorThread
+{
+private:
+    int argc, iFileIndex, iLangIndex, ret;
+    char **argv;
+
+public:
+    void setArgs(int argc, char** argv, int iFileIndex, int iLangIndex);
+    void setret(int ret);
+    int getargc();
+    int getiFileIndex();
+    int getiLangIndex();
+    char **getargv();
+    int getret();
+
+    ScilabThread (ScilabVM* vm);
+    ScilabVM* vm();
+    void execute();
+};
+
+class ScilabVM : public vmkit::VirtualMachine
+{
+private:
+    int ret;
+
+public:
+    vmkit::BumpPtrAllocator Alloc;
+    vmkit::CompiledFrames **frames;
+
+    ScilabVM (vmkit::BumpPtrAllocator& Alloc, vmkit::CompiledFrames** frames) : VirtualMachine(Alloc, frames) {}
+    ~ScilabVM() {}
+
+    virtual void startCollection() {}
+    virtual void endCollection() {}
+    virtual void scanWeakReferencesQueue(word_t closure) {}
+    virtual void scanSoftReferencesQueue(word_t closure) {}
+    virtual void scanPhantomReferencesQueue(word_t closure) {}
+    virtual void scanFinalizationQueue(word_t closure) {}
+    virtual void addFinalizationCandidate(gc* obj) {}
+    virtual void finalizeObject(gc* res) {}
+    virtual void traceObject(gc* obj, word_t closure) {}
+    virtual void setType(gc* header, void* type) {}
+    virtual void setType(void* header, void* type) {}
+    virtual void* getType(gc* obj) {}
+    virtual size_t getObjectSize(gc* obj) {}
+    virtual const char* getObjectTypeName(gc* obj) {}
+    virtual bool isCorruptedType(gc* header) {}
+    virtual void printMethod(vmkit::FrameInfo* FI, word_t ip, word_t addr) {}
+    virtual void invokeEnqueueReference(gc* res) {}
+    virtual void clearObjectReferent(gc* ref) {}
+    virtual gc** getObjectReferentPtr(gc* _obj) {}
+    virtual void setObjectReferent(gc* _obj, gc* val) {}
+
+    virtual void runApplication(int argc, char** argv) {}
+
+    virtual void runApplication(int argc, char**  argv, int iFileIndex, int iLangIndex);
+
+    virtual void nullPointerException() {}
+    virtual void stackOverflowError() {}
+
+    static void mainStart(ScilabThread* thread);
+    int getret();
+    void setret(int ret);
+};
+}