diff options
| author | Sverker Eriksson <[email protected]> | 2014-10-13 20:09:19 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-10-24 18:12:16 +0200 |
| commit | da3073e8d3d26ec6c63979a22c913d7758eeed71 (patch) | |
| tree | 57f185f5c002e09f2a3532a1c703be0189fcafc6 /erts/emulator/hipe/hipe_ppc_asm.m4 | |
| parent | e45a4a8a3797a637a23ad5d660138c021f3ba1b1 (diff) | |
| download | otp-da3073e8d3d26ec6c63979a22c913d7758eeed71.tar.gz otp-da3073e8d3d26ec6c63979a22c913d7758eeed71.tar.bz2 otp-da3073e8d3d26ec6c63979a22c913d7758eeed71.zip | |
erts: Extend usage of ASM macro to avoid including asm macros in C code
and reduce the probability of macro name collisions
Catalyst: ppc macro "r0" conflicting with local variable in external.c
Diffstat (limited to 'erts/emulator/hipe/hipe_ppc_asm.m4')
| -rw-r--r-- | erts/emulator/hipe/hipe_ppc_asm.m4 | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/erts/emulator/hipe/hipe_ppc_asm.m4 b/erts/emulator/hipe/hipe_ppc_asm.m4 index 343402f9f0..4a1caa1543 100644 --- a/erts/emulator/hipe/hipe_ppc_asm.m4 +++ b/erts/emulator/hipe/hipe_ppc_asm.m4 @@ -23,6 +23,22 @@ changecom(`/*', `*/')dnl #define HIPE_PPC_ASM_H' /* + * Tunables. + */ +define(LEAF_WORDS,16)dnl number of stack words for leaf functions +define(NR_ARG_REGS,4)dnl admissible values are 0 to 6, inclusive + +`#define PPC_LEAF_WORDS 'LEAF_WORDS +`#define PPC_NR_ARG_REGS 'NR_ARG_REGS +`#define NR_ARG_REGS 'NR_ARG_REGS + + +`#ifdef ASM' +/* + * Only assembler stuff from here on (when included from *.S) + */ + +/* * Handle 32 vs 64-bit. */ ifelse(ARCH,ppc64,` @@ -53,13 +69,6 @@ define(WSIZE,4)dnl `#define STORE 'STORE `#define CMPI 'CMPI -/* - * Tunables. - */ -define(LEAF_WORDS,16)dnl number of stack words for leaf functions -define(NR_ARG_REGS,4)dnl admissible values are 0 to 6, inclusive - -`#define PPC_LEAF_WORDS 'LEAF_WORDS /* * Workarounds for Darwin. @@ -193,8 +202,6 @@ NAME: \ /* * Argument (parameter) registers. */ -`#define PPC_NR_ARG_REGS 'NR_ARG_REGS -`#define NR_ARG_REGS 'NR_ARG_REGS define(defarg,`define(ARG$1,`$2')dnl #`define ARG'$1 $2' @@ -309,4 +316,6 @@ define(QUICK_CALL_RET,`NBIF_POP_N(eval(RET_POP($2)))b $1')dnl `/* #define QUICK_CALL_RET_F_3 'QUICK_CALL_RET(F,3)` */' `/* #define QUICK_CALL_RET_F_5 'QUICK_CALL_RET(F,5)` */' +`#endif /* ASM */' + `#endif /* HIPE_PPC_ASM_H */' |