changeset 0c808c6d4481 in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=0c808c6d4481 description: copyright: I missed some copyrights during ruby integration
diffstat: 5 files changed, 121 insertions(+), 176 deletions(-) src/mem/gems_common/Allocator.hh | 40 ++++++++------ src/mem/gems_common/ioutil/attrlex.ll | 85 +++++++++--------------------- src/mem/gems_common/ioutil/attrparse.yy | 86 +++++++++---------------------- src/mem/ruby/common/Address.hh | 41 ++++++++------ src/mem/ruby/system/MemoryNode.cc | 45 ++++++++-------- diffs (truncated from 343 to 300 lines): diff -r 2f66c82a2e20 -r 0c808c6d4481 src/mem/gems_common/Allocator.hh --- a/src/mem/gems_common/Allocator.hh Tue Jun 09 23:55:53 2009 -0700 +++ b/src/mem/gems_common/Allocator.hh Wed Jun 10 00:41:56 2009 -0700 @@ -1,23 +1,29 @@ /* - * Copyright (c) 1999 by Mark Hill and David Wood for the Wisconsin - * Multifacet Project. ALL RIGHTS RESERVED. + * Copyright (c) 1999 Mark D. Hill and David A. Wood + * All rights reserved. * - * ##HEADER## + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * - * This software is furnished under a license and may be used and - * copied only in accordance with the terms of such license and the - * inclusion of the above copyright notice. This software or any - * other copies thereof or any derivative works may not be provided or - * otherwise made available to any other persons. Title to and - * ownership of the software is retained by Mark Hill and David Wood. - * Any use of this software must include the above copyright notice. - * - * THIS SOFTWARE IS PROVIDED "AS IS". THE LICENSOR MAKES NO - * WARRANTIES ABOUT ITS CORRECTNESS OR PERFORMANCE. - * */ - -/* - * $Id$ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef ALLOCATOR_H diff -r 2f66c82a2e20 -r 0c808c6d4481 src/mem/gems_common/ioutil/attrlex.ll --- a/src/mem/gems_common/ioutil/attrlex.ll Tue Jun 09 23:55:53 2009 -0700 +++ b/src/mem/gems_common/ioutil/attrlex.ll Wed Jun 10 00:41:56 2009 -0700 @@ -1,63 +1,30 @@ /* - Copyright (C) 1999-2005 by Mark D. Hill and David A. Wood for the - Wisconsin Multifacet Project. Contact: [email protected] - http://www.cs.wisc.edu/gems/ - - -------------------------------------------------------------------- - - This file a component of the Multifacet GEMS (General - Execution-driven Multiprocessor Simulator) software toolset - originally developed at the University of Wisconsin-Madison. - - Ruby was originally developed primarily by Milo Martin and Daniel - Sorin with contributions from Ross Dickson, Carl Mauer, and Manoj - Plakal. - - SLICC was originally developed by Milo Martin with substantial - contributions from Daniel Sorin. - - Opal was originally developed by Carl Mauer based upon code by - Craig Zilles. - - Substantial further development of Multifacet GEMS at the - University of Wisconsin was performed by Alaa Alameldeen, Brad - Beckmann, Ross Dickson, Pacia Harper, Milo Martin, Michael Marty, - Carl Mauer, Kevin Moore, Manoj Plakal, Daniel Sorin, Min Xu, and - Luke Yen. - - -------------------------------------------------------------------- - - If your use of this software contributes to a published paper, we - request that you (1) cite our summary paper that appears on our - website (http://www.cs.wisc.edu/gems/) and (2) e-mail a citation - for your published paper to [email protected]. - - If you redistribute derivatives of this software, we request that - you notify us and either (1) ask people to register with us at our - website (http://www.cs.wisc.edu/gems/) or (2) collect registration - information and periodically send it to us. - - -------------------------------------------------------------------- - - Multifacet GEMS is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - Multifacet GEMS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with the Multifacet GEMS; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307, USA - - The GNU General Public License is contained in the file LICENSE. - -### END HEADER ### -*/ - + * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ %option noyywrap diff -r 2f66c82a2e20 -r 0c808c6d4481 src/mem/gems_common/ioutil/attrparse.yy --- a/src/mem/gems_common/ioutil/attrparse.yy Tue Jun 09 23:55:53 2009 -0700 +++ b/src/mem/gems_common/ioutil/attrparse.yy Wed Jun 10 00:41:56 2009 -0700 @@ -1,64 +1,30 @@ /* - Copyright (C) 1999-2005 by Mark D. Hill and David A. Wood for the - Wisconsin Multifacet Project. Contact: [email protected] - http://www.cs.wisc.edu/gems/ - - -------------------------------------------------------------------- - - This file a component of the Multifacet GEMS (General - Execution-driven Multiprocessor Simulator) software toolset - originally developed at the University of Wisconsin-Madison. - - Ruby was originally developed primarily by Milo Martin and Daniel - Sorin with contributions from Ross Dickson, Carl Mauer, and Manoj - Plakal. - - SLICC was originally developed by Milo Martin with substantial - contributions from Daniel Sorin. - - Opal was originally developed by Carl Mauer based upon code by - Craig Zilles. - - Substantial further development of Multifacet GEMS at the - University of Wisconsin was performed by Alaa Alameldeen, Brad - Beckmann, Ross Dickson, Pacia Harper, Milo Martin, Michael Marty, - Carl Mauer, Kevin Moore, Manoj Plakal, Daniel Sorin, Min Xu, and - Luke Yen. - - -------------------------------------------------------------------- - - If your use of this software contributes to a published paper, we - request that you (1) cite our summary paper that appears on our - website (http://www.cs.wisc.edu/gems/) and (2) e-mail a citation - for your published paper to [email protected]. - - If you redistribute derivatives of this software, we request that - you notify us and either (1) ask people to register with us at our - website (http://www.cs.wisc.edu/gems/) or (2) collect registration - information and periodically send it to us. - - -------------------------------------------------------------------- - - Multifacet GEMS is free software; you can redistribute it and/or - modify it under the terms of version 2 of the GNU General Public - License as published by the Free Software Foundation. - - Multifacet GEMS is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with the Multifacet GEMS; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307, USA - - The GNU General Public License is contained in the file LICENSE. - -### END HEADER ### -*/ - - + * Copyright (c) 1999-2005 Mark D. Hill and David A. Wood + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ %{ /*------------------------------------------------------------------------*/ diff -r 2f66c82a2e20 -r 0c808c6d4481 src/mem/ruby/common/Address.hh --- a/src/mem/ruby/common/Address.hh Tue Jun 09 23:55:53 2009 -0700 +++ b/src/mem/ruby/common/Address.hh Wed Jun 10 00:41:56 2009 -0700 @@ -1,24 +1,29 @@ - /* - * Copyright (c) 1999 by Mark Hill and David Wood for the Wisconsin - * Multifacet Project. ALL RIGHTS RESERVED. + * Copyright (c) 1999 Mark D. Hill and David A. Wood + * All rights reserved. * - * ##HEADER## + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * - * This software is furnished under a license and may be used and - * copied only in accordance with the terms of such license and the - * inclusion of the above copyright notice. This software or any - * other copies thereof or any derivative works may not be provided or - * otherwise made available to any other persons. Title to and - * ownership of the software is retained by Mark Hill and David Wood. - * Any use of this software must include the above copyright notice. - * - * THIS SOFTWARE IS PROVIDED "AS IS". THE LICENSOR MAKES NO - * WARRANTIES ABOUT ITS CORRECTNESS OR PERFORMANCE. - * */ - -/* - * $Id$ + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef ADDRESS_H diff -r 2f66c82a2e20 -r 0c808c6d4481 src/mem/ruby/system/MemoryNode.cc --- a/src/mem/ruby/system/MemoryNode.cc Tue Jun 09 23:55:53 2009 -0700 +++ b/src/mem/ruby/system/MemoryNode.cc Wed Jun 10 00:41:56 2009 -0700 @@ -1,28 +1,29 @@ /* - * Copyright (c) 1999 by Mark Hill and David Wood for the Wisconsin - * Multifacet Project. ALL RIGHTS RESERVED. + * Copyright (c) 1999 Mark D. Hill and David A. Wood + * All rights reserved. * - * ##HEADER## + * Redistribution and use in source and binary forms, with or without _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
