70,73c70,71
< header_output = ''
< decoder_output = ''
< decode_block = 'switch(%s) {\n' % switchVal
< exec_output = ''
---
> blocks = OutputBlocks()
> blocks.decode_block += 'switch(%s) {\n' % switchVal
75,82c73,75
< (new_header_output,
< new_decoder_output,
< new_decode_block,
< new_exec_output) = builder(name, Name, *todo)
< header_output += new_header_output
< decoder_output += new_decoder_output
< decode_block += '\tcase %s: %s\n' % (val, new_decode_block)
< exec_output += new_exec_output
---
> built = builder(name, Name, *todo)
> built.decode_block = '\tcase %s: %s\n' % (val, built.decode_block)
> blocks.append(built)
84,93c77,81
< (new_header_output,
< new_decoder_output,
< new_decode_block,
< new_exec_output) = builder(name, Name, *default)
< header_output += new_header_output
< decoder_output += new_decoder_output
< decode_block += '\tdefault: %s\n' % new_decode_block
< exec_output += new_exec_output
< decode_block += '}\n'
< return (header_output, decoder_output, decode_block, exec_output)
---
> built = builder(name, Name, *default)
> built.decode_block = '\tdefault: %s\n' % built.decode_block
> blocks.append(built)
> blocks.decode_block += '}\n'
> return blocks
145a134
> code = "GenFault ${new UnimpInstFault}\n" + code
158a148
> code = "GenFault ${new UnimpInstFault}\n" + code
171c161,163
< return assembleMicro(name, Name, code)
---
> blocks = OutputBlocks()
> blocks.append(assembleMicro(name, Name, code))
> return blocks