X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c18276c5f769c232a091e7a8620d307c1afbbdd2..778f65057da68465382593cd036b6ee59ada54e9:/src/gras/DataDesc/ddt_convert.c

diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c
index 486f2004f1..fd20823961 100644
--- a/src/gras/DataDesc/ddt_convert.c
+++ b/src/gras/DataDesc/ddt_convert.c
@@ -15,42 +15,60 @@
 
 #include "gras/DataDesc/datadesc_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc,
+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: AIX
- ***  B C:1/1: I:2/2:4/2:4/2:8/2: P:4/2:4/2: D:4/2:8/2: ARM
- ***  l C<1/1> I<2/2:4/4:4/4:8/8> P<4/4:4/4> D<4/4:8/8> win32 
+  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}, 
-                    {1,2,4,4,4,   4,4,   4,4}},
-
-  {"little64", 0,   {1,2,4,8,8,   8,8,   4,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}},
+  
+  {"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}},
 
-  {"big32",    1,   {1,2,4,4,8,   4,4,   4,8}, 
-                    {1,2,4,4,8,   4,4,   4,8}},
+  {"little64",      0, {1,2,4,8,8,   8,8,   4,8}, /* alpha, ia64 */
+                       {1,2,4,8,8,   8,8,   4,8}},
 
-  {"big64",    1,   {1,2,4,8,8,   8,8,   4,8}, 
-                    {1,2,4,8,8,   8,8,   4,8}},
+  {"big32_8",       1, {1,2,4,4,8,   4,4,   4,8}, 
+                       {1,2,4,4,8,   4,4,   4,8}},
 
-  {"aix",      1,   {1,2,4,4,8,   4,4,   4,8}, 
-                    {1,2,4,4,8,   4,4,   4,4}},
+  {"big32_8_4",     1, {1,2,4,4,8,   4,4,   4,8}, /* AIX */
+                       {1,2,4,4,8,   4,4,   4,4}},
 
-  {"arm",      1,   {1,2,4,4,8,   4,4,   4,8}, 
-                    {1,2,2,2,2,   2,2,   2,2}},
+  {"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}},
 
-  {"win32",    0,   {1,2,4,4,8,   4,4,   4,8}, 
-                    {1,2,4,4,8,   4,4,   4,8}}
+  {"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) {
@@ -75,7 +93,7 @@ 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.
  */
-xbt_error_t
+void
 gras_dd_convert_elm(gras_datadesc_type_t type, int count,
 		    int r_arch, 
 		    void *src, void *dst) {
@@ -210,7 +228,6 @@ gras_dd_convert_elm(gras_datadesc_type_t type, int count,
     }
   }
 
-  return no_error;
 }
 
 static void