From 3e2533eda26ecf20d0e09688c0a1f651fac50603 Mon Sep 17 00:00:00 2001 From: Vladimir Prus Date: Tue, 5 Feb 2008 11:53:43 +0300 Subject: [PATCH] Update --- bfd/CVS/Entries | 18 +++++++++--------- bfd/ChangeLog | 28 ++++++++++++++++++++++++++++ bfd/archures.c | 3 ++- bfd/bfd-in2.h | 3 ++- bfd/configure | 10 ++++++++++ bfd/cpu-mips.c | 8 +++++--- bfd/elf32-xtensa.c | 23 +++++++++++++++++------ bfd/elfxx-mips.c | 12 +++++++++++- bfd/version.h | 2 +- bfd/warning.m4 | 10 ++++++++++ gdb/CVS/Entries | 6 +++--- gdb/ChangeLog | 11 +++++++++++ gdb/testsuite/gdb.ada/CVS/Entries | 2 ++ gdb/varobj.c | 2 +- gdb/version.in | 2 +- include/elf/CVS/Entries | 4 ++-- include/elf/ChangeLog | 5 +++++ include/elf/mips.h | 3 ++- include/opcode/CVS/Entries | 4 ++-- include/opcode/ChangeLog | 8 ++++++++ include/opcode/mips.h | 13 ++++++++++--- opcodes/CVS/Entries | 8 ++++---- opcodes/ChangeLog | 13 +++++++++++++ opcodes/configure | 10 ++++++++++ opcodes/mips-dis.c | 6 +++++- opcodes/mips-opc.c | 4 +++- sim/sh/CVS/Entries | 4 ++-- sim/sh/ChangeLog | 4 ++++ sim/sh/interp.c | 21 ++++++++------------- 29 files changed, 191 insertions(+), 56 deletions(-) diff --git a/bfd/CVS/Entries b/bfd/CVS/Entries index cbefc9f..0071246 100644 --- a/bfd/CVS/Entries +++ b/bfd/CVS/Entries @@ -85,7 +85,6 @@ D/po//// /cofflink.c/1.65/Fri Jul 27 22:04:23 2007// /coffswap.h/1.17/Tue Jul 3 14:26:40 2007// /config.in/1.38/Tue Oct 16 15:15:50 2007// -/configure/1.273/Tue Oct 16 15:15:50 2007// /configure.com/1.1.1.1/Mon May 3 07:28:55 1999// /configure.host/1.17/Fri Dec 30 22:25:57 2005// /configure.in/1.238/Tue Oct 16 15:15:50 2007// @@ -349,15 +348,12 @@ D/po//// /vms-misc.c/1.27/Mon Oct 15 02:00:11 2007// /vms-tir.c/1.19/Wed Aug 1 20:06:05 2007// /vms.h/1.13/Tue Jul 3 14:26:43 2007// -/warning.m4/1.3/Wed Apr 19 02:06:13 2006// /xcoff-target.h/1.18/Tue Jul 3 14:26:43 2007// /xcofflink.c/1.47/Tue Jul 3 14:26:43 2007// /xsym.c/1.22/Tue Jul 3 14:26:43 2007// /xsym.h/1.12/Tue Jul 3 14:26:43 2007// /xtensa-isa.c/1.10/Tue Jul 3 14:26:43 2007// /xtensa-modules.c/1.9/Tue Jul 3 14:26:43 2007// -/archures.c/1.129/Fri Nov 30 11:53:28 2007// -/cpu-mips.c/1.28/Fri Nov 30 11:53:28 2007// /elf32-mep.c/1.9/Fri Nov 30 11:51:47 2007// /ChangeLog-2007/1.1/Wed Jan 2 21:41:01 2008// /elf-hppa.h/1.87/Wed Jan 9 19:56:52 2008// @@ -370,7 +366,6 @@ D/po//// /section.c/1.98/Wed Jan 9 19:56:52 2008// /som.c/1.70/Wed Jan 9 19:56:52 2008// /bfd-in.h/1.132/Wed Jan 30 06:44:52 2008// -/bfd-in2.h/1.437/Wed Jan 30 06:44:52 2008// /bfd.c/1.100/Wed Jan 30 06:44:52 2008// /coff-alpha.c/1.37/Wed Jan 30 06:44:52 2008// /coff-mips.c/1.34/Wed Jan 30 06:44:52 2008// @@ -388,22 +383,27 @@ D/po//// /elf32-s390.c/1.96/Wed Jan 30 06:44:53 2008// /elf32-sh.c/1.155/Wed Jan 30 06:44:53 2008// /elf32-vax.c/1.47/Wed Jan 30 06:44:53 2008// -/elf32-xtensa.c/1.106/Wed Jan 30 06:44:53 2008// /elf64-ppc.c/1.274/Wed Jan 30 06:44:54 2008// /elf64-ppc.h/1.25/Wed Jan 30 06:44:54 2008// /elf64-s390.c/1.97/Wed Jan 30 06:44:54 2008// /elf64-x86-64.c/1.145/Wed Jan 30 06:44:54 2008// /elflink.c/1.294/Wed Jan 30 06:44:54 2008// -/elfxx-mips.c/1.224/Wed Jan 30 06:44:54 2008// /elfxx-sparc.c/1.37/Wed Jan 30 06:44:54 2008// /elfxx-target.h/1.112/Wed Jan 30 06:44:54 2008// /format.c/1.27/Wed Jan 30 06:44:54 2008// /libecoff.h/1.24/Wed Jan 30 06:44:54 2008// /vms.c/1.44/Wed Jan 30 06:44:54 2008// /elf32-spu.h/1.5/Fri Feb 1 06:16:40 2008// -/ChangeLog/1.4123/Mon Feb 4 05:53:08 2008// /config.bfd/1.237/Mon Feb 4 05:53:08 2008// /elf.c/1.431/Mon Feb 4 05:53:11 2008// /elf32-arm.c/1.133/Mon Feb 4 05:53:13 2008// /elf32-spu.c/1.28/Mon Feb 4 05:53:14 2008// -/version.h/1.2232/Mon Feb 4 05:53:15 2008// +/ChangeLog/1.4126/Tue Feb 5 08:52:33 2008// +/archures.c/1.130/Tue Feb 5 08:52:33 2008// +/bfd-in2.h/1.438/Tue Feb 5 08:52:35 2008// +/configure/1.274/Tue Feb 5 08:52:39 2008// +/cpu-mips.c/1.29/Tue Feb 5 08:52:39 2008// +/elf32-xtensa.c/1.107/Tue Feb 5 08:52:41 2008// +/elfxx-mips.c/1.225/Tue Feb 5 08:52:44 2008// +/version.h/1.2233/Tue Feb 5 08:52:44 2008// +/warning.m4/1.4/Tue Feb 5 08:52:44 2008// diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8b6d641..6c9e799 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,31 @@ +2008-02-04 Bob Wilson + + * elf32-xtensa (elf_xtensa_relocate_section): After finding an invalid + relocation, do not continue processing it. Ignore R_XTENSA_ASM_EXPAND + relocations against dynamic symbols. + (elf_xtensa_finish_dynamic_sections): Do not fail if there is no + .xt.lit section. + +2008-02-04 Kai Tietz + H.J. Lu + + PR 5715 + * warning.m4: Enable -Wno-format by default when using gcc on + mingw. + * configure: Regenerated. + +2008-02-04 Adam Nemet + + * archures.c: Update copyright. + (bfd_mach_mips_octeon): New macro. + * bfd-in2.h: Regenerate. + * elfxx-mips.c (_bfd_elf_mips_mach): Handle Octeon. + (mips_set_isa_flags): Likewise. + (mips_mach_extensions): Add Octeon. + * cpu-mips.c: Update copyright. + (I_mipsocteon): New enum constant. + (arch_info_struct): Add Octeon. + 2008-02-04 Alan Modra * elf32-spu.c (spu_elf_relocate_section): Correct return type. diff --git a/bfd/archures.c b/bfd/archures.c index 3459e55..9a5c7c4 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -1,6 +1,6 @@ /* BFD library support routines for architectures. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Hacked by John Gilmore and Steve Chamberlain of Cygnus Support. @@ -172,6 +172,7 @@ DESCRIPTION .#define bfd_mach_mips_loongson_2e 3001 .#define bfd_mach_mips_loongson_2f 3002 .#define bfd_mach_mips_sb1 12310201 {* octal 'SB', 01 *} +.#define bfd_mach_mips_octeon 6501 .#define bfd_mach_mipsisa32 32 .#define bfd_mach_mipsisa32r2 33 .#define bfd_mach_mipsisa64 64 diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index b514ad1..5e44ef7 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -8,7 +8,7 @@ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -1849,6 +1849,7 @@ enum bfd_architecture #define bfd_mach_mips_loongson_2e 3001 #define bfd_mach_mips_loongson_2f 3002 #define bfd_mach_mips_sb1 12310201 /* octal 'SB', 01 */ +#define bfd_mach_mips_octeon 6501 #define bfd_mach_mipsisa32 32 #define bfd_mach_mipsisa32r2 33 #define bfd_mach_mipsisa64 64 diff --git a/bfd/configure b/bfd/configure index c15a118..bd532e3 100755 --- a/bfd/configure +++ b/bfd/configure @@ -10609,6 +10609,16 @@ echo "$as_me: error: bad value ${enableval} for --enable-werror" >&2;} esac fi; +# Enable -Wno-format by default when using gcc on mingw +case "${host}" in + *-*-mingw32*) + if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then + GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" + fi + ;; + *) ;; +esac + # Enable -Werror by default when using gcc if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then ERROR_ON_WARNING=yes diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c index 6384162..07f966b 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -1,6 +1,6 @@ /* bfd back-end for mips support Copyright 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, - 2002, 2003, 2004, 2007 Free Software Foundation, Inc. + 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -88,7 +88,8 @@ enum I_mipsisa64r2, I_sb1, I_loongson_2e, - I_loongson_2f + I_loongson_2f, + I_mipsocteon }; #define NN(index) (&arch_info_struct[(index) + 1]) @@ -123,7 +124,8 @@ static const bfd_arch_info_type arch_info_struct[] = N (64, 64, bfd_mach_mipsisa64r2,"mips:isa64r2", FALSE, NN(I_mipsisa64r2)), N (64, 64, bfd_mach_mips_sb1, "mips:sb1", FALSE, NN(I_sb1)), N (64, 64, bfd_mach_mips_loongson_2e, "mips:loongson_2e", FALSE, NN(I_loongson_2e)), - N (64, 64, bfd_mach_mips_loongson_2f, "mips:loongson_2f", FALSE, 0) + N (64, 64, bfd_mach_mips_loongson_2f, "mips:loongson_2f", FALSE, NN(I_loongson_2f)), + N (64, 64, bfd_mach_mips_octeon, "mips:octeon", FALSE, 0) }; /* The default architecture is mips:3000, but with a machine number of diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index 43ef7d8..05ee9df 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -2164,6 +2164,7 @@ elf_xtensa_relocate_section (bfd *output_bfd, (info, error_message, input_bfd, input_section, rel->r_offset))) return FALSE; + continue; } else if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) && (input_section->flags & SEC_ALLOC) != 0 @@ -2244,6 +2245,13 @@ elf_xtensa_relocate_section (bfd *output_bfd, BFD_ASSERT (sizeof (Elf32_External_Rela) * srel->reloc_count <= srel->size); } + else if (r_type == R_XTENSA_ASM_EXPAND && dynamic_symbol) + { + /* This should only happen for non-PIC code, which is not + supposed to be used on systems with dynamic linking. + Just ignore these relocations. */ + continue; + } } /* Dynamic relocs are not propagated for SEC_DEBUGGING sections @@ -2467,7 +2475,7 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, bfd *dynobj; asection *sdyn, *srelplt, *sgot, *sxtlit, *sgotloc; Elf32_External_Dyn *dyncon, *dynconend; - int num_xtlit_entries; + int num_xtlit_entries = 0; if (! elf_hash_table (info)->dynamic_sections_created) return TRUE; @@ -2592,11 +2600,14 @@ elf_xtensa_finish_dynamic_sections (bfd *output_bfd, BFD_ASSERT (! info->relocatable); sxtlit = bfd_get_section_by_name (output_bfd, ".xt.lit"); sgotloc = htab->sgotloc; - BFD_ASSERT (sxtlit && sgotloc); - num_xtlit_entries = - elf_xtensa_combine_prop_entries (output_bfd, sxtlit, sgotloc); - if (num_xtlit_entries < 0) - return FALSE; + BFD_ASSERT (sgotloc); + if (sxtlit) + { + num_xtlit_entries = + elf_xtensa_combine_prop_entries (output_bfd, sxtlit, sgotloc); + if (num_xtlit_entries < 0) + return FALSE; + } dyncon = (Elf32_External_Dyn *) sdyn->contents; dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size); diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index ef2f6a7..1b24ee5 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -1,6 +1,6 @@ /* MIPS-specific support for ELF Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Most of the information added by Ian Lance Taylor, Cygnus Support, . @@ -5227,6 +5227,9 @@ _bfd_elf_mips_mach (flagword flags) case E_MIPS_MACH_LS2F: return bfd_mach_mips_loongson_2f; + case E_MIPS_MACH_OCTEON: + return bfd_mach_mips_octeon; + default: switch (flags & EF_MIPS_ARCH) { @@ -9480,6 +9483,10 @@ mips_set_isa_flags (bfd *abfd) val = E_MIPS_ARCH_64 | E_MIPS_MACH_SB1; break; + case bfd_mach_mips_octeon: + val = E_MIPS_ARCH_64R2 | E_MIPS_MACH_OCTEON; + break; + case bfd_mach_mipsisa32: val = E_MIPS_ARCH_32; break; @@ -11215,6 +11222,9 @@ struct mips_mach_extension { are ordered topologically with MIPS I extensions listed last. */ static const struct mips_mach_extension mips_mach_extensions[] = { + /* MIPS64r2 extensions. */ + { bfd_mach_mips_octeon, bfd_mach_mipsisa64r2 }, + /* MIPS64 extensions. */ { bfd_mach_mipsisa64r2, bfd_mach_mipsisa64 }, { bfd_mach_mips_sb1, bfd_mach_mipsisa64 }, diff --git a/bfd/version.h b/bfd/version.h index b4378bc..1ab28ee 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20080204 +#define BFD_VERSION_DATE 20080205 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ diff --git a/bfd/warning.m4 b/bfd/warning.m4 index b366cad..0b0bf2f 100644 --- a/bfd/warning.m4 +++ b/bfd/warning.m4 @@ -11,6 +11,16 @@ AC_ARG_ENABLE(werror, *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;; esac]) +# Enable -Wno-format by default when using gcc on mingw +case "${host}" in + *-*-mingw32*) + if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then + GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" + fi + ;; + *) ;; +esac + # Enable -Werror by default when using gcc if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then ERROR_ON_WARNING=yes diff --git a/gdb/CVS/Entries b/gdb/CVS/Entries index b0c50c0..e1c7910 100644 --- a/gdb/CVS/Entries +++ b/gdb/CVS/Entries @@ -582,11 +582,9 @@ D/vx-share//// /solib-sunos.c/1.27/Fri Feb 1 06:16:40 2008// /solib-svr4.c/1.82/Fri Feb 1 06:16:40 2008// /symfile.c/1.198/Fri Feb 1 06:16:40 2008/-ko/ -/varobj.c/1.101/Fri Feb 1 06:16:40 2008/-ko/ /varobj.h/1.15/Fri Feb 1 06:16:40 2008/-ko/ /win32-nat.c/1.150/Fri Feb 1 06:16:40 2008/-ko/ D/src//// -/ChangeLog/1.9137/Mon Feb 4 05:50:55 2008/-ko/ /NEWS/1.255/Mon Feb 4 05:49:39 2008/-ko/ /breakpoint.c/1.301/Mon Feb 4 05:49:39 2008/-ko/ /breakpoint.h/1.65/Mon Feb 4 05:49:39 2008/-ko/ @@ -617,4 +615,6 @@ D/src//// /valarith.c/1.58/Mon Feb 4 05:51:17 2008/-ko/ /valops.c/1.183/Mon Feb 4 05:51:20 2008/-ko/ /value.h/1.108/Mon Feb 4 05:51:20 2008/-ko/ -/version.in/1.2406/Mon Feb 4 05:51:20 2008// +/ChangeLog/1.9139/Mon Feb 4 07:48:54 2008/-ko/ +/varobj.c/1.103/Mon Feb 4 07:48:29 2008/-ko/ +/version.in/1.2407/Tue Feb 5 08:52:32 2008// diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e100a1a..8e06da0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2008-02-04 Vladimir Prus + + * varobj.c (c_value_of_variable): Use xstrdup. + +2008-02-04 Vladimir Prus + + Update stored rendition of varobj value when format changes. + * varobj.c (varobj_set_display_format): Recomputed + print_value. + (c_value_of_variable): Return print_value. + 2008-02-03 Doug Evans * eval.c (evaluate_subexp_standard): Fix type of result of mixed diff --git a/gdb/testsuite/gdb.ada/CVS/Entries b/gdb/testsuite/gdb.ada/CVS/Entries index ff96439..114cfef 100644 --- a/gdb/testsuite/gdb.ada/CVS/Entries +++ b/gdb/testsuite/gdb.ada/CVS/Entries @@ -69,3 +69,5 @@ D/formatted_ref//// /Makefile.in/1.4/Mon Feb 4 05:53:05 2008// /nested.exp/1.1/Fri Feb 1 22:48:16 2008// /sym_print_name.exp/1.1/Fri Feb 1 23:15:36 2008// +D/nested//// +D/sym_print_name//// diff --git a/gdb/varobj.c b/gdb/varobj.c index 258e0bf..2236931 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -2252,7 +2252,7 @@ c_value_of_variable (struct varobj *var) gdb_assert (varobj_value_is_changeable_p (var)); gdb_assert (!value_lazy (var->value)); - return strdup (var->print_value); + return xstrdup (var->print_value); } } } diff --git a/gdb/version.in b/gdb/version.in index 2df03c0..fb5ca98 100644 --- a/gdb/version.in +++ b/gdb/version.in @@ -1 +1 @@ -6.7.50.20080204-cvs +6.7.50.20080205-cvs diff --git a/include/elf/CVS/Entries b/include/elf/CVS/Entries index b1d733a..07a1ce3 100644 --- a/include/elf/CVS/Entries +++ b/include/elf/CVS/Entries @@ -52,10 +52,10 @@ /xc16x.h/1.1/Fri Feb 17 14:36:26 2006// /xstormy16.h/1.4/Tue May 10 10:21:10 2005// /internal.h/1.19/Fri Nov 30 11:53:29 2007// -/mips.h/1.35/Fri Nov 30 11:53:29 2007// /dwarf2.h/1.22/Fri Dec 14 14:05:18 2007// /xtensa.h/1.6/Fri Dec 14 14:05:18 2007// /common.h/1.91/Wed Jan 30 06:44:59 2008// -/ChangeLog/1.315/Mon Feb 4 05:49:40 2008// /ia64.h/1.14/Mon Feb 4 05:49:40 2008// +/ChangeLog/1.316/Tue Feb 5 08:52:49 2008// +/mips.h/1.36/Tue Feb 5 08:52:49 2008// D diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 9382d9b..b1c7567 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -1,3 +1,8 @@ +2008-02-04 Adam Nemet + + * mips.h: Update copyright. + (E_MIPS_MACH_OCTEON): New macro. + 2008-01-30 Tristan Gingold Add OpenVMS extensions. diff --git a/include/elf/mips.h b/include/elf/mips.h index 63a9718..7b72cac 100644 --- a/include/elf/mips.h +++ b/include/elf/mips.h @@ -1,6 +1,6 @@ /* MIPS ELF support for BFD. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 + 2003, 2004, 2005, 2008 Free Software Foundation, Inc. By Ian Lance Taylor, Cygnus Support, , from @@ -213,6 +213,7 @@ END_RELOC_NUMBERS (R_MIPS_maxext) #define E_MIPS_MACH_4120 0x00870000 #define E_MIPS_MACH_4111 0x00880000 #define E_MIPS_MACH_SB1 0x008a0000 +#define E_MIPS_MACH_OCTEON 0x008b0000 #define E_MIPS_MACH_5400 0x00910000 #define E_MIPS_MACH_5500 0x00980000 #define E_MIPS_MACH_9000 0x00990000 diff --git a/include/opcode/CVS/Entries b/include/opcode/CVS/Entries index 4bd60d2..c044b82 100644 --- a/include/opcode/CVS/Entries +++ b/include/opcode/CVS/Entries @@ -48,7 +48,7 @@ /tic80.h/1.4/Tue May 10 10:21:13 2005// /v850.h/1.6/Tue May 10 10:21:13 2005// /vax.h/1.3/Tue May 10 10:21:13 2005// -/ChangeLog/1.353/Fri Nov 30 11:53:29 2007// -/mips.h/1.55/Fri Nov 30 11:53:29 2007// /avr.h/1.11/Wed Jan 30 06:44:59 2008// +/ChangeLog/1.354/Tue Feb 5 08:52:50 2008// +/mips.h/1.56/Tue Feb 5 08:52:50 2008// D diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index afd480b..9edf24c 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,11 @@ +2008-02-04 Adam Nemet + + * mips.h: Update copyright. + (INSN_CHIP_MASK): New macro. + (INSN_OCTEON): New macro. + (CPU_OCTEON): New macro. + (OPCODE_IS_MEMBER): Handle Octeon instructions. + 2007-11-29 Mark Shinwell * mips.h (INSN_LOONGSON_2E): New. diff --git a/include/opcode/mips.h b/include/opcode/mips.h index 20638d8..6ddc9d0 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h @@ -1,6 +1,6 @@ /* mips.h. Mips opcode list for GDB, the GNU debugger. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 + 2003, 2004, 2005, 2008 Free Software Foundation, Inc. Contributed by Ralph Campbell and OSF Commented and modified by Ian Lance Taylor, Cygnus Support @@ -510,6 +510,12 @@ struct mips_opcode static const unsigned int mips_isa_table[] = { 0x0001, 0x0003, 0x0607, 0x1e0f, 0x3e1f, 0x0a23, 0x3e63, 0x3ebf, 0x3fff }; +/* Masks used for Chip specific instructions. */ +#define INSN_CHIP_MASK 0xc3ff0800 + +/* Cavium Networks Octeon instructions. */ +#define INSN_OCTEON 0x00000800 + /* Masks used for MIPS-defined ASEs. */ #define INSN_ASE_MASK 0x3c00f000 @@ -521,8 +527,6 @@ static const unsigned int mips_isa_table[] = /* MIPS-3D ASE */ #define INSN_MIPS3D 0x00008000 -/* Chip specific instructions. These are bitmasks. */ - /* MIPS R4650 instruction. */ #define INSN_4650 0x00010000 /* LSI R4010 instruction. */ @@ -605,6 +609,7 @@ static const unsigned int mips_isa_table[] = #define CPU_SB1 12310201 /* octal 'SB', 01. */ #define CPU_LOONGSON_2E 3001 #define CPU_LOONGSON_2F 3002 +#define CPU_OCTEON 6501 /* Test for membership in an ISA including chip specific ISAs. INSN is pointer to an element of the opcode table; ISA is the specified @@ -635,6 +640,8 @@ static const unsigned int mips_isa_table[] = && ((insn)->membership & INSN_LOONGSON_2E) != 0) \ || (cpu == CPU_LOONGSON_2F \ && ((insn)->membership & INSN_LOONGSON_2F) != 0) \ + || (cpu == CPU_OCTEON \ + && ((insn)->membership & INSN_OCTEON) != 0) \ || 0) /* Please keep this term for easier source merging. */ /* This is a list of macro expanded instructions. diff --git a/opcodes/CVS/Entries b/opcodes/CVS/Entries index eb2adee..37d82c7 100644 --- a/opcodes/CVS/Entries +++ b/opcodes/CVS/Entries @@ -29,7 +29,6 @@ D/po//// /cgen-types.h/1.3/Thu Jul 5 09:49:00 2007// /cgen.sh/1.7/Thu Jul 5 09:49:00 2007// /config.in/1.13/Sun Sep 9 01:22:57 2007// -/configure/1.102/Mon Oct 8 15:40:41 2007// /configure.in/1.80/Mon Oct 8 15:40:41 2007// /cr16-dis.c/1.3/Thu Jul 5 09:49:00 2007// /cr16-opc.c/1.3/Mon Oct 1 15:55:37 2007// @@ -206,8 +205,6 @@ D/po//// /z8k-dis.c/1.18/Thu Jul 5 09:49:02 2007// /z8k-opc.h/1.11/Thu Jul 5 09:49:02 2007// /z8kgen.c/1.14/Thu Jul 5 09:49:02 2007// -/mips-dis.c/1.69/Fri Nov 30 11:53:29 2007// -/mips-opc.c/1.64/Fri Nov 30 11:53:29 2007// /s390-opc.txt/1.19/Fri Nov 30 11:51:48 2007// /ChangeLog-2007/1.2/Thu Jan 3 05:27:55 2008// /Makefile.am/1.123/Wed Jan 9 19:56:55 2008// @@ -221,5 +218,8 @@ D/po//// /i386-reg.tbl/1.7/Wed Jan 30 06:45:00 2008// /i386-tbl.h/1.30/Wed Jan 30 06:45:00 2008// /ia64-dis.c/1.15/Wed Jan 30 06:45:00 2008// -/ChangeLog/1.1228/Fri Feb 1 06:16:40 2008// /ppc-opc.c/1.103/Fri Feb 1 06:16:40 2008// +/ChangeLog/1.1230/Tue Feb 5 08:52:44 2008// +/configure/1.103/Tue Feb 5 08:52:47 2008// +/mips-dis.c/1.70/Tue Feb 5 08:52:48 2008// +/mips-opc.c/1.65/Tue Feb 5 08:52:49 2008// diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9e40103..1c18707 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,16 @@ +2008-02-04 H.J. Lu + + PR 5715 + * configure: Regenerated. + +2008-02-04 Adam Nemet + + * mips-dis.c: Update copyright. + (mips_arch_choices): Add Octeon. + * mips-opc.c: Update copyright. + (IOCT): New macro. + (mips_builtin_opcodes): Add Octeon instruction synciobdma. + 2008-01-29 Alan Modra * ppc-opc.c: Support optional L form mtmsr. diff --git a/opcodes/configure b/opcodes/configure index 46d059d..84b2a22 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -10471,6 +10471,16 @@ echo "$as_me: error: bad value ${enableval} for --enable-werror" >&2;} esac fi; +# Enable -Wno-format by default when using gcc on mingw +case "${host}" in + *-*-mingw32*) + if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then + GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format" + fi + ;; + *) ;; +esac + # Enable -Werror by default when using gcc if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then ERROR_ON_WARNING=yes diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index 378847d..a03078a 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -1,6 +1,6 @@ /* Print mips instructions for GDB, the GNU debugger, or for objdump. Copyright 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2005, 2007 + 2000, 2001, 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc. Contributed by Nobuyuki Hikichi(hikichi@sra.co.jp). @@ -458,6 +458,10 @@ const struct mips_arch_choice mips_arch_choices[] = ISA_MIPS3 | INSN_LOONGSON_2F, mips_cp0_names_numeric, NULL, 0, mips_hwr_names_numeric }, + { "octeon", 1, bfd_mach_mips_octeon, CPU_OCTEON, + ISA_MIPS64R2 | INSN_OCTEON, mips_cp0_names_numeric, NULL, 0, + mips_hwr_names_numeric }, + /* This entry, mips16, is here only for ISA/processor selection; do not print its name. */ { "", 1, bfd_mach_mips16, CPU_MIPS16, ISA_MIPS3 | INSN_MIPS16, diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c index 746763b..b0f9d7e 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -1,6 +1,6 @@ /* mips-opc.c -- MIPS opcode list. Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 - 2003, 2004, 2005, 2007 Free Software Foundation, Inc. + 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. Contributed by Ralph Campbell and OSF Commented and modified by Ian Lance Taylor, Cygnus Support Extended for MIPS32 support by Anders Norlander, and by SiByte, Inc. @@ -121,6 +121,7 @@ #define N5 (INSN_5400 | INSN_5500) #define N54 INSN_5400 #define N55 INSN_5500 +#define IOCT INSN_OCTEON #define G1 (T3 \ ) @@ -1295,6 +1296,7 @@ const struct mips_opcode mips_builtin_opcodes[] = {"sync.p", "", 0x0000040f, 0xffffffff, INSN_SYNC, 0, I2 }, {"sync.l", "", 0x0000000f, 0xffffffff, INSN_SYNC, 0, I2 }, {"synci", "o(b)", 0x041f0000, 0xfc1f0000, SM|RD_b, 0, I33 }, +{"synciobdma", "", 0x0000008f, 0xffffffff, INSN_SYNC, 0, IOCT }, {"syscall", "", 0x0000000c, 0xffffffff, TRAP, 0, I1 }, {"syscall", "B", 0x0000000c, 0xfc00003f, TRAP, 0, I1 }, {"teqi", "s,j", 0x040c0000, 0xfc1f0000, RD_s|TRAP, 0, I2 }, diff --git a/sim/sh/CVS/Entries b/sim/sh/CVS/Entries index 3eeb8bf..2e9b60e 100644 --- a/sim/sh/CVS/Entries +++ b/sim/sh/CVS/Entries @@ -1,10 +1,10 @@ -/ChangeLog/1.55/Mon Oct 8 11:51:31 2007/-ko/ /config.in/1.2/Thu Dec 21 04:42:42 2006/-ko/ /configure/1.11/Tue Jun 13 08:06:50 2006/-ko/ /configure.ac/1.3/Fri Jan 14 20:05:48 2005// /gencode.c/1.34/Mon Oct 8 11:51:31 2007/-ko/ -/interp.c/1.19/Thu Nov 10 11:05:31 2005/-ko/ /syscall.h/1.3/Wed Oct 15 12:30:47 2003/-ko/ /tconfig.in/1.1.1.1/Fri Apr 16 01:35:12 1999/-ko/ /Makefile.in/1.6/Wed Jan 9 19:56:56 2008/-ko/ +/ChangeLog/1.56/Tue Feb 5 08:52:51 2008/-ko/ +/interp.c/1.20/Tue Feb 5 08:52:51 2008/-ko/ D diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index e06e764..8a3d88a 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,7 @@ +2008-02-04 Antony King + + * interp.c (macl): Fix non-portable implementation. + 2007-10-08 Andrew Stubbs * gencode.c (tab): Add RAISE_EXCEPTION_IF_IN_DELAY_SLOT to the diff --git a/sim/sh/interp.c b/sim/sh/interp.c index d89b0dc..a2472ad 100644 --- a/sim/sh/interp.c +++ b/sim/sh/interp.c @@ -1429,14 +1429,9 @@ macl (regs, memory, n, m) int m, n; { long tempm, tempn; - long prod, macl, mach, sum; - long long ans,ansl,ansh,t; - unsigned long long high,low,combine; - union mac64 - { - long m[2]; /* mach and macl*/ - long long m64; /* 64 bit MAC */ - }mac64; + long macl, mach; + long long ans; + long long mac64; tempm = RSLAT (regs[m]); regs[m] += 4; @@ -1447,15 +1442,15 @@ macl (regs, memory, n, m) mach = MACH; macl = MACL; - mac64.m[0] = macl; - mac64.m[1] = mach; + mac64 = ((long long) macl & 0xffffffff) | + ((long long) mach & 0xffffffff) << 32; ans = (long long) tempm * (long long) tempn; /* Multiply 32bit * 32bit */ - mac64.m64 += ans; /* Accumulate 64bit + 64 bit */ + mac64 += ans; /* Accumulate 64bit + 64 bit */ - macl = mac64.m[0]; - mach = mac64.m[1]; + macl = (long) (mac64 & 0xffffffff); + mach = (long) ((mac64 >> 32) & 0xffffffff); if (S) /* Store only 48 bits of the result */ { -- 2.11.4.GIT