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

[Gael Thomas]

Author: gthomas
Date: Sat Oct 10 14:56:35 2009
New Revision: 83726

URL: http://llvm.org/viewvc/llvm-project?rev=83726&view=rev
Log:
Opinfo is not more a gc object


Modified:
    vmkit/trunk/lib/N3/VMCore/Assembly.h
    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/Assembly.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Assembly.h?rev=83726&r1=83725&r2=83726&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Assembly.h (original)
+++ vmkit/trunk/lib/N3/VMCore/Assembly.h Sat Oct 10 14:56:35 2009
@@ -65,7 +65,6 @@
 class Section : public mvm::PermanentObject {
 public:
   virtual void print(mvm::PrintBuffer* buf) const;
-  virtual void TRACER;
   
   char* name;
   uint32 virtualSize;
@@ -84,7 +83,6 @@
 class Stream : public mvm::PermanentObject {
 public:
   virtual void print(mvm::PrintBuffer* buf) const;
-  virtual void TRACER;
 
   char* name;
   uint32 realOffset;
@@ -94,7 +92,6 @@
 class Table : public mvm::PermanentObject {
 public:
   virtual void print(mvm::PrintBuffer* buf) const;
-  virtual void TRACER;
 
   uint32 offset;
   uint32 rowsNumber;
@@ -111,7 +108,6 @@
 class Header : public mvm::PermanentObject {
 public:
   virtual void print(mvm::PrintBuffer* buf) const;
-  virtual void TRACER;
 
   uint32 signature;
   uint32 major;

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.h (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.h Sat Oct 10 14:56:35 2009
@@ -56,9 +56,8 @@
   virtual void TRACER;
 };
 
-class Opinfo : public mvm::Object {
+class Opinfo {
 public:
-  static VirtualTable* VT; 
   llvm::BasicBlock* newBlock;
   llvm::BasicBlock* exceptionBlock;
   bool reqSuppl;
@@ -67,7 +66,6 @@
   virtual void print(mvm::PrintBuffer* buf) const {
     buf->write("Opinfo");
   }
-  virtual void TRACER;
 };
 
 

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp Sat Oct 10 14:56:35 2009
@@ -174,6 +174,10 @@
 #endif
   
   INIT(Property);
+  INIT(VMCond);
+  INIT(LockObj);
+
+  INIT(VMObject);
   INIT(VMArray);
   INIT(ArrayUInt8);
   INIT(ArraySInt8);
@@ -185,13 +189,9 @@
   INIT(ArrayFloat);
   INIT(ArrayDouble);
   INIT(ArrayObject);
-  INIT(VMCond);
-  INIT(LockObj);
-  INIT(VMObject);
-  INIT(ThreadSystem);
-  INIT(CLIString);
-  INIT(Opinfo);
   INIT(Exception);
+  INIT(CLIString);
+  INIT(ThreadSystem);
 
 #undef INIT
 

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VirtualTables.cpp Sat Oct 10 14:56:35 2009
@@ -42,14 +42,10 @@
   INIT(ThreadSystem);
   INIT(CLIString);
   INIT(Property);
-  INIT(Opinfo);
   INIT(Exception);
   
 #undef INIT
 
-void Opinfo::TRACER {
-}
-
 void CLIJit::TRACER {
   compilingMethod->CALL_TRACER;
   compilingClass->CALL_TRACER;
@@ -213,12 +209,6 @@
   loadedTokenClasses->CALL_TRACER;
   loadedTokenMethods->CALL_TRACER;
   loadedTokenFields->CALL_TRACER;
-  //lockVar->MARK_AND_TRACE;
-  //condVar->MARK_AND_TRACE;
-  textSection->CALL_TRACER;
-  rsrcSection->CALL_TRACER;
-  relocSection->CALL_TRACER;
-  CLIHeader->CALL_TRACER;
   vm->CALL_TRACER;
   delegatee->MARK_AND_TRACE;
   // TODO trace assembly refs...
@@ -237,24 +227,6 @@
   loadedAssemblies->CALL_TRACER;
 }
 
-void Section::TRACER {
-}
-
-void Stream::TRACER {
-}
-
-void Table::TRACER {
-}
-
-void Header::TRACER {
-  tildStream->CALL_TRACER;
-  stringStream->CALL_TRACER;
-  usStream->CALL_TRACER;
-  blobStream->CALL_TRACER;
-  guidStream->CALL_TRACER;
-  CALL_TRACER_VECTOR(Table*, tables, gc_allocator);
-}
-
 void CLIString::TRACER {
 }