diff options
| author | John Gilmore <gnu@cygnus> | 1992-01-02 23:09:53 +0000 |
|---|---|---|
| committer | John Gilmore <gnu@cygnus> | 1992-01-02 23:09:53 +0000 |
| commit | 1a4d253ce71b22ffcc671d5d7c2edb27f9714ff8 (patch) | |
| tree | bc27aa56e83e59dd62e8795b25e5b6a70a2dac65 | |
| parent | 1d4c28c5fadff5eebe66a4a64c6b480aa3a020d5 (diff) | |
| download | gdb-1a4d253ce71b22ffcc671d5d7c2edb27f9714ff8.zip gdb-1a4d253ce71b22ffcc671d5d7c2edb27f9714ff8.tar.gz gdb-1a4d253ce71b22ffcc671d5d7c2edb27f9714ff8.tar.bz2 | |
Rename bitfields to avoid conflict with macro names in new opcode/sparc.h.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/sparc-pinsn.c | 30 |
2 files changed, 20 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c4302dc..4ebde46 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 2 15:07:41 1992 John Gilmore (gnu at cygnus.com) + + * sparc-pinsn.c: Rename bitfields that overlap with macro names + in ../include/opcode/sparc.h. + Wed Jan 1 04:29:00 1992 Fred Fish (fnf at cygnus.com) * Makefile.in: Change tm-svr4.h to tm-sysv4.h. Change xm-svr4.h diff --git a/gdb/sparc-pinsn.c b/gdb/sparc-pinsn.c index 36dad5a..ba2237b 100644 --- a/gdb/sparc-pinsn.c +++ b/gdb/sparc-pinsn.c @@ -34,29 +34,29 @@ union sparc_insn unsigned long int code; struct { - unsigned int OP:2; -#define op ldst.OP - unsigned int RD:5; -#define rd ldst.RD + unsigned int anop:2; +#define op ldst.anop + unsigned int anrd:5; +#define rd ldst.anrd unsigned int op3:6; - unsigned int RS1:5; -#define rs1 ldst.RS1 + unsigned int anrs1:5; +#define rs1 ldst.anrs1 unsigned int i:1; - unsigned int ASI:8; -#define asi ldst.ASI - unsigned int RS2:5; -#define rs2 ldst.RS2 + unsigned int anasi:8; +#define asi ldst.anasi + unsigned int anrs2:5; +#define rs2 ldst.anrs2 #define shcnt rs2 } ldst; struct { - unsigned int OP:2, RD:5, op3:6, RS1:5, i:1; + unsigned int anop:2, anrd:5, op3:6, anrs1:5, i:1; unsigned int IMM13:13; #define imm13 IMM13.IMM13 } IMM13; struct { - unsigned int OP:2; + unsigned int anop:2; unsigned int a:1; unsigned int cond:4; unsigned int op2:3; @@ -66,9 +66,9 @@ union sparc_insn #define imm22 disp22 struct { - unsigned int OP:2; - unsigned int DISP30:30; -#define disp30 call.DISP30 + unsigned int anop:2; + unsigned int adisp30:30; +#define disp30 call.adisp30 } call; }; |