summaryrefslogtreecommitdiff
path: root/src/arch/mips/isa/formats/formats.isa
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-06-09 17:47:23 -0400
committerKorey Sewell <ksewell@umich.edu>2006-06-09 17:47:23 -0400
commitf8df550db826c9fe29cc184fce873db6789e42ee (patch)
tree96aa51eef059ef3740c5e67459682f4256a95812 /src/arch/mips/isa/formats/formats.isa
parentcaca57421b32410f6ff1356ae75684891337073f (diff)
parentb94fecfa10236b51ded904a5f1a57f4a5ebe7acc (diff)
downloadgem5-f8df550db826c9fe29cc184fce873db6789e42ee.tar.xz
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release --HG-- extra : convert_revision : 82b83199a36059d4b402f89f7db2de299ea59c1e
Diffstat (limited to 'src/arch/mips/isa/formats/formats.isa')
-rw-r--r--src/arch/mips/isa/formats/formats.isa7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/mips/isa/formats/formats.isa b/src/arch/mips/isa/formats/formats.isa
index 7d493ffae..ed31788a6 100644
--- a/src/arch/mips/isa/formats/formats.isa
+++ b/src/arch/mips/isa/formats/formats.isa
@@ -10,8 +10,8 @@
//Include utility functions
##include "util.isa"
-//Include the cop0 formats
-##include "cop0.isa"
+//Include the control/cp0/cp1 formats
+##include "control.isa"
//Include the integer formats
##include "int.isa"
@@ -22,6 +22,9 @@
//Include the mem format
##include "mem.isa"
+//Include the mem format
+##include "mt.isa"
+
//Include the trap format
##include "trap.isa"