Sorry, I yet again have one push for two different things. I also modified state machine besides fixing the licenses. Nate, I am not sure what the licenses for getopt should be.
On Thu, Jul 23, 2009 at 11:28 AM, Polina Dudnik <[email protected]> wrote: > changeset 82ee4a597908 in /z/repo/m5 > details: http://repo.m5sim.org/m5?cmd=changeset;node=82ee4a597908 > description: > Fixed the licences plus minor fixes for compilation > > diffstat: > > 23 files changed, 1581 insertions(+), 950 deletions(-) > src/mem/ruby/tester/DetermGETXGenerator.cc | 80 - > src/mem/ruby/tester/DetermGETXGenerator.hh | 80 - > src/mem/ruby/tester/DetermInvGenerator.cc | 79 - > src/mem/ruby/tester/DetermInvGenerator.hh | 80 - > src/mem/ruby/tester/DetermSeriesGETSGenerator.cc | 79 - > src/mem/ruby/tester/DetermSeriesGETSGenerator.hh | 79 - > src/mem/ruby/tester/DeterministicDriver.cc | 81 - > src/mem/ruby/tester/DeterministicDriver.hh | 79 - > src/mem/ruby/tester/RaceyDriver.cc | 79 - > src/mem/ruby/tester/RaceyDriver.hh | 80 - > src/mem/ruby/tester/RaceyPseudoThread.cc | 44 - > src/mem/ruby/tester/RaceyPseudoThread.hh | 38 > src/mem/ruby/tester/SConscript | 7 > src/mem/ruby/tester/SpecifiedGenerator.cc | 79 - > src/mem/ruby/tester/SpecifiedGenerator.hh | 79 - > src/mem/ruby/tester/Tester_Globals.hh | 79 - > src/mem/ruby/tester/getopt.cc | 945 > ++++++++++++++++++++++ > src/mem/ruby/tester/getopt.hh | 129 +++ > src/mem/ruby/tester/main.cc | 79 - > src/mem/ruby/tester/main.hh | 79 - > src/mem/ruby/tester/test_framework.cc | 80 - > src/mem/ruby/tester/test_framework.hh | 79 - > src/mem/slicc/symbols/StateMachine.cc | 18 > > diffs (truncated from 2779 to 300 lines): > > diff -r 743ddf69eeed -r 82ee4a597908 > src/mem/ruby/tester/DetermGETXGenerator.cc > --- a/src/mem/ruby/tester/DetermGETXGenerator.cc Wed Jul 22 01:57:55 > 2009 -0700 > +++ b/src/mem/ruby/tester/DetermGETXGenerator.cc Wed Jul 22 20:28:32 > 2009 -0500 > @@ -1,58 +1,30 @@ > - > /* > - Copyright (C) 1999-2008 by Mark D. Hill and David A. Wood for the > - Wisconsin Multifacet Project. Contact: [email protected] > - http://www.cs.wisc.edu/gems/ > - > - -------------------------------------------------------------------- > - > - This file is part of the Ruby Multiprocessor Memory System Simulator, > - 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. > - > - Substantial further development of Multifacet GEMS at the > - University of Wisconsin was performed by Alaa Alameldeen, Brad > - Beckmann, Jayaram Bobba, Ross Dickson, Dan Gibson, Pacia Harper, > - Derek Hower, Milo Martin, Michael Marty, Carl Mauer, Michelle Moravan, > - Kevin Moore, Andrew Phelps, Manoj Plakal, Daniel Sorin, Haris Volos, > - 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-2008 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. > + */ > > /* > * $Id$ > diff -r 743ddf69eeed -r 82ee4a597908 > src/mem/ruby/tester/DetermGETXGenerator.hh > --- a/src/mem/ruby/tester/DetermGETXGenerator.hh Wed Jul 22 01:57:55 > 2009 -0700 > +++ b/src/mem/ruby/tester/DetermGETXGenerator.hh Wed Jul 22 20:28:32 > 2009 -0500 > @@ -1,58 +1,30 @@ > - > /* > - Copyright (C) 1999-2008 by Mark D. Hill and David A. Wood for the > - Wisconsin Multifacet Project. Contact: [email protected] > - http://www.cs.wisc.edu/gems/ > - > - -------------------------------------------------------------------- > - > - This file is part of the Ruby Multiprocessor Memory System Simulator, > - 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. > - > - Substantial further development of Multifacet GEMS at the > - University of Wisconsin was performed by Alaa Alameldeen, Brad > - Beckmann, Jayaram Bobba, Ross Dickson, Dan Gibson, Pacia Harper, > - Derek Hower, Milo Martin, Michael Marty, Carl Mauer, Michelle Moravan, > - Kevin Moore, Andrew Phelps, Manoj Plakal, Daniel Sorin, Haris Volos, > - 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-2008 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. > + */ > > /* > * $Id$ > diff -r 743ddf69eeed -r 82ee4a597908 > src/mem/ruby/tester/DetermInvGenerator.cc > --- a/src/mem/ruby/tester/DetermInvGenerator.cc Wed Jul 22 01:57:55 2009 > -0700 > +++ b/src/mem/ruby/tester/DetermInvGenerator.cc Wed Jul 22 20:28:32 2009 > -0500 > @@ -1,58 +1,31 @@ > > /* > - Copyright (C) 1999-2008 by Mark D. Hill and David A. Wood for the > - Wisconsin Multifacet Project. Contact: [email protected] > - http://www.cs.wisc.edu/gems/ > - > - -------------------------------------------------------------------- > - > - This file is part of the Ruby Multiprocessor Memory System Simulator, > - 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. > - > - Substantial further development of Multifacet GEMS at the > - University of Wisconsin was performed by Alaa Alameldeen, Brad > - Beckmann, Jayaram Bobba, Ross Dickson, Dan Gibson, Pacia Harper, > - Derek Hower, Milo Martin, Michael Marty, Carl Mauer, Michelle Moravan, > - Kevin Moore, Andrew Phelps, Manoj Plakal, Daniel Sorin, Haris Volos, > - 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-2008 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. > + */ > > /* > * $Id$ > diff -r 743ddf69eeed -r 82ee4a597908 > src/mem/ruby/tester/DetermInvGenerator.hh > --- a/src/mem/ruby/tester/DetermInvGenerator.hh Wed Jul 22 01:57:55 2009 > -0700 > +++ b/src/mem/ruby/tester/DetermInvGenerator.hh Wed Jul 22 20:28:32 2009 > -0500 > @@ -1,58 +1,31 @@ > > /* > - Copyright (C) 1999-2008 by Mark D. Hill and David A. Wood for the > - Wisconsin Multifacet Project. Contact: [email protected] > - http://www.cs.wisc.edu/gems/ > - > - -------------------------------------------------------------------- > - > - This file is part of the Ruby Multiprocessor Memory System Simulator, > - 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. > - > - Substantial further development of Multifacet GEMS at the > - University of Wisconsin was performed by Alaa Alameldeen, Brad > - Beckmann, Jayaram Bobba, Ross Dickson, Dan Gibson, Pacia Harper, > - Derek Hower, Milo Martin, Michael Marty, Carl Mauer, Michelle Moravan, > - Kevin Moore, Andrew Phelps, Manoj Plakal, Daniel Sorin, Haris Volos, > - 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 > _______________________________________________ > m5-dev mailing list > [email protected] > http://m5sim.org/mailman/listinfo/m5-dev >
_______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
