15 files changed, 71 insertions, 80 deletions
diff --git a/arch/sparc/isa_desc/base.h b/arch/sparc/isa/base.isa
index b504f1906..b504f1906 100644
--- a/arch/sparc/isa_desc/base.h
+++ b/arch/sparc/isa/base.isa
diff --git a/arch/sparc/isa_desc/bitfields.h b/arch/sparc/isa/bitfields.isa
index b0ac57575..b0ac57575 100644
--- a/arch/sparc/isa_desc/bitfields.h
+++ b/arch/sparc/isa/bitfields.isa
diff --git a/arch/sparc/isa_desc/decoder.h b/arch/sparc/isa/decoder.isa
index 06834ecc3..06834ecc3 100644
--- a/arch/sparc/isa_desc/decoder.h
+++ b/arch/sparc/isa/decoder.isa
diff --git a/arch/sparc/isa/formats.isa b/arch/sparc/isa/formats.isa
new file mode 100644
index 000000000..a21e1c110
--- /dev/null
+++ b/arch/sparc/isa/formats.isa
@@ -0,0 +1,19 @@
+//Include the basic format
+//Templates from this format are used later
+##include "m5/arch/sparc/isa_desc/formats/basic.isa"
+
+//Include the integerOp and integerOpCc format
+##include "m5/arch/sparc/isa_desc/formats/integerop.isa"
+
+//Include the mem format
+##include "m5/arch/sparc/isa_desc/formats/mem.isa"
+
+//Include the trap format
+##include "m5/arch/sparc/isa_desc/formats/trap.isa"
+
+//Include the branch format
+##include "m5/arch/sparc/isa_desc/formats/branch.isa"
+
+//Include the noop format
+##include "m5/arch/sparc/isa_desc/formats/noop.isa"
+
diff --git a/arch/sparc/isa_desc/formats/basic.format b/arch/sparc/isa/formats/basic.isa
index 1994df41c..1994df41c 100644
--- a/arch/sparc/isa_desc/formats/basic.format
+++ b/arch/sparc/isa/formats/basic.isa
diff --git a/arch/sparc/isa_desc/formats/branch.format b/arch/sparc/isa/formats/branch.isa
index c4c0a90af..c4c0a90af 100644
--- a/arch/sparc/isa_desc/formats/branch.format
+++ b/arch/sparc/isa/formats/branch.isa
diff --git a/arch/sparc/isa_desc/formats/integerop.format b/arch/sparc/isa/formats/integerop.isa
index 275a346d3..275a346d3 100644
--- a/arch/sparc/isa_desc/formats/integerop.format
+++ b/arch/sparc/isa/formats/integerop.isa
diff --git a/arch/sparc/isa_desc/formats/mem.format b/arch/sparc/isa/formats/mem.isa
index abc00b6f2..abc00b6f2 100644
--- a/arch/sparc/isa_desc/formats/mem.format
+++ b/arch/sparc/isa/formats/mem.isa
diff --git a/arch/sparc/isa_desc/formats/noop.format b/arch/sparc/isa/formats/noop.isa
index bc83e3261..bc83e3261 100644
--- a/arch/sparc/isa_desc/formats/noop.format
+++ b/arch/sparc/isa/formats/noop.isa
diff --git a/arch/sparc/isa_desc/formats/trap.format b/arch/sparc/isa/formats/trap.isa
index bee77fe69..bee77fe69 100644
--- a/arch/sparc/isa_desc/formats/trap.format
+++ b/arch/sparc/isa/formats/trap.isa
diff --git a/arch/sparc/isa_desc/includes.h b/arch/sparc/isa/includes.isa
index ff7cb7d1d..ff7cb7d1d 100644
--- a/arch/sparc/isa_desc/includes.h
+++ b/arch/sparc/isa/includes.isa
diff --git a/arch/sparc/isa/main.isa b/arch/sparc/isa/main.isa
new file mode 100644
index 000000000..8b6166d34
--- /dev/null
+++ b/arch/sparc/isa/main.isa
@@ -0,0 +1,52 @@
+// -*- mode:c++ -*-
+
+// 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
+// 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 "m5/arch/sparc/isa_desc/includes.isa"
+
+////////////////////////////////////////////////////////////////////
+//
+// Namespace statement.  Everything below this line will be in the
+// SparcISAInst namespace.
+//
+
+namespace SparcISA;
+
+//Include the bitfield definitions
+##include "m5/arch/sparc/isa_desc/bitfields.isa"
+
+//Include the operand_types and operand definitions
+##include "m5/arch/sparc/isa_desc/operands.isa"
+
+//Include the base class for sparc instructions, and some support code
+##include "m5/arch/sparc/isa_desc/base.isa"
+
+//Include the definitions for the instruction formats
+##include "m5/arch/sparc/isa_desc/formats.isa"
+
+//Include the decoder definition
+##include "m5/arch/sparc/isa_desc/decoder.isa"
diff --git a/arch/sparc/isa_desc/operands.h b/arch/sparc/isa/operands.isa
index 77de6c9c4..77de6c9c4 100644
--- a/arch/sparc/isa_desc/operands.h
+++ b/arch/sparc/isa/operands.isa
diff --git a/arch/sparc/isa_desc/formats.h b/arch/sparc/isa_desc/formats.h
deleted file mode 100644
index 733a093f5..000000000
--- a/arch/sparc/isa_desc/formats.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//Include the basic format
-//Templates from this format are used later
-##include "m5/arch/sparc/isa_desc/formats/basic.format"
-
-//Include the integerOp and integerOpCc format
-##include "m5/arch/sparc/isa_desc/formats/integerop.format"
-
-//Include the mem format
-##include "m5/arch/sparc/isa_desc/formats/mem.format"
-
-//Include the trap format
-##include "m5/arch/sparc/isa_desc/formats/trap.format"
-
-//Include the branch format
-##include "m5/arch/sparc/isa_desc/formats/branch.format"
-
-//Include the noop format
-##include "m5/arch/sparc/isa_desc/formats/noop.format"
-
diff --git a/arch/sparc/isa_desc/isa_desc b/arch/sparc/isa_desc/isa_desc
deleted file mode 100644
index 1a5cc4a56..000000000
--- a/arch/sparc/isa_desc/isa_desc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- 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, Kevin Lim, 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.
-
-////////////////////////////////////////////////////////////////////
-//
-// SPARC ISA description file.
-//
-////////////////////////////////////////////////////////////////////
-
-//Include the C++ include directives
-##include "m5/arch/sparc/isa_desc/includes.h"
-
-////////////////////////////////////////////////////////////////////
-//
-// Namespace statement.  Everything below this line will be in the
-// SparcISAInst namespace.
-//
-
-namespace SparcISA;
-
-//Include the bitfield definitions
-##include "m5/arch/sparc/isa_desc/bitfields.h"
-
-//Include the operand_types and operand definitions
-##include "m5/arch/sparc/isa_desc/operands.h"
-
-//Include the base class for sparc instructions, and some support code
-##include "m5/arch/sparc/isa_desc/base.h"
-
-//Include the definitions for the instruction formats
-##include "m5/arch/sparc/isa_desc/formats.h"
-
-//Include the decoder definition
-##include "m5/arch/sparc/isa_desc/decoder.h"