github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-04-29 13:13:50 +00:00
Code Releases Activity

KA10: Minor cleanup and fix some Coverity errors.

Browse Source
This commit is contained in:
Richard Cornwell
2019-06-29 13:27:57 -04:00
parent 37556b0c23
commit 0338b2f7d9
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
PDP10/ka10_cpu.c
View File

@@ -1457,7 +1457,8 @@ int page_lookup(int addr, int flag, int *loc, int wr, int cur_context, int fetch
/* Check for access error */ /* Check for access error */
if ((data & RSIGN) == 0 || (wr & ((data & 0100000) == 0))) { if ((data & RSIGN) == 0 || (wr & ((data & 0100000) == 0))) {
fault_data = ((((uint64)(addr))<<9) | ((uint64)(uf) << 27)) & LMASK; page = (RMASK & addr) >> 9;
fault_data = ((((uint64)(page))<<18) | ((uint64)(uf) << 27)) & LMASK;
fault_data |= (data & 0400000) ? 010LL : 0LL; /* A */ fault_data |= (data & 0400000) ? 010LL : 0LL; /* A */
fault_data |= (data & 0100000) ? 004LL : 0LL; /* W */ fault_data |= (data & 0100000) ? 004LL : 0LL; /* W */
fault_data |= (data & 0040000) ? 002LL : 0LL; /* S */ fault_data |= (data & 0040000) ? 002LL : 0LL; /* S */
@@ -2744,13 +2745,7 @@ st_pi:
} }
/* Update history */ /* Update history */
#if KI if (hst_lnt) {
if (hst_lnt && /*(fm_sel || */PC > 020 && (PC & 0777774) != 0777040 &&
(PC & 0777700) != 023700 && (PC != 0526772)) {
#else
if (hst_lnt /*&& (FLAGS & USER) && PC > 017 && (PC & 0777774) != 0472174 && */
/* (PC & 0777700) != 0113700 && (PC != 0527154)*/) {
#endif
hst_p = hst_p + 1; hst_p = hst_p + 1;
if (hst_p >= hst_lnt) { if (hst_p >= hst_lnt) {
hst_p = 0; hst_p = 0;
@@ -2836,9 +2831,13 @@ unasign:
AB = ub_ptr | 0424; AB = ub_ptr | 0424;
Mem_write_nopage(); Mem_write_nopage();
AB |= 1; AB |= 1;
MB = ((uint64)(FLAGS) << 23) | ((PC + (trap_flag == 0)) & RMASK); MB = (((uint64)(FLAGS) << 23) & LMASK) | ((PC + (trap_flag == 0)) & RMASK);
if ((FLAGS & USER) == 0) {
MB &= ~SMASK;
MB |= (FLAGS & PRV_PUB) ? SMASK : 0;
}
Mem_write_nopage(); Mem_write_nopage();
FLAGS &= ~ (BYTI|ADRFLT|TRP1|TRP2); FLAGS &= ~ (PRV_PUB|BYTI|ADRFLT|TRP1|TRP2);
AB = ub_ptr | 0430; AB = ub_ptr | 0430;
if (trap_flag != 0) if (trap_flag != 0)
AB |= 1; AB |= 1;
@@ -5814,10 +5813,9 @@ last:
Mem_write_nopage(); Mem_write_nopage();
FLAGS |= trap_flag & (TRP1|TRP2); FLAGS |= trap_flag & (TRP1|TRP2);
trap_flag = 1; trap_flag = 1;
AB = 0420; AB = ((FLAGS & USER) ? ub_ptr : eb_ptr) | 0420;
f_pc_inh = 1; f_pc_inh = 1;
pi_cycle = 1; pi_cycle = 1;
AB += (FLAGS & USER) ? ub_ptr : eb_ptr;
Mem_read_nopage(); Mem_read_nopage();
goto no_fetch; goto no_fetch;
} }

2
PDP10/ka10_pmp.c
View File

@@ -204,7 +204,7 @@ struct pmp_t
uint16 tpos; /* Track position */ uint16 tpos; /* Track position */
uint16 rpos; /* Start of current record */ uint16 rpos; /* Start of current record */
uint16 dlen; /* remaining in data */ uint16 dlen; /* remaining in data */
uint16 tsize; /* Size of one track include rounding */ uint32 tsize; /* Size of one track include rounding */
uint8 state; /* Current state */ uint8 state; /* Current state */
uint8 klen; /* remaining in key */ uint8 klen; /* remaining in key */
uint8 filemsk; /* Current file mask */ uint8 filemsk; /* Current file mask */