github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-03-08 03:39:23 +00:00
Code Releases Activity

IBM360: Fixed minor bugs in 370 support.

Browse Source
This commit is contained in:
Richard Cornwell
2020-03-21 14:52:58 -04:00
parent 8ec77af839
commit 0fd6f8dc45
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
IBM360/ibm360_chan.c
View File

@@ -145,6 +145,8 @@ find_subchan(uint16 device) {
switch(chan) {
case 4:
base += subchannels;
/* Fall through */
case 0: /* Multiplexer channel */
if (device >= subchannels)
device = ((device - subchannels) >> 4) & 0x7;
@@ -162,8 +164,8 @@ find_subchan(uint16 device) {
/* find a channel for a given index */
int
find_chan(int index) {
return (chan_dev[index] >> 8) & 0xf;
find_chan(int chan) {
return (chan_dev[chan] >> 8) & 0xf;
}
/* Read a full word into memory.
@@ -206,9 +208,11 @@ readfull(int chan, uint32 addr, uint32 *word) {
int
readbuff(int chan) {
int sk, k;
uint32 addr = ccw_addr[chan];
uint32 addr;
if (ccw_flags[chan] & FLAG_IDA && cpu_unit[0].flags & FEAT_370)
addr = ccw_iaddr[chan];
else
addr = ccw_addr[chan];
if ((addr & AMASK) > MEMSIZE) {
chan_status[chan] |= STATUS_PCHK;
chan_byte[chan] = BUFF_CHNEND;
@@ -257,9 +261,11 @@ readbuff(int chan) {
int
writebuff(int chan) {
int sk, k;
uint32 addr = ccw_addr[chan];
uint32 addr;
if (ccw_flags[chan] & FLAG_IDA && cpu_unit[0].flags & FEAT_370)
addr = ccw_iaddr[chan];
else
addr = ccw_addr[chan];
if ((addr & AMASK) > MEMSIZE) {
chan_status[chan] |= STATUS_PCHK;
chan_byte[chan] = BUFF_CHNEND;
@@ -890,6 +896,7 @@ int haltio(uint16 addr) {
sim_debug(DEBUG_CMD, &cpu_dev, "HIO %x %x %x %x\n", addr, chan,
ccw_cmd[chan], ccw_flags[chan]);
/* Generic halt I/O, tell device to stop and
/* If any error pending save csw and return cc=1 */
if (chan_status[chan] & (STATUS_PCI|STATUS_ATTN|STATUS_CHECK|\
STATUS_PROT|STATUS_PCHK|STATUS_EXPT)) {
@@ -908,14 +915,14 @@ int haltio(uint16 addr) {
(M[0x44 >> 2] & 0xffff);
return cc;
}
/* If channel active, tell it to terminate */
if (ccw_cmd[chan])
chan_byte[chan] = BUFF_CHNEND;
/* Store CSW and return 1. */
sim_debug(DEBUG_CMD, &cpu_dev, "HIO %x %x cc=1\n", addr, chan);
M[0x44 >> 2] = (((uint32)chan_status[chan]) << 16) |
M[0x44 >> 2] = (((uint32)chan_status[chan]) << 16) |
(M[0x44 >> 2] & 0xffff);
return 1;
}

4
IBM360/ibm360_cpu.c
View File

@@ -1030,7 +1030,7 @@ sim_instr(void)
seg_len = (((cregs[1] >> 24) & 0xff) + 1) << 4;
}
/* Generate pte index mask */
page_index = (~(seg_mask << seg_shift) & ~page_mask) & AMASK;
page_index = ((~(seg_mask << seg_shift) & ~page_mask) & AMASK) >> page_shift;
reason = SCPE_OK;
ilc = 0;
/* Enable timer if option set */
@@ -2881,7 +2881,7 @@ fprintf(stderr, "Set TOD %016llx\r\n", tod_clock);
goto supress;
case 0x13: /* RRB */
/* Set storage block reference bit to zero */
addr1 >>= 1;
addr1 >>= 11;
dest = key[addr1];
key[addr1] &= 0xfd; /* Clear reference bit */
cc = (dest >> 1) & 03;