summaryrefslogtreecommitdiff
path: root/arch/sparc/isa/formats.isa
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-03-16 14:08:31 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-03-16 14:08:31 -0500
commit1d741c48af9f08718d359d9e3b7d3c0bf562a467 (patch)
tree088166d7dbb41b065080a4ace70ce91a9aa24039 /arch/sparc/isa/formats.isa
parent31a20c88c52f6051575fe760251407d11e5715ba (diff)
parent558cc7f775dc404e4152212b5c6459ad9f4bb269 (diff)
downloadgem5-1d741c48af9f08718d359d9e3b7d3c0bf562a467.tar.xz
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem arch/sparc/isa/decoder.isa: SCCS merged --HG-- extra : convert_revision : 460843b49bc96b3fbc5897828c23f9cf9b010ae0
Diffstat (limited to 'arch/sparc/isa/formats.isa')
-rw-r--r--arch/sparc/isa/formats.isa11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/sparc/isa/formats.isa b/arch/sparc/isa/formats.isa
index 547f8be48..9310ba3d3 100644
--- a/arch/sparc/isa/formats.isa
+++ b/arch/sparc/isa/formats.isa
@@ -5,12 +5,21 @@
//Include the integerOp and integerOpCc format
##include "m5/arch/sparc/isa/formats/integerop.isa"
-//Include the mem format
+//Include the memory format
##include "m5/arch/sparc/isa/formats/mem.isa"
+//Include the compare and swap format
+##include "m5/arch/sparc/isa/formats/cas.isa"
+
//Include the trap format
##include "m5/arch/sparc/isa/formats/trap.isa"
+//Include the "unknown" format
+##include "m5/arch/sparc/isa/formats/unknown.isa"
+
+//Include the priveleged mode format
+##include "m5/arch/sparc/isa/formats/priv.isa"
+
//Include the branch format
##include "m5/arch/sparc/isa/formats/branch.isa"