github.com/open-simh.simh
1
0
Fork 0
mirror of https://github.com/open-simh/simh.git synced 2026-04-07 14:14:06 +00:00
Code Issues Projects Releases Wiki Activity

IBM1130, PDP10, PDP11: Replaced assert() with ASSURE() for run time error checks

Browse Source
This commit is contained in:
Mark Pizzolato
2018-08-11 14:44:15 -07:00
parent 1b7d77e03b
commit 6ffa4c8a41
9 changed files with 55 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PDP11/pdp11_cr.c
View File

@@ -290,7 +290,6 @@
#define DFLT_AIECO (0)
#endif
#include <assert.h>
#define CR_ER (00404)
#include "pdp11_cr_dat.h"
#define PUNCH_EOD (07417)
@@ -703,9 +702,9 @@ static t_bool readCardImage ( UNIT *uptr,
/* Read card image into internal buffer */
assert (colStart < colEnd);
assert (colStart >= 0);
assert (colEnd <= 81);
ASSURE (colStart < colEnd);
ASSURE (colStart >= 0);
ASSURE (colEnd <= 81);
for (col = colStart; col < colEnd; ) {
int16 i;
int c1, c2, c3;
@@ -782,9 +781,9 @@ static t_bool readCardASCII ( UNIT *uptr,
int c = 0, col, peek;
FILE *fp = uptr->fileref;
assert (colStart < colEnd);
assert (colStart >= 1);
assert (colEnd <= 80);
ASSURE (colStart < colEnd);
ASSURE (colStart >= 1);
ASSURE (colEnd <= 80);
if (DEBUG_PRS (cr_dev))
fprintf (sim_deb, "readCardASCII\n");

3
PDP11/pdp11_dmc.c
View File

@@ -109,7 +109,6 @@ The other test was to configure DECnet on VMS 4.6 and do SET HOST.
#include "pdp11_defs.h"
#endif
#include <assert.h>
#include "sim_tmxr.h"
#include "pdp11_ddcmp.h"
@@ -468,7 +467,7 @@ static t_bool insqueue (QH *entry, QH *pred)
{
if ((pred->queue->size > 0) && (pred->queue->count >= pred->queue->size))
return FALSE;
assert (entry->queue == NULL);
ASSURE (entry->queue == NULL);
entry->next = pred->next;
entry->prev = pred;
entry->queue = pred->queue;

35
PDP11/pdp11_kmc.c
View File

@@ -47,7 +47,6 @@
#define KMC_RDX 8
#include <assert.h>
#include "pdp11_dup.h"
#include "pdp11_ddcmp.h"
@@ -1031,7 +1030,7 @@ static t_stat kmc_txService (UNIT *txup) {
dupstate *d = line2dup[txup->unit_line];
t_bool more;
assert ((k >= 0) && (k < (int32) kmc_dev.numunits) && (d->kmc == k) &&
ASSURE ((k >= 0) && (k < (int32) kmc_dev.numunits) && (d->kmc == k) &&
(d->line == txup->unit_line));
/* Provide the illusion of progress. */
@@ -1198,8 +1197,8 @@ static t_stat kmc_txService (UNIT *txup) {
*/
case TXMRDY: /* Data with OS-embedded HCRC */
d->txstate = TXACT;
assert (d->txmsg[d->txslen + 0] != DDCMP_ENQ);
assert (((d->txmlen - d->txslen) > 8) && /* Data, length should match count */
ASSURE (d->txmsg[d->txslen + 0] != DDCMP_ENQ);
ASSURE (((d->txmlen - d->txslen) > 8) && /* Data, length should match count */
(((size_t)(((d->txmsg[d->txslen + 2] & 077) << 8) | d->txmsg[d->txslen + 1])) ==
(d->txmlen - (d->txslen + 8))));
if (!dup_put_msg_bytes (d->dupidx, d->txmsg + d->txslen, d->txmlen - d->txslen, TRUE, TRUE)) {
@@ -1212,7 +1211,7 @@ static t_stat kmc_txService (UNIT *txup) {
case TXRDY: /* Control or DATA with KDP-CRCH */
d->txstate = TXACT; /* Note that DUP can complete before returning */
if (d->txmsg[d->txslen + 0] == DDCMP_ENQ) { /* Control message */
assert ((d->txmlen - d->txslen) == 6);
ASSURE ((d->txmlen - d->txslen) == 6);
if (!dup_put_msg_bytes (d->dupidx, d->txmsg, d->txslen + 6, TRUE, TRUE)) {
sim_debug (DF_PKT, &kmc_dev, "KMC%u line %u: DUP%d refused TX packet\n", k, d->line, d->dupidx);
TXDELAY (TXRDY, TXDUP_DELAY);
@@ -1221,7 +1220,7 @@ static t_stat kmc_txService (UNIT *txup) {
break;
}
assert (((d->txmlen - d->txslen) > 6) && /* Data, length should match count */
ASSURE (((d->txmlen - d->txslen) > 6) && /* Data, length should match count */
(((size_t)(((d->txmsg[d->txslen + 2] & 077) << 8) | d->txmsg[d->txslen + 1])) ==
(d->txmlen - (d->txslen + 6))));
if (!dup_put_msg_bytes (d->dupidx, d->txmsg, d->txslen + 6, TRUE, TRUE)) {
@@ -1250,7 +1249,7 @@ static t_stat kmc_txService (UNIT *txup) {
#undef TXSTOP
if (d->txstate == TXIDLE) {
assert (!d->txavail);
ASSURE (!d->txavail);
if (dup_set_RTS (d->dupidx, FALSE) != SCPE_OK) {
sim_debug (DF_CTO, &kmc_dev, "KMC%u line %u: dup: %d DUP CSR NXM\n",
k, d->line, d->dupidx);
@@ -1303,7 +1302,7 @@ static t_stat kmc_rxService (UNIT *rxup) {
t_stat r;
uint16 xrem, seglen;
assert ((k >= 0) && (k < (int32) kmc_dev.numunits) && (d->kmc == k) &&
ASSURE ((k >= 0) && (k < (int32) kmc_dev.numunits) && (d->kmc == k) &&
(d->line == rxup->unit_line));
if (d->rxstate > RXBDL) {
@@ -1420,7 +1419,7 @@ static t_stat kmc_rxService (UNIT *rxup) {
if (seglen > d->rx.bd[1]) {
seglen = d->rx.bd[1];
}
assert (seglen > 0);
ASSURE (seglen > 0);
xrem = (uint16)Map_WriteB (d->rx.ba, seglen, d->rxmsg + d->rxused);
if (xrem != 0) {
@@ -1458,7 +1457,7 @@ static t_stat kmc_rxService (UNIT *rxup) {
if (d->ctrlFlags & SEL6_CI_ENASS) { /* Note that spec requires first bd >= 6 if SS match enabled */
if (!(d->rxmsg[5] == (d->ctrlFlags & SEL6_CI_SADDR))) { /* Also include SELECT? */
ASSURE ((bdl = (BDL *)remqueue(d->bdqh.prev, &d->bdavail)) != NULL);
assert (bdl->ba == d->rx.bda);
ASSURE (bdl->ba == d->rx.bda);
ASSURE (insqueue (&bdl->hdr, &d->rxqh, &d->rxavail, MAXQUEUE));
d->rxstate = RXIDLE;
break;
@@ -1545,7 +1544,7 @@ static t_stat kmc_rxService (UNIT *rxup) {
break;
default:
assert (FALSE);
ASSURE (FALSE);
}
if ((d->rxstate != RXIDLE) || d->rxavail) {
@@ -1949,7 +1948,7 @@ void kmc_rxBufferIn(dupstate *d, int32 ba, uint16 sel6v) {
if (d->line == UNASSIGNED_LINE)
return;
assert ((k >= 0) && (((unsigned int)k) < kmc_dev.numunits) && (d->dupidx != -1));
ASSURE ((k >= 0) && (((unsigned int)k) < kmc_dev.numunits) && (d->dupidx != -1));
rxup = &rx_units[d->line][k];
@@ -2031,9 +2030,9 @@ static void kdp_receive(int32 dupidx, int count) {
UNIT *rxup;
UNUSED_ARG (count);
assert ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
ASSURE ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
d = &dupState[dupidx];
assert (dupidx == d->dupidx);
ASSURE (dupidx == d->dupidx);
k = d->kmc;
rxup = &rx_units[d->line][k];
@@ -2070,7 +2069,7 @@ void kmc_txBufferIn(dupstate *d, int32 ba, uint16 sel6v) {
if (d->line == UNASSIGNED_LINE)
return;
assert ((k >= 0) && (((unsigned int)k) < kmc_dev.numunits) && (d->dupidx != -1));
ASSURE ((k >= 0) && (((unsigned int)k) < kmc_dev.numunits) && (d->dupidx != -1));
if (!kmc_printBufferIn (k, &kmc_dev, d->line, FALSE, d->txavail, ba, sel6v))
return;
@@ -2139,7 +2138,7 @@ static void kmc_txComplete (int32 dupidx, int status) {
UNIT *txup;
int32 k;
assert ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
ASSURE ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
d = &dupState[dupidx];
k = d->kmc;
@@ -2231,7 +2230,7 @@ static t_bool kmc_txAppendBuffer(dupstate *d) {
if (!d->txmsg || (d->txmsize < d->txmlen+d->tx.bd[1])) {
d->txmsize = d->txmlen+d->tx.bd[1];
d->txmsg = (uint8 *)realloc(d->txmsg, d->txmsize);
assert (d->txmsg);
ASSURE (d->txmsg);
}
rem = (uint16)Map_ReadB (d->tx.ba, d->tx.bd[1], d->txmsg+d->txmlen);
d->tx.bd[1] -= rem;
@@ -2348,7 +2347,7 @@ static void kmc_ctrlOut (int32 k, uint8 code, uint16 rx, uint8 line, uint32 bda)
static void kmc_modemChange (int32 dupidx) {
dupstate *d;
assert ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
ASSURE ((dupidx >= 0) && (((size_t)dupidx) < DIM(dupState)));
d = &dupState[dupidx];
if (d->dupidx != -1) {

1
PDP11/pdp11_xq.c
View File

@@ -247,7 +247,6 @@
------------------------------------------------------------------------------
*/
#include <assert.h>
#include "pdp11_xq.h"
#include "pdp11_xq_bootrom.h"