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

KA10: Updated ITS paging, start of KL10B working.

Browse Source
This commit is contained in:
Richard Cornwell 2019-09-17 23:31:42 -04:00
parent 1832aed1c1
commit 8837ae9771
3 changed files with 398 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
PDP10/kl10_fe.c
View File

@ -238,6 +238,8 @@ struct _buffer {
char buff[256]; /* Buffer */
} cty_in, cty_out;
int cty_data;
DIB dte_dib[] = {
{ DTE_DEVNUM|000, 1, dte_devio, dte_devirq},
};
@ -505,7 +507,7 @@ void dte_second(UNIT *uptr) {
#if KL_ITS
if (word == 0 && QITS && (uptr->STATUS & ITS_ON) != 0) {
dte_its(uptr);
uptr->STATUS |= DTE_10DB;
// uptr->STATUS |= DTE_10DB;
uptr->STATUS &= ~DTE_11DB;
return;
}
@ -515,14 +517,16 @@ void dte_second(UNIT *uptr) {
switch(word & SEC_CMDMSK) {
default:
case SEC_MONO: /* Ouput character in monitor mode */
ch = (int32)(word & 0177);
M[SEC_DTCHR + base] = ch;
ch = sim_tt_outcvt( ch, TT_GET_MODE(uptr->flags));
if ((r = sim_putchar_s (ch)) != SCPE_OK) { /* Output errors */
if (((cty_out.in_ptr + 1) & 0xff) == cty_out.out_ptr) {
sim_activate(uptr, 1000);
return;
}
M[SEC_DTMTD + base] = FMASK ^ 1;
ch = (int32)(word & 0177);
ch = sim_tt_outcvt( ch, TT_GET_MODE(uptr->flags));
cty_out.buff[cty_out.in_ptr] = (char)(word & 0x7f);
cty_out.in_ptr = (cty_out.in_ptr + 1) & 0xff;
M[SEC_DTCHR + base] = ch;
M[SEC_DTMTD + base] = FMASK;
M[SEC_DTF11 + base] = 0;
break;
case SEC_SETPRI:
@ -542,21 +546,22 @@ enter_pri:
/* Start input process */
break;
case SEC_SETDDT: /* Read character from console */
if ((ch = dte_unit[1].CHHOLD) == 0) {
sim_activate(uptr, 100);
return;
if (cty_in.in_ptr == cty_in.out_ptr) {
sim_activate(uptr, 100);
return;
}
ch = cty_in.buff[cty_in.out_ptr];
cty_in.out_ptr = (cty_in.out_ptr + 1) & 0xff;
M[SEC_DTF11 + base] = 0177 & ch;
M[SEC_DTMTI + base] = FMASK;
dte_unit[1].CHHOLD = 0;
break;
case SEC_CLRDDT: /* Clear DDT input mode */
uptr->STATUS &= ~DTE_MON;
sim_cancel(&dte_unit[1]);
// sim_cancel(&dte_unit[1]);
break;
case SEC_MONON:
uptr->STATUS |= DTE_MON;
sim_activate(&dte_unit[1], 100);
// sim_activate(&dte_unit[1], 100);
break;
case SEC_RDSW: /* Read switch register */
M[SEC_DTSWR + base] = SW;
@ -686,10 +691,27 @@ void dte_its(UNIT *uptr) {
}
/* Check for line speed */
word = M[ITS_DTELSP];
if ((word & SMASK) == 0) {
if ((word & SMASK) == 0) { /* Ready? */
M[ITS_DTELSP] = FMASK;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS DTELSP = %012llo %012llo\n", word, M[ITS_DTELPR]);
}
/* Check if any input for it */
if ((uptr->STATUS & ITS_ON) != 0) {
word = M[ITS_DTETYI];
if ((word & SMASK) != 0) { /* Ready? */
if (cty_in.in_ptr != cty_in.out_ptr) {
ch = cty_in.buff[cty_in.out_ptr];
cty_in.out_ptr = (cty_in.out_ptr + 1) & 0xff;
word = (uint64)ch;
M[ITS_DTETYI] = word;
/* Tell 10 something is ready */
uptr->STATUS |= DTE_10DB;
if (uptr->STATUS & DTE_PIE)
set_interrupt(DTE_DEVNUM, uptr->STATUS);
}
}
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS DTETYI = %012llo\n", word);
}
#if 0
/* Check for input */
word = M[ITS_DTETYI];
@ -865,16 +887,16 @@ dte_function(UNIT *uptr)
data1[0] = 0;
if (dte_queue(uptr, PRI_EM2TI, PRI_EMCTY, 1, data1) == 0)
return;
#if (NUM_DEVS_LP > 0)
data1[0] = 140;
if (dte_queue(uptr, PRI_EMHLA, PRI_EMLPT, 1, data1) == 0)
return;
#endif
//#if (NUM_DEVS_LP > 0)
// data1[0] = 140;
// if (dte_queue(uptr, PRI_EMHLA, PRI_EMLPT, 1, data1) == 0)
// return;
//#endif
// data1[0] = ((ln + 1) << 8) | 32;
// (void)dte_queue(uptr, PRI_EMHLA, PRI_EMDL1, 1, data1);
if (dte_queue(uptr, PRI_EMAKA, PRI_EMDH1, 0, data1) == 0)
return;
// if (dte_queue(uptr, PRI_EMAKA, PRI_EMDH1, 0, data1) == 0)
// return;
break;
case PRI_EM2TI: /* Replay to initial message. */
@ -934,19 +956,20 @@ dte_function(UNIT *uptr)
cty:
data1[0] = 0;
while (cmd->dptr < cmd->dcnt) {
if (((cty_out.in_ptr + 1) & 0xff) == cty_out.out_ptr)
return;
ch = (int32)(cmd->data[cmd->dptr >> 1]);
if ((cmd->dptr & 1) == 0)
ch >>= 8;
ch &= 0177;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY type %x\n", ch);
ch = sim_tt_outcvt( ch, TT_GET_MODE(uptr->flags));
if ((r = sim_putchar_s (ch)) != SCPE_OK) /* Output errors */
return;
cty_out.buff[cty_out.in_ptr] = (char)(ch & 0xff);
cty_out.in_ptr = (cty_out.in_ptr + 1) & 0xff;
cty_data = 1; /* Let output know it needs to ack this */
cmd->dptr++;
}
if (cmd->dptr != cmd->dcnt)
return;
if (dte_queue(uptr, PRI_EMACK, PRI_EMCTY, 1, data1) == 0)
return;
break;
@ -1126,6 +1149,37 @@ error:
return;
}
void
dte_input()
{
uint16 data1;
uint16 dataq[32];
int n;
int save_ptr;
char ch;
/* Check if CTY done with input */
if (cty_data && cty_out.in_ptr == cty_out.out_ptr) {
data1 = 0;
if (dte_queue(&dte_unit[0], PRI_EMACK, PRI_EMCTY, 1, &data1) == 0)
return;
cty_data = 0;
}
n = 0;
save_ptr = cty_in.out_ptr;
while (cty_in.in_ptr != cty_in.out_ptr && n < 32) {
ch = cty_in.buff[cty_in.out_ptr];
cty_in.out_ptr = (cty_in.out_ptr + 1) & 0xff;
sim_debug(DEBUG_DETAIL, &tty_dev, "CTY recieve %02x\n", ch);
dataq[n++] = ch;
}
if (n > 0 && dte_queue(&dte_unit[0], PRI_EMLNC, PRI_EMCTY, n, dataq) == 0) {
/* Restore the input pointer */
cty_in.out_ptr = save_ptr;
return;
}
}
/*
* Queue up a packet to send to 10.
*/
@ -1217,57 +1271,71 @@ t_stat dtei_svc (UNIT *uptr)
base = eb_ptr;
#endif
sim_clock_coschedule (uptr, tmxr_poll);
if ((uptr->STATUS & DTE_SEC) == 0) {
#if KL_ITS
if ((uptr->STATUS & (DTE_SEC|ITS_ON)) == 0) {
#else
if ((uptr->STATUS & (DTE_SEC)) == 0) {
#endif
dte_function(uptr); /* Process queue */
dte_input(uptr);
dte_start(optr);
}
/* continue poll */
if ((ch = uptr->CHHOLD) == 0) {
if ((ch = sim_poll_kbd ()) < SCPE_KFLAG) /* no char or error? */
return ch;
if (ch & SCPE_BREAK) /* ignore break */
return SCPE_OK;
ch = 0177 & sim_tt_inpcvt(ch, TT_GET_MODE (uptr->flags));
uptr->CHHOLD = ch;
/* Flush out any pending CTY output */
while(cty_out.in_ptr != cty_out.out_ptr) {
ch = cty_out.buff[cty_out.out_ptr];
if (sim_putchar(ch) != SCPE_OK)
break;
cty_out.out_ptr = (cty_out.out_ptr + 1) & 0xff;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY outch %x '%c'\n", ch,
((ch > 040 && ch < 0177)? ch: '.'));
}
/* If we have room see if any new lines */
if (((cty_in.in_ptr + 1) & 0xff) != cty_in.out_ptr) {
ch = sim_poll_kbd ();
if (ch & SCPE_KFLAG) {
ch = 0177 & sim_tt_inpcvt(ch, TT_GET_MODE (uptr->flags));
cty_in.buff[cty_in.in_ptr] =ch & 0377;
cty_in.in_ptr = (cty_in.in_ptr + 1) & 0xff;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY char %x '%c'\n", ch,
((ch > 040 && ch < 0177)? ch: '.'));
}
}
#if KL_ITS
if ((optr->STATUS & (DTE_SEC|ITS_ON)) == (DTE_SEC) &&
#else
if ((optr->STATUS & DTE_SEC) != 0 &&
#endif
cty_in.in_ptr != cty_in.out_ptr &&
(optr->STATUS & DTE_MON) != 0 &&
M[SEC_DTMTI + base] == 0) {
ch = cty_in.buff[cty_in.out_ptr];
cty_in.out_ptr = (cty_in.out_ptr + 1) & 0xff;
M[SEC_DTF11 + base] = ch;
M[SEC_DTMTI + base] = FMASK;
optr->STATUS |= DTE_10DB;
if (optr->STATUS & DTE_PIE)
set_interrupt(DTE_DEVNUM, optr->STATUS);
}
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY char %x\n", ch);
#if KL_ITS
if (QITS && (optr->STATUS & ITS_ON) != 0) {
uint64 word = M[ITS_DTETYI];
if ((word & SMASK) != 0) {
if (ch != 0) {
word = ch;
uptr->CHHOLD = 0;
if (cty_in.in_ptr != cty_in.out_ptr) {
ch = cty_in.buff[cty_in.out_ptr];
cty_in.out_ptr = (cty_in.out_ptr + 1) & 0xff;
word = (uint64)ch;
M[ITS_DTETYI] = word;
/* Tell 10 something is ready */
optr->STATUS |= DTE_10DB;
if (optr->STATUS & DTE_PIE)
set_interrupt(DTE_DEVNUM, optr->STATUS);
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS DTETYI = %012llo\n", word);
}
}
}
return SCPE_OK;
}
#endif
if (optr->STATUS & DTE_SEC) {
if (optr->STATUS & DTE_MON && M[SEC_DTMTI + base] == 0) {
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY char %x\n", ch & 0177);
M[SEC_DTF11 + base] = ch;
M[SEC_DTMTI + base] = FMASK;
optr->STATUS |= DTE_10DB;
if (optr->STATUS & DTE_PIE)
set_interrupt(DTE_DEVNUM, optr->STATUS);
uptr->CHHOLD = 0;
}
} else {
#if KL_ITS
if (QITS)
return SCPE_OK;
#endif
data1 = (PRI_EMCTY << 8) | ch;
if (dte_queue(uptr, PRI_EMLNC, PRI_EMCTY, 1, &data1) != 0)
uptr->CHHOLD = 0;
}
return SCPE_OK;
}
@ -1278,6 +1346,7 @@ dtertc_srv(UNIT * uptr)
UNIT *optr = &dte_unit[0];
sim_activate_after(uptr, 1000000/rtc_tps);
/* Check if clock requested */
if (uptr->STATUS & SEC_CLK) {
rtc_tick++;
if (rtc_wait != 0) {
@ -1297,21 +1366,24 @@ dtertc_srv(UNIT * uptr)
}
}
#if KL_ITS
if (QITS) {
uint64 word;
/* Check if Timesharing is running */
if (QITS) {
uint64 word;
word = (M[ITS_DTECHK] + 1) & FMASK;
if (word == 0) {
optr->STATUS |= ITS_ON;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS ON\n");
} else if (word >= (15 * 60)) {
optr->STATUS &= ~ITS_ON;
word = 15 * 60;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS OFF\n");
}
M[ITS_DTECHK] = word;
word = (M[ITS_DTECHK] + 1) & FMASK;
if (word == 0) {
optr->STATUS |= ITS_ON;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS ON\n");
} else if (word >= (15 * 60)) {
optr->STATUS &= ~ITS_ON;
word = 15 * 60;
sim_debug(DEBUG_DETAIL, &dte_dev, "CTY ITS OFF\n");
}
M[ITS_DTECHK] = word;
} else
#endif
/* Update out keep alive timer if in secondary protocol */
if ((optr->STATUS & DTE_SEC) == 0) {
int addr = 0144 + eb_ptr;
uint64 word;

304
PDP10/kx10_cpu.c
View File

@ -190,6 +190,7 @@ int brk_flags; /* Break flags */
int t20_page; /* Tops 20 paging selected */
int ptr_flg; /* Access to pointer value */
#if KLB
int sect; /* Actual resolved section */
int cur_sect; /* Current section */
int prev_sect; /* Previous section */
int pc_sect; /* Program counter section */
@ -1247,7 +1248,7 @@ t_stat dev_pag(uint32 dev, uint64 *data) {
if (res & BIT1) {
/* Load previous section */
#if KLB
prev_sect = (res >> 18) & 077;
prev_sect = (res >> 18) & 07777;
#endif
}
if ((res & RSIGN) == 0) {
@ -1999,19 +2000,19 @@ load_tlb(int uf, int page, int upmp, int wr, int trap, int flag)
if (QKLB) {
base = 0540;
if (!flag)
base += (cur_sect & 037);
base += (sect & 037);
}
#endif
if (uf)
data = M[ub_ptr + base];
else
data = M[eb_ptr + base];
fprintf(stderr, "Map %012llo %012llo %012llo\n\r", data, spt, cst);
//fprintf(stderr, "Map %06o %03o %012llo %012llo %012llo\n\r", base, sect, data, spt, cst);
/* Find correct page table */
do {
switch ((data >> 33) & 07) {
default: /* Invalid page */
fault_data = 0;
fault_data = 024LL << 30;
page_fault = 1;
return 0;
case 1: /* Direct page */
@ -2044,13 +2045,13 @@ fprintf(stderr, "Map %012llo %012llo %012llo\n\r", data, spt, cst);
}
} while (!match);
fprintf(stderr, "XMap %012llo\n\r", data);
//fprintf(stderr, "XMap %012llo\n\r", data);
match = 0;
/* Now look up address of final table entry */
do {
if ((data >> 18) & PG_STG) {
fprintf(stderr, "ZMap %012llo not in stg\n\r", data);
//fprintf(stderr, "ZMap %012llo not in stg\n\r", data);
if (trap) {
fault_data = 0;
page_fault = 1;
@ -2063,7 +2064,7 @@ fprintf(stderr, "ZMap %012llo not in stg\n\r", data);
if (cst) {
uint64 c = M[cst + pg];
if ((c & PG_AGE) == 0) {
fprintf(stderr, "ZMap %012llo %012llo age\n\r", data, c);
//fprintf(stderr, "ZMap %012llo %012llo age\n\r", data, c);
if (trap) {
fault_data = 0;
page_fault = 1;
@ -2075,13 +2076,13 @@ fprintf(stderr, "ZMap %012llo %012llo age\n\r", data, c);
/* Get address of page */
data = M[(pg << 9) + page];
fprintf(stderr, "YMap %012llo\n\r", data);
//fprintf(stderr, "YMap %012llo\n\r", data);
/* Decode map pointer */
switch ((data >> 33) & 07) {
default: /* Invalid page */
if (trap) {
fault_data = 0;
fault_data = 024LL << 30;
page_fault = 1;
}
return 0;
@ -2167,7 +2168,7 @@ fprintf(stderr, "YMap %012llo\n\r", data);
data |= 0020000;
#if KLB
if (QKLB)
data |= (((flag) ? 0: cur_sect) & 037) << 18;
data |= (((flag) ? 0: sect) & 037) << 18;
#endif
/* And save it */
if (uf)
@ -2192,8 +2193,8 @@ fprintf(stderr, "YMap %012llo\n\r", data);
data = e_tlb[page];
}
}
//fprintf(stderr, "Page %03o %06o %o\r\n", page, (data & RMASK), uf);
return (int)(data & RMASK);
//fprintf(stderr, "Page %03o %08o %o\r\n", page, data, uf);
return (int)(data);
}
/*
@ -2249,13 +2250,27 @@ int page_lookup(int addr, int flag, int *loc, int wr, int cur_context, int fetch
//fprintf(stderr, "PXCT ir=%03o pc=%06o ad=%06o x=%02o c=%o b=%o p=%o w=%o", IR, PC, addr, xct_flag, cur_context, BYF5, ptr_flg, wr);
if (((xct_flag & 8) != 0 && cur_context && !ptr_flg) ||
((xct_flag & 4) != 0 && !cur_context && !BYF5 && !ptr_flg) ||
((xct_flag & 2) != 0 && cur_context && ptr_flg) ||
((xct_flag & 2) != 0 && !cur_context && ptr_flg) ||
((xct_flag & 1) != 0 && !cur_context && BYF5 )) {
uf = (FLAGS & USERIO) != 0;
pub = (FLAGS & PRV_PUB) != 0;
#if KLB
if (QKLB)
sect = prev_sect;
#endif
}
//fprintf(stderr, "%o %o\n\r", uf, pub);
}
#if KLB
if (QKLB && t20_page && !flag && (sect & 07740) != 0) {
//fprintf(stderr, "Page fault %06o a=%o wr=%o w=%o %06o\n\r", addr, (data & RSIGN) == 0, wr, (data & 0100000) == 0, data);
fault_data = (027LL << 30) | (uint64)addr | (((uint64)sect) << 18);
if (uf) /* U */
fault_data |= SMASK; /* BIT0 */
page_fault = 1;
return 0;
}
#endif
/* Handle KI paging odditiy */
if (!uf && !t20_page && (page & 0740) == 0340) {
@ -2271,7 +2286,7 @@ int page_lookup(int addr, int flag, int *loc, int wr, int cur_context, int fetch
data = e_tlb[page];
#if KLB
if (QKLB && t20_page && ((data >> 18) & 037) != ((flag) ? 0 : cur_sect))
if (QKLB && t20_page && ((data >> 18) & 077) != ((flag) ? 0 : sect))
data = 0;
#endif
/* If not valid, go refill it */
@ -2279,6 +2294,12 @@ int page_lookup(int addr, int flag, int *loc, int wr, int cur_context, int fetch
data = load_tlb(uf, page, upmp, wr, 1, flag);
if (data == 0 && page_fault) {
fault_data |= ((uint64)addr);
if (uf) /* U */
fault_data |= SMASK; /* BIT0 */
#if KLB
if (QKLB)
fault_data = (((uint64)sect) << 18);
#endif
#if KL_ITS
if (QITS && (xct_flag & 020) != 0) {
PC = (PC + 1) & AMASK;
@ -2302,8 +2323,12 @@ int page_lookup(int addr, int flag, int *loc, int wr, int cur_context, int fetch
/* Check for access error */
if ((data & RSIGN) == 0 || (wr & ((data & 0100000) == 0))) {
fprintf(stderr, "Page fault %06o a=%o wr=%o w=%o %06o\n\r", addr, (data & RSIGN) == 0, wr, (data & 0100000) == 0, data);
//fprintf(stderr, "Page fault %06o a=%o wr=%o w=%o %06o\n\r", addr, (data & RSIGN) == 0, wr, (data & 0100000) == 0, data);
fault_data = BIT8 | (uint64)addr;
#if KLB
if (QKLB)
fault_data |= (((uint64)sect) << 18);
#endif
/* Remap the flag bits */
if (uf) { /* U */
fault_data |= SMASK; /* BIT0 */
@ -2402,13 +2427,17 @@ int Mem_read(int flag, int cur_context, int fetch) {
int addr;
sim_interval--;
#if KLB
if ((glb_sect == 0 || sect == 0 || (glb_sect && sect == 1)) && AB < 020) {
#else
if (AB < 020) {
#endif
if (xct_flag != 0 && !fetch && (FLAGS & USER) == 0) {
//fprintf(stderr, "PXCT ir=%03o pc=%06o ad=%06o x=%02o c=%o b=%o p=%o rgr ", IR, PC, addr, xct_flag, cur_context, BYF5, ptr_flg);
if (((xct_flag & 8) != 0 && cur_context) ||
if (((xct_flag & 8) != 0 && cur_context && !ptr_flg) ||
((xct_flag & 4) != 0 && !cur_context && !BYF5 && !ptr_flg) ||
((xct_flag & 2) != 0 && !cur_context && ptr_flg) ||
((xct_flag & 1) != 0 && !cur_context && BYF5)) {
((xct_flag & 1) != 0 && !cur_context && BYF5 )) {
MB = FM[prev_ctx|AB];
//fprintf(stderr, "prev \n\r");
return 0;
@ -2434,13 +2463,17 @@ int Mem_write(int flag, int cur_context) {
int addr;
sim_interval--;
#if KLB
if ((glb_sect == 0 || sect == 0 || (glb_sect && sect == 1)) && AB < 020) {
#else
if (AB < 020) {
#endif
if (xct_flag != 0 && (FLAGS & USER) == 0) {
//fprintf(stderr, "PXCT ir=%03o pc=%06o ad=%06o x=%02o c=%o b=%o p=%o rgw ", IR, PC, addr, xct_flag, cur_context, BYF5, ptr_flg);
if (((xct_flag & 8) != 0 && cur_context) ||
if (((xct_flag & 8) != 0 && cur_context && !ptr_flg) ||
((xct_flag & 4) != 0 && !cur_context && !BYF5 && !ptr_flg) ||
((xct_flag & 2) != 0 && !cur_context && ptr_flg) ||
((xct_flag & 1) != 0 && !cur_context && BYF5)) {
((xct_flag & 1) != 0 && !cur_context && BYF5 )) {
//fprintf(stderr, "prev \n\r");
FM[prev_ctx|AB] = MB;
return 0;
@ -3920,18 +3953,18 @@ if ((reason = build_dev_tab ()) != SCPE_OK) /* build, chk dib_tab */
#if KI | KL
trap_flag = 0;
#if KL
#if KLB
if (QKLB)
sect = cur_sect = pc_sect;
else
sect = cur_sect = 0;
glb_sect = 0;
#endif
extend = 0;
ptr_flg = 0;
#endif
#endif
AB = PC;
#if KLB
if (QKLB)
cur_sect = pc_sect;
else
cur_sect = 0;
glb_sect = 0;
#endif
uuo_cycle = 0;
f_pc_inh = 0;
}
@ -3952,13 +3985,17 @@ fetch:
}
#endif
#if KL & KLB
glb_sect = (cur_sect != 0);
#endif
if (Mem_read(pi_cycle | uuo_cycle, 1, 1)) {
pi_rq = check_irq_level();
if (pi_rq)
goto st_pi;
#if KL
if ((FLAGS & (TRP1|TRP2)) == 0)
PC = (PC + 1) & RMASK;
if (((fault_data >> 30) & 037) == 021)
PC = (PC + 1) & RMASK;
#endif
goto last;
}
@ -3985,6 +4022,9 @@ no_fetch:
}
#endif
#if KLB
glb_sect = 0;
#endif
/* Handle indirection repeat until no longer indirect */
do {
@ -4000,26 +4040,81 @@ no_fetch:
AR = MB;
AB = MB & RMASK;
ix = GET_XR(MB);
#if KLB
if (QKLB) {
if (((xct_flag & 8) != 0 && (FLAGS & USER) == 0 && !ptr_flg) ||
((xct_flag & 2) != 0 && (FLAGS & USER) == 0 && ptr_flg))
sect = cur_sect = prev_sect;
}
#endif
if (ix) {
#if KL
// if (xct_flag != 0)
//fprintf(stderr, "PXCT ir=%03o pc=%06o ad=%06o x=%02o m=%012llo\n\r", IR, PC, AB, xct_flag, MB);
if (((xct_flag & 8) != 0 && (FLAGS & USER) == 0) ||
((xct_flag & 2) != 0 && (FLAGS & USER) == 0 && ptr_flg))
AR = FM[prev_ctx|ix];
else
AR = get_reg(ix);
if (((xct_flag & 8) != 0 && (FLAGS & USER) == 0) ||
((xct_flag & 2) != 0 && (FLAGS & USER) == 0 && ptr_flg))
AR = FM[prev_ctx|ix];
else
AR = get_reg(ix);
#if KLB
/* Check if extended indexing */
if (QKLB && cur_sect != 0 && (AR & SMASK) == 0 && (AR & SECTM) != 0) {
fprintf(stderr, "Index %06o %012llo %06o\n\r", AB, AR, cur_sect);
AR = (AR + ((AB & RSIGN) ? SECTM|((uint64)AB): (uint64)AB)) & (SECTM|RMASK);
sect = cur_sect = (AR >> 18) & 07777;
glb_sect = 1;
fprintf(stderr, "Index2 %06o %012llo %06o\n\r", AB, AR, cur_sect);
AB = 0;
} else
glb_sect = 0;
#endif
AR = MB = (AB + AR) & FMASK;
#else
AR = MB = (AB + get_reg(ix)) & FMASK;
#endif
AB = MB & RMASK;
}
if (IR != 0254)
AR &= RMASK;
if (ind & !pi_rq)
if (Mem_read(pi_cycle | uuo_cycle, 1, 0))
#if KL & KLB
in_loop:
#endif
if (ind & !pi_rq) {
if (Mem_read(pi_cycle | uuo_cycle, 1, 0))
goto last;
#if KL & KLB
/* Check if extended indexing */
if (QKLB && cur_sect != 0) {
if (MB & SMASK) { /* Instruction format IFIW */
if (MB & BIT1) { /* Illegal index word */
fault_data = 024LL << 30 | (((FLAGS & USER) != 0)?SMASK:0) |
(AR & RMASK) | ((uint64)cur_sect << 18);
fprintf(stderr, "fault %012llo %06o %012llo\n\r", fault_data, FLAGS << 5, AR);
page_fault = 1;
goto last;
}
glb_sect = 0;
} else { /* Extended index EFIW */
ind = (MB & BIT1) != 0;
ix = (MB >> 30) & 017;
if (ix != 0) {
if (((xct_flag & 8) != 0 && (FLAGS & USER) == 0) ||
((xct_flag & 2) != 0 && (FLAGS & USER) == 0 && ptr_flg))
AR = FM[prev_ctx|ix];
else
AR = get_reg(ix);
AR = (AR + MB) & (SECTM|RMASK);
} else
AR = MB;
sect = cur_sect = (AR >> 18) & 07777;
AB = AR & RMASK;
glb_sect = 1;
ix = 0;
fprintf(stderr, "EFIW %012llo %o %02o %06o %06o\n\r", MB, ind, ix, cur_sect, AB);
if (ind)
goto in_loop;
}
}
#endif
}
/* Handle events during a indirect loop */
if (sim_interval-- <= 0) {
if ((reason = sim_process_event()) != SCPE_OK) {
@ -4027,6 +4122,12 @@ no_fetch:
}
}
} while (ind & !pi_rq);
if (IR != 0254) {
#if KL & KLB
// if (QKLB && IR != 0415)
#endif
AR &= RMASK;
}
/* If there is a interrupt handle it. */
@ -4088,11 +4189,15 @@ st_pi:
hst_p = 0;
}
hst[hst_p].pc = HIST_PC | ((BYF5)? (HIST_PC2|PC) : IA);
hst[hst_p].ea = AB;
#if KL
if (extend)
hst[hst_p].pc |= HIST_PCE;
#if KLB
hst[hst_p].pc |= (pc_sect << 18);
hst[hst_p].ea |= (sect << 18);
#endif
#endif
hst[hst_p].ea = AB;
hst[hst_p].ir = AD;
hst[hst_p].flags = (FLAGS << 5)
#if KA | KI | PDP6
@ -4191,11 +4296,21 @@ muuo:
#endif
unasign:
/* Save Opcode */
#if KL & KLB
if (QKLB)
MB = ((uint64)(IR) << 10) | ((uint64)(AC) << 6) | ((uint64)(FLAGS) << 23);
else
#endif
MB = ((uint64)(IR) << 27) | ((uint64)(AC) << 23) | (uint64)(AB);
AB = ub_ptr | 0424;
Mem_write_nopage();
/* Save flags */
AB++;
#if KL & KLB
if (QKLB)
MB = ((uint64)(pc_sect) << 18) | ((PC + (trap_flag == 0)) & RMASK);
else
#endif
MB = (((uint64)(FLAGS) << 23) & LMASK) | ((PC + (trap_flag == 0)) & RMASK);
if ((FLAGS & USER) == 0) {
MB &= ~SMASK;
@ -4203,6 +4318,13 @@ unasign:
}
Mem_write_nopage();
#if KL
#if KLB
if (QKLB) { /* Save address */
MB = ((uint64)(cur_sect) << 18) | (AB & RMASK);
AB ++;
Mem_write_nopage();
}
#endif
/* Save context */
AB ++;
MB = (ub_ptr >> 9) | ((uint64)(prev_ctx & 0160)) << 20 |
@ -4221,6 +4343,12 @@ unasign:
AB |= 4;
Mem_read_nopage();
#if KL & KLB
if (QKLB) {
pc_sect = (MB >> 18) & 07777;
FLAGS = 0;
} else
#endif
FLAGS = (MB >> 23) & 017777;
/* If transistioning from user to executive adjust flags */
if ((FLAGS & USER) != 0 && (AB & 4) != 0)
@ -5474,8 +5602,7 @@ unasign:
if ((FLAGS & BYTI) == 0) { /* BYF6 */
modify = 1;
#if KL
ptr_flg = 1;
if (Mem_read(0, 1, 0)) {
if (Mem_read(0, 0, 0)) {
#else
if (Mem_read(0, !QITS, 0)) {
#endif
@ -5500,7 +5627,7 @@ unasign:
AR |= (uint64)(SC & 077) << 30;
MB = AR;
#if KL
if (Mem_write(0, 1))
if (Mem_write(0, 0))
#else
if (Mem_write(0, !QITS))
#endif
@ -5515,8 +5642,7 @@ unasign:
case 0137:/* DPB */
if ((FLAGS & BYTI) == 0 || !BYF5) {
#if KL
ptr_flg = 1;
if (Mem_read(0, 1, 0))
if (Mem_read(0, 0, 0))
#else
if (Mem_read(0, !QITS, 0))
#endif
@ -5530,6 +5656,9 @@ ldb_ptr:
f_inst_fetch = 0;
f_pc_inh = 1;
FLAGS |= BYTI;
#if KL
ptr_flg = 1;
#endif
BYF5 = 1;
#if ITS
if (QITS && pi_cycle == 0 && mem_prot == 0) {
@ -6744,14 +6873,16 @@ left:
xjrstf:
if (Mem_read(0, 0, 0))
goto last;
BR = MB >> 32; /* Move flags into position */
BR = MB >> 23; /* Move flags into position */
AB = (AB + 1) & RMASK;
if (Mem_read(0, 0, 0))
goto last;
AR = MB; /* Get PC. */
#if KLB
if (QKLB)
pc_sect = (MB >> 18) & 017;
if (QKLB) {
pc_sect = (AR >> 18) & 07777;
fprintf(stderr, "xjrstf %012llo\n\r", AR);
}
#endif
goto jrstf;
@ -6858,6 +6989,10 @@ jrstf:
}
#endif
PC = AR & RMASK;
#if KLB
if (QKLB && glb_sect)
pc_sect = (AR >> 18) & 07777;
#endif
#else
/* JEN */
if (AC & 010) { /* Restore interrupt level. */
@ -7173,6 +7308,11 @@ jrstf:
break;
case 0264: /* JSR */ /* AR Frm PC */
#if KL & KLB
if (QKLB && pc_sect != 0)
MB = ((uint64)pc_sect << 18) + (PC + !pi_cycle);
else
#endif
MB = (((uint64)(FLAGS) << 23) & LMASK) | ((PC + !pi_cycle) & RMASK);
#if KI | KL
if ((FLAGS & USER) == 0) {
@ -7198,11 +7338,24 @@ jrstf:
}
#endif
PC_CHANGE
#if KL & KLB
if (QKLB) {
AR = AR + 1;
if (glb_sect)
pc_sect = (AR >> 18) & 07777;
PC = AR & RMASK;
} else
#endif
PC = (AR + 1) & RMASK;
f_pc_inh = 1;
break;
case 0265: /* JSP */ /* AR Frm PC */
#if KL & KLB
if (QKLB && pc_sect != 0)
AD = ((uint64)pc_sect << 18) + (PC + !pi_cycle);
else
#endif
AD = (((uint64)(FLAGS) << 23) & LMASK) |
((PC + !pi_cycle) & RMASK);
FLAGS &= ~ (BYTI|ADRFLT|TRP1|TRP2);
@ -7223,6 +7376,10 @@ jrstf:
}
#endif
PC_CHANGE
#if KL & KLB
if (QKLB && glb_sect)
pc_sect = (AR >> 18) & 07777;
#endif
PC = AR & RMASK;
AR = AD;
f_pc_inh = 1;
@ -7241,6 +7398,10 @@ jrstf:
}
#endif
PC_CHANGE
#if KL & KLB
if (QKLB && glb_sect)
pc_sect = (AR >> 18) & 07777;
#endif
PC = AR & RMASK;
AR = BR;
break;
@ -7930,7 +8091,7 @@ last:
pi_cycle = 0;
set_pi_hold(); /* Hold off all lower interrupts */
}
fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
//fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
BYF5 = 0;
#if KL_ITS
if (QITS) {
@ -7944,6 +8105,11 @@ fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
AB++;
FLAGS |= trap_flag & (TRP1|TRP2);
trap_flag = (TRP1|TRP2);
#if KLB
if (QKLB)
MB = (((uint64)(FLAGS) << 23) & LMASK);
else
#endif
MB = (((uint64)(FLAGS) << 23) & LMASK) | (PC & RMASK);
if ((FLAGS & USER) == 0) {
MB &= ~SMASK;
@ -7951,6 +8117,13 @@ fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
}
Mem_write_nopage();
AB++;
#if KLB
if (QKLB) {
MB = (((uint64)pc_sect) << 18) | (PC & RMASK);
Mem_write_nopage();
AB++;
}
#endif
flag1 = flag3 = 0;
if (FLAGS & PUBLIC)
flag3 = 1;
@ -7964,6 +8137,10 @@ fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
if ((FLAGS & USER) == 0 && (flag3 || (FLAGS & OVR) != 0))
FLAGS |= PRV_PUB|OVR;
PC = MB & RMASK;
#if KLB
if (QKLB)
pc_sect = (MB >> 18) & 07777;
#endif
f_pc_inh = 1;
}
#endif
@ -7989,6 +8166,14 @@ fprintf(stderr, "Page fault %06o %012llo %06o\n\r", PC, fault_data, FLAGS << 5);
FLAGS &= ~ADRFLT;
#else
if (!f_pc_inh && !pi_cycle) {
#endif
#if KLB
if (QKLB) {
PC++;
if (PC & BIT17)
pc_sect = (pc_sect + 1) & 07777;
PC &= RMASK;
} else
#endif
PC = (PC + 1) & RMASK;
}
@ -8882,6 +9067,11 @@ do_extend(uint32 ia)
break;
case 020: /* XBLT */
#if KLB
if (QKLB) {
return 0;
}
#endif
case 021: /* GSNGL */
case 022: /* GDBLE */
case 023: /* GDFIX */
@ -9298,14 +9488,28 @@ else lnt = hst_lnt;
di = hst_p - lnt; /* work forward */
if (di < 0)
di = di + hst_lnt;
fprintf (st, "PC AC EA AR RES FLAGS IR\n\n");
fprintf (st, "PC AC EA AR RES FLAGS IR\n\n");
for (k = 0; k < lnt; k++) { /* print specified */
h = &hst[(++di) % hst_lnt]; /* entry pointer */
if (h->pc & HIST_PC) { /* instruction? */
fprintf (st, "%06o ", h->pc & 0777777);
#if KL
#if KLB
if (QKLB)
fprintf(st, "%09o ", h->pc & 0777777777);
else
#endif
#endif
fprintf (st, "%06o ", h->pc & 0777777);
fprint_val (st, h->ac, 8, 36, PV_RZRO);
fputs (" ", st);
fprintf (st, "%06o ", h->ea);
#if KL
#if KLB
if (QKLB)
fprintf(st, "%09o ", h->ea & 0777777777);
else
#endif
#endif
fprintf (st, "%06o ", h->ea);
fputs (" ", st);
fprint_val (st, h->mb, 8, 36, PV_RZRO);
fputs (" ", st);

3
PDP10/kx10_defs.h
View File

@ -171,6 +171,7 @@ extern DEBTAB crd_debug[];
#define XMASK 03777777777777LL
#define EMASK 00777000000000LL
#define MMASK 00000777777777LL
#define SECTM 00007777000000LL
#define BIT1 00200000000000LL
#define BIT2 00100000000000LL
#define BIT3 00040000000000LL
@ -531,7 +532,7 @@ int auxcpu_write (int addr, t_uint64);
#define NUM_DEVS_TU 1
#define NUM_DEVS_PMP WAITS
#define NUM_DEVS_DKB WAITS
#define NUM_DEVS_III (WAITS & USE_DISPLAY)
#define NUM_DEVS_III (WAITS * USE_DISPLAY)
#define NUM_DEVS_PD ITS | KL_ITS
#define NUM_DEVS_IMX ITS
#define NUM_DEVS_STK ITS