diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-12-18 12:19:30 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-12-18 12:19:30 -0500 |
| commit | 9e7dc343832f473b2058d4f9b39a27430142006f (patch) | |
| tree | 5f61750159b2b3e64468155cb2d9a5d24a3d8524 /src/arch/alpha/isa/main.isa | |
| parent | c3ec52346b99d398916765679877686c109e3513 (diff) | |
| parent | d19d7aa8a55cd4413ab00de69deb237d89d5ef4a (diff) | |
| download | gem5-9e7dc343832f473b2058d4f9b39a27430142006f.tar.xz | |
Merge zizzer.eecs.umich.edu:/.automount/zower/eecshome/m5/newmem
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/sparco3
--HG--
extra : convert_revision : f17800685609d8353ec14676f45fbb123fc4e6c3
Diffstat (limited to 'src/arch/alpha/isa/main.isa')
| -rw-r--r-- | src/arch/alpha/isa/main.isa | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/alpha/isa/main.isa b/src/arch/alpha/isa/main.isa index 6e65cf9d3..d72dfe34a 100644 --- a/src/arch/alpha/isa/main.isa +++ b/src/arch/alpha/isa/main.isa @@ -338,7 +338,7 @@ def template BasicDecodeWithMnemonic {{ // The most basic instruction format... used only for a few misc. insts def format BasicOperate(code, *flags) {{ - iop = InstObjParams(name, Name, 'AlphaStaticInst', CodeBlock(code), flags) + iop = InstObjParams(name, Name, 'AlphaStaticInst', code, flags) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) decode_block = BasicDecode.subst(iop) @@ -424,8 +424,7 @@ def template OperateNopCheckDecode {{ // Like BasicOperate format, but generates NOP if RC/FC == 31 def format BasicOperateWithNopCheck(code, *opt_args) {{ - iop = InstObjParams(name, Name, 'AlphaStaticInst', CodeBlock(code), - opt_args) + iop = InstObjParams(name, Name, 'AlphaStaticInst', code, opt_args) header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) decode_block = OperateNopCheckDecode.subst(iop) |