[vmkit-commits] [vmkit] r52969 - in /vmkit/trunk/lib/N3: PNetLib/PNetMSCorlib.cpp VMCore/VMClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul  1 12:45:18 2008
New Revision: 52969

URL: http://llvm.org/viewvc/llvm-project?rev=52969&view=rev
Log:
Move the get*Delegatee functions to the class library dependent files.


Modified:
    vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp
    vmkit/trunk/lib/N3/VMCore/VMClass.cpp

Modified: vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp?rev=52969&r1=52968&r2=52969&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetMSCorlib.cpp Tue Jul  1 12:45:18 2008
@@ -127,3 +127,38 @@
 
 }
 
+VMObject* Property::getPropertyDelegatee() {
+  if (!delegatee) {
+    delegatee = (*MSCorlib::propertyType)();
+    (*MSCorlib::ctorPropertyType)(delegatee);
+    (*MSCorlib::propertyPropertyType)(delegatee, (VMObject*)this);
+  }
+  return delegatee;
+}
+
+VMObject* VMMethod::getMethodDelegatee() {
+  if (!delegatee) {
+    delegatee = (*MSCorlib::methodType)();
+    (*MSCorlib::ctorMethodType)(delegatee);
+    (*MSCorlib::methodMethodType)(delegatee, (VMObject*)this);
+  }
+  return delegatee;
+}
+
+VMObject* VMCommonClass::getClassDelegatee() {
+  if (!delegatee) {
+    delegatee = (*MSCorlib::clrType)();
+    (*MSCorlib::ctorClrType)(delegatee);
+    (*MSCorlib::typeClrType)(delegatee, (VMObject*)this);
+  }
+  return delegatee;
+}
+
+VMObject* Assembly::getAssemblyDelegatee() {
+  if (!delegatee) {
+    delegatee = (*MSCorlib::assemblyReflection)();
+    (*MSCorlib::ctorAssemblyReflection)(delegatee);
+    (*MSCorlib::assemblyAssemblyReflection)(delegatee, (VMObject*)this);
+  }
+  return delegatee;
+}

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMClass.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMClass.cpp Tue Jul  1 12:45:18 2008
@@ -276,10 +276,19 @@
 }
 
 void VMClass::unifyTypes() {
+  printf("in %s\n", this->printString());
+
   for (std::vector<VMField*>::iterator i = virtualFields.begin(), 
        e = virtualFields.end(); i!= e; ++i) {
+    printf("Resolving in %s\n", this->printString());
     (*i)->signature->resolveType(false, false);
-  }
+    printf("Now I have\n");
+    naturalType->print(llvm::cout);
+    printf("\n");
+  }
+  printf("this = %s\n", this->printString());
+  naturalType->print(llvm::cout);
+  printf("\n");
   if (naturalType->isAbstract())
     naturalType = naturalType->getForwardedType();
   
@@ -763,41 +772,6 @@
   }
 }
 
-VMObject* Property::getPropertyDelegatee() {
-  if (!delegatee) {
-    delegatee = (*MSCorlib::propertyType)();
-    (*MSCorlib::ctorPropertyType)(delegatee);
-    (*MSCorlib::propertyPropertyType)(delegatee, (VMObject*)this);
-  }
-  return delegatee;
-}
-
-VMObject* VMMethod::getMethodDelegatee() {
-  if (!delegatee) {
-    delegatee = (*MSCorlib::methodType)();
-    (*MSCorlib::ctorMethodType)(delegatee);
-    (*MSCorlib::methodMethodType)(delegatee, (VMObject*)this);
-  }
-  return delegatee;
-}
-
-VMObject* VMCommonClass::getClassDelegatee() {
-  if (!delegatee) {
-    delegatee = (*MSCorlib::clrType)();
-    (*MSCorlib::ctorClrType)(delegatee);
-    (*MSCorlib::typeClrType)(delegatee, (VMObject*)this);
-  }
-  return delegatee;
-}
-
-VMObject* Assembly::getAssemblyDelegatee() {
-  if (!delegatee) {
-    delegatee = (*MSCorlib::assemblyReflection)();
-    (*MSCorlib::ctorAssemblyReflection)(delegatee);
-    (*MSCorlib::assemblyAssemblyReflection)(delegatee, (VMObject*)this);
-  }
-  return delegatee;
-}
 
 bool VMMethod::signatureEquals(std::vector<VMCommonClass*>& args) {
   bool stat = isStatic(flags);