From fb90b1dd13fb6c0090bfe2731ca9ccee56479761 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Thu, 9 Feb 2006 22:27:41 -0500 Subject: Minor cleanup of include-handling code in isa_parser.py. arch/isa_parser.py: Clean up ##include code a bit. arch/sparc/isa/formats.isa: arch/sparc/isa/main.isa: Fix include paths. --HG-- extra : convert_revision : 0689963c2948e5f1088ecbf2cf6018d29bdaceff --- arch/sparc/isa/formats.isa | 12 ++++++------ arch/sparc/isa/main.isa | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'arch/sparc') diff --git a/arch/sparc/isa/formats.isa b/arch/sparc/isa/formats.isa index a21e1c110..547f8be48 100644 --- a/arch/sparc/isa/formats.isa +++ b/arch/sparc/isa/formats.isa @@ -1,19 +1,19 @@ //Include the basic format //Templates from this format are used later -##include "m5/arch/sparc/isa_desc/formats/basic.isa" +##include "m5/arch/sparc/isa/formats/basic.isa" //Include the integerOp and integerOpCc format -##include "m5/arch/sparc/isa_desc/formats/integerop.isa" +##include "m5/arch/sparc/isa/formats/integerop.isa" //Include the mem format -##include "m5/arch/sparc/isa_desc/formats/mem.isa" +##include "m5/arch/sparc/isa/formats/mem.isa" //Include the trap format -##include "m5/arch/sparc/isa_desc/formats/trap.isa" +##include "m5/arch/sparc/isa/formats/trap.isa" //Include the branch format -##include "m5/arch/sparc/isa_desc/formats/branch.isa" +##include "m5/arch/sparc/isa/formats/branch.isa" //Include the noop format -##include "m5/arch/sparc/isa_desc/formats/noop.isa" +##include "m5/arch/sparc/isa/formats/noop.isa" diff --git a/arch/sparc/isa/main.isa b/arch/sparc/isa/main.isa index 8b6166d34..ab0290d58 100644 --- a/arch/sparc/isa/main.isa +++ b/arch/sparc/isa/main.isa @@ -26,7 +26,7 @@ // (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" +##include "m5/arch/sparc/isa/includes.isa" //////////////////////////////////////////////////////////////////// // @@ -37,16 +37,16 @@ namespace SparcISA; //Include the bitfield definitions -##include "m5/arch/sparc/isa_desc/bitfields.isa" +##include "m5/arch/sparc/isa/bitfields.isa" //Include the operand_types and operand definitions -##include "m5/arch/sparc/isa_desc/operands.isa" +##include "m5/arch/sparc/isa/operands.isa" //Include the base class for sparc instructions, and some support code -##include "m5/arch/sparc/isa_desc/base.isa" +##include "m5/arch/sparc/isa/base.isa" //Include the definitions for the instruction formats -##include "m5/arch/sparc/isa_desc/formats.isa" +##include "m5/arch/sparc/isa/formats.isa" //Include the decoder definition -##include "m5/arch/sparc/isa_desc/decoder.isa" +##include "m5/arch/sparc/isa/decoder.isa" -- cgit v1.2.3