Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Reindent some code, no real change (should do it for all my code once for good)
[simgrid.git] / src / gras / DataDesc / ddt_convert.c
index 99f3390..e310edf 100644 (file)
@@ -2,11 +2,12 @@
 
 /* ddt_remote - Stuff needed to get datadescs about remote hosts            */
 
-/* Authors: Olivier Aumage, Martin Quinson                                  */
-/* Copyright (C) 2003, 2004 the GRAS posse.                                 */
+/* Copyright (c) 2003 Olivier Aumage.                                       */
+/* Copyright (c) 2003, 2004 Martin Quinson.                                 */
+/* All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  under the terms of the license (GNU LGPL) which comes with this package. */
* under the terms of the license (GNU LGPL) which comes with this package. */
 
 /************************************************************************/
 /* C combines the power of assembler with the portability of assembler. */
 
 #include "gras/DataDesc/datadesc_private.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc,
-                                "Inter-architecture convertions");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_convert,gras_ddt,
+               "Inter-architecture convertions");
 
 /***
  *** Table of all known architectures:
  ***
- ***  l C<1/1> I<2/2:4/4:4/4:8/4> P<4/4:4/4> D<4/4:8/4>
- ***  l C<1/1> I<2/2:4/4:8/8:8/8> P<4/4:4/4> D<4/4:8/8>
- ***  B C<1/1> I<2/2:4/4:4/8:8/8> P<4/4:4/4> D<4/4:8/4>
- ***  B C<1/1> I<2/2:4/8:8/8:8/8> P<4/4:4/4> D<4/4:8/4>
- ***  B C:1/1: I:2/2:4/4:4/4:8/8: P:4/4:4/4: D:4/4:8/4:
- ***
+  l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=0; gras_arch_name=little32;;
+  l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=1; gras_arch_name=little32_4;;
+
+  l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=2; gras_arch_name=little64;;
+
+  B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=3; gras_arch_name=big32;;
+  B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=4; gras_arch_name=big32_8_4;;
+  B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=5; gras_arch_name=big32_4;;
+  B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:) gras_arch=6; gras_arch_name=big32_2;;
+
+  B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=7; gras_arch_name=big64;;
+
  ***/
 
 const gras_arch_desc_t gras_arches[gras_arch_count] = {
-  {"little32", 0,   {1,2,4,4,8,   4,4,   4,8}, // 4},
-                    {1,2,4,4,4,   4,4,   4,4}},
 
-  {"little64", 0,   {1,2,4,8,8,   8,8,   4,8}, // 8},
-                    {1,2,4,8,8,   8,8,   4,8}},
+               {"little32_1",  0, {1,2,4,4,8,   4,4,   4,8},   /* little endian, 1 byte alignement (win32) */
+                               {1,1,1,1,1,   1,1,   1,1}},
+
+                               {"little32_2",  0, {1,2,4,4,8,   4,4,   4,8},   /* little endian, 2 bytes alignements (win32) */
+                                               {1,2,2,2,2,   2,2,   2,2}},
+
+                                               {"little32_4",    0, {1,2,4,4,8,   4,4,   4,8},   /* little endian, 4 bytes alignements (win32 and linux x86) */
+                                                               {1,2,4,4,4,   4,4,   4,4}},
 
-  {"big32",    1,   {1,2,4,4,8,   4,4,   4,8}, // 8},
-                    {1,2,4,4,8,   4,4,   4,8}},
+                                                               {"little32_8",    0, {1,2,4,4,8,   4,4,   4,8},         /* little endian, 8 bytes alignement (win32) */
+                                                                               {1,2,4,4,8,   4,4,   4,8}},
 
-  {"big64",    1,   {1,2,4,8,8,   8,8,   4,8}, // 8}
-                    {1,2,4,8,8,   8,8,   4,8}},
+                                                                               {"little64",      0, {1,2,4,8,8,   8,8,   4,8}, /* alpha, ia64 */
+                                                                                               {1,2,4,8,8,   8,8,   4,8}},
 
-  {"aix",      1,   {1,2,4,4,8,   4,4,   4,8}, // 8}
-                    {1,2,4,4,8,   4,4,   4,4}}
-   
+                                                                                               {"big32_8",       1, {1,2,4,4,8,   4,4,   4,8},
+                                                                                                               {1,2,4,4,8,   4,4,   4,8}},
+
+                                                                                                               {"big32_8_4",     1, {1,2,4,4,8,   4,4,   4,8}, /* AIX */
+                                                                                                                               {1,2,4,4,8,   4,4,   4,4}},
+
+                                                                                                                               {"big32_4",       1, {1,2,4,4,8,   4,4,   4,8}, /* G5 */
+                                                                                                                                               {1,2,4,4,4,   4,4,   4,4}},
+
+                                                                                                                                               {"big32_2",       1, {1,2,4,4,8,   4,4,   4,8}, /* ARM */
+                                                                                                                                                               {1,2,2,2,2,   2,2,   2,2}},
+
+                                                                                                                                                               {"big64",         1, {1,2,4,8,8,   8,8,   4,8}, /* sparc */
+                                                                                                                                                                               {1,2,4,8,8,   8,8,   4,8}},
+
+                                                                                                                                                                               {"big64_8_4",     1, {1,2,4,8,8,   8,8,   4,8}, /* aix with -maix64 */
+                                                                                                                                                                                               {1,2,4,8,8,   8,8,   4,4}}
 };
 
 const char *gras_datadesc_arch_name(int code) {
-   if (code < 0 || code >= gras_arch_count)
-     return "[unknown arch]";
-   return gras_arches[code].name;
+       if (code < 0 || code >= gras_arch_count)
+               return "[unknown arch]";
+       return gras_arches[code].name;
 }
 
+
 /**
  * Local function doing the grunt work
  */
 static void
 gras_dd_reverse_bytes(void *to,
-                     const void *from,
-                     size_t length);
-
+               const void *from,
+               size_t length);
 
 /**
  * gras_dd_convert_elm:
@@ -68,41 +93,41 @@ gras_dd_reverse_bytes(void *to,
  * The data to be converted is stored in @src, and is to be stored in @dst.
  * Both pointers may be the same location if no resizing is needed.
  */
-gras_error_t
-gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
-                   int r_arch, 
-                   void *src, void *dst) {
-  gras_dd_cat_scalar_t scal = type->category.scalar_data;
-  int cpt;
-  const void *r_data;
-  void *l_data;
-  unsigned long r_size, l_size;
-  /* Hexadecimal displayer
+void
+gras_dd_convert_elm(gras_datadesc_type_t type, int count,
+               int r_arch,
+               void *src, void *dst) {
+       gras_dd_cat_scalar_t scal = type->category.scalar_data;
+       int cpt;
+       const void *r_data;
+       void *l_data;
+       unsigned long r_size, l_size;
+       /* Hexadecimal displayer
   union {
     char c[sizeof(int)];
     int i;
   } tester;
-  */
-
-  gras_assert(type->category_code == e_gras_datadesc_type_cat_scalar);
-  gras_assert(r_arch != GRAS_THISARCH);
-  
-  r_size = type->size[r_arch];
-  l_size = type->size[GRAS_THISARCH];
-  DEBUG4("r_size=%lu l_size=%lu,    src=%p dst=%p",
-        r_size,l_size,src,dst);
-
-  DEBUG2("remote=%c local=%c", gras_arches[r_arch].endian?'B':'l',
-        gras_arches[GRAS_THISARCH].endian?'B':'l');
-
-  if(r_size != l_size) {
-    for(cpt = 0, r_data = src, l_data = dst; 
-       cpt < count; 
-       cpt++, 
-         r_data = (char *)r_data + r_size,
-         l_data = (char *)l_data + l_size) {
-
-      /*
+        */
+
+       xbt_assert(type->category_code == e_gras_datadesc_type_cat_scalar);
+       xbt_assert(r_arch != GRAS_THISARCH);
+
+       r_size = type->size[r_arch];
+       l_size = type->size[GRAS_THISARCH];
+       DEBUG4("r_size=%lu l_size=%lu,    src=%p dst=%p",
+                       r_size,l_size,src,dst);
+
+       DEBUG2("remote=%c local=%c", gras_arches[r_arch].endian?'B':'l',
+                       gras_arches[GRAS_THISARCH].endian?'B':'l');
+
+       if(r_size != l_size) {
+               for(cpt = 0, r_data = src, l_data = dst;
+               cpt < count;
+               cpt++,
+               r_data = (char *)r_data + r_size,
+               l_data = (char *)l_data + l_size) {
+
+                       /*
       fprintf(stderr,"r_data=");
       for (cpt=0; cpt<r_size; cpt++) {
        tester.i=0;
@@ -110,65 +135,65 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
        fprintf(stderr,"\\%02x", tester.i);
       }
       fprintf(stderr,"\n");
-      */
-
-      /* Resize that damn integer, pal */
-
-      unsigned char *l_sign, *r_sign;
-      int padding;
-      int sizeChange = l_size - r_size;
-      int lowOrderFirst = !gras_arches[r_arch].endian ||
-       gras_arches[r_arch].endian == gras_arches[GRAS_THISARCH].endian; 
-
-      DEBUG5("Resize integer %d from %lu @%p to %lu @%p",
-            cpt, r_size,r_data, l_size,l_data);
-      gras_assert0(r_data != l_data, "Impossible to resize in place");
-
-      if(sizeChange < 0) {
-       DEBUG3("Truncate %d bytes (%s,%s)", -sizeChange,
-              lowOrderFirst?"lowOrderFirst":"bigOrderFirst",
-              scal.encoding == e_gras_dd_scalar_encoding_sint?"signed":"unsigned");
-       /* Truncate high-order bytes. */
-       memcpy(l_data, 
-              gras_arches[r_arch].endian ? ((char*)r_data-sizeChange)
-                                         :         r_data,
-              l_size);
-
-       if(scal.encoding == e_gras_dd_scalar_encoding_sint) {
-         DEBUG0("This is signed");
-         /* Make sure the high order bit of r_data and l_data are the same */
-         l_sign = gras_arches[GRAS_THISARCH].endian
-                ? ((unsigned char*)l_data + l_size - 1)
-                :  (unsigned char*)l_data;
-         r_sign = gras_arches[r_arch].endian
-                ? ((unsigned char*)r_data + r_size - 1)
-                :  (unsigned char*)r_data;
-         DEBUG2("This is signed (r_sign=%c l_sign=%c", *r_sign,*l_sign);
-
-         if ((*r_sign > 127) != (*l_sign > 127)) {
-           if(*r_sign > 127)
-             *l_sign += 128;
-           else
-             *l_sign -= 128;
-         }
-       }
-      } else {
-       DEBUG1("Extend %d bytes", sizeChange);
-       if (scal.encoding != e_gras_dd_scalar_encoding_sint) {
-         DEBUG0("This is signed");
-         padding = 0; /* pad unsigned with 0 */
-       } else {
-         /* extend sign */
-         r_sign = gras_arches[r_arch].endian ? ((unsigned char*)r_data + r_size - 1)
-                                             :  (unsigned char*)r_data;
-         padding = (*r_sign > 127) ? 0xff : 0;
-       }
-
-       memset(l_data, padding, l_size);
-       memcpy(!gras_arches[r_arch].endian ? l_data : ((char *)l_data + sizeChange), 
-              r_data, r_size);
-
-       /*
+                        */
+
+                       /* Resize that damn integer, pal */
+
+                       unsigned char *l_sign, *r_sign;
+                       int padding;
+                       int sizeChange = l_size - r_size;
+                       int lowOrderFirst = !gras_arches[r_arch].endian ||
+                       gras_arches[r_arch].endian == gras_arches[GRAS_THISARCH].endian;
+
+                       DEBUG5("Resize integer %d from %lu @%p to %lu @%p",
+                                       cpt, r_size,r_data, l_size,l_data);
+                       xbt_assert0(r_data != l_data, "Impossible to resize in place");
+
+                       if(sizeChange < 0) {
+                               DEBUG3("Truncate %d bytes (%s,%s)", -sizeChange,
+                                               lowOrderFirst?"lowOrderFirst":"bigOrderFirst",
+                                                               scal.encoding == e_gras_dd_scalar_encoding_sint?"signed":"unsigned");
+                               /* Truncate high-order bytes. */
+                               memcpy(l_data,
+                                               gras_arches[r_arch].endian ? ((char*)r_data-sizeChange)
+                                                               :         r_data,
+                                                               l_size);
+
+                               if(scal.encoding == e_gras_dd_scalar_encoding_sint) {
+                                       DEBUG0("This is signed");
+                                       /* Make sure the high order bit of r_data and l_data are the same */
+                                       l_sign = gras_arches[GRAS_THISARCH].endian
+                                       ? ((unsigned char*)l_data + l_size - 1)
+                                                       :  (unsigned char*)l_data;
+                                       r_sign = gras_arches[r_arch].endian
+                                       ? ((unsigned char*)r_data + r_size - 1)
+                                                       :  (unsigned char*)r_data;
+                                       DEBUG2("This is signed (r_sign=%c l_sign=%c", *r_sign,*l_sign);
+
+                                       if ((*r_sign > 127) != (*l_sign > 127)) {
+                                               if(*r_sign > 127)
+                                                       *l_sign += 128;
+                                               else
+                                                       *l_sign -= 128;
+                                       }
+                               }
+                       } else {
+                               DEBUG1("Extend %d bytes", sizeChange);
+                               if (scal.encoding != e_gras_dd_scalar_encoding_sint) {
+                                       DEBUG0("This is signed");
+                                       padding = 0; /* pad unsigned with 0 */
+                               } else {
+                                       /* extend sign */
+                                       r_sign = gras_arches[r_arch].endian ? ((unsigned char*)r_data + r_size - 1)
+                                                       :  (unsigned char*)r_data;
+                                       padding = (*r_sign > 127) ? 0xff : 0;
+                               }
+
+                               memset(l_data, padding, l_size);
+                               memcpy(!gras_arches[r_arch].endian ? l_data : ((char *)l_data + sizeChange),
+                                               r_data, r_size);
+
+                               /*
        fprintf(stderr,"r_data=");
        for (cpt=0; cpt<r_size; cpt++) {
          tester.i=0;
@@ -183,54 +208,53 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
          tester.c[0]= ((char*)l_data)[cpt];
          fprintf(stderr,"\\%02x", tester.i);
        } fprintf(stderr,"\n");
-       */
-      }
-    }
-  }
+                                */
+                       }
+               }
+       }
 
-  /* flip bytes if needed */
-  if(gras_arches[r_arch].endian != gras_arches[GRAS_THISARCH].endian && 
-     (l_size * count)  > 1) {
+       /* flip bytes if needed */
+       if(gras_arches[r_arch].endian != gras_arches[GRAS_THISARCH].endian &&
+                       (l_size * count)  > 1) {
 
-    for(cpt = 0, r_data=dst, l_data=dst;
-       cpt < count;
-       cpt++, 
-         r_data = (char *)r_data + l_size, /* resizing already done */
-         l_data = (char *)l_data + l_size) {                
+               for(cpt = 0, r_data=dst, l_data=dst;
+               cpt < count;
+               cpt++,
+               r_data = (char *)r_data + l_size, /* resizing already done */
+               l_data = (char *)l_data + l_size) {
 
-      DEBUG1("Flip elm %d",cpt);
-      gras_dd_reverse_bytes(l_data, r_data, l_size);
-    }
-  }
+                       DEBUG1("Flip elm %d",cpt);
+                       gras_dd_reverse_bytes(l_data, r_data, l_size);
+               }
+       }
 
-  return no_error;
 }
 
 static void
 gras_dd_reverse_bytes(void *to,
-                     const void *from,
-                     size_t length) {
+               const void *from,
+               size_t length) {
 
-  char charBegin;
-  const char *fromBegin;
-  const char *fromEnd;
-  char *toBegin;
-  char *toEnd;
+       char charBegin;
+       const char *fromBegin;
+       const char *fromEnd;
+       char *toBegin;
+       char *toEnd;
 
-  for(fromBegin = (const char *)from, 
-       fromEnd = fromBegin + length - 1,
-       toBegin = (char *)to,
-       toEnd = toBegin + length - 1;
+       for(fromBegin = (const char *)from,
+                       fromEnd = fromBegin + length - 1,
+                       toBegin = (char *)to,
+                       toEnd = toBegin + length - 1;
 
-      fromBegin <= fromEnd; 
+       fromBegin <= fromEnd;
 
-      fromBegin++, fromEnd--, 
+       fromBegin++, fromEnd--,
        toBegin++, toEnd--) {
 
-    charBegin = *fromBegin;
-    *toBegin = *fromEnd;
-    *toEnd = charBegin;
-  }
+               charBegin = *fromBegin;
+               *toBegin = *fromEnd;
+               *toEnd = charBegin;
+       }
 }
 
 
@@ -241,5 +265,5 @@ gras_dd_reverse_bytes(void *to,
  */
 int
 gras_arch_selfid(void) {
-  return GRAS_THISARCH;
+       return GRAS_THISARCH;
 }