From 39d8c4947915e302c8f1dbf5f9d517cc568a1cc7 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sun, 5 Jun 2005 05:08:37 -0400 Subject: [PATCH] Fix a few broken or inconsistently formatted copyrights that the script doesn't deal with. Don't bother with copyright notices in generated files. LICENSE: Fix author list. arch/alpha/ev5.cc: arch/alpha/ev5.hh: Fix inconsistently formatted copyright. arch/isa_parser.py: base/traceflags.py: Fix copyright & author list. Don't bother with copyrights in generated files. dev/rtcreg.h: Fix broken copyright. --HG-- extra : convert_revision : d628e63c495960e2b129cef0aa8fddbdd4dabd45 --- LICENSE | 2 +- arch/alpha/ev5.cc | 2 +- arch/alpha/ev5.hh | 2 +- arch/isa_parser.py | 32 +-------------------- base/traceflags.py | 69 ++-------------------------------------------- 5 files changed, 7 insertions(+), 100 deletions(-) diff --git a/LICENSE b/LICENSE index 3c9fd6627..05aa2d1b0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2000-2004 The Regents of The University of Michigan +Copyright (c) 2000-2005 The Regents of The University of Michigan All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index 4ae688330..f57f0dc7f 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2005 The Regents of The University of Michigan + * Copyright (c) 2003-2005 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/arch/alpha/ev5.hh b/arch/alpha/ev5.hh index 91011fc17..2112d8ba5 100644 --- a/arch/alpha/ev5.hh +++ b/arch/alpha/ev5.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002-2004 The Regents of The University of Michigan + * Copyright (c) 2003-2005 The Regents of The University of Michigan * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/arch/isa_parser.py b/arch/isa_parser.py index 0faa79728..db8d2f1da 100755 --- a/arch/isa_parser.py +++ b/arch/isa_parser.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (c) 2003 The Regents of The University of Michigan +# Copyright (c) 2003-2005 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -1552,36 +1552,6 @@ class InstObjParams: # file_template = ''' -/* - * Copyright (c) 2003 - * The Regents of The University of Michigan - * All Rights Reserved - * - * This code is part of the M5 simulator, developed by Nathan Binkert, - * Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions - * from Ron Dreslinski, Dave Greene, and Lisa Hsu. - * - * Permission is granted to use, copy, create derivative works and - * redistribute this software and such derivative works for any - * purpose, so long as the copyright notice above, this grant of - * permission, and the disclaimer below appear in all copies made; and - * so long as the name of The University of Michigan is not used in - * any advertising or publicity pertaining to the use or distribution - * of this software without specific, written prior authorization. - * - * THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE - * UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND - * WITHOUT WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. THE REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE - * LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, SPECIAL, INDIRECT, - * INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM - * ARISING OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN - * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGES. - */ - /* * DO NOT EDIT THIS FILE!!! * diff --git a/base/traceflags.py b/base/traceflags.py index 3f5056ed8..a7d9ff9bf 100644 --- a/base/traceflags.py +++ b/base/traceflags.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2004 The Regents of The University of Michigan +# Copyright (c) 2004-2005 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -186,38 +186,7 @@ except IOError, e: sys.exit("can't open %s: %s" % (hhfilename, e)) # file header boilerplate -print >>hhfile, '''/* $Id $ */ - -/* - * Copyright (c) 2004 - * The Regents of The University of Michigan - * All Rights Reserved - * - * This code is part of the M5 simulator, developed by Nathan Binkert, - * Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions - * from Ron Dreslinski, Dave Greene, and Lisa Hsu. - * - * Permission is granted to use, copy, create derivative works and - * redistribute this software and such derivative works for any - * purpose, so long as the copyright notice above, this grant of - * permission, and the disclaimer below appear in all copies made; and - * so long as the name of The University of Michigan is not used in - * any advertising or publicity pertaining to the use or distribution - * of this software without specific, written prior authorization. - * - * THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE - * UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND - * WITHOUT WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. THE REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE - * LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, SPECIAL, INDIRECT, - * INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM - * ARISING OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN - * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGES. - */ - +print >>hhfile, ''' /* * DO NOT EDIT THIS FILE! * @@ -285,39 +254,7 @@ except OSError, e: sys.exit("can't open %s: %s" % (ccfilename, e)) # file header -print >>ccfile, '''\ -/* $Id $ */ - -/* - * Copyright (c) 2004 - * The Regents of The University of Michigan - * All Rights Reserved - * - * This code is part of the M5 simulator, developed by Nathan Binkert, - * Erik Hallnor, Steve Raasch, and Steve Reinhardt, with contributions - * from Ron Dreslinski, Dave Greene, and Lisa Hsu. - * - * Permission is granted to use, copy, create derivative works and - * redistribute this software and such derivative works for any - * purpose, so long as the copyright notice above, this grant of - * permission, and the disclaimer below appear in all copies made; and - * so long as the name of The University of Michigan is not used in - * any advertising or publicity pertaining to the use or distribution - * of this software without specific, written prior authorization. - * - * THIS SOFTWARE IS PROVIDED AS IS, WITHOUT REPRESENTATION FROM THE - * UNIVERSITY OF MICHIGAN AS TO ITS FITNESS FOR ANY PURPOSE, AND - * WITHOUT WARRANTY BY THE UNIVERSITY OF MICHIGAN OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. THE REGENTS OF THE UNIVERSITY OF MICHIGAN SHALL NOT BE - * LIABLE FOR ANY DAMAGES, INCLUDING DIRECT, SPECIAL, INDIRECT, - * INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WITH RESPECT TO ANY CLAIM - * ARISING OUT OF OR IN CONNECTION WITH THE USE OF THE SOFTWARE, EVEN - * IF IT HAS BEEN OR IS HEREAFTER ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGES. - */ - +print >>ccfile, ''' /* * DO NOT EDIT THIS FILE! *