diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2005-06-05 04:08:41 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-06-05 04:08:41 -0400 |
commit | d9991ff59953389251c6d081c6318ac1e0549954 (patch) | |
tree | b9cb82ff4081ce1d5fe154d65d31d2cb446dfcbb /arch | |
parent | 2ccbeef33813dfff99bd45fa53709ea92fc67fe7 (diff) | |
parent | 5070f27c694571eb238bb2f98d69cf06d551994c (diff) | |
download | gem5-d9991ff59953389251c6d081c6318ac1e0549954.tar.xz |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-clean
--HG--
extra : convert_revision : 6fce1b31995cf5c68bd2f4bdfa2b88db6dcd006c
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/ev5.cc | 28 | ||||
-rw-r--r-- | arch/alpha/ev5.hh | 28 | ||||
-rw-r--r-- | arch/alpha/isa_desc | 28 |
3 files changed, 82 insertions, 2 deletions
diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc index 9dcc9cab1..4ae688330 100644 --- a/arch/alpha/ev5.cc +++ b/arch/alpha/ev5.cc @@ -1,4 +1,30 @@ -/* $Id$ */ +/* + * Copyright (c) 2002-2005 The Regents of The University of Michigan + * 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. + */ #include "arch/alpha/alpha_memory.hh" #include "arch/alpha/isa_traits.hh" diff --git a/arch/alpha/ev5.hh b/arch/alpha/ev5.hh index 317f3d19d..91011fc17 100644 --- a/arch/alpha/ev5.hh +++ b/arch/alpha/ev5.hh @@ -1,4 +1,30 @@ -/* $Id$ */ +/* + * Copyright (c) 2002-2004 The Regents of The University of Michigan + * 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. + */ #ifndef __ARCH_ALPHA_EV5_HH__ #define __ARCH_ALPHA_EV5_HH__ diff --git a/arch/alpha/isa_desc b/arch/alpha/isa_desc index 02b9bfa09..bf7163a1c 100644 --- a/arch/alpha/isa_desc +++ b/arch/alpha/isa_desc @@ -1,5 +1,33 @@ // -*- mode:c++ -*- +//Copyright (c) 2003, 2004, 2005 +//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, Lisa Hsu, Ali Saidi, and Andrew +//Schultz. + +//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. + //////////////////////////////////////////////////////////////////// // // Alpha ISA description file. |