X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d9af359d50c749f3eafaf037ee58f1ba0c4bf8dd..778f65057da68465382593cd036b6ee59ada54e9:/src/gras/DataDesc/ddt_convert.c diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index f144a2f86f..fd20823961 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -15,7 +15,7 @@ #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"); /*** @@ -36,30 +36,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc, ***/ const gras_arch_desc_t gras_arches[gras_arch_count] = { - {"little32", 0, {1,2,4,4,8, 4,4, 4,8}, /* win32 */ - {1,2,4,4,8, 4,4, 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}, /* linux x86 */ - {1,2,4,4,4, 4,4, 4,4}}, - - {"little64", 0, {1,2,4,8,8, 8,8, 4,8}, /* alpha, ia64 */ - {1,2,4,8,8, 8,8, 4,8}}, + {"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}}, + {"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_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_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}}, + {"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", 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) { @@ -84,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) { @@ -219,7 +228,6 @@ gras_dd_convert_elm(gras_datadesc_type_t type, int count, } } - return no_error; } static void