From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25285 invoked by alias); 27 Oct 2003 16:09:45 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 25256 invoked from network); 27 Oct 2003 16:09:42 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 27 Oct 2003 16:09:42 -0000 Received: from int-mx2.corp.redhat.com (nat-pool-rdu-dmz.redhat.com [172.16.52.200] (may be forged)) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id h9RG9fM20946 for ; Mon, 27 Oct 2003 11:09:41 -0500 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id h9RG9ea28506 for ; Mon, 27 Oct 2003 11:09:40 -0500 Received: from cygbert.vinschen.de (vpn50-10.rdu.redhat.com [172.16.50.10]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id h9RG9XJ23724 for ; Mon, 27 Oct 2003 08:09:34 -0800 Received: by cygbert.vinschen.de (Postfix, from userid 500) id 137CE58092; Mon, 27 Oct 2003 17:09:28 +0100 (CET) Date: Mon, 27 Oct 2003 16:09:00 -0000 From: Corinna Vinschen To: gdb-patches@sources.redhat.com Subject: [RFA] sh-tdep.c: Add new SH machine types Message-ID: <20031027160927.GX1653@cygbert.vinschen.de> Reply-To: gdb-patches@sources.redhat.com Mail-Followup-To: gdb-patches@sources.redhat.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-SW-Source: 2003-10/txt/msg00782.txt.bz2 Hi, the below patch adds the new bfd machine types sh4a and sh4al_dsp (new CPUs) and the new soft-fpu subtypes sh4_nofpu and sh4a_nofpu. Corinna * sh-tdep.c (sh_sh4_nofpu_register_name): New function. (sh_sh4al_dsp_register_name): Ditto. (sh4_nofpu_show_regs): Ditto. (sh_gdbarch_init): Add cases for bfd_mach_sh4al_dsp, bfd_mach_sh4a, bfd_mach_sh4_nofpu and bfd_mach_sh4a_nofpu. Index: sh-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/sh-tdep.c,v retrieving revision 1.152 diff -u -p -r1.152 sh-tdep.c --- sh-tdep.c 14 Oct 2003 15:35:43 -0000 1.152 +++ sh-tdep.c 27 Oct 2003 16:07:23 -0000 @@ -256,6 +256,60 @@ sh_sh4_register_name (int reg_nr) return register_names[reg_nr]; } +static const char * +sh_sh4_nofpu_register_name (int reg_nr) +{ + static char *register_names[] = { + /* general registers 0-15 */ + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", + /* 16 - 22 */ + "pc", "pr", "gbr", "vbr", "mach", "macl", "sr", + /* 23, 24 */ + "", "", + /* floating point registers 25 - 40 -- not for nofpu target */ + "", "", "", "", "", "", "", "", + "", "", "", "", "", "", "", "", + /* 41, 42 */ + "ssr", "spc", + /* bank 0 43 - 50 */ + "r0b0", "r1b0", "r2b0", "r3b0", "r4b0", "r5b0", "r6b0", "r7b0", + /* bank 1 51 - 58 */ + "r0b1", "r1b1", "r2b1", "r3b1", "r4b1", "r5b1", "r6b1", "r7b1", + /* double precision (pseudo) 59 - 66 -- not for nofpu target */ + "", "", "", "", "", "", "", "", + /* vectors (pseudo) 67 - 70 -- not for nofpu target */ + "", "", "", "", + }; + if (reg_nr < 0) + return NULL; + if (reg_nr >= (sizeof (register_names) / sizeof (*register_names))) + return NULL; + return register_names[reg_nr]; +} + +static const char * +sh_sh4al_dsp_register_name (int reg_nr) +{ + static char *register_names[] = { + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", + "pc", "pr", "gbr", "vbr", "mach", "macl", "sr", + "", "dsr", + "a0g", "a0", "a1g", "a1", "m0", "m1", "x0", "x1", + "y0", "y1", "", "", "", "", "", "mod", + "ssr", "spc", + "rs", "re", "", "", "", "", "", "", + "r0b", "r1b", "r2b", "r3b", "r4b", "r5b", "r6b", "r7b" + "", "", "", "", "", "", "", "", + }; + if (reg_nr < 0) + return NULL; + if (reg_nr >= (sizeof (register_names) / sizeof (*register_names))) + return NULL; + return register_names[reg_nr]; +} + static const unsigned char * sh_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) { @@ -1340,6 +1394,36 @@ sh4_show_regs (void) } static void +sh4_nofpu_show_regs (void) +{ + printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n", + paddr (read_register (PC_REGNUM)), + (long) read_register (SR_REGNUM), + (long) read_register (PR_REGNUM), + (long) read_register (MACH_REGNUM), + (long) read_register (MACL_REGNUM)); + + printf_filtered ("GBR=%08lx VBR=%08lx", + (long) read_register (GBR_REGNUM), + (long) read_register (VBR_REGNUM)); + printf_filtered (" SSR=%08lx SPC=%08lx", + (long) read_register (SSR_REGNUM), + (long) read_register (SPC_REGNUM)); + + printf_filtered + ("\nR0-R7 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + (long) read_register (0), (long) read_register (1), + (long) read_register (2), (long) read_register (3), + (long) read_register (4), (long) read_register (5), + (long) read_register (6), (long) read_register (7)); + printf_filtered ("R8-R15 %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + (long) read_register (8), (long) read_register (9), + (long) read_register (10), (long) read_register (11), + (long) read_register (12), (long) read_register (13), + (long) read_register (14), (long) read_register (15)); +} + +static void sh_dsp_show_regs (void) { printf_filtered ("PC=%s SR=%08lx PR=%08lx MACH=%08lx MACHL=%08lx\n", @@ -2097,13 +2181,20 @@ sh_gdbarch_init (struct gdbarch_info inf break; case bfd_mach_sh3_dsp: + case bfd_mach_sh4al_dsp: sh_show_regs = sh3_dsp_show_regs; break; case bfd_mach_sh4: + case bfd_mach_sh4a: sh_show_regs = sh4_show_regs; break; + case bfd_mach_sh4_nofpu: + case bfd_mach_sh4a_nofpu: + sh_show_regs = sh4_nofpu_show_regs; + break; + case bfd_mach_sh5: sh_show_regs = sh64_show_regs; /* SH5 is handled entirely in sh64-tdep.c */ @@ -2222,6 +2313,7 @@ sh_gdbarch_init (struct gdbarch_info inf break; case bfd_mach_sh4: + case bfd_mach_sh4a: set_gdbarch_register_name (gdbarch, sh_sh4_register_name); set_gdbarch_register_type (gdbarch, sh_sh4_register_type); set_gdbarch_fp0_regnum (gdbarch, 25); @@ -2232,6 +2324,16 @@ sh_gdbarch_init (struct gdbarch_info inf set_gdbarch_extract_return_value (gdbarch, sh3e_sh4_extract_return_value); set_gdbarch_push_dummy_call (gdbarch, sh_push_dummy_call_fpu); + break; + + case bfd_mach_sh4_nofpu: + case bfd_mach_sh4a_nofpu: + set_gdbarch_register_name (gdbarch, sh_sh4_nofpu_register_name); + break; + + case bfd_mach_sh4al_dsp: + set_gdbarch_register_name (gdbarch, sh_sh4al_dsp_register_name); + set_gdbarch_register_sim_regno (gdbarch, sh_dsp_register_sim_regno); break; default: -- Corinna Vinschen Cygwin Developer Red Hat, Inc.