folkert/python-pdp1170
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor cleanups

Browse source
This commit is contained in:
Neil Webber 2024-05-02 09:16:16 -05:00
parent 0c6256571a
commit 98510af5e7
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
rp.py
View file

@ -141,46 +141,40 @@ class RPRM:
self.command_history.pop(-1) self.command_history.pop(-1)
self.command_history.insert(0, (value, self.statestring())) self.command_history.insert(0, (value, self.statestring()))
self.logger.debug(f"RP: writing CS1 to {oct(value)}; "
f"state: {self.statestring()}")
self._cs1 = value self._cs1 = value
self.logger.debug(f"RP: CS1 set to {oct(self._cs1)}") self.logger.debug(f"RP: CS1 set to {oct(self._cs1)}")
if self._cs1 & 0x4000:
self.logger.debug(f"LOOK!!!! XXX")
if self._cs1 & self.HPCS1_BITS.RDY: if self._cs1 & self.HPCS1_BITS.RDY:
self.AS = 1 # this is very bogus but maybe works for now self.AS = 1 # this is very bogus but maybe works for now
# TRE/ERROR always cleared on next op cmd = self._cs1 & self.HPCS1_BITS.FN # NOTE: not shifted
if value & self.HPCS1_BITS.GO: gobit = self._cs1 & self.HPCS1_BITS.GO
self._cs1 &= ~self.HPCS1_BITS.TRE if gobit:
# clear the command, the go bit, and also TRE/ERROR (per book)
self._cs1 &= ~(cmd | self.HPCS1_BITS.GO | self.HPCS1_BITS.TRE)
match value & self.HPCS1_BITS.FN, value & self.HPCS1_BITS.GO: match cmd, gobit:
case 0, go: case 0, _:
self._cs1 &= ~go pass
case 0o06 | 0o12 | 0o16 | 0o20 | 0o22 as fcode, go: case 0o06 | 0o12 | 0o16 | 0o20 | 0o22 as fcode, _:
self.logger.debug(f"RP: operation {oct(fcode)} ignored.") self.logger.debug(f"RP: operation {oct(fcode)} ignored.")
self.logger.debug(self.statestring()) self.logger.debug(self.statestring())
self._cs1 &= ~(go | fcode)
self._cs1 |= self.HPCS1_BITS.RDY self._cs1 |= self.HPCS1_BITS.RDY
if self._cs1 & self.HPCS1_BITS.IE: if self._cs1 & self.HPCS1_BITS.IE:
self.ub.intmgr.simple_irq(5, 0o254) self.ub.intmgr.simple_irq(5, 0o254)
case 0o30, 1: # SEARCH case 0o30, 1: # SEARCH
self._cs1 &= ~0o31
self._cs1 |= self.HPCS1_BITS.RDY self._cs1 |= self.HPCS1_BITS.RDY
self.CC = self.DC self.CC = self.DC
if self._cs1 & self.HPCS1_BITS.IE: if self._cs1 & self.HPCS1_BITS.IE:
self.ub.intmgr.simple_irq(5, 0o254) self.ub.intmgr.simple_irq(5, 0o254)
case 0o60, 1: case 0o60, 1:
self._cs1 &= ~0o61
self.writecmd() self.writecmd()
if self._cs1 & self.HPCS1_BITS.IE: if self._cs1 & self.HPCS1_BITS.IE:
self.ub.intmgr.simple_irq(5, 0o254) self.ub.intmgr.simple_irq(5, 0o254)
case 0o70, 1: case 0o70, 1:
self._cs1 &= ~0o71
self.readcmd() self.readcmd()
if self._cs1 & self.HPCS1_BITS.IE: if self._cs1 & self.HPCS1_BITS.IE:
self.ub.intmgr.simple_irq(5, 0o254) self.ub.intmgr.simple_irq(5, 0o254)