67c67
< class Macroop(Micro_Container):
---
> class Combinational_Macroop(Micro_Container):
69a70,74
> class Rom_Macroop(object):
> def __init__(self, name, target):
> self.name = name
> self.target = target
>
312a318,320
> if not t.parser.rom:
> print_error("Rom block found, but no Rom object specified.")
> raise TypeError, "Rom block found, but no Rom object was specified."
320c328,332
< t[0] = t[4]
---
> if not t.parser.rom_macroop_type:
> print_error("ROM based macroop found, but no ROM macroop class was specified.")
> raise TypeError, "ROM based macroop found, but no ROM macroop class was specified."
> macroop = t.parser.rom_macroop_type(t[3], t[5])
> t[0] = macroop
321a334
>
441c454,455
< def __init__(self, macro_type, microops, rom):
---
> def __init__(self, macro_type, microops,
> rom = None, rom_macroop_type = None):
447a462
> self.parser.rom_macroop_type = rom_macroop_type