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

diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c
index 2ab8d4859f..efc4946f04 100644
--- a/src/gras/DataDesc/ddt_convert.c
+++ b/src/gras/DataDesc/ddt_convert.c
@@ -12,19 +12,41 @@
 /* C combines the power of assembler with the portability of assembler. */
 /************************************************************************/
 
-#include "DataDesc/datadesc_private.h"
+#include "gras/DataDesc/datadesc_private.h"
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(convert,DataDesc);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc,
+				 "Inter-architecture convertions");
 
 /***
- *** Table of all known architectures. 
+ *** 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
  ***/
 
 const gras_arch_desc_t gras_arches[gras_arch_count] = {
-  {"little32", 0,   {1,2,4,4,8,   4,4,   4,8}},
-  {"little64", 0,   {1,2,4,8,8,   8,8,   4.8}},
-  {"big32",    1,   {1,2,4,4,8,   4,4,   4,8}},
-  {"big64",    1,   {1,2,4,8,8,   8,8,   4,8}}
+  {"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}},
+
+  {"big32",    1,   {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}, 
+                    {1,2,4,8,8,   8,8,   4,8}},
+
+  {"aix",      1,   {1,2,4,4,8,   4,4,   4,8}, 
+                    {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}}
+
 };
 
 const char *gras_datadesc_arch_name(int code) {
@@ -37,13 +59,6 @@ const char *gras_datadesc_arch_name(int code) {
  * Local function doing the grunt work
  */
 static void
-gras_dd_resize_int(const void *source,
-		   size_t sourceSize,
-		   void *destination,
-		   size_t destinationSize,
-		   int signedType,
-		   int lowOrderFirst);
-static void
 gras_dd_reverse_bytes(void *to,
 		      const void *from,
 		      size_t length);
@@ -56,32 +71,32 @@ 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,
+xbt_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;
-  size_t r_size, l_size;
-
-  gras_assert(type->category_code == e_gras_datadesc_type_cat_scalar);
-
-
+  unsigned long r_size, l_size;
+  /* Hexadecimal displayer
+  union {
+    char c[sizeof(int)];
+    int i;
+  } tester;
+  */
+
+  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=%d l_size=%d,    src=%p dst=%p",
+  DEBUG4("r_size=%lu l_size=%lu,    src=%p dst=%p",
 	 r_size,l_size,src,dst);
 
-  if (r_arch == GRAS_THISARCH) { 
-//      || scal.encoding == e_gras_dd_scalar_encoding_float) {
-    DEBUG0("No conversion needed");
-    return no_error;
-  }
-
-  r_size = type->size[r_arch];
-  l_size = type->size[GRAS_THISARCH];
+  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; 
@@ -90,21 +105,97 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
 	  r_data = (char *)r_data + r_size,
 	  l_data = (char *)l_data + l_size) {
 
-      DEBUG5("Resize elm %d from %d @%p to %d @%p",cpt, r_size,r_data, l_size,l_data);
-      gras_dd_resize_int(r_data, r_size, l_data, l_size,
-			 scal.encoding == e_gras_dd_scalar_encoding_sint,
-			 gras_arches[r_arch].endian && 
-			 gras_arches[r_arch].endian 
-			 != gras_arches[GRAS_THISARCH].endian);*/
-
+      /*
+      fprintf(stderr,"r_data=");
+      for (cpt=0; cpt<r_size; cpt++) {
+	tester.i=0;
+	tester.c[0]= ((char*)r_data)[cpt];
+	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);
+      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;
+	  tester.c[0] = ((char*)r_data)[cpt];
+	  fprintf(stderr,"\\%02x", tester.i);
+	}
+	fprintf(stderr,"\n");
+
+	fprintf(stderr,"l_data=");
+	for (cpt=0; cpt<l_size; cpt++) {
+	  tester.i=0;
+	  tester.c[0]= ((char*)l_data)[cpt];
+	  fprintf(stderr,"\\%02x", tester.i);
+	} fprintf(stderr,"\n");
+	*/
+      }
     }
-    src=dst; /* Make sure to reverse bytes on the right data */
   }
 
+  /* flip bytes if needed */
   if(gras_arches[r_arch].endian != gras_arches[GRAS_THISARCH].endian && 
      (l_size * count)  > 1) {
 
-    for(cpt = 0, r_data=src, l_data=dst;
+    for(cpt = 0, r_data=dst, l_data=dst;
 	cpt < count;
 	cpt++, 
 	  r_data = (char *)r_data + l_size, /* resizing already done */
@@ -145,65 +236,6 @@ gras_dd_reverse_bytes(void *to,
   }
 }
 
-/*
- * Copies the integer value of size #sourceSize# stored in #source# to the
- * #destinationSize#-long area #destination#.  #signedType# indicates whether
- * or not the source integer is signed; #lowOrderFirst# whether or not the
- * bytes run least-significant to most-significant.
- *
- * It should be thread safe (operates on local variables and calls mem*)
- */
-static void
-gras_dd_resize_int(const void *r_data,
-		   size_t r_size,
-		   void *destination,
-		   size_t l_size,
-		   int signedType,
-		   int lowOrderFirst) {
-
-  unsigned char *destinationSign;
-  int padding;
-  int sizeChange = l_size - r_size;
-  unsigned char *r_dataSign;
-  
-  gras_assert0(sizeChange, "Nothing to resize");
-
-  if(sizeChange < 0) {
-    DEBUG1("Truncate %d bytes", -sizeChange);
-    /* Truncate high-order bytes. */
-    memcpy(destination, 
-	   lowOrderFirst?r_data:((char*)r_data-sizeChange),
-	   l_size);
-    if(signedType) {
-      DEBUG0("This is signed");
-      /* Make sure the high order bit of r_data and
-       * destination are the same */
-      destinationSign = lowOrderFirst ? ((unsigned char*)destination + l_size - 1) : (unsigned char*)destination;
-      r_dataSign = lowOrderFirst ? ((unsigned char*)r_data + r_size - 1) : (unsigned char*)r_data;
-      if((*r_dataSign > 127) != (*destinationSign > 127)) {
-	if(*r_dataSign > 127)
-	  *destinationSign += 128;
-	else
-	  *destinationSign -= 128;
-      }
-    }
-  } else {
-    DEBUG1("Extend %d bytes", sizeChange);
-    /* Pad with zeros or extend sign, as appropriate. */
-    if(!signedType)
-      padding = 0;
-    else {
-      r_dataSign = lowOrderFirst ? ((unsigned char*)r_data + r_size - 1)
-	                         : (unsigned char*)r_data;
-      padding = (*r_dataSign > 127) ? 0xff : 0;
-    }
-    memset(destination, padding, l_size);
-    memcpy(lowOrderFirst ? destination 
-                         : ((char *)destination + sizeChange),
-	   r_data, r_size);
-  }
-}
-
 
 /**
  * gras_arch_selfid: