PDP11, Qbus/Unibus VAX: Silence various compiler warnings
This commit is contained in:
parent
31606161ce
commit
0e72400e09
10 changed files with 10 additions and 22 deletions
|
@ -1073,7 +1073,7 @@ t_stat hk_svc (UNIT *uptr)
|
||||||
{
|
{
|
||||||
int32 i, t, dc, fnc;
|
int32 i, t, dc, fnc;
|
||||||
t_seccnt sectsread;
|
t_seccnt sectsread;
|
||||||
t_stat err;
|
t_stat err = 0;
|
||||||
int32 wc, awc, da;
|
int32 wc, awc, da;
|
||||||
uint32 drv, ba;
|
uint32 drv, ba;
|
||||||
uint16 comp;
|
uint16 comp;
|
||||||
|
|
|
@ -879,11 +879,9 @@ AUTO_CON auto_tab[] = {/*c #v am vm fxa fxv */
|
||||||
|
|
||||||
static void build_vector_tab (void)
|
static void build_vector_tab (void)
|
||||||
{
|
{
|
||||||
int32 ilvl, ibit;
|
|
||||||
static t_bool done = FALSE;
|
static t_bool done = FALSE;
|
||||||
AUTO_CON *autp;
|
AUTO_CON *autp;
|
||||||
DEVICE *dptr;
|
DEVICE *dptr;
|
||||||
DIB *dibp;
|
|
||||||
uint32 j, k;
|
uint32 j, k;
|
||||||
|
|
||||||
if (done)
|
if (done)
|
||||||
|
@ -895,10 +893,13 @@ for (j = 0; (dptr = sim_devices[j]) != NULL; j++) {
|
||||||
for (autp = auto_tab; autp->valid >= 0; autp++) {
|
for (autp = auto_tab; autp->valid >= 0; autp++) {
|
||||||
for (k=0; autp->dnam[k]; k++) {
|
for (k=0; autp->dnam[k]; k++) {
|
||||||
if (!strcmp(dptr->name, autp->dnam[k])) {
|
if (!strcmp(dptr->name, autp->dnam[k])) {
|
||||||
|
#if (VEC_SET != 0)
|
||||||
|
int32 ilvl, ibit;
|
||||||
|
DIB *dibp;
|
||||||
|
|
||||||
dibp = (DIB *)dptr->ctxt;
|
dibp = (DIB *)dptr->ctxt;
|
||||||
ilvl = dibp->vloc / 32;
|
ilvl = dibp->vloc / 32;
|
||||||
ibit = dibp->vloc % 32;
|
ibit = dibp->vloc % 32;
|
||||||
#if (VEC_SET != 0)
|
|
||||||
if (1) {
|
if (1) {
|
||||||
int v;
|
int v;
|
||||||
|
|
||||||
|
@ -918,7 +919,7 @@ t_stat auto_config (const char *name, int32 nctrl)
|
||||||
{
|
{
|
||||||
uint32 csr = IOPAGEBASE + AUTO_CSRBASE;
|
uint32 csr = IOPAGEBASE + AUTO_CSRBASE;
|
||||||
uint32 vec = AUTO_VECBASE;
|
uint32 vec = AUTO_VECBASE;
|
||||||
int32 ilvl, ibit, numc;
|
int32 numc;
|
||||||
AUTO_CON *autp;
|
AUTO_CON *autp;
|
||||||
DEVICE *dptr;
|
DEVICE *dptr;
|
||||||
DIB *dibp;
|
DIB *dibp;
|
||||||
|
@ -962,8 +963,6 @@ for (autp = auto_tab; autp->valid >= 0; autp++) { /* loop thru table */
|
||||||
if (dibp == NULL) /* not there??? */
|
if (dibp == NULL) /* not there??? */
|
||||||
return SCPE_IERR;
|
return SCPE_IERR;
|
||||||
numc = dibp->numc ? dibp->numc : 1;
|
numc = dibp->numc ? dibp->numc : 1;
|
||||||
ilvl = dibp->vloc / 32;
|
|
||||||
ibit = dibp->vloc % 32;
|
|
||||||
/* Identify how many devices earlier in the device list are
|
/* Identify how many devices earlier in the device list are
|
||||||
enabled and use that info to determine fixed address assignments */
|
enabled and use that info to determine fixed address assignments */
|
||||||
for (k=jena=0; k<j; k++) {
|
for (k=jena=0; k<j; k++) {
|
||||||
|
|
|
@ -371,10 +371,7 @@ return val;
|
||||||
|
|
||||||
t_stat pclk_svc (UNIT *uptr)
|
t_stat pclk_svc (UNIT *uptr)
|
||||||
{
|
{
|
||||||
int32 rv;
|
|
||||||
|
|
||||||
sim_debug (DBG_TICK, &pclk_dev, "pclk_svc()\n");
|
sim_debug (DBG_TICK, &pclk_dev, "pclk_svc()\n");
|
||||||
rv = CSR_GETRATE (pclk_csr); /* get rate */
|
|
||||||
if (pclk_csr & CSR_DONE) /* done already set? */
|
if (pclk_csr & CSR_DONE) /* done already set? */
|
||||||
pclk_csr = pclk_csr | CSR_ERR; /* set error */
|
pclk_csr = pclk_csr | CSR_ERR; /* set error */
|
||||||
else
|
else
|
||||||
|
|
|
@ -1069,8 +1069,6 @@ return SCPE_OK;
|
||||||
|
|
||||||
t_stat rl_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
t_stat rl_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||||
{
|
{
|
||||||
int32 dtype = GET_DTYPE (val);
|
|
||||||
|
|
||||||
if ((val < 0) || (cptr && *cptr))
|
if ((val < 0) || (cptr && *cptr))
|
||||||
return SCPE_ARG;
|
return SCPE_ARG;
|
||||||
if (uptr->flags & UNIT_ATT)
|
if (uptr->flags & UNIT_ATT)
|
||||||
|
|
|
@ -1391,8 +1391,6 @@ return sim_disk_detach (uptr);
|
||||||
|
|
||||||
t_stat rp_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
t_stat rp_set_type (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||||
{
|
{
|
||||||
int32 dtype = GET_DTYPE (val);
|
|
||||||
|
|
||||||
if ((val < 0) || (cptr && *cptr))
|
if ((val < 0) || (cptr && *cptr))
|
||||||
return SCPE_ARG;
|
return SCPE_ARG;
|
||||||
if (uptr->flags & UNIT_ATT)
|
if (uptr->flags & UNIT_ATT)
|
||||||
|
|
|
@ -2874,7 +2874,6 @@ return SCPE_OK;
|
||||||
|
|
||||||
t_stat rq_set_plug (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
t_stat rq_set_plug (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
|
||||||
{
|
{
|
||||||
MSC *cp = rq_ctxmap[uptr->cnum];
|
|
||||||
int32 plug;
|
int32 plug;
|
||||||
uint32 i;
|
uint32 i;
|
||||||
t_stat r;
|
t_stat r;
|
||||||
|
|
|
@ -607,8 +607,6 @@ static int32 td_ctime = 150; /* command time */
|
||||||
static int32 td_xtime = 180; /* tr set time */
|
static int32 td_xtime = 180; /* tr set time */
|
||||||
static int32 td_itime = 180; /* init time */
|
static int32 td_itime = 180; /* init time */
|
||||||
|
|
||||||
static int32 td_regval; /* temp location used in reg declarations */
|
|
||||||
|
|
||||||
static int32 td_ctrls = 1; /* number of enabled controllers */
|
static int32 td_ctrls = 1; /* number of enabled controllers */
|
||||||
|
|
||||||
static uint32 tdi_ireq = 0;
|
static uint32 tdi_ireq = 0;
|
||||||
|
|
|
@ -835,8 +835,6 @@ return TX_FIFO_SIZE - lp->txfifo_cnt;
|
||||||
static int32 tx_fifo_put ( TMLX *lp,
|
static int32 tx_fifo_put ( TMLX *lp,
|
||||||
int32 data )
|
int32 data )
|
||||||
{
|
{
|
||||||
int32 status = 0;
|
|
||||||
|
|
||||||
if (tx_fifo_free_count (lp) == 0)
|
if (tx_fifo_free_count (lp) == 0)
|
||||||
return -1;
|
return -1;
|
||||||
lp->txfifo[(lp->txfifo_idx + lp->txfifo_cnt) % TX_FIFO_SIZE] = data;
|
lp->txfifo[(lp->txfifo_idx + lp->txfifo_cnt) % TX_FIFO_SIZE] = data;
|
||||||
|
|
|
@ -1313,7 +1313,7 @@ t_stat xq_process_mop(CTLR* xq)
|
||||||
return SCPE_NOFNC;
|
return SCPE_NOFNC;
|
||||||
|
|
||||||
while ((meb->type != 0) && (meb < limit)) {
|
while ((meb->type != 0) && (meb < limit)) {
|
||||||
address = (meb->add_hi << 16) || (meb->add_mi << 8) || meb->add_lo;
|
address = (meb->add_hi << 16) | (meb->add_mi << 8) | meb->add_lo;
|
||||||
|
|
||||||
/* MOP stuff here - NOT YET FULLY IMPLEMENTED */
|
/* MOP stuff here - NOT YET FULLY IMPLEMENTED */
|
||||||
sim_debug (DBG_WRN, xq->dev, "Processing MEB type: %d\n", meb->type);
|
sim_debug (DBG_WRN, xq->dev, "Processing MEB type: %d\n", meb->type);
|
||||||
|
@ -3147,7 +3147,6 @@ t_stat xq_boot (int32 unitno, DEVICE *dptr)
|
||||||
{
|
{
|
||||||
#ifdef VM_PDP11
|
#ifdef VM_PDP11
|
||||||
size_t i;
|
size_t i;
|
||||||
DIB *dib = (DIB *)dptr->ctxt;
|
|
||||||
extern int32 REGFILE[6][2]; /* R0-R5, two sets */
|
extern int32 REGFILE[6][2]; /* R0-R5, two sets */
|
||||||
|
|
||||||
for (i = 0; i < BOOT_LEN; i++)
|
for (i = 0; i < BOOT_LEN; i++)
|
||||||
|
|
|
@ -1049,6 +1049,8 @@ switch (opc) { /* case on opcode */
|
||||||
RSVD_OPND_FAULT(EDITPC);
|
RSVD_OPND_FAULT(EDITPC);
|
||||||
pop = pop & ~EO_RPT_MASK; /* isolate op */
|
pop = pop & ~EO_RPT_MASK; /* isolate op */
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
rpt = 1;
|
||||||
switch (pop) { /* case on op */
|
switch (pop) { /* case on op */
|
||||||
|
|
||||||
case EO_END_FLOAT: /* end float */
|
case EO_END_FLOAT: /* end float */
|
||||||
|
@ -1217,7 +1219,7 @@ return cc;
|
||||||
|
|
||||||
int32 ReadDstr (int32 lnt, int32 adr, DSTR *src, int32 acc)
|
int32 ReadDstr (int32 lnt, int32 adr, DSTR *src, int32 acc)
|
||||||
{
|
{
|
||||||
int32 c, i, end, t;
|
int32 c, i, end, t = 0;
|
||||||
|
|
||||||
*src = Dstr_zero; /* clear result */
|
*src = Dstr_zero; /* clear result */
|
||||||
end = lnt / 2; /* last byte */
|
end = lnt / 2; /* last byte */
|
||||||
|
|
Loading…
Add table
Reference in a new issue