[vmkit-commits] [vmkit] r83713 - in /vmkit/trunk/lib/N3/VMCore: CLIJit.cpp CLIJit.h N3Initialise.cpp VirtualTables.cpp

[Gael Thomas]

Author: gthomas
Date: Sat Oct 10 07:32:38 2009
New Revision: 83713

URL: http://llvm.org/viewvc/llvm-project?rev=83713&view=rev
Log:
CLIJit is now allocated when a compilation start and deleted at the end


Modified:
    vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJit.h
    vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
    vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp

Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.cpp?rev=83713&r1=83712&r2=83713&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Sat Oct 10 07:32:38 2009
@@ -456,7 +456,7 @@
 Instruction* CLIJit::invokeInline(VMMethod* meth, 
                                   std::vector<Value*>& args, VMGenericClass* genClass, VMGenericMethod* genMethod) {
   
-  CLIJit* jit = gc_new(CLIJit)();
+  CLIJit* jit = new CLIJit();
   jit->module = meth->classDef->vm->module;
   jit->compilingClass = meth->classDef; 
   jit->compilingMethod = meth;
@@ -467,7 +467,8 @@
   Instruction* ret = jit->inlineCompile(llvmFunction, currentBlock, 
                                         currentExceptionBlock, args, dynamic_cast<VMGenericClass*>(jit->compilingClass), genMethod);
   inlineMethods[meth] = false;
-  
+
+	delete jit;
   return ret;
 }
 
@@ -1446,7 +1447,7 @@
 
 
 Function* CLIJit::compile(VMClass* cl, VMMethod* meth) {
-  CLIJit* jit = gc_new(CLIJit)();
+  CLIJit* jit = new CLIJit();
   jit->compilingClass = cl; 
   jit->compilingMethod = meth;
   jit->module = cl->vm->module;
@@ -1460,7 +1461,8 @@
   } else {
     func = jit->compileFatOrTiny(dynamic_cast<VMGenericClass*>(cl), dynamic_cast<VMGenericMethod*>(meth));
   }
-  
+
+	delete jit;
   return func;
 }
 

Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.h?rev=83713&r1=83712&r2=83713&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.h (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.h Sat Oct 10 07:32:38 2009
@@ -71,16 +71,13 @@
 };
 
 
-class CLIJit : public mvm::Object {
+class CLIJit {
 public:
-  
-  static VirtualTable* VT; 
   virtual void print(mvm::PrintBuffer* buf) const {
     buf->write("CLIJit");
   }
   virtual void TRACER;
   
-  
   static const char* OpcodeNames[0xE1];
   static const char* OpcodeNamesFE[0x23];
 

Modified: vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp?rev=83713&r1=83712&r2=83713&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp Sat Oct 10 07:32:38 2009
@@ -190,7 +190,6 @@
   INIT(VMObject);
   INIT(ThreadSystem);
   INIT(CLIString);
-  INIT(CLIJit);
   INIT(CacheNode);
   INIT(Enveloppe);
   INIT(Opinfo);

Modified: vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp?rev=83713&r1=83712&r2=83713&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp Sat Oct 10 07:32:38 2009
@@ -45,7 +45,6 @@
   INIT(CacheNode);
   INIT(Enveloppe);
   INIT(Opinfo);
-  INIT(CLIJit);
   INIT(Exception);
   
 #undef INIT