From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10519 invoked by alias); 13 Jun 2003 08:12:05 -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 10486 invoked from network); 13 Jun 2003 08:12:05 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 13 Jun 2003 08:12:05 -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 h5D8C3H19007 for ; Fri, 13 Jun 2003 04:12:03 -0400 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 h5D8C3T15405 for ; Fri, 13 Jun 2003 04:12:03 -0400 Received: from cygbert.vinschen.de (vpn50-12.rdu.redhat.com [172.16.50.12]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id h5D8C1w03097 for ; Fri, 13 Jun 2003 01:12:01 -0700 Received: by cygbert.vinschen.de (Postfix, from userid 500) id 8A00F58110; Fri, 13 Jun 2003 10:11:59 +0200 (CEST) Date: Fri, 13 Jun 2003 08:12:00 -0000 From: Corinna Vinschen To: gdb-patches@sources.redhat.com Subject: [PATCH] h8300-tdep.c: Drop xxx_register_byte and xxx_virtual_register_type Message-ID: <20030613081159.GA11176@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-06/txt/msg00460.txt.bz2 Applied as obvious. Corinna * h8300-tdep.c (h8300_register_byte): Remove. (h8300h_register_byte): Remove. (h8300_register_virtual_type): Remove. Substitute by... (h8300_register_type): New function. (h8300_extract_struct_value_address): Drop usage of h8300_register_byte. (h8300h_extract_struct_value_address): Ditto. (h8300_gdbarch_init): Drop calls to set_gdbarch_deprecated_register_byte and set_gdbarch_deprecated_register_virtual_type. Add call to set_gdbarch_register_type. Index: h8300-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/h8300-tdep.c,v retrieving revision 1.69 diff -u -p -r1.69 h8300-tdep.c --- h8300-tdep.c 13 Jun 2003 04:40:32 -0000 1.69 +++ h8300-tdep.c 13 Jun 2003 08:04:13 -0000 @@ -1003,32 +1003,12 @@ h8300_saved_pc_after_call (struct frame_ return read_memory_unsigned_integer (read_register (E_SP_REGNUM), BINWORD); } -static int -h8300_register_byte (int regno) -{ - if (regno < 0 || regno >= NUM_REGS) - internal_error (__FILE__, __LINE__, - "h8300_register_byte: illegal register number %d", regno); - else - return regno * h8300_reg_size; -} - -static int -h8300h_register_byte (int regno) -{ - if (regno < 0 || regno >= NUM_REGS) - internal_error (__FILE__, __LINE__, - "h8300_register_byte: illegal register number %d", regno); - else - return regno * h8300h_reg_size; -} - static struct type * -h8300_register_virtual_type (int regno) +h8300_register_type (struct gdbarch *gdbarch, int regno) { if (regno < 0 || regno >= NUM_REGS) internal_error (__FILE__, __LINE__, - "h8300_register_virtual_type: illegal register number %d", + "h8300_register_type: illegal register number %d", regno); else { @@ -1062,7 +1042,7 @@ static CORE_ADDR h8300_extract_struct_value_address (char *regbuf) { return - extract_unsigned_integer (regbuf + h8300_register_byte (E_ARG0_REGNUM), + extract_unsigned_integer (regbuf + h8300_reg_size * E_ARG0_REGNUM, h8300_reg_size); } @@ -1070,7 +1050,7 @@ static CORE_ADDR h8300h_extract_struct_value_address (char *regbuf) { return - extract_unsigned_integer (regbuf + h8300_register_byte (E_ARG0_REGNUM), + extract_unsigned_integer (regbuf + h8300h_reg_size * E_ARG0_REGNUM, h8300h_reg_size); } @@ -1120,7 +1100,6 @@ h8300_gdbarch_init (struct gdbarch_info h8300hmode = 0; set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_register_name (gdbarch, h8300_register_name); - set_gdbarch_deprecated_register_byte (gdbarch, h8300_register_byte); set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 2 * TARGET_CHAR_BIT); break; @@ -1131,7 +1110,6 @@ h8300_gdbarch_init (struct gdbarch_info h8300hmode = 1; set_gdbarch_num_regs (gdbarch, 13); set_gdbarch_register_name (gdbarch, h8300_register_name); - set_gdbarch_deprecated_register_byte (gdbarch, h8300h_register_byte); set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); break; @@ -1142,7 +1120,6 @@ h8300_gdbarch_init (struct gdbarch_info h8300hmode = 1; set_gdbarch_num_regs (gdbarch, 14); set_gdbarch_register_name (gdbarch, h8300s_register_name); - set_gdbarch_deprecated_register_byte (gdbarch, h8300h_register_byte); set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); break; @@ -1153,7 +1130,6 @@ h8300_gdbarch_init (struct gdbarch_info h8300hmode = 1; set_gdbarch_num_regs (gdbarch, 18); set_gdbarch_register_name (gdbarch, h8300sx_register_name); - set_gdbarch_deprecated_register_byte (gdbarch, h8300h_register_byte); set_gdbarch_ptr_bit (gdbarch, 4 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 4 * TARGET_CHAR_BIT); break; @@ -1171,7 +1147,7 @@ h8300_gdbarch_init (struct gdbarch_info set_gdbarch_sp_regnum (gdbarch, E_SP_REGNUM); set_gdbarch_deprecated_fp_regnum (gdbarch, E_FP_REGNUM); set_gdbarch_pc_regnum (gdbarch, E_PC_REGNUM); - set_gdbarch_deprecated_register_virtual_type (gdbarch, h8300_register_virtual_type); + set_gdbarch_register_type (gdbarch, h8300_register_type); set_gdbarch_print_registers_info (gdbarch, h8300_print_registers_info); set_gdbarch_print_float_info (gdbarch, h8300_print_float_info); -- Corinna Vinschen Cygwin Developer Red Hat, Inc. mailto:vinschen@redhat.com