diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-28 15:14:13 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-28 15:14:13 -0500 |
| commit | 1507bfb20a4053abb9f8eb1a97bafc800a9c934f (patch) | |
| tree | 2432869e6b12601a548d1178e1b1a573bd70eb9b /arch/sparc/isa/formats/mem.isa | |
| parent | c27c122afc6b778e67a9c77915fac71730a5a4ef (diff) | |
| parent | 7abba537474607ce361deebb22166c73c3763f42 (diff) | |
| download | gem5-1507bfb20a4053abb9f8eb1a97bafc800a9c934f.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 762df7bf15e8e22a8fab8bbcd933047d1c8cdfa9
Diffstat (limited to 'arch/sparc/isa/formats/mem.isa')
| -rw-r--r-- | arch/sparc/isa/formats/mem.isa | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/isa/formats/mem.isa b/arch/sparc/isa/formats/mem.isa index 06725eae8..cf6e7d95b 100644 --- a/arch/sparc/isa/formats/mem.isa +++ b/arch/sparc/isa/formats/mem.isa @@ -34,9 +34,10 @@ def template MemExecute {{ Trace::InstRecord *traceData) const { Fault fault = NoFault; + Addr EA; %(op_decl)s; %(op_rd)s; - ea_code + %(ea_code)s; %(code)s; if(fault == NoFault) @@ -54,9 +55,9 @@ def format Mem(code, *opt_flags) {{ orig_code = code cblk = CodeBlock(code) iop = InstObjParams(name, Name, 'SparcStaticInst', cblk, opt_flags) + iop.ea_code = CodeBlock('EA = I ? (R1 + SIMM13) : R1 + R2;').code header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) decode_block = BasicDecode.subst(iop) exec_output = MemExecute.subst(iop) - exec_output.replace('ea_code', 'EA = I ? (R1 + SIMM13) : R1 + R2;'); }}; |