if regfile == 'CR':
# CRRegs register numbering is *unary* encoded
- # *sigh*. numbering inverted on part-CRs. because POWER.
- if name == 'full_cr': # full CR
- return e.do.read_cr_whole, 0b11111111
+ if name == 'full_cr': # full CR (from FXM field)
+ return e.do.read_cr_whole.ok, e.do.read_cr_whole.data
if name == 'cr_a': # CR A
return e.read_cr1.ok, 1<<(7-e.read_cr1.data)
if name == 'cr_b': # CR B
CA = 1<<XERRegs.CA
OV = 1<<XERRegs.OV
if name == 'xer_so':
- return (e.do.oe.oe[0] & e.do.oe.oe_ok) | e.xer_in, SO
+ # SO needs to be read for overflow *and* for creation
+ # of CR0 and also for MFSPR
+ return ((e.do.oe.oe[0] & e.do.oe.oe_ok) | (e.xer_in & SO == SO)|
+ (e.do.rc.rc & e.do.rc.ok)), SO
if name == 'xer_ov':
- return (e.do.oe.oe[0] & e.do.oe.oe_ok) | e.xer_in, OV
+ return ((e.do.oe.oe[0] & e.do.oe.oe_ok) |
+ (e.xer_in & CA == CA)), OV
if name == 'xer_ca':
- return (e.do.input_carry == CryIn.CA.value) | e.xer_in, CA
+ return ((e.do.input_carry == CryIn.CA.value) |
+ (e.xer_in & OV == OV)), CA
# STATE regfile
if regfile == 'STATE':
# STATE register numbering is *unary* encoded
PC = 1<<StateRegs.PC
- MSR = 1<<Stateegs.MSR
+ MSR = 1<<StateRegs.MSR
if name in ['cia', 'nia']:
return Const(1), PC # TODO: detect read-conditions
if name == 'msr':
if regfile == 'FAST':
# FAST register numbering is *unary* encoded
- CTR = 1<<FastRegs.CTR
- LR = 1<<FastRegs.LR
- TAR = 1<<FastRegs.TAR
- SRR0 = 1<<FastRegs.SRR0
- SRR1 = 1<<FastRegs.SRR1
if name == 'fast1':
- return e.read_fast1.ok, 1<<e.read_fast1.data
+ return e.read_fast1.ok, e.read_fast1.data
if name == 'fast2':
- return e.read_fast2.ok, 1<<e.read_fast2.data
+ return e.read_fast2.ok, e.read_fast2.data
# SPR regfile
if regfile == 'CR':
# CRRegs register numbering is *unary* encoded
# *sigh*. numbering inverted on part-CRs. because POWER.
- if name == 'full_cr': # full CR
- return e.do.write_cr_whole, 0b11111111
+ if name == 'full_cr': # full CR (from FXM field)
+ return e.do.write_cr_whole.ok, e.do.write_cr_whole.data
if name == 'cr_a': # CR A
return e.write_cr, 1<<(7-e.write_cr.data)
if regfile == 'FAST':
# FAST register numbering is *unary* encoded
if name == 'fast1':
- return e.write_fast1, 1<<e.write_fast1.data
+ return e.write_fast1, e.write_fast1.data
if name == 'fast2':
- return e.write_fast2, 1<<e.write_fast2.data
+ return e.write_fast2, e.write_fast2.data
# SPR regfile