arm: Add support for ARMv8 (AArch64 & AArch32)

[gem5.git] / src / arch / arm / isa / formats / formats.isa

diff --git a/src/arch/arm/isa/formats/formats.isa b/src/arch/arm/isa/formats/formats.isa
index b55b821100cb1767e99d1718e0fe0dd2d6329bd5..44e9c5b5e1471816c792ff7cba03e55f8f486946 100644 (file)
--- a/src/arch/arm/isa/formats/formats.isa
+++ b/src/arch/arm/isa/formats/formats.isa
@@ -1,6 +1,6 @@
 // -*- mode:c++ -*-
 
-// Copyright (c) 2010 ARM Limited
+// Copyright (c) 2010-2011 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -44,12 +44,15 @@
 //Include the basic format
 ##include "basic.isa"
 
+//Include support for decoding AArch64 instructions
+##include "aarch64.isa"
+
+//Include support for decoding AArch64 NEON instructions
+##include "neon64.isa"
+
 //Include support for predicated instructions
 ##include "pred.isa"
 
-//Include utility functions
-##include "util.isa"
-
 //Include the float formats
 ##include "fp.isa"
 
@@ -62,14 +65,26 @@
 //Include the branch format
 ##include "branch.isa"
 
+//Miscellaneous instructions that don't fit elsewhere
+##include "misc.isa"
+
 //Include the unimplemented format
 ##include "unimp.isa"
 
 //Include the unknown format
 ##include "unknown.isa"
 
+//Include the breakpoint format
+##include "breakpoint.isa"
+
 //Include the formats for data processing instructions
 ##include "data.isa"
 
 //Include the formats for multiply instructions
 ##include "mult.isa"
+
+//Unconditional instructions
+##include "uncond.isa"
+
+//M5 Psuedo-ops
+##include "m5ops.isa"