From 7b3de7e387c40ade7ebe3b63e06e155ff1794ed5 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 01:05:08 +0000 Subject: 2004-01-29 Ralf Corsepius PR 561/rtems * asm.h: Add CONCAT0, EVAL. Let SYM and REG use CONCAT0 and EVAL. --- cpukit/score/cpu/m68k/ChangeLog | 5 +++++ cpukit/score/cpu/m68k/asm.h | 9 +++++---- cpukit/score/cpu/m68k/rtems/asm.h | 9 +++++---- 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index cd6780cc28..f2094d1eaa 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,3 +1,8 @@ +2004-01-29 Ralf Corsepius + + PR 561/rtems + * asm.h: Add CONCAT0, EVAL. Let SYM and REG use CONCAT0 and EVAL. + 2004-01-21 Ralf Corsepius * configure.ac: Move RTEMS_TOP one subdir down. diff --git a/cpukit/score/cpu/m68k/asm.h b/cpukit/score/cpu/m68k/asm.h index 6c388fb396..d35b3595fa 100644 --- a/cpukit/score/cpu/m68k/asm.h +++ b/cpukit/score/cpu/m68k/asm.h @@ -56,13 +56,16 @@ #define CONCAT1(a, b) CONCAT2(a, b) #define CONCAT2(a, b) a ## b +#define EVAL(x) x +#define CONCAT0(a, b) EVAL(a)EVAL(b) + /* Use the right prefix for global labels. */ -#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) +#define SYM(x) CONCAT0 (__USER_LABEL_PREFIX__, x) /* Use the right prefix for registers. */ -#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x) +#define REG(x) CONCAT0 (__REGISTER_PREFIX__, x) #define d0 REG (d0) #define d1 REG (d1) @@ -140,5 +143,3 @@ #endif /* end of include file */ - - diff --git a/cpukit/score/cpu/m68k/rtems/asm.h b/cpukit/score/cpu/m68k/rtems/asm.h index 6c388fb396..d35b3595fa 100644 --- a/cpukit/score/cpu/m68k/rtems/asm.h +++ b/cpukit/score/cpu/m68k/rtems/asm.h @@ -56,13 +56,16 @@ #define CONCAT1(a, b) CONCAT2(a, b) #define CONCAT2(a, b) a ## b +#define EVAL(x) x +#define CONCAT0(a, b) EVAL(a)EVAL(b) + /* Use the right prefix for global labels. */ -#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) +#define SYM(x) CONCAT0 (__USER_LABEL_PREFIX__, x) /* Use the right prefix for registers. */ -#define REG(x) CONCAT1 (__REGISTER_PREFIX__, x) +#define REG(x) CONCAT0 (__REGISTER_PREFIX__, x) #define d0 REG (d0) #define d1 REG (d1) @@ -140,5 +143,3 @@ #endif /* end of include file */ - - -- cgit v1.2.3