164a165
> }};
165a167
> def template LoadInitiateAcc {{
172,173c174,175
< %(ea_decl)s;
< %(ea_rd)s;
---
> %(op_decl)s;
> %(op_rd)s;
182a185
> }};
183a187
> def template LoadCompleteAcc {{
188,189c192,193
< %(code_decl)s;
< %(code_rd)s;
---
> %(op_decl)s;
> %(op_rd)s;
194c198
< %(code_wb)s;
---
> %(op_wb)s;
230a235
> }};
231a237
> def template StoreInitiateAcc {{
257a264
> }};
258a266
> def template StoreCompleteAcc {{
277a286,287
> LoadFuncs = [LoadExecute, LoadInitiateAcc, LoadCompleteAcc]
> StoreFuncs = [StoreExecute, StoreInitiateAcc, StoreCompleteAcc]
311,324c321,324
< def doSplitExecute(code, execute, name, Name, opt_flags, microParam):
< codeParam = microParam.copy()
< codeParam["ea_code"] = ''
< codeIop = InstObjParams(name, Name, '', code, opt_flags, codeParam)
< eaIop = InstObjParams(name, Name, '', microParam["ea_code"],
< opt_flags, microParam)
< iop = InstObjParams(name, Name, '', code, opt_flags, microParam)
< (iop.ea_decl,
< iop.ea_rd,
< iop.ea_wb) = (eaIop.op_decl, eaIop.op_rd, eaIop.op_wb)
< (iop.code_decl,
< iop.code_rd,
< iop.code_wb) = (codeIop.op_decl, codeIop.op_rd, codeIop.op_wb)
< return execute.subst(iop)
---
> def doSplitExecute(execute, name, Name, opt_flags, microParam):
> iop = InstObjParams(name, Name, '', microParam, opt_flags)
> (execf, initf, compf) = execute
> return execf.subst(iop) + initf.subst(iop) + compf.subst(iop)
333,334c333,335
< microParams = {"ea_code" : eaCode, "fault_check": faultCode}
< executeCode += doSplitExecute(code, execute, name, Name,
---
> microParams = {"code": code, "ea_code": eaCode,
> "fault_check": faultCode}
> executeCode += doSplitExecute(execute, name, Name,