From c6f4c129c66f19ff2574d568af7242be621c9795 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 26 Sep 2005 06:59:39 +0000 Subject: [PATCH] gdb/ 2005-09-26 Jan Beulich * amd64-tdep.h (AMD64_FCTRL_REGNUM, AMD64_FSTAT_REGNUM, AMD64_MXCSR_REGNUM): New. * amd64-tdep.c (amd64_dwarf_regmap): Add eflags, selector regs, mxcsr, fp control and status words. * i386-tdep.c (): Add selector regs, mxcsr, fp control and status words. --- gdb/ChangeLog | 9 +++++++++ gdb/amd64-tdep.c | 30 +++++++++++++++++++++++++++++- gdb/amd64-tdep.h | 5 ++++- gdb/i386-tdep.c | 15 ++++++++++++++- 4 files changed, 56 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1ddfe1eb166..bfa38e611ca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2005-09-26 Jan Beulich + + * amd64-tdep.h (AMD64_FCTRL_REGNUM, AMD64_FSTAT_REGNUM, + AMD64_MXCSR_REGNUM): New. + * amd64-tdep.c (amd64_dwarf_regmap): Add eflags, selector regs, + mxcsr, fp control and status words. + * i386-tdep.c (): Add selector regs, mxcsr, fp control and status + words. + 2005-09-26 Paul Brook * arm-tdep.c (arm_type_align): New function. diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c index 8cb175145b5..ab7030cf555 100644 --- a/gdb/amd64-tdep.c +++ b/gdb/amd64-tdep.c @@ -212,7 +212,35 @@ static int amd64_dwarf_regmap[] = AMD64_ST0_REGNUM + 0, AMD64_ST0_REGNUM + 1, AMD64_ST0_REGNUM + 2, AMD64_ST0_REGNUM + 3, AMD64_ST0_REGNUM + 4, AMD64_ST0_REGNUM + 5, - AMD64_ST0_REGNUM + 6, AMD64_ST0_REGNUM + 7 + AMD64_ST0_REGNUM + 6, AMD64_ST0_REGNUM + 7, + + /* Control and Status Flags Register. */ + AMD64_EFLAGS_REGNUM, + + /* Selector Registers. */ + AMD64_ES_REGNUM, + AMD64_CS_REGNUM, + AMD64_SS_REGNUM, + AMD64_DS_REGNUM, + AMD64_FS_REGNUM, + AMD64_GS_REGNUM, + -1, + -1, + + /* Segment Base Address Registers. */ + -1, + -1, + -1, + -1, + + /* Special Selector Registers. */ + -1, + -1, + + /* Floating Point Control Registers. */ + AMD64_MXCSR_REGNUM, + AMD64_FCTRL_REGNUM, + AMD64_FSTAT_REGNUM }; static const int amd64_dwarf_regmap_len = diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h index e01be02b1ac..e5ce22a3398 100644 --- a/gdb/amd64-tdep.h +++ b/gdb/amd64-tdep.h @@ -52,8 +52,11 @@ enum amd64_regnum AMD64_FS_REGNUM, /* %fs */ AMD64_GS_REGNUM, /* %gs */ AMD64_ST0_REGNUM = 24, /* %st0 */ + AMD64_FCTRL_REGNUM = AMD64_ST0_REGNUM + 8, + AMD64_FSTAT_REGNUM = AMD64_ST0_REGNUM + 9, AMD64_XMM0_REGNUM = 40, /* %xmm0 */ - AMD64_XMM1_REGNUM /* %xmm1 */ + AMD64_XMM1_REGNUM, /* %xmm1 */ + AMD64_MXCSR_REGNUM = AMD64_XMM0_REGNUM + 16 }; /* Number of general purpose registers. */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 3fd82a69ceb..b060a2250bd 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -225,12 +225,25 @@ i386_svr4_reg_to_regnum (int reg) /* Floating-point registers. */ return reg - 11 + I387_ST0_REGNUM; } - else if (reg >= 21) + else if (reg >= 21 && reg <= 36) { /* The SSE and MMX registers have the same numbers as with dbx. */ return i386_dbx_reg_to_regnum (reg); } + switch (reg) + { + case 37: return I387_FCTRL_REGNUM; + case 38: return I387_FSTAT_REGNUM; + case 39: return I387_MXCSR_REGNUM; + case 40: return I386_ES_REGNUM; + case 41: return I386_CS_REGNUM; + case 42: return I386_SS_REGNUM; + case 43: return I386_DS_REGNUM; + case 44: return I386_FS_REGNUM; + case 45: return I386_GS_REGNUM; + } + /* This will hopefully provoke a warning. */ return NUM_REGS + NUM_PSEUDO_REGS; } -- 2.30.2