Changeset 221

Timestamp:

Feb 3, 2007, 11:01:41 PM (18 years ago)

Author:

cinc

Message:

Changes...

Location:

trunk/nom

Files:

• class_c/nomclassmanager.c (modified) (4 diffs)
• include/nomtk.h (modified) (1 diff)
• src/nombuildclass.c (modified) (19 diffs)
• src/nombuildnomcls.c (modified) (8 diffs)
• src/nombuildnomobj.c (modified) (1 diff)

trunk/nom/class_c/nomclassmanager.c ¶

@@ -56 +56 @@
    \remark This method isn't implemented yet.
  */
-NOM_Scope CORBA_Object NOMLINK impl_NOMClassMgr_nomFindClassFromId(NOMClassMgr* nomSelf,
-                                                                   const CORBA_long classId,
+NOM_Scope PNOMObject NOMLINK impl_NOMClassMgr_nomFindClassFromId(NOMClassMgr* nomSelf,
+                                                                 const CORBA_long classId,
+                                                                 const CORBA_long ulMajorVersion,
+                                                                 const CORBA_long ulMinorVersion,
+                                                                 CORBA_Environment *ev)
+{
+  /*  NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf); */
+  CORBA_Object nomRetval;
+
+  nomPrintf("%s: %s not implemented yet (line %d)\n", __FILE__, __FUNCTION__, __LINE__);
+  nomRetval=NULL;
+  return nomRetval;
+}
+
+/**
+   \brief Function which implements the nomFindClassFromName() method of NOMClassMgr.
+ */
+NOM_Scope PNOMObject NOMLINK impl_NOMClassMgr_nomFindClassFromName(NOMClassMgr* nomSelf, 
+                                                                   const CORBA_char * className,
                                                                    const CORBA_long ulMajorVersion,
                                                                    const CORBA_long ulMinorVersion,
                                                                    CORBA_Environment *ev)
-{
-  /*  NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf); */
-  CORBA_Object nomRetval;
-
-  nomPrintf("%s: %s not implemented yet (line %d)\n", __FILE__, __FUNCTION__, __LINE__);
-  nomRetval=NULL;
-  return nomRetval;
-}
-
-/**
-   \brief Function which implements the nomFindClassFromName() method of NOMClassMgr.
- */
-NOM_Scope CORBA_Object NOMLINK impl_NOMClassMgr_nomFindClassFromName(NOMClassMgr* nomSelf, 
-                                                                     const CORBA_char * className,
-                                                                     const CORBA_long ulMajorVersion,
-                                                                     const CORBA_long ulMinorVersion,
-                                                                     CORBA_Environment *ev)
 {
   CORBA_Object nomRetval=NULLHANDLE;
@@ -144 +144 @@
 
 
-
 /**
    \brief Function which implements the nomGetClassList() method of NOMClassMgr.
@@ -159 +158 @@
 
 NOM_Scope gpointer NOMLINK impl_NOMClassMgr_nomGetClassInfoPtrFromName(NOMClassMgr* nomSelf,
-                                                                       const CORBA_char * className, CORBA_Environment *ev)
+                                                                       const CORBA_char * className,
+                                                                       CORBA_Environment *ev)
 {
   nomMethodTab * mtab;
@@ -176 +176 @@
 
 
-/*
+/**
   This function is called when a method is (accidently) removed from our list.
   This may happen e.g. when a class is registered again using the same name. The old

trunk/nom/include/nomtk.h ¶

@@ -90 +90 @@
                                                     NOM_ulong majorVersion,
                                                     NOM_ulong minorVersion);
-void addMethodAndDataToThisPrivClassStruct(NOMClassPriv* nClass, NOMClassPriv* ncpParent, nomStaticClassInfo *sci);
+boolean addMethodAndDataToThisPrivClassStruct(NOMClassPriv* nClass, NOMClassPriv* ncpParent, nomStaticClassInfo *sci);
 NOMClass*  createNOMObjectClassObjectAndUpdateNOMObject(NOMClass* nomClass, NOMClassPriv* nClass, NOM_ulong ulSize);
 void fillCClassDataStructParentMtab(nomStaticClassInfo *sci, NOMClassPriv *nClass, NOMClass *nomClass);

trunk/nom/src/nombuildclass.c ¶

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
+/** \file
+    This File contains most of the magic to create classes for NOM.
+ */
 
 #define INCL_DOS
@@ -320 +323 @@
 
 
-/*
+/**
   - This function builds the nomMethodTab of class nClass.
   - Calculates the method thunks
@@ -328 +331 @@
   methods. 
  */
-void addMethodAndDataToThisPrivClassStruct(NOMClassPriv* nClass, NOMClassPriv* ncpParent, nomStaticClassInfo *sci) 
+boolean addMethodAndDataToThisPrivClassStruct(NOMClassPriv* nClass, NOMClassPriv* ncpParent, nomStaticClassInfo *sci) 
 {
   BYTE * mem;
@@ -334 +337 @@
 
 BUILDNOMCLASS_ENTER
+
+  /* Get mem for method thunking code. This assembler code is needed so the indirect
+     jump to the methods from the object pointer which is known does work. For each class
+     an individual thunking code must be calculated because the number of instance
+     variables is not defined. */
+  if(0!=sci->ulNumStaticMethods){
+    nClass->mThunk=NOMMalloc(sizeof(nomMethodThunk)*sci->ulNumStaticMethods);
+    if(!nClass->mThunk)
+      return FALSE;
+  }
 
   nClass->sci=sci;   /* Save static class info for internal use */
@@ -347 +360 @@
   nClass->parentMtabStruct.mtab=(nomMethodTab*)&nClass->thisMtab;
   
-#ifdef DEBUG_NOMBUILDCLASS
-  nomPrintf("nClass->mtabList.next: %x\n", nClass->mtabList.next);
-#endif
+  DBG_NOMBUILDCLASS(TRUE, "nClass->mtabList.next: %x\n", nClass->mtabList.next);
   
   /* There're some parents. Copy parent mtab data into new mtab. */
@@ -367 +378 @@
   /* Add class struct of this class. This includes the proc adresses. */
   if(sci->ulNumStaticMethods) {
-#ifdef DEBUG_NOMBUILDCLASS
-    nomPrintf("copy own data: %d (classptr+numProcs*procpointersize) from %x (cds, classDataStruct of %x) to %x (our mtab part)\n", 
-              sizeof(NOMClass*)+sci->ulNumStaticMethods*sizeof(nomMethodProc*),
-              sci->nomCds, sci->nomCds->nomClassObject, mem);
-#endif
+    DBG_NOMBUILDCLASS(TRUE, 
+                      "copy own data: %d (classptr+numProcs*procpointersize) from %x (cds, classDataStruct of %x) to %x (our mtab part)\n", 
+                      sizeof(NOMClass*)+sci->ulNumStaticMethods*sizeof(nomMethodProc*),
+                      sci->nomCds, sci->nomCds->nomClassObject, mem);
+
     nClass->entries0=(NOMClass**)mem; /* Our part in the mtab starts here. We need this position to insert the class object pointer
                                          later. */
@@ -396 +407 @@
   sci->ccds->instanceDataToken=&nClass->thunk;
 
-  BUILDNOMCLASS_LEAVE
+  BUILDNOMCLASS_LEAVE;
+  return TRUE;
 }
 
@@ -530 +542 @@
   if((nClass=(NOMClassPriv*)NOMCalloc(1, ulMemSize))==NULLHANDLE)
     return NULLHANDLE;
-
+#if 0
+  //Moved to addMethodAndDataToThisPrivClassStruct()
   /* Get mem for method thunking code */
   if(0!=sci->ulNumStaticMethods){
@@ -539 +552 @@
     }
   }
+#endif
+
   /* Add class struct of this class.
      This includes 
@@ -544 +559 @@
      -add the parent mtab info to the new built mtab
   */
-  addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci) ;
-
+  if(!addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci)){
+    NOMFree(nClass);
+    return NULLHANDLE;
+  };
+  
   DBG_NOMBUILDCLASS(TRUE, "%s:  mtab: %x\n", __FUNCTION__, nClass->mtab);
 
@@ -598 +616 @@
   nomClassMeta=_nomFindClassFromName(NOMClassMgrObject, *sci->nomExplicitMetaId, majorVersion, minorVersion, NULLHANDLE);
 
-#ifdef DEBUG_NOMBUILDCLASS
-  nomPrintf("%d: %x %s %s\n", __LINE__, nomClassMeta, *sci->nomClassId, *sci->nomExplicitMetaId);
-#endif
+    DBG_NOMBUILDCLASS(TRUE, "%x %s %s\n", nomClassMeta, *sci->nomClassId, *sci->nomExplicitMetaId);
 
   if(!nomClassMeta)
@@ -632 +648 @@
                             nomClass);
   
-#ifdef DEBUG_NOMBUILDCLASS
-  nomPrintf("%d: New class Object (child of NOMClass): %x \n", __LINE__, nomClass);
-#endif
+  DBG_NOMBUILDCLASS(TRUE, "New class Object (child of NOMClass): %x \n", nomClass);
 
   /* nomClassReady() is called in nomBuildClass() */
@@ -802 +816 @@
 }
 
-
+/**
+   Build a class for NOM from the data generated from the IDL compiler and
+   compiled into the DLL.
+ */
 NOMEXTERN NOMClass * NOMLINK nomBuildClass(gulong ulReserved,
                                            nomStaticClassInfo *sci,
@@ -886 +903 @@
     priv_buildNOMObjectClassInfo(ulReserved, sci, /* yes */
                                  ulMajorVersion, ulMinorVersion);
-    return NULLHANDLE; /* We can't return a SOMClass for SOMObject because SOMClass isn't built yet. */
+    return NULLHANDLE; /* We can't return a NOMClass for NOMObject because NOMClass isn't built yet. */
   }
 
@@ -907 +924 @@
     ncpParent=priv_findPrivClassInGlobalClassListFromName(pGlobalNomEnv,
                                                           **(sci->nomIdAllParents)); /* This may also return a class not derived
-                                                                                        from SOMClass */
+                                                                                        from NOMClass */
 #endif
     if(!ncpParent)
@@ -1008 +1025 @@
     return NULLHANDLE;
 
+#if 0
+  //Moved to addMethodAndDataToThisPrivClassStruct()
   if(0!=sci->ulNumStaticMethods){
     /* Get mem for method thunking code */
@@ -1016 +1035 @@
     }
   }
+#endif
 
   nClass->ulClassSize=sci->ulInstanceDataSize+ulParentDataSize;
 
   if((nomClass=(NOMClass*)NOMCalloc(1, sci->ulInstanceDataSize+ulParentDataSize))==NULLHANDLE) {
-    NOMFree(nClass->mThunk);
+    //NOMFree(nClass->mThunk);
     NOMFree(nClass);
     return NULLHANDLE;
@@ -1028 +1048 @@
 
   /* Add class struct of this class. This includes resolving the method adresses. */
-  addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci) ;
+  if(!addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci)){
+    NOMFree(nClass);
+    NOMFree(nomClass);
+    return NULLHANDLE;
+  };
 
   /* Resolve overrides if any */
@@ -1047 +1071 @@
   nClass->mtab->nomClassName=*sci->nomClassId;
   nClass->mtab->ulInstanceSize=sci->ulInstanceDataSize+ulParentDataSize; /* Size of instance data of this class and all
-                                                                        parent classes. This isn't actually allocated for this class
-                                                                        object but the entry is used when creating the objects. */
+                                                                            parent classes. This isn't actually allocated
+                                                                            for this class object but the entry is used
+                                                                            when creating the objects. */
   fillCClassDataStructParentMtab(sci, nClass, nomClass);
 

trunk/nom/src/nombuildnomcls.c ¶

@@ -49 +49 @@
 /********************************************************/
 
-/* Define if you want to have messages from somBuildClass() and friends */
+/* Define if you want to have messages from nomBuildClass() and friends */
 //#define DEBUG_NOMBUILDCLASS
 /* Define if you want to have messages from building NOMObject */
@@ -59 +59 @@
     #define BUILDNOMCLASS_ENTER nomPrintf("\n%d: *** entering %s...\n",__LINE__,  __FUNCTION__);
     #define BUILDNOMCLASS_LEAVE nomPrintf("%d: *** Leaving %s...\n\n",__LINE__,  __FUNCTION__);
+    #define DBG_BUILDNOMCLASS(a, b,...)   if(a) nomPrintf("%d: " b , __LINE__,  __VA_ARGS__);
 #else
     #define BUILDNOMCLASS_ENTER
     #define BUILDNOMCLASS_LEAVE
+    #define DBG_BUILDNOMCLASS(a, b,...)
 #endif
 
@@ -101 +103 @@
 
   /* Calculate size of new class object */
-#ifdef DEBUG_BUILDNOMCLASS
-  nomPrintf("%d: ncParent->mtab->mtabSize: %d\n", __LINE__, ncpParent->mtab->mtabSize);
-#endif
+  DBG_BUILDNOMCLASS(TRUE, "ncParent->mtab->mtabSize: %d\n", ncpParent->mtab->mtabSize);
 
   mtabSize=ncpParent->mtab->mtabSize+sizeof(nomMethodProc*)*(sci->ulNumStaticMethods)+sizeof(NOMClass*);/* numStaticMethods is correct here!
@@ -114 +114 @@
   gulParentDataSize=ncpParent->mtab->ulInstanceSize; /* Parent instance size. This is the mtab pointer + instance vars */
 
-#ifdef DEBUG_BUILDNOMCLASS
-  nomPrintf("%d: mtabSize is: %d, ulParentDataSize is: %d (instance vars + mtab ptr)\n",
-            __LINE__, mtabSize, gulParentDataSize);
-  nomPrintf("%d: sci->numStaticMethods: %d\n", __LINE__, sci->ulNumStaticMethods);
-#endif
+  DBG_BUILDNOMCLASS(TRUE,"mtabSize is: %d, ulParentDataSize is: %d (instance vars + mtab ptr)\n",
+                    mtabSize, gulParentDataSize);
+  DBG_BUILDNOMCLASS(TRUE, "sci->numStaticMethods: %d\n", sci->ulNumStaticMethods);
 
   /* Alloc private class struct using SOMCalloc. */
@@ -124 +122 @@
     return NULLHANDLE;
 
-  /* Get mem for method thunking code */
-  nClass->mThunk=NOMMalloc(sizeof(nomMethodThunk)*sci->ulNumStaticMethods);
-  if(!nClass->mThunk) {
-    NOMFree(nClass);
-    return NULLHANDLE;
-  }
-
+  /* Get mem for method thunking code. This assembler code is needed so the indirect
+     jump to the methods from the object pointer which is known does work. For each class
+     an individual thunking code must be calculated because the number of instance
+     variables is not defined. */
+#if 0
+  //Moved to addMethodAndDataToThisPrivClassStruct()
+  if(0!=sci->ulNumStaticMethods){
+    nClass->mThunk=NOMMalloc(sizeof(nomMethodThunk)*sci->ulNumStaticMethods);
+    if(!nClass->mThunk) {
+      NOMFree(nClass);
+      return NULLHANDLE;
+    }
+  }
+#endif
   /* The size of each instance of this class. A NOM object has a method tab pointer
      at the beginning followed by the instance variables. */
@@ -142 +147 @@
      mtab-entries[] to our new one before adding our own methods.
      sci will be saved in nClass->sci */
-#warning !!!!! Move mem alloc for thunking into this func !!!!!
-  addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci);
+  //#warning !!!!! Move mem alloc for thunking into this func !!!!!
+  if(!addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci)){
+    NOMFree(nClass);
+    return NULLHANDLE;
+  };
 
   /**********************************/
@@ -261 +269 @@
   pGlobalNomEnv->nomObjectMetaClass=(NOMClass*)nomClass->mtab->entries[0];
 
-#ifdef DEBUG_BUILDNOMCLASS
-  nomPrintf("%d: mtab: %x New class ptr (class object SOMClass): %x (SOMClassPriv: %x) for %s\n",
-            __LINE__, nomClass->mtab, nomClass, nClass, *sci->nomClassId);
-#endif
+    DBG_BUILDNOMCLASS(TRUE, "mtab: %x New class ptr (class object SOMClass): %x (SOMClassPriv: %x) for %s\n",
+                      nomClass->mtab, nomClass, nClass, *sci->nomClassId);
 
   pGlobalNomEnv->defaultMetaClass=nomClass;
@@ -274 +280 @@
 #endif
 
-
   /* Run initialization code if any */
   _nomInit(nomClass, NULLHANDLE);

trunk/nom/src/nombuildnomobj.c ¶

@@ -147 +147 @@
      an individual thunking code must be calculated because the number of instance
      variables is not defined. */
-  nClass->mThunk=NOMMalloc(sizeof(nomMethodThunk)*sci->ulNumStaticMethods);
-  if(!nClass->mThunk) {
-    NOMFree(nClass);
-    return NULLHANDLE; 
+  if(0!=sci->ulNumStaticMethods){
+    nClass->mThunk=NOMMalloc(sizeof(nomMethodThunk)*sci->ulNumStaticMethods);
+    if(!nClass->mThunk) {
+      NOMFree(nClass);
+      return NULLHANDLE; 
+    }
   }