diff --git a/GRI/gri_stddev.c b/GRI/gri_stddev.c index 62c22304..a1ada830 100644 --- a/GRI/gri_stddev.c +++ b/GRI/gri_stddev.c @@ -1,6 +1,6 @@ /* gri_stddev.c: GRI-909 standard devices - Copyright (c) 2001-2015, Robert M Supnik + Copyright (c) 2001-2016, 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 + 05-May-16 RMS Fixed calling sequence inconsistencies (Mark Pizzolato) 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 @@ -211,7 +212,7 @@ DEVICE rtc_dev = { /* Console terminal function processors */ -uint32 tty_rd (int32 src, int32 ea) +uint32 tty_rd (uint32 src) { return tti_unit.buf; /* return data */ } @@ -303,7 +304,7 @@ return SCPE_OK; /* High speed paper tape function processors */ -uint32 hsrp_rd (int32 src, int32 ea) +uint32 hsrp_rd (uint32 src) { return hsr_unit.buf; /* return data */ } @@ -391,7 +392,7 @@ return SCPE_OK; /* Clock function processors */ -t_stat rtc_fo (int32 op) +t_stat rtc_fo (uint32 op) { if (op & RTC_OFF) /* clock off? */ sim_cancel (&rtc_unit); @@ -402,7 +403,7 @@ if (op & RTC_OV) /* clr ovflo? */ return SCPE_OK; } -uint32 rtc_sf (int32 op) +uint32 rtc_sf (uint32 op) { if ((op & RTC_OV) && (dev_done & INT_RTC)) return 1; diff --git a/I1401/i1401_cd.c b/I1401/i1401_cd.c index a3436043..9110a712 100644 --- a/I1401/i1401_cd.c +++ b/I1401/i1401_cd.c @@ -1,6 +1,6 @@ /* i1401_cd.c: IBM 1402 card reader/punch - Copyright (c) 1993-2015, Robert M. Supnik + Copyright (c) 1993-2016, 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"), @@ -35,6 +35,7 @@ Cards are represented as ASCII text streams terminated by newlines. This allows cards to be created and edited as normal files. + 05-May-16 RMS Fixed calling sequence inconsistency (Mark Pizzolato) 28-Feb-15 RMS Added read from console 24-Mar-09 RMS Fixed read stacker operation in column binary mode Fixed punch stacker operation (Van Snyder) @@ -391,7 +392,7 @@ return SCPE_OK; or $, ., square for overlap control (ignored). */ -t_stat select_stack (int32 ilnt, int32 mod) +t_stat select_stack (int32 mod) { if (mod == BCD_ONE) s1sel = 1; diff --git a/PDP10/pdp10_mdfp.c b/PDP10/pdp10_mdfp.c index 0caa5624..eaeed1d4 100644 --- a/PDP10/pdp10_mdfp.c +++ b/PDP10/pdp10_mdfp.c @@ -1,6 +1,6 @@ /* pdp10_mdfp.c: PDP-10 multiply/divide and floating point simulator - Copyright (c) 1993-2008, Robert M Supnik + Copyright (c) 1993-2016, 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. + 05-May-16 RMS Fixed bug in DMUL carry (Mark Pizzolato) 2-Apr-04 RMS Fixed bug in floating point unpack Fixed bug in FIXR (found by Phil Stone, fixed by Chris Smith) @@ -320,7 +321,7 @@ for (i = 0; i < 71; i++) { /* 71 mpyer bits */ } if (mpy[1] & 1) { /* if mpy lo bit = 1 */ AC(p1) = AC(p1) + mpc[1]; - AC(ac) = AC(ac) + mpc[0] + (TSTS (AC(p1) != 0)); + AC(ac) = AC(ac) + mpc[0] + (TSTS (AC(p1)) != 0); AC(p1) = CLRS (AC(p1)); } } diff --git a/SDS/sds_sys.c b/SDS/sds_sys.c index e1ddc261..c0413678 100644 --- a/SDS/sds_sys.c +++ b/SDS/sds_sys.c @@ -1,6 +1,6 @@ /* sds_sys.c: SDS 940 simulator interface - Copyright (c) 2001-2012, Robert M Supnik + Copyright (c) 2001-2016, 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. + 05-May-16 RMS Fixed ascii-to-sds940 data (Mark Pizzolato) 19-Mar-12 RMS Fixed declarations of CCT arrays (Mark Pizzolato) */ @@ -150,10 +151,10 @@ const int8 sds940_to_ascii[64] = { }; const int8 ascii_to_sds940[128] = { - -1, 141, 142, 143, 144, 145, 146, 147, /* 00 - 37 */ - -1, 151, 152, 153, 154, 155, -1, -1, - -1, 161, 162, 163, 164, 165, 166, 167, - 170, 171, 172, -1, -1, -1, -1, -1, + -1, 0141, 0142, 0143, 0144, 0145, 0146, 0147, /* 00 - 37 */ + -1, 0151, 0152, 0153, 0154, 0155, -1, -1, + -1, 0161, 0162, 0163, 0164, 0165, 0166, 0167, + 0170, 0171, 0172, -1, -1, -1, -1, -1, 000, 001, 002, 003, 004, 005, 006, 007, /* 40 - 77 */ 010, 011, 012, 013, 014, 015, 016, 017, 020, 021, 022, 023, 024, 025, 026, 027,