diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-12 17:19:14 +0000 |
| commit | 02732929e8a69fcdda523ebc7aa511d4cdbb0f0e (patch) | |
| tree | 0c4f8c8327b69c0191da08d8ca8ee24b20f37e19 /src/arch/x86/isa/formats | |
| parent | 1a3e668446e4b2d2c61651c9ae58e643c2aa3ad2 (diff) | |
| parent | 0d8d3f988f835e58e5e53b6ee2be871e7bff9132 (diff) | |
| download | gem5-02732929e8a69fcdda523ebc7aa511d4cdbb0f0e.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : 1d2efac895a1c8328026a079e0b319a436325616
Diffstat (limited to 'src/arch/x86/isa/formats')
| -rw-r--r-- | src/arch/x86/isa/formats/multi.isa | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/arch/x86/isa/formats/multi.isa b/src/arch/x86/isa/formats/multi.isa index 8648800b4..f951dc28a 100644 --- a/src/arch/x86/isa/formats/multi.isa +++ b/src/arch/x86/isa/formats/multi.isa @@ -62,12 +62,16 @@ ////////////////////////////////////////////////////////////////////////// def format Inst(*opTypeSet) {{ - decode_block = specializeInst(Name, list(opTypeSet), EmulEnv()) + blocks = specializeInst(Name, list(opTypeSet), EmulEnv()) + (header_output, decoder_output, + decode_block, exec_output) = blocks.makeList() }}; def format MultiInst(switchVal, *opTypeSets) {{ switcher = {} for (count, opTypeSet) in zip(xrange(len(opTypeSets)), opTypeSets): switcher[count] = (opTypeSet, EmulEnv()) - decode_block = doSplitDecode(Name, specializeInst, switchVal, switcher) + blocks = doSplitDecode(Name, specializeInst, switchVal, switcher) + (header_output, decoder_output, + decode_block, exec_output) = blocks.makeList() }}; |