2002-01-07 Ben Elliston <bje@redhat.com>

	* utils.scm (copyright-fsf): Add 2002.
	(copyright-cygnus): Rename to copyright-red-hat.
	(copyright-red-hat): Add 2002.
	(CURRENT-COPYRIGHT): Update comment.
	* opcodes.scm (option-set!): Update callers.
	* sid-model.scm (cgen-model.cxx): Likewise.
	* sid-cpu.scm: Likewise.
	* sid-decode.scm: Likewise.
	* sid.scm (option-set!): Handle "redhat" as an option for
	"copyright"; use copyright-red-hat.
	* sim.scm (option-set!): Likewise.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index e1fc806..ccb3f6a 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,17 @@
+2002-01-07  Ben Elliston  <bje@redhat.com>
+
+       * utils.scm (copyright-fsf): Add 2002.
+       (copyright-cygnus): Rename to copyright-red-hat.
+       (copyright-red-hat): Add 2002.
+       (CURRENT-COPYRIGHT): Update comment.
+       * opcodes.scm (option-set!): Update callers.
+       * sid-model.scm (cgen-model.cxx): Likewise.
+       * sid-cpu.scm: Likewise.
+       * sid-decode.scm: Likewise.
+       * sid.scm (option-set!): Handle "redhat" as an option for
+       "copyright"; use copyright-red-hat.
+       * sim.scm (option-set!): Likewise.
+
 2002-01-03  Dave Brolley  <brolley@redhat.com>
 
        * decode.scm (-distinguishing-bit-population): Compute num-insns, the

diff --git a/cgen/opcodes.scm b/cgen/opcodes.scm
index a61606a..c3eb168 100644 (file)
--- a/cgen/opcodes.scm
+++ b/cgen/opcodes.scm
@@ -1,5 +1,5 @@
 ; General cpu info generator support.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; Global state variables.
@@ -36,8 +36,8 @@
     ((opinst) (set! -opcodes-build-operand-instance-table? #t))
     ((copyright) (cond ((equal?  value '("fsf"))
                        (set! CURRENT-COPYRIGHT copyright-fsf))
-                      ((equal? value '("cygnus"))
-                       (set! CURRENT-COPYRIGHT copyright-cygnus))
+                      ((equal? value '("redhat"))
+                       (set! CURRENT-COPYRIGHT copyright-red-hat))
                       (else (error "invalid copyright value" value))))
     ((package) (cond ((equal?  value '("binutils"))
                      (set! CURRENT-PACKAGE package-gnu-binutils-gdb))

diff --git a/cgen/sid-cpu.scm b/cgen/sid-cpu.scm
index 16ef839..042f773 100644 (file)
--- a/cgen/sid-cpu.scm
+++ b/cgen/sid-cpu.scm
@@ -1,5 +1,5 @@
 ; CPU family related simulator generator, excluding decoding and model support.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; ***********
@@ -75,7 +75,7 @@
 
   (string-write
    (gen-copyright "Misc. entries in the @arch@ description file."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 #ifndef DESC_@ARCH@_H
 #define DESC_@ARCH@_H
@@ -242,7 +242,7 @@ namespace @arch@ {
 
   (string-write
    (gen-copyright "CPU class elements for @cpu@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 // This file is included in the middle of the cpu class struct.
 
@@ -416,7 +416,7 @@ typedef struct @prefix@_trace_record {
 
   (string-write
    (gen-copyright "CPU family header for @cpu@ / @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 #ifndef DEFS_@PREFIX@_H
 #define DEFS_@PREFIX@_H
@@ -503,7 +503,7 @@ namespace @cpu@ {
   (string-write
    (gen-copyright (string-append "Simulator instruction operand writer for "
                                (current-arch-name) ".")
-                copyright-cygnus package-cygnus-simulators)
+                copyright-red-hat package-cygnus-simulators)
    "\
 
 #include \"@cpu@.h\"
@@ -621,7 +621,7 @@ using namespace @cpu@;
 
   (string-write
    (gen-copyright "Simulator instruction semantics for @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 
 #include \"@cpu@.h\"
@@ -1253,7 +1253,7 @@ restart:
 
   (string-write
    (gen-copyright "Simulator instruction semantics for @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 
 #include \"@cpu@.h\"

diff --git a/cgen/sid-decode.scm b/cgen/sid-decode.scm
index d2ae130..c55f998 100644 (file)
--- a/cgen/sid-decode.scm
+++ b/cgen/sid-decode.scm
@@ -1,5 +1,5 @@
 ; Decoder generation.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; Return decode entries for each insn.
@@ -711,7 +711,7 @@ void
 
   (string-write
    (gen-copyright "Decode header for @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 #ifndef @PREFIX@_DECODE_H
 #define @PREFIX@_DECODE_H
@@ -763,7 +763,7 @@ typedef UINT @prefix@_insn_word;
 
   (string-write
    (gen-copyright "Simulator instruction decoder for @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 
 #include \"@cpu@.h\"

diff --git a/cgen/sid-model.scm b/cgen/sid-model.scm
index e90bcf3..eb381f6 100644 (file)
--- a/cgen/sid-model.scm
+++ b/cgen/sid-model.scm
@@ -1,5 +1,5 @@
 ; Simulator model support, plus misc. things associated with a cpu family.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; Return C code to define cpu implementation properties.
@@ -337,7 +337,7 @@ const MACH " (gen-sym mach) "_mach =
 
   (string-write
    (gen-copyright "Simulator model support for @prefix@."
-                 copyright-cygnus package-cygnus-simulators)
+                 copyright-red-hat package-cygnus-simulators)
    "\
 
 #include \"@arch@-main.h\"

diff --git a/cgen/sid.scm b/cgen/sid.scm
index 1be32d3..b28f57a 100644 (file)
--- a/cgen/sid.scm
+++ b/cgen/sid.scm
@@ -1,5 +1,5 @@
 ; Simulator generator support routines.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; One goal of this file is to provide cover functions for all methods.
@@ -27,8 +27,8 @@
 ; with-multiple-isa
 ;      enable multiple-isa support (e.g. arm+thumb)
 ;      ??? wip.
-; copyright fsf|cygnus
-;      emit an FSF or Cygnus copyright (temporary, pending decision)
+; copyright fsf|redhat
+;      emit an FSF or Red Hat copyright (temporary, pending decision)
 ; package gnusim|cygsim
 ;      indicate the software package
 
@@ -94,8 +94,8 @@
     ((with-multiple-isa) (set! -with-multiple-isa? #t))
     ((copyright) (cond ((equal?  value '("fsf"))
                        (set! CURRENT-COPYRIGHT copyright-fsf))
-                      ((equal? value '("cygnus"))
-                       (set! CURRENT-COPYRIGHT copyright-cygnus))
+                      ((equal? value '("redhat"))
+                       (set! CURRENT-COPYRIGHT copyright-red-hat))
                       (else (error "invalid copyright value" value))))
     ((package) (cond ((equal?  value '("gnusim"))
                      (set! CURRENT-PACKAGE package-gnu-simulators))

diff --git a/cgen/sim.scm b/cgen/sim.scm
index 0c32992..560b59f 100644 (file)
--- a/cgen/sim.scm
+++ b/cgen/sim.scm
@@ -1,5 +1,5 @@
 ; Simulator generator support routines.
-; Copyright (C) 2000, 2001 Red Hat, Inc.
+; Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 
 ; One goal of this file is to provide cover functions for all methods.
@@ -44,7 +44,7 @@
 ;      Only generate parallel versions of each insn.
 ; with-multiple-isa
 ;      Enable multiple-isa support (eg. arm+thumb).
-; copyright fsf|cygnus
+; copyright fsf|redhat
 ;      emit an FSF or Cygnus copyright (temporary, pending decision)
 ; package gnusim|cygsim
 ;      indicate the software package
@@ -110,8 +110,8 @@
     ((with-parallel-only) (set! -with-parallel-only? #t))
     ((copyright) (cond ((equal?  value '("fsf"))
                        (set! CURRENT-COPYRIGHT copyright-fsf))
-                      ((equal? value '("cygnus"))
-                       (set! CURRENT-COPYRIGHT copyright-cygnus))
+                      ((equal? value '("redhat"))
+                       (set! CURRENT-COPYRIGHT copyright-red-hat))
                       (else (error "invalid copyright value" value))))
     ((package) (cond ((equal?  value '("gnusim"))
                      (set! CURRENT-PACKAGE package-gnu-simulators))

diff --git a/cgen/utils.scm b/cgen/utils.scm
index c3b3bc1..0de24f3 100644 (file)
--- a/cgen/utils.scm
+++ b/cgen/utils.scm
@@ -1,5 +1,5 @@
 ; Generic Utilities.
-; Copyright (C) 2000 Red Hat, Inc.
+; Copyright (C) 2000, 2002 Red Hat, Inc.
 ; This file is part of CGEN.
 ; See file COPYING.CGEN for details.
 
@@ -1141,7 +1141,7 @@
   (cons "\
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 "
        "\
 This program is free software; you can redistribute it and/or modify
@@ -1162,16 +1162,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 ; Pair of header,trailer parts of copyright.
 
-(define copyright-cygnus
+(define copyright-red-hat
   (cons "\
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright (C) 2000, 2001 Red Hat, Inc.
+Copyright (C) 2000, 2001, 2002 Red Hat, Inc.
 "
        "\
 "))
 
-; Set this to one of copyright-fsf, copyright-cygnus.
+; Set this to one of copyright-fsf, copyright-red-hat.
 
 (define CURRENT-COPYRIGHT copyright-fsf)