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

PDP1: Generalized PTR EOL and EOF handling

Browse source
This commit is contained in:
Bob Supnik 2020-05-29 09:14:16 -07:00 • committed by Mark Pizzolato
parent 3d40da5539
commit b85112a400
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
PDP1/pdp1_stddev.c
View file

@ -1,6 +1,6 @@
/* pdp1_stddev.c: PDP-1 standard devices /* pdp1_stddev.c: PDP-1 standard devices
Copyright (c) 1993-2016, Robert M. Supnik Copyright (c) 1993-2020, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -28,6 +28,7 @@
tti keyboard tti keyboard
tto teleprinter tto teleprinter
21-Mar-20 RMS Generalized PTR EOL and EOF handling
13-Jul-16 RMS Added Expensive Typewriter ribbon color support 13-Jul-16 RMS Added Expensive Typewriter ribbon color support
18-May-16 RMS Added FIODEC-to-ASCII mode for paper tape punch 18-May-16 RMS Added FIODEC-to-ASCII mode for paper tape punch
28-Mar-15 RMS Revised to use sim_printf 28-Mar-15 RMS Revised to use sim_printf
@ -56,6 +57,7 @@
#include "pdp1_defs.h" #include "pdp1_defs.h"
#include "sim_tmxr.h" #include "sim_tmxr.h"
#define FIODEC_SPACE 000 /* space */
#define FIODEC_STOP 013 /* stop code */ #define FIODEC_STOP 013 /* stop code */
#define FIODEC_BLACK 034 /* TTY black ribbon */ #define FIODEC_BLACK 034 /* TTY black ribbon */
#define FIODEC_RED 035 /* TTY red ribbon */ #define FIODEC_RED 035 /* TTY red ribbon */
@ -81,6 +83,7 @@ int32 ptr_uc = 0; /* upper/lower case */
int32 ptp_uc = 0; int32 ptp_uc = 0;
int32 ptr_hold = 0; /* holding buffer */ int32 ptr_hold = 0; /* holding buffer */
int32 ptr_leader = PTR_LEADER; /* leader count */ int32 ptr_leader = PTR_LEADER; /* leader count */
int32 ptr_last = 0; /* prev character*/
int32 ptr_sbs = 0; /* SBS level */ int32 ptr_sbs = 0; /* SBS level */
int32 ptp_stopioe = 0; int32 ptp_stopioe = 0;
int32 ptp_sbs = 0; /* SBS level */ int32 ptp_sbs = 0; /* SBS level */
@ -134,10 +137,10 @@ int32 fiodec_to_ascii[128] = {
int32 ascii_to_fiodec[128] = { int32 ascii_to_fiodec[128] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
BOTH+075, BOTH+036, 0, 0, BOTH+FIODEC_STOP, BOTH+FIODEC_CR, 0, 0, BOTH+075, BOTH+036, BOTH+FIODEC_CR, 0, BOTH+FIODEC_STOP, BOTH+FIODEC_CR, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
BOTH+0, UC+005, UC+001, UC+004, 0, 0, UC+006, UC+002, BOTH+FIODEC_SPACE, UC+005, UC+001, UC+004, 0, 0, UC+006, UC+002,
057, 055, UC+073, UC+054, 033, 054, 073, 021, 057, 055, UC+073, UC+054, 033, 054, 073, 021,
020, 001, 002, 003, 004, 005, 006, 007, 020, 001, 002, 003, 004, 005, 006, 007,
010, 011, 0, 0, UC+007, UC+033, UC+010, UC+021, 010, 011, 0, 0, UC+007, UC+033, UC+010, UC+021,
@ -169,6 +172,7 @@ REG ptr_reg[] = {
{ FLDATAD (DONE, iosta, IOS_V_PTR, "device done flag") }, { FLDATAD (DONE, iosta, IOS_V_PTR, "device done flag") },
{ FLDATAD (RPLS, cpls, CPLS_V_PTR, "return restart pulse flag") }, { FLDATAD (RPLS, cpls, CPLS_V_PTR, "return restart pulse flag") },
{ ORDATA (HOLD, ptr_hold, 9), REG_HRO }, { ORDATA (HOLD, ptr_hold, 9), REG_HRO },
{ ORDATA (LAST, ptr_last, 8), REG_HRO },
{ ORDATA (STATE, ptr_state, 5), REG_HRO }, { ORDATA (STATE, ptr_state, 5), REG_HRO },
{ FLDATA (WAIT, ptr_wait, 0), REG_HRO }, { FLDATA (WAIT, ptr_wait, 0), REG_HRO },
{ DRDATAD (POS, ptr_unit.pos, T_ADDR_W, "position in the input file"), PV_LEFT }, { DRDATAD (POS, ptr_unit.pos, T_ADDR_W, "position in the input file"), PV_LEFT },
@ -395,7 +399,17 @@ else sim_activate (uptr, uptr->wait); /* get next char */
return SCPE_OK; return SCPE_OK;
} }
/* Read next ASCII character */ /* Read next ASCII character
This handles all three styles of end of line.
1a. Old Mac style - only CRs. CRs are converted to FIODEC_CR.
1b. Linux style - only LFs. LFs are converted to FIODEC_CR.
1c. Windows syle - CR+LF. CRs are converted to FIODEC_CR; next LF is ignored.
On end of file, the routine returns a FIODEC_STOP, unless the
previous character was the ASCII equivalent, FF. On the next end of file,
or if the previous character was FF, the routine returns EOF.
*/
int ptr_get_ascii (UNIT *uptr) int ptr_get_ascii (UNIT *uptr)
{ {
@ -413,18 +427,27 @@ if (ptr_hold & CW) { /* char waiting? */
else { else {
for (;;) { /* until valid char */ for (;;) { /* until valid char */
if ((c = getc (uptr->fileref)) == EOF) { /* get next char, EOF? */ if ((c = getc (uptr->fileref)) == EOF) { /* get next char, EOF? */
ptr_leader = PTR_LEADER; /* set up for trailer */ if (ptr_last == '\f') /* already returned FIO_STOP? */
return FIODEC_STOP; /* return STOP */ return EOF; /* then EOF */
ptr_last = '\f'; /* pretend read FIO_STOP */
return FIODEC_STOP; /* return FIO_STOP */
} }
uptr->pos = uptr->pos + 1; /* count char */ uptr->pos = uptr->pos + 1; /* count char */
c = c & 0177; /* cut to 7b */ c = c & 0177; /* cut to 7b */
if (c == '\n') /* NL -> CR */ if ((c == '\n') && (ptr_last == '\r')) { /* LF after CR? */
c = '\r'; ptr_last = 0; /* defang test */
else if (c == '\r') /* ignore CR */ continue; /* ignore char */
continue; }
in = ascii_to_fiodec[c]; /* convert char */ ptr_last = c; /* save char */
if ((in == 0) && (c != ' ')) /* ignore unknowns */ if ((c == '\n') || (c == '\r')) /* CR, LF -> FIO_CR*/
in = BOTH | FIODEC_CR;
else if (c == ' ') /* space -> FIO_SPC */
in = BOTH | FIODEC_SPACE;
else { /* other */
in = ascii_to_fiodec[c]; /* convert */
if (in == 0) /* ignore invalid char */
continue; continue;
}
if ((in & BOTH) || ((in & UC) == ptr_uc)) /* case match? */ if ((in & BOTH) || ((in & UC) == ptr_uc)) /* case match? */
in = in & TT_WIDTH; /* cut to 6b */ in = in & TT_WIDTH; /* cut to 6b */
else { /* no, case shift */ else { /* no, case shift */
@ -448,6 +471,7 @@ t_stat ptr_reset (DEVICE *dptr)
ptr_state = 0; /* clear state */ ptr_state = 0; /* clear state */
ptr_wait = 0; ptr_wait = 0;
ptr_hold = 0; ptr_hold = 0;
ptr_last = 0;
ptr_uc = 0; ptr_uc = 0;
ptr_unit.buf = 0; ptr_unit.buf = 0;
cpls = cpls & ~CPLS_PTR; cpls = cpls & ~CPLS_PTR;