296,297c296,297
< iop = InstObjParams(name, Name, 'BlockMem', pcedCode,
< opt_flags, {"ea_code": addrCalcReg,
---
> iop = InstObjParams(name, Name, 'BlockMem',
> {"code": pcedCode, "ea_code": addrCalcReg,
299,301c299,301
< "set_flags": flag_code})
< iop_imm = InstObjParams(name, Name + 'Imm', 'BlockMemImm', pcedCode,
< opt_flags, {"ea_code": addrCalcImm,
---
> "set_flags": flag_code}, opt_flags)
> iop_imm = InstObjParams(name, Name + 'Imm', 'BlockMemImm',
> {"code": pcedCode, "ea_code": addrCalcImm,
303c303
< "set_flags": flag_code})
---
> "set_flags": flag_code}, opt_flags)
318,326c318,326
< # We need to make sure to check the highest priority fault last.
< # That way, if other faults have been detected, they'll be overwritten
< # rather than the other way around.
< faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
< (header_output,
< decoder_output,
< exec_output,
< decode_block) = doBlockMemFormat(code, faultCode,
< LoadExecute, name, Name, opt_flags)
---
> # We need to make sure to check the highest priority fault last.
> # That way, if other faults have been detected, they'll be overwritten
> # rather than the other way around.
> faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
> (header_output,
> decoder_output,
> exec_output,
> decode_block) = doBlockMemFormat(code, faultCode,
> LoadFuncs, name, Name, opt_flags)
330,338c330,338
< # We need to make sure to check the highest priority fault last.
< # That way, if other faults have been detected, they'll be overwritten
< # rather than the other way around.
< faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
< (header_output,
< decoder_output,
< exec_output,
< decode_block) = doBlockMemFormat(code, faultCode,
< StoreExecute, name, Name, opt_flags)
---
> # We need to make sure to check the highest priority fault last.
> # That way, if other faults have been detected, they'll be overwritten
> # rather than the other way around.
> faultCode = AlternateASIPrivFaultCheck + BlockAlignmentFaultCheck
> (header_output,
> decoder_output,
> exec_output,
> decode_block) = doBlockMemFormat(code, faultCode,
> StoreFuncs, name, Name, opt_flags)