diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-03-04 13:06:24 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-03-04 13:06:24 -0500 |
commit | 5790e295a93e9aecd17696fc35106dccff094cfb (patch) | |
tree | 4cecab1454e4ac75e18ae9c467fd3e8ad8fa4ec1 /arch/isa_parser.py | |
parent | 1e071c9f5fd5258ff92dc496aecc175db94a5ad7 (diff) | |
parent | fc664f7ca6d4883e9efe7fb823cd903a867af7a9 (diff) | |
download | gem5-5790e295a93e9aecd17696fc35106dccff094cfb.tar.xz |
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-shadowregs
arch/alpha/ev5.cc:
Remove intr_post, it is no longer used.
arch/alpha/isa_traits.hh:
Hand merge.
--HG--
extra : convert_revision : 94f14539a9e5646f8c368b15b2dff18ab2f492cf
Diffstat (limited to 'arch/isa_parser.py')
-rwxr-xr-x | arch/isa_parser.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/isa_parser.py b/arch/isa_parser.py index 5185ed573..570110d84 100755 --- a/arch/isa_parser.py +++ b/arch/isa_parser.py @@ -225,7 +225,7 @@ def p_specification(t): # wrap the decode block as a function definition t[4].wrap_decode_block(''' StaticInstPtr -%(isa_name)s::decodeInst(%(isa_name)s::MachInst machInst) +%(isa_name)s::decodeInst(%(isa_name)s::ExtMachInst machInst) { using namespace %(namespace)s; ''' % vars(), '}') |