From 3184d3f9a5cff766aa17a8fb12d8a76513804e35 Mon Sep 17 00:00:00 2001 From: Jonathan Larmour Date: Thu, 26 Apr 2012 15:20:14 +0000 Subject: [PATCH] * arm-tdep.h (VFP_REGISTER_SIZE): Define. * features/arm-with-m-vfp-d16.xml: New file. Describes Cortex-M with VFPv4-sp-d16 FPU register layout. * features/Makefile (WHICH): Add arm-with-m-vfp-d16. * features/arm-with-m-vfp-d16.c: New. Generated from above. * arm-tdep.c: Include arm-with-m-vfp-d16.c. (arm-register_g_packet_guesses): Add vfp-d16 guess. (_initialise_arm_tdep): Initialize arm-with-m-vfp-d16 tdesc. --- gdb/ChangeLog | 11 ++++++ gdb/arm-tdep.c | 10 ++++++ gdb/arm-tdep.h | 4 +++ gdb/features/Makefile | 2 +- gdb/features/arm-with-m-vfp-d16.c | 53 +++++++++++++++++++++++++++++ gdb/features/arm-with-m-vfp-d16.xml | 13 +++++++ 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 gdb/features/arm-with-m-vfp-d16.c create mode 100644 gdb/features/arm-with-m-vfp-d16.xml diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 171e75bdbb8..09dad5f4926 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2012-04-26 Jonathan Larmour + + * arm-tdep.h (VFP_REGISTER_SIZE): Define. + * features/arm-with-m-vfp-d16.xml: New file. Describes + Cortex-M with VFPv4-sp-d16 FPU register layout. + * features/Makefile (WHICH): Add arm-with-m-vfp-d16. + * features/arm-with-m-vfp-d16.c: New. Generated from above. + * arm-tdep.c: Include arm-with-m-vfp-d16.c. + (arm-register_g_packet_guesses): Add vfp-d16 guess. + (_initialise_arm_tdep): Initialize arm-with-m-vfp-d16 tdesc. + 2012-04-25 Doug Evans * cli/cli-decode.c (print_doc_line): Use stream instead of diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index b14b944122d..f83dc0e6c48 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -59,6 +59,7 @@ #include "features/arm-with-m.c" #include "features/arm-with-m-fpa-layout.c" +#include "features/arm-with-m-vfp-d16.c" #include "features/arm-with-iwmmxt.c" #include "features/arm-with-vfpv2.c" #include "features/arm-with-vfpv3.c" @@ -9698,6 +9699,14 @@ arm_register_g_packet_guesses (struct gdbarch *gdbarch) (16 * INT_REGISTER_SIZE) + INT_REGISTER_SIZE, tdesc_arm_with_m); + + /* M-profile plus M4F VFP. */ + register_remote_g_packet_guess (gdbarch, + /* r0-r12,sp,lr,pc; d0-d15; fpscr,xpsr */ + (16 * INT_REGISTER_SIZE) + + (16 * VFP_REGISTER_SIZE) + + (2 * INT_REGISTER_SIZE), + tdesc_arm_with_m_vfp_d16); } /* Otherwise we don't have a useful guess. */ @@ -10333,6 +10342,7 @@ _initialize_arm_tdep (void) /* Initialize the standard target descriptions. */ initialize_tdesc_arm_with_m (); initialize_tdesc_arm_with_m_fpa_layout (); + initialize_tdesc_arm_with_m_vfp_d16 (); initialize_tdesc_arm_with_iwmmxt (); initialize_tdesc_arm_with_vfpv2 (); initialize_tdesc_arm_with_vfpv3 (); diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 8a334fb0587..97596d5965c 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -71,6 +71,10 @@ enum gdb_regnum { bits. DWORD aligned they use 96 bits. */ #define FP_REGISTER_SIZE 12 +/* Say how long VFP double precision registers are. Used for documentation + purposes and code readability. These are fixed at 64 bits. */ +#define VFP_REGISTER_SIZE 8 + /* Number of machine registers. The only define actually required is gdbarch_num_regs. The other definitions are used for documentation purposes and code readability. */ diff --git a/gdb/features/Makefile b/gdb/features/Makefile index 83f507775f3..79803a51e7a 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -31,7 +31,7 @@ # make GDB=/path/to/gdb XMLTOC="xml files" cfiles WHICH = arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \ - arm-with-m arm-with-m-fpa-layout \ + arm-with-m arm-with-m-fpa-layout arm-with-m-vfp-d16 \ i386/i386 i386/i386-linux \ i386/i386-mmx i386/i386-mmx-linux \ i386/amd64 i386/amd64-linux \ diff --git a/gdb/features/arm-with-m-vfp-d16.c b/gdb/features/arm-with-m-vfp-d16.c new file mode 100644 index 00000000000..cadeaf1a528 --- /dev/null +++ b/gdb/features/arm-with-m-vfp-d16.c @@ -0,0 +1,53 @@ +/* THIS FILE IS GENERATED. Original: arm-with-m-vfp-d16.xml */ + +#include "defs.h" +#include "osabi.h" +#include "target-descriptions.h" + +struct target_desc *tdesc_arm_with_m_vfp_d16; +static void +initialize_tdesc_arm_with_m_vfp_d16 (void) +{ + struct target_desc *result = allocate_target_description (); + struct tdesc_feature *feature; + + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.m-profile"); + tdesc_create_reg (feature, "r0", 0, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r1", 1, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r2", 2, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r3", 3, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r4", 4, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r5", 5, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r6", 6, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r7", 7, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r8", 8, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r9", 9, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r10", 10, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r11", 11, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "r12", 12, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "sp", 13, 1, NULL, 32, "data_ptr"); + tdesc_create_reg (feature, "lr", 14, 1, NULL, 32, "int"); + tdesc_create_reg (feature, "pc", 15, 1, NULL, 32, "code_ptr"); + tdesc_create_reg (feature, "xpsr", 25, 1, NULL, 32, "int"); + + feature = tdesc_create_feature (result, "org.gnu.gdb.arm.vfp"); + tdesc_create_reg (feature, "d0", 26, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d1", 27, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d2", 28, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d3", 29, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d4", 30, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d5", 31, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d6", 32, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d7", 33, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d8", 34, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d9", 35, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d10", 36, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d11", 37, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d12", 38, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d13", 39, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d14", 40, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "d15", 41, 1, NULL, 64, "ieee_double"); + tdesc_create_reg (feature, "fpscr", 42, 1, "float", 32, "int"); + + tdesc_arm_with_m_vfp_d16 = result; +} diff --git a/gdb/features/arm-with-m-vfp-d16.xml b/gdb/features/arm-with-m-vfp-d16.xml new file mode 100644 index 00000000000..9637d5e8abe --- /dev/null +++ b/gdb/features/arm-with-m-vfp-d16.xml @@ -0,0 +1,13 @@ + + + + + + + + + -- 2.30.2