diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-03-28 19:36:40 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-03-28 19:36:40 -0500 |
| commit | 55293c9e98d5ae918665268b1c786561bd393c25 (patch) | |
| tree | fbfeb01e854473835479d917ba73f4e94592d5b2 /arch/sparc/isa/formats | |
| parent | c1046488e073b2535c76c473aec34fe499c149e3 (diff) | |
| parent | 818f3ae22f324601742801b166350691cddf3a2a (diff) | |
| download | gem5-55293c9e98d5ae918665268b1c786561bd393c25.tar.xz | |
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision : 7effd744f9061d4aa8e9c3fa769115dfa73cbb79
Diffstat (limited to 'arch/sparc/isa/formats')
| -rw-r--r-- | arch/sparc/isa/formats/mem.isa | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/sparc/isa/formats/mem.isa b/arch/sparc/isa/formats/mem.isa index cf6e7d95b..f1162e24b 100644 --- a/arch/sparc/isa/formats/mem.isa +++ b/arch/sparc/isa/formats/mem.isa @@ -52,10 +52,15 @@ def template MemExecute {{ // Primary format for integer operate instructions: 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 + addrCalc = 'EA = I ? (Rs1 + SIMM13) : Rs1 + Rs2;' + composite = code + '\n' + addrCalc + origCodeBlk = CodeBlock(code) + compositeBlk = CodeBlock(composite) + addrCalcBlk = CodeBlock(addrCalc) + iop = InstObjParams(name, Name, 'SparcStaticInst', compositeBlk, opt_flags) + iop.code = origCodeBlk.code + iop.orig_code = origCodeBlk.orig_code + iop.ea_code = addrCalcBlk.code header_output = BasicDeclare.subst(iop) decoder_output = BasicConstructor.subst(iop) decode_block = BasicDecode.subst(iop) |