From 4682a89c6f6add1d1118247df59a612fa7b82871 Mon Sep 17 00:00:00 2001 From: pbrook Date: Tue, 12 Apr 2005 19:35:52 +0000 Subject: [PATCH] 2005-04-12 Paul Brook * opcode/m88k.h: Rename psr macros to avoid conflicts. --- include/ChangeLog | 4 ++++ include/opcode/m88k.h | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 796a4abc6d..f57ecab82b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2005-04-12 Paul Brook + + * opcode/m88k.h: Rename psr macros to avoid conflicts. + 2005-04-11 Kaveh R. Ghazi * libiberty.h (fopen_unlocked, fdopen_unlocked, freopen_unlocked): diff --git a/include/opcode/m88k.h b/include/opcode/m88k.h index c201349dc5..0b0666dd76 100644 --- a/include/opcode/m88k.h +++ b/include/opcode/m88k.h @@ -231,22 +231,22 @@ struct PROCESSOR /* Definitions for fields in psr. */ -#define mode 31 -#define rbo 30 -#define ser 29 -#define carry 28 -#define sf7m 11 -#define sf6m 10 -#define sf5m 9 -#define sf4m 8 -#define sf3m 7 -#define sf2m 6 -#define sf1m 5 -#define mam 4 -#define inm 3 -#define exm 2 -#define trm 1 -#define ovfm 0 +#define psr_mode 31 +#define psr_rbo 30 +#define psr_ser 29 +#define psr_carry 28 +#define psr_sf7m 11 +#define psr_sf6m 10 +#define psr_sf5m 9 +#define psr_sf4m 8 +#define psr_sf3m 7 +#define psr_sf2m 6 +#define psr_sf1m 5 +#define psr_mam 4 +#define psr_inm 3 +#define psr_exm 2 +#define psr_trm 1 +#define psr_ovfm 0 /* The 1 clock operations. */ -- 2.11.0