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

GRI, PDP1, S3, SDS: Forwardport of Bob Supnik's merge from the master branch (change to sim_printf)

Browse source
This commit is contained in:
Mark Pizzolato 2015-04-03 19:53:39 -07:00
parent fb3c5327b7
commit f2ca388f9c
14 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GRI/gri_cpu.c
View file

@ -1,6 +1,6 @@
/* gri_cpu.c: GRI-909 CPU simulator
Copyright (c) 2001-2008, Robert M. Supnik
Copyright (c) 2001-2015, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

2
GRI/gri_defs.h
View file

@ -1,6 +1,6 @@
/* gri_defs.h: GRI-909 simulator definitions
Copyright (c) 2001-2010, Robert M. Supnik
Copyright (c) 2001-2015, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

3
GRI/gri_stddev.c
View file

@ -1,6 +1,6 @@
/* gri_stddev.c: GRI-909 standard devices
Copyright (c) 2001-2008, Robert M Supnik
Copyright (c) 2001-2015, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -29,6 +29,7 @@
hsp S42-006 high speed punch
rtc real time clock
28-Mar-15 RMS Revised to use sim_printf
31-May-08 RMS Fixed declarations (Peter Schorn)
30-Sep-06 RMS Fixed handling of non-printable characters in KSR mode
22-Nov-05 RMS Revised for new terminal processing routines

2
GRI/gri_sys.c
View file

@ -1,6 +1,6 @@
/* gri_sys.c: GRI-909 simulator interface
Copyright (c) 2001-2008, Robert M Supnik
Copyright (c) 2001-2015, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

10
PDP1/pdp1_cpu.c
View file

@ -1,6 +1,6 @@
/* pdp1_cpu.c: PDP-1 CPU simulator
Copyright (c) 1993-2012, Robert M. Supnik
Copyright (c) 1993-2015, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
cpu PDP-1 central processor
27-Mar-15 RMS Backported changed from GitHub master
21-Mar-12 RMS Fixed & vs && in Ea_ch (Michael Bloom)
30-May-07 RMS Fixed typo in SBS clear (Norm Lastovica)
28-Dec-06 RMS Added 16-channel SBS support, PDP-1D support
@ -1703,15 +1704,14 @@ return SCPE_OK;
#ifdef USE_DISPLAY
/* set "test switches"; from display code */
void
cpu_set_switches(unsigned long bits)
void cpu_set_switches(unsigned long bits)
{
/* just what we want; smaller CPUs might want to shift down? */
TW = bits;
}
unsigned long
cpu_get_switches(void)
unsigned long cpu_get_switches(void)
{
return TW;
}

3
PDP1/pdp1_dt.c
View file

@ -1,6 +1,6 @@
/* pdp1_dt.c: 18b DECtape simulator
Copyright (c) 1993-2008, Robert M Supnik
Copyright (c) 1993-2015, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
dt Type 550/555 DECtape
28-Mar-15 RMS Revised to use sim_printf
21-Dec-06 RMS Added 16-channel SBS support
23-Jun-06 RMS Fixed conflict in ATTACH switches
Revised header format

3
PDP1/pdp1_stddev.c
View file

@ -1,6 +1,6 @@
/* pdp1_stddev.c: PDP-1 standard devices
Copyright (c) 1993-2012, Robert M. Supnik
Copyright (c) 1993-2015, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -28,6 +28,7 @@
tti keyboard
tto teleprinter
28-Mar-15 RMS Revised to use sim_printf
21-Mar-12 RMS Fixed unitialized variable in tto_svc (Michael Bloom)
21-Dec-06 RMS Added 16-channel sequence break support
29-Oct-03 RMS Added PTR FIODEC-to-ASCII translation (Phil Budne)

3
PDP1/pdp1_sys.c
View file

@ -1,6 +1,6 @@
/* pdp1_sys.c: PDP-1 simulator interface
Copyright (c) 1993-2008, Robert M. Supnik
Copyright (c) 1993-2015, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -23,6 +23,7 @@
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik.
27-Mar-15 RMS Backported changes from GitHub master
03-Jan-07 RMS Fixed bugs in block loader, char input
21-Dec-06 RMS Added 16-channel sequence break support, PDP-1D support
06-Apr-04 RMS Fixed bug in binary loader (found by Mark Crispin)

2
S3/s3_cd.c
View file

@ -264,7 +264,7 @@ int32 crd (int32 op, int32 m, int32 n, int32 data)
default:
break;
}
printf (">>CRD non-existent function %d\n", op);
sim_printf (">>CRD non-existent function %d\n", op);
return SCPE_OK;
}

6
S3/s3_cpu.c
View file

@ -609,12 +609,12 @@ if (opaddr == 0xf0) { /* Is it command format?
if (qbyte & 0x01) display[2][3] = '|' ;
if (rbyte & 0x01) display[2][7] = '|' ;
/* Print display segment array */
printf("\n\r");
sim_printf("\n");
for (i = 0; i < 3; i++) {
for (j = 0; j < 9; j++) {
printf ("%c", display[i][j]);
sim_printf ("%c", display[i][j]);
}
printf ("\n\r");
sim_printf ("\n");
}
reason = STOP_HALT;
break;

2
S3/s3_disk.c
View file

@ -610,7 +610,7 @@ int32 dsk (int32 disk, int32 op, int32 m, int32 n, int32 data)
default:
break;
}
printf (">>DSK%d non-existent function %d\n", disk, op);
sim_printf (">>DSK%d non-existent function %d\n", disk, op);
return SCPE_OK;
}

2
S3/s3_lp.c
View file

@ -203,7 +203,7 @@ int32 lpt (int32 op, int32 m, int32 n, int32 data)
default:
break;
}
printf (">>LPT non-existent function %d\n", op);
sim_printf (">>LPT non-existent function %d\n", op);
return SCPE_OK;
}

2
S3/s3_pkb.c
View file

@ -231,7 +231,7 @@ int32 pkb (int32 op, int32 m, int32 n, int32 data)
default:
break;
}
printf (">>PKB non-existent function %d\n", op);
sim_printf (">>PKB non-existent function %d\n", op);
return SCPE_OK;
}

2
SDS/sds_mux.c
View file

@ -113,7 +113,7 @@ uint32 mux_tps = 100; /* polls/second */
uint32 mux_scan = 0; /* scanner */
uint32 mux_slck = 0; /* scanner locked */
TMLN mux_ldsc[MUX_LINES] = { {0} }; /* line descriptors */
TMLN mux_ldsc[MUX_LINES] = { {0} }; /* line descriptors */
TMXR mux_desc = { MUX_LINES, 0, 0, mux_ldsc }; /* mux descriptor */
t_stat mux (uint32 fnc, uint32 inst, uint32 *dat);