Changeset 5d57155 for GenericIO.cxx

Timestamp:

09/25/17 16:15:39 (7 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

b02d091

Parents:

fb69232

git-author:

Hal Finkel <hfinkel@…> (09/25/17 16:15:39)

git-committer:

Hal Finkel <hfinkel@…> (09/25/17 16:15:39)

Message:

Add support for float4 (and other homogeneous aggregates)

File:

• GenericIO.cxx (modified) (7 diffs)

GenericIO.cxx

@@ -322 +322 @@
   endian_specific_value<uint64_t, IsBigEndian> Flags;
   endian_specific_value<uint64_t, IsBigEndian> Size;
+  endian_specific_value<uint64_t, IsBigEndian> ElementSize;
 };
 
@@ -583 +584 @@
       VH->Flags = VFlags;
       RecordSize += VH->Size = Vars[i].Size;
+      VH->ElementSize = Vars[i].ElementSize;
     }
 
@@ -1379 +1381 @@
       }
 
+      size_t ElementSize = VH->Size;
+      if (offsetof_safe(VH, ElementSize) < GH->VarsSize)
+        ElementSize = VH->ElementSize;
+
       VarFound = true;
       bool IsFloat = (bool) (VH->Flags & FloatValue),
@@ -1387 +1393 @@
               " in: " << OpenFileName << ": current: " << Vars[i].Size <<
               ", file: " << VH->Size;
+        throw runtime_error(ss.str());
+      } else if (ElementSize != Vars[i].ElementSize) {
+        stringstream ss;
+        ss << "Element size mismatch for variable " << Vars[i].Name <<
+              " in: " << OpenFileName << ": current: " << Vars[i].ElementSize <<
+              ", file: " << ElementSize;
         throw runtime_error(ss.str());
       } else if (IsFloat != Vars[i].IsFloat) {
@@ -1565 +1577 @@
       // Byte swap the data if necessary.
       if (IsBigEndian != isBigEndian())
-        for (size_t j = 0; j < RH->NElems; ++j) {
-          char *Offset = ((char *) VarData) + j*Vars[i].Size;
-          bswap(Offset, Vars[i].Size);
+        for (size_t j = 0;
+             j < RH->NElems*(Vars[i].Size/Vars[i].ElementSize); ++j) {
+          char *Offset = ((char *) VarData) + j*Vars[i].ElementSize;
+          bswap(Offset, Vars[i].ElementSize);
         }
 
@@ -1625 +1638 @@
     if (VNameNull < NameSize)
       VName.resize(VNameNull);
+
+    size_t ElementSize = VH->Size;
+    if (offsetof_safe(VH, ElementSize) < GH->VarsSize)
+      ElementSize = VH->ElementSize;
 
     bool IsFloat = (bool) (VH->Flags & FloatValue),
@@ -1634 +1651 @@
     VI.push_back(VariableInfo(VName, (size_t) VH->Size, IsFloat, IsSigned,
                               IsPhysCoordX, IsPhysCoordY, IsPhysCoordZ,
-                              MaybePhysGhost));
+                              MaybePhysGhost, ElementSize));
   }
 }