X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ba7b88014d3dfe4aa65b777260ed1d07a3cc56c..27085945e2ba71b57ef35d9aceb52e206c382e95:/src/gras/DataDesc/ddt_convert.c diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index 6a82100fde..5f1842e69c 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -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. */ @@ -14,36 +15,53 @@ #include "gras/DataDesc/datadesc_private.h" -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc, "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}, + {"little32", 0, {1,2,4,4,8, 4,4, 4,8}, /* win32 */ + {1,2,4,4,8, 4,4, 4,8}}, + + {"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}, // 8}, + {"little64", 0, {1,2,4,8,8, 8,8, 4,8}, /* alpha, ia64 */ {1,2,4,8,8, 8,8, 4,8}}, - {"big32", 1, {1,2,4,4,8, 4,4, 4,8}, // 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}, // 8} - {1,2,4,8,8, 8,8, 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}}, - {"aix", 1, {1,2,4,4,8, 4,4, 4,8}, // 8} - {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) { @@ -52,6 +70,7 @@ const char *gras_datadesc_arch_name(int code) { return gras_arches[code].name; } + /** * Local function doing the grunt work */ @@ -60,7 +79,6 @@ gras_dd_reverse_bytes(void *to, const void *from, size_t length); - /** * gras_dd_convert_elm: * @@ -68,15 +86,15 @@ 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, +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; - size_t r_size, l_size; + unsigned long r_size, l_size; /* Hexadecimal displayer union { char c[sizeof(int)]; @@ -84,12 +102,12 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, } tester; */ - gras_assert(type->category_code == e_gras_datadesc_type_cat_scalar); - gras_assert(r_arch != GRAS_THISARCH); + 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); DEBUG2("remote=%c local=%c", gras_arches[r_arch].endian?'B':'l', @@ -120,9 +138,9 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, int lowOrderFirst = !gras_arches[r_arch].endian || gras_arches[r_arch].endian == gras_arches[GRAS_THISARCH].endian; - DEBUG5("Resize integer %d from %d @%p to %d @%p", + 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"); + xbt_assert0(r_data != l_data, "Impossible to resize in place"); if(sizeChange < 0) { DEBUG3("Truncate %d bytes (%s,%s)", -sizeChange, @@ -203,7 +221,6 @@ gras_dd_convert_elm(gras_datadesc_type_t *type, int count, } } - return no_error; } static void