*** empty log message ***

src/exe/rt_ini/src/ini.c

@@ -22,7 +22,7 @@
 #endif
 #include "rt_ini_alias.h"
 #include "rt_ini_msg.h"
-///#include "rt_load.h"
+/* #include "rt_load.h" */
 #include "rt_lst.h"
 #include "rt_errh.h"
 #include "rt_syi.h"
@@ -831,8 +831,8 @@ ini_LoadDirectory (
     } else {
       cp->busid = qcom_MyBus(sts);
     }
-    sprintf(cp->dir, "%s::%s", cp->hostspec, load_cNameDirectory);
-    sprintf(cp->bdir, "%s::%s", cp->hostspec, load_cBaseNameDirectory);
+    sprintf(cp->dir, "%s::%s", cp->hostspec, dbs_cNameDirectory);
+    sprintf(cp->bdir, "%s::%s", cp->hostspec, dbs_cNameBaseDirectory);
   }
 
 #elif defined(OS_VMS)
@@ -844,8 +844,8 @@ ini_LoadDirectory (
       if (s != NULL)
 	cp->busid = atoi(s);
     }
-    sprintf(cp->dir, "%s", load_cNameBaseDirectory);
-    sprintf(cp->dir, "%s", load_cNameDirectory);
+    sprintf(cp->bdir, "%s", dbs_cNameBaseDirectory);
+    sprintf(cp->dir, "%s", dbs_cNameDirectory);
   }
 #elif defined(OS_LYNX) || defined(OS_LINUX)
   {
@@ -945,7 +945,7 @@ ini_ReadBootFile (
   pwr_tVolumeId		vid;
 #endif
 
-  //  pwr_tProjVersion	ver;
+  /*  pwr_tProjVersion	ver;*/
   FILE *f;
   ivol_sVolume		*vp;
 

src/exp/com/src/os_vms/pwrb_env.com

@@ -134,6 +134,7 @@ $       defjob pwr_exe_en_us    pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.exe'dbg
 $       defjob pwr_exe_sv_se    pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.exe'dbg'.sv_se]
 $       defjob pwr_lib          pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.lib'dbg']
 $       defjob pwr_obj          pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.obj'dbg']
+$       defjob pwr_load         pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.load]
 $       defjob pwr_cnf          pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.cnf]
 $       defjob pwr_db           pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.db]
 $       defjob pwr_doc          pwrb_root:[os_'pwre_os'.hw_'pwre_hw'.exp.doc]
@@ -160,6 +161,7 @@ $       call undefjob pwr_exe_en_us
 $       call undefjob pwr_exe_sv_se    
 $       call undefjob pwr_lib          
 $       call undefjob pwr_obj          
+$       call undefjob pwr_load          
 $       call undefjob pwr_cnf          
 $       call undefjob pwr_db           
 $       call undefjob pwr_doc          

src/lib/rt/src/rt_gdb.h

@@ -498,7 +498,6 @@ typedef struct {
 } gdb_sCclassVolume;
 
 
-#if 0
 /** Cached Attribute
  */
 #if 0

src/wbl/pwrb/src/pwrb_c_co_pi24bo.wb_load

@@ -162,11 +162,26 @@ SObject pwrb:Class
     Object Template Co_PI24BO
       Body RtBody
 	Attr ConvMask = 65535
-        Attr COAbsFlag = 1
-        Attr NoOfBits = 24
-        Attr MulCount = 4
-        Attr CopWrRough = 1
-        Attr CopWrFine = 1
+        Attr COAbsFlag[0] = 1
+        Attr COAbsFlag[1] = 1
+        Attr COAbsFlag[2] = 1
+        Attr COAbsFlag[3] = 1
+        Attr NoOfBits[0] = 24
+        Attr NoOfBits[1] = 24
+        Attr NoOfBits[2] = 24
+        Attr NoOfBits[3] = 24
+        Attr MulCount[0] = 4
+        Attr MulCount[1] = 4
+        Attr MulCount[2] = 4
+        Attr MulCount[3] = 4
+        Attr CopWrRough[0] = 1
+        Attr CopWrRough[1] = 1
+        Attr CopWrRough[2] = 1
+        Attr CopWrRough[3] = 1
+        Attr CopWrFine[0] = 1
+        Attr CopWrFine[1] = 1
+        Attr CopWrFine[2] = 1
+        Attr CopWrFine[3] = 1
         Attr MaxNoOfCounters = 1
         Attr Process = 1
       EndBody

wb/lib/wb/src/wb_name.h

@@ -152,7 +152,7 @@ public:
   // bool bodyId();
   // bool bodyName();
     
-  static char *unatName( char *name) { return wb_nrep::unatName( name);} 
+  static char *unatName( const char *name) { return wb_nrep::unatName( name);} 
   static bool checkObjectName( const char *name) { return wb_nrep::checkObjectName( name);}
 private:
   void check() const { if ( evenSts()) throw wb_error(m_sts);}

wb/lib/wb/src/wb_wblnode.cpp

@@ -9,6 +9,8 @@
 #include "wb_dbs.h"
 #include "wb_name.h"
 
+#define wblAlign(size) ((size + 3) & ~3)
+
 struct wb_wblvocabTokenTypes tokens;
 
 /* Datatypes */
@@ -567,6 +569,9 @@ void wb_wblnode::buildAttribute( ref_wblnode classdef, ref_wblnode objbodydef,
   a_elements = ((pwr_sParam *)rbody)->Info.Elements;
   a_flags = ((pwr_sParam *)rbody)->Info.Flags;
 
+  if ( a_elements == 0)
+    a_elements = 1;
+
   if ( !a_tid) {
     m_vrep->error( "Unknown attribute type", getFileName(), line_number);
     return;
@@ -578,16 +583,27 @@ void wb_wblnode::buildAttribute( ref_wblnode classdef, ref_wblnode objbodydef,
   if ( a_type == 0)
     a_type = ((pwr_sParam *)rbody)->Info.Type = type;
 
-  // Check obsoletet definitions of size and offset
-  if ( a_size && a_size != a_elements * size)
-    m_vrep->error( "Mismatch in attribute size", getFileName(), line_number);
-  if ( a_offset && a_offset != *boffset)
-    m_vrep->error( "Mismatch in attribute offset", getFileName(), line_number);
-
-  a_size = ((pwr_sParam *)rbody)->Info.Size = a_elements * size;
-  a_offset = ((pwr_sParam *)rbody)->Info.Offset = *boffset;
+  if ( a_flags & pwr_mAdef_pointer) {
+    size = sizeof( void *);
+  }
+  if ( a_flags & pwr_mAdef_array) {
+    size *= a_elements;
+  }
+  if ( ((pwr_sParam *)rbody)->Info.PgmName[0] == 0) {
+    strncpy( ((pwr_sParam *)rbody)->Info.PgmName, wb_name::unatName( name()),
+	     sizeof( ((pwr_sParam *)rbody)->Info.PgmName));
+  }
+  if ( cdh_NoCaseStrcmp( cname, "$Input") == 0) {
+    a_size = ((pwr_sParam *)rbody)->Info.Size = size;
+    a_offset = ((pwr_sParam *)rbody)->Info.Offset = *boffset + sizeof( void *);
+    *boffset += sizeof( void *) + wblAlign( a_size);
+  }
+  else {
+    a_size = ((pwr_sParam *)rbody)->Info.Size = size;
+    a_offset = ((pwr_sParam *)rbody)->Info.Offset = *boffset;
+    *boffset += wblAlign( a_size);
+  }
   ((pwr_sParam *)rbody)->Info.ParamIndex = *bindex;
-  *boffset += a_size;
   (*bindex)++;
 }