From 4c15ccf7afa959f14f950cb96f7f93eb9349777d Mon Sep 17 00:00:00 2001 From: Geoffrey Keating Date: Tue, 12 Dec 2000 20:54:13 +0000 Subject: [PATCH] In sim/common: * sim-endian.h: Don't have parameters on macro definitions which are simply renaming functions, to permit use of XCONCAT2 in both the macro name and the arguments in a use of such a definition. In sim/ppc: * sim-endian.h: Don't have parameters on macro definitions which are simply renaming functions, to permit use of XCONCAT2 in both the macro name and the arguments in a use of such a definition. --- sim/common/ChangeLog | 6 +++ sim/common/sim-endian.h | 112 ++++++++++++++++++++-------------------- sim/ppc/ChangeLog | 6 +++ sim/ppc/sim-endian.h | 98 +++++++++++++++++------------------ 4 files changed, 117 insertions(+), 105 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8107fd6b68..134111fe2e 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2000-12-12 Geoffrey Keating + + * sim-endian.h: Don't have parameters on macro definitions which + are simply renaming functions, to permit use of XCONCAT2 in both + the macro name and the arguments in a use of such a definition. + 2000-12-11 Ben Elliston * cgen-ops.h (SUBWORDDFDI): New function. diff --git a/sim/common/sim-endian.h b/sim/common/sim-endian.h index d733c82056..8239aa0ff0 100644 --- a/sim/common/sim-endian.h +++ b/sim/common/sim-endian.h @@ -80,53 +80,53 @@ INLINE_SIM_ENDIAN(unsigned_8) sim_endian_split_16 (unsigned_16 word, int w); /* SWAP */ -#define SWAP_1(X) swap_1(X) -#define SWAP_2(X) swap_2(X) -#define SWAP_4(X) swap_4(X) -#define SWAP_8(X) swap_8(X) -#define SWAP_16(X) swap_16(X) +#define SWAP_1 swap_1 +#define SWAP_2 swap_2 +#define SWAP_4 swap_4 +#define SWAP_8 swap_8 +#define SWAP_16 swap_16 /* HOST to BE */ -#define H2BE_1(X) endian_h2be_1(X) -#define H2BE_2(X) endian_h2be_2(X) -#define H2BE_4(X) endian_h2be_4(X) -#define H2BE_8(X) endian_h2be_8(X) -#define H2BE_16(X) endian_h2be_16(X) -#define BE2H_1(X) endian_be2h_1(X) -#define BE2H_2(X) endian_be2h_2(X) -#define BE2H_4(X) endian_be2h_4(X) -#define BE2H_8(X) endian_be2h_8(X) -#define BE2H_16(X) endian_be2h_16(X) +#define H2BE_1 endian_h2be_1 +#define H2BE_2 endian_h2be_2 +#define H2BE_4 endian_h2be_4 +#define H2BE_8 endian_h2be_8 +#define H2BE_16 endian_h2be_16 +#define BE2H_1 endian_be2h_1 +#define BE2H_2 endian_be2h_2 +#define BE2H_4 endian_be2h_4 +#define BE2H_8 endian_be2h_8 +#define BE2H_16 endian_be2h_16 /* HOST to LE */ -#define H2LE_1(X) endian_h2le_1(X) -#define H2LE_2(X) endian_h2le_2(X) -#define H2LE_4(X) endian_h2le_4(X) -#define H2LE_8(X) endian_h2le_8(X) -#define H2LE_16(X) endian_h2le_16(X) -#define LE2H_1(X) endian_le2h_1(X) -#define LE2H_2(X) endian_le2h_2(X) -#define LE2H_4(X) endian_le2h_4(X) -#define LE2H_8(X) endian_le2h_8(X) -#define LE2H_16(X) endian_le2h_16(X) +#define H2LE_1 endian_h2le_1 +#define H2LE_2 endian_h2le_2 +#define H2LE_4 endian_h2le_4 +#define H2LE_8 endian_h2le_8 +#define H2LE_16 endian_h2le_16 +#define LE2H_1 endian_le2h_1 +#define LE2H_2 endian_le2h_2 +#define LE2H_4 endian_le2h_4 +#define LE2H_8 endian_le2h_8 +#define LE2H_16 endian_le2h_16 /* HOST to TARGET */ -#define H2T_1(X) endian_h2t_1(X) -#define H2T_2(X) endian_h2t_2(X) -#define H2T_4(X) endian_h2t_4(X) -#define H2T_8(X) endian_h2t_8(X) -#define H2T_16(X) endian_h2t_16(X) -#define T2H_1(X) endian_t2h_1(X) -#define T2H_2(X) endian_t2h_2(X) -#define T2H_4(X) endian_t2h_4(X) -#define T2H_8(X) endian_t2h_8(X) -#define T2H_16(X) endian_t2h_16(X) +#define H2T_1 endian_h2t_1 +#define H2T_2 endian_h2t_2 +#define H2T_4 endian_h2t_4 +#define H2T_8 endian_h2t_8 +#define H2T_16 endian_h2t_16 +#define T2H_1 endian_t2h_1 +#define T2H_2 endian_t2h_2 +#define T2H_4 endian_t2h_4 +#define T2H_8 endian_t2h_8 +#define T2H_16 endian_t2h_16 /* CONVERT IN PLACE @@ -219,22 +219,22 @@ do { \ Byte swap a quantity the size of the targets word */ #if (WITH_TARGET_WORD_BITSIZE == 64) -#define H2T_word(X) H2T_8(X) -#define T2H_word(X) T2H_8(X) -#define H2BE_word(X) H2BE_8(X) -#define BE2H_word(X) BE2H_8(X) -#define H2LE_word(X) H2LE_8(X) -#define LE2H_word(X) LE2H_8(X) -#define SWAP_word(X) SWAP_8(X) +#define H2T_word H2T_8 +#define T2H_word T2H_8 +#define H2BE_word H2BE_8 +#define BE2H_word BE2H_8 +#define H2LE_word H2LE_8 +#define LE2H_word LE2H_8 +#define SWAP_word SWAP_8 #endif #if (WITH_TARGET_WORD_BITSIZE == 32) -#define H2T_word(X) H2T_4(X) -#define T2H_word(X) T2H_4(X) -#define H2BE_word(X) H2BE_4(X) -#define BE2H_word(X) BE2H_4(X) -#define H2LE_word(X) H2LE_4(X) -#define LE2H_word(X) LE2H_4(X) -#define SWAP_word(X) SWAP_4(X) +#define H2T_word H2T_4 +#define T2H_word T2H_4 +#define H2BE_word H2BE_4 +#define BE2H_word BE2H_4 +#define H2LE_word H2LE_4 +#define LE2H_word LE2H_4 +#define SWAP_word SWAP_4 #endif @@ -243,13 +243,13 @@ do { \ Byte swap a quantity the size of the targets IEEE 1275 memory cell */ -#define H2T_cell(X) H2T_4(X) -#define T2H_cell(X) T2H_4(X) -#define H2BE_cell(X) H2BE_4(X) -#define BE2H_cell(X) BE2H_4(X) -#define H2LE_cell(X) H2LE_4(X) -#define LE2H_cell(X) LE2H_4(X) -#define SWAP_cell(X) SWAP_4(X) +#define H2T_cell H2T_4 +#define T2H_cell T2H_4 +#define H2BE_cell H2BE_4 +#define BE2H_cell BE2H_4 +#define H2LE_cell H2LE_4 +#define LE2H_cell LE2H_4 +#define SWAP_cell SWAP_4 diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 48b6a724ee..52e6685a14 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,9 @@ +2000-12-12 Geoffrey Keating + + * sim-endian.h: Don't have parameters on macro definitions which + are simply renaming functions, to permit use of XCONCAT2 in both + the macro name and the arguments in a use of such a definition. + 2000-11-15 Jim Blandy * sim_calls.c: Doc fix. diff --git a/sim/ppc/sim-endian.h b/sim/ppc/sim-endian.h index ceca97024d..74e8f1b2b6 100644 --- a/sim/ppc/sim-endian.h +++ b/sim/ppc/sim-endian.h @@ -246,46 +246,46 @@ INLINE_SIM_ENDIAN(unsigned_8) endian_le2h_8(unsigned_8 x); /* SWAP */ -#define SWAP_1(X) swap_1(X) -#define SWAP_2(X) swap_2(X) -#define SWAP_4(X) swap_4(X) -#define SWAP_8(X) swap_8(X) +#define SWAP_1 swap_1 +#define SWAP_2 swap_2 +#define SWAP_4 swap_4 +#define SWAP_8 swap_8 /* HOST to BE */ -#define H2BE_1(X) endian_h2be_1(X) -#define H2BE_2(X) endian_h2be_2(X) -#define H2BE_4(X) endian_h2be_4(X) -#define H2BE_8(X) endian_h2be_8(X) -#define BE2H_1(X) endian_be2h_1(X) -#define BE2H_2(X) endian_be2h_2(X) -#define BE2H_4(X) endian_be2h_4(X) -#define BE2H_8(X) endian_be2h_8(X) +#define H2BE_1 endian_h2be_1 +#define H2BE_2 endian_h2be_2 +#define H2BE_4 endian_h2be_4 +#define H2BE_8 endian_h2be_8 +#define BE2H_1 endian_be2h_1 +#define BE2H_2 endian_be2h_2 +#define BE2H_4 endian_be2h_4 +#define BE2H_8 endian_be2h_8 /* HOST to LE */ -#define H2LE_1(X) endian_h2le_1(X) -#define H2LE_2(X) endian_h2le_2(X) -#define H2LE_4(X) endian_h2le_4(X) -#define H2LE_8(X) endian_h2le_8(X) -#define LE2H_1(X) endian_le2h_1(X) -#define LE2H_2(X) endian_le2h_2(X) -#define LE2H_4(X) endian_le2h_4(X) -#define LE2H_8(X) endian_le2h_8(X) +#define H2LE_1 endian_h2le_1 +#define H2LE_2 endian_h2le_2 +#define H2LE_4 endian_h2le_4 +#define H2LE_8 endian_h2le_8 +#define LE2H_1 endian_le2h_1 +#define LE2H_2 endian_le2h_2 +#define LE2H_4 endian_le2h_4 +#define LE2H_8 endian_le2h_8 /* HOST to TARGET */ -#define H2T_1(X) endian_h2t_1(X) -#define H2T_2(X) endian_h2t_2(X) -#define H2T_4(X) endian_h2t_4(X) -#define H2T_8(X) endian_h2t_8(X) -#define T2H_1(X) endian_t2h_1(X) -#define T2H_2(X) endian_t2h_2(X) -#define T2H_4(X) endian_t2h_4(X) -#define T2H_8(X) endian_t2h_8(X) +#define H2T_1 endian_h2t_1 +#define H2T_2 endian_h2t_2 +#define H2T_4 endian_h2t_4 +#define H2T_8 endian_h2t_8 +#define T2H_1 endian_t2h_1 +#define T2H_2 endian_t2h_2 +#define T2H_4 endian_t2h_4 +#define T2H_8 endian_t2h_8 /* CONVERT IN PLACE @@ -370,22 +370,22 @@ do { \ Byte swap a quantity the size of the targets word */ #if (WITH_TARGET_WORD_BITSIZE == 64) -#define H2T_word(X) H2T_8(X) -#define T2H_word(X) T2H_8(X) -#define H2BE_word(X) H2BE_8(X) -#define BE2H_word(X) BE2H_8(X) -#define H2LE_word(X) H2LE_8(X) -#define LE2H_word(X) LE2H_8(X) -#define SWAP_word(X) SWAP_8(X) +#define H2T_word H2T_8 +#define T2H_word T2H_8 +#define H2BE_word H2BE_8 +#define BE2H_word BE2H_8 +#define H2LE_word H2LE_8 +#define LE2H_word LE2H_8 +#define SWAP_word SWAP_8 #endif #if (WITH_TARGET_WORD_BITSIZE == 32) -#define H2T_word(X) H2T_4(X) -#define T2H_word(X) T2H_4(X) -#define H2BE_word(X) H2BE_4(X) -#define BE2H_word(X) BE2H_4(X) -#define H2LE_word(X) H2LE_4(X) -#define LE2H_word(X) LE2H_4(X) -#define SWAP_word(X) SWAP_4(X) +#define H2T_word H2T_4 +#define T2H_word T2H_4 +#define H2BE_word H2BE_4 +#define BE2H_word BE2H_4 +#define H2LE_word H2LE_4 +#define LE2H_word LE2H_4 +#define SWAP_word SWAP_4 #endif @@ -393,13 +393,13 @@ do { \ Byte swap a quantity the size of the targets IEEE 1275 memory cell */ -#define H2T_cell(X) H2T_4(X) -#define T2H_cell(X) T2H_4(X) -#define H2BE_cell(X) H2BE_4(X) -#define BE2H_cell(X) BE2H_4(X) -#define H2LE_cell(X) H2LE_4(X) -#define LE2H_cell(X) LE2H_4(X) -#define SWAP_cell(X) SWAP_4(X) +#define H2T_cell H2T_4 +#define T2H_cell T2H_4 +#define H2BE_cell H2BE_4 +#define BE2H_cell BE2H_4 +#define H2LE_cell H2LE_4 +#define LE2H_cell LE2H_4 +#define SWAP_cell SWAP_4 #if (SIM_ENDIAN_INLINE & INCLUDE_MODULE) -- 2.34.1