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

I7000: Removed compiler warnings.

Browse source
This commit is contained in:
Richard Cornwell 2020-10-13 20:05:30 -04:00
parent fb1be2093d
commit 4057374c7c
17 changed files with 46 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
I7000/i7000_chan.c
View file

@ -184,6 +184,8 @@ set_chan(UNIT * uptr, int32 val, CONST char *cptr, void *desc)
return SCPE_IERR; return SCPE_IERR;
chan = UNIT_G_CHAN(uptr->flags); chan = UNIT_G_CHAN(uptr->flags);
if (chan >= NUM_CHAN)
chan = 0;
dibp = (DIB *) dptr->ctxt; dibp = (DIB *) dptr->ctxt;
if (dibp == NULL) if (dibp == NULL)

8
I7000/i7000_com.c
View file

@ -514,7 +514,7 @@ t_stat com_svc(UNIT * uptr)
/* Grab next entry. */ /* Grab next entry. */
in_head++; in_head++;
/* Wrap around end of ring */ /* Wrap around end of ring */
if (in_head >= (sizeof(in_buff)/sizeof(uint16))) if (in_head >= (int)((sizeof(in_buff)/sizeof(uint16))))
in_head = 0; in_head = 0;
com_data = in_buff[in_head]; com_data = in_buff[in_head];
/* Check if end of current transfer */ /* Check if end of current transfer */
@ -1097,7 +1097,7 @@ com_post_eom()
sim_debug(DEBUG_EXP, &com_dev, "inserting eom %d %d %d\n", sim_debug(DEBUG_EXP, &com_dev, "inserting eom %d %d %d\n",
in_head, in_tail, in_count); in_head, in_tail, in_count);
ent = in_tail + 1; ent = in_tail + 1;
if (ent >= (sizeof(in_buff)/sizeof(uint16))) /* Wrap around */ if (ent >= (int)((sizeof(in_buff)/sizeof(uint16)))) /* Wrap around */
ent = 0; ent = 0;
if (ent != in_head) { /* If next element would be head, queue is full */ if (ent != in_head) { /* If next element would be head, queue is full */
/* If we can't put one on, handler will do it for us */ /* If we can't put one on, handler will do it for us */
@ -1120,12 +1120,12 @@ com_inp_msg(uint32 ln, uint16 msg)
sim_debug(DEBUG_EXP, &com_dev, "inserting %d %04o %d %d %d\n", ln, msg, sim_debug(DEBUG_EXP, &com_dev, "inserting %d %04o %d %d %d\n", ln, msg,
in_head, in_tail, in_count); in_head, in_tail, in_count);
ent1 = in_tail + 1; ent1 = in_tail + 1;
if (ent1 >= (sizeof(in_buff)/sizeof(uint16))) /* Wrap around */ if (ent1 >= (int)((sizeof(in_buff)/sizeof(uint16)))) /* Wrap around */
ent1 = 0; ent1 = 0;
if (ent1 == in_head) /* If next element would be head, queue is full */ if (ent1 == in_head) /* If next element would be head, queue is full */
return TRUE; return TRUE;
ent2 = ent1 + 1; ent2 = ent1 + 1;
if (ent2 >= (sizeof(in_buff)/sizeof(uint16))) /* Wrap around */ if (ent2 >= (int)((sizeof(in_buff)/sizeof(uint16)))) /* Wrap around */
ent2 = 0; ent2 = 0;
if (ent2 == in_head) /* If next element would be head, queue is full */ if (ent2 == in_head) /* If next element would be head, queue is full */
return TRUE; return TRUE;

2
I7000/i7000_defs.h
View file

@ -253,7 +253,7 @@ extern DEBTAB crd_debug[];
#define UNIT_V_CHAN (UNIT_V_SELECT + 1) /* 10 */ #define UNIT_V_CHAN (UNIT_V_SELECT + 1) /* 10 */
#define UNIT_CHAN (017 << UNIT_V_CHAN) /* 10-14 */ #define UNIT_CHAN (017 << UNIT_V_CHAN) /* 10-14 */
#define UNIT_S_CHAN(x) (UNIT_CHAN & ((x) << UNIT_V_CHAN)) #define UNIT_S_CHAN(x) (UNIT_CHAN & ((x) << UNIT_V_CHAN))
#define UNIT_G_CHAN(x) ((UNIT_CHAN & (x)) >> UNIT_V_CHAN) #define UNIT_G_CHAN(x) ((int)((UNIT_CHAN & (x)) >> UNIT_V_CHAN))
#define UNIT_V_LOCAL (UNIT_V_UF + 0) /* 0 */ #define UNIT_V_LOCAL (UNIT_V_UF + 0) /* 0 */
#define DEV_BUF_NUM(x) (((x) & 07) << DEV_V_UF) #define DEV_BUF_NUM(x) (((x) & 07) << DEV_V_UF)
#define GET_DEV_BUF(x) (((x) >> DEV_V_UF) & 07) #define GET_DEV_BUF(x) (((x) >> DEV_V_UF) & 07)

8
I7000/i7000_dsk.c
View file

@ -297,14 +297,12 @@ DEVICE dsk_dev = {
uint32 dsk_cmd(UNIT * uptr, uint16 cmd, uint16 dev) uint32 dsk_cmd(UNIT * uptr, uint16 cmd, uint16 dev)
{ {
int chan;
int u = (uptr->u3 >> 8) & 0xf; int u = (uptr->u3 >> 8) & 0xf;
UNIT *base = &dsk_unit[u]; int chan = UNIT_G_CHAN(dsk_unit[u].flags);
#ifdef I7010
int sel; int sel;
chan = UNIT_G_CHAN(dsk_unit[u].flags); sel = (dsk_unit[u].flags & UNIT_SELECT) ? 1 : 0;
sel = (base->flags & UNIT_SELECT) ? 1 : 0;
#ifdef I7010
if (cmd & 0x100) if (cmd & 0x100)
sense[(chan * 2) + sel] |= STAT_SIXBIT; sense[(chan * 2) + sel] |= STAT_SIXBIT;
else else

18
I7000/i7000_lpr.c
View file

@ -134,7 +134,7 @@ lpr_setlpp(UNIT *uptr, int32 val, CONST char *cptr, void *desc)
} }
if (i < 20 || i > 100) if (i < 20 || i > 100)
return SCPE_ARG; return SCPE_ARG;
uptr->capac = i; uptr->u6 = i;
uptr->u4 = 0; uptr->u4 = 0;
return SCPE_OK; return SCPE_OK;
} }
@ -144,7 +144,7 @@ lpr_getlpp(FILE *st, UNIT *uptr, int32 v, CONST void *desc)
{ {
if (uptr == NULL) if (uptr == NULL)
return SCPE_IERR; return SCPE_IERR;
fprintf(st, "linesperpage=%d", uptr->capac); fprintf(st, "linesperpage=%d", uptr->u6);
return SCPE_OK; return SCPE_OK;
} }
@ -185,7 +185,7 @@ print_line(UNIT * uptr, int chan, int unit)
case 1: case 1:
case 9: if (uptr->u4 == 1) case 9: if (uptr->u4 == 1)
break; break;
i = uptr->capac - uptr->u4 + 1; break; i = uptr->u6 - uptr->u4 + 1; break;
} }
if (i == 0) if (i == 0)
break; break;
@ -231,7 +231,7 @@ print_line(UNIT * uptr, int chan, int unit)
sim_putchar(out[j++]); sim_putchar(out[j++]);
} }
uptr->u4++; uptr->u4++;
if (uptr->u4 > (int32)uptr->capac) { if (uptr->u4 > (int32)uptr->u6) {
uptr->u4 = 1; uptr->u4 = 1;
} }
@ -255,7 +255,7 @@ print_line(UNIT * uptr, int chan, int unit)
sim_putchar('\n'); sim_putchar('\n');
} }
uptr->u4++; uptr->u4++;
if (uptr->u4 > (int32)uptr->capac) { if (uptr->u4 > (int32)uptr->u6) {
uptr->u4 = 1; uptr->u4 = 1;
} }
} }
@ -266,7 +266,7 @@ print_line(UNIT * uptr, int chan, int unit)
if (uptr->u4 == 1) if (uptr->u4 == 1)
lpr_chan9[chan] = 1; lpr_chan9[chan] = 1;
#ifdef I7010 #ifdef I7010
if (uptr->u4 == uptr->capac) if (uptr->u4 == uptr->u6)
lpr_chan12[chan] = 1; lpr_chan12[chan] = 1;
#endif #endif
@ -356,8 +356,8 @@ uint32 lpr_cmd(UNIT * uptr, uint16 cmd, uint16 dev)
case 1: case 1:
case 9: if (uptr->u4 == 1) case 9: if (uptr->u4 == 1)
break; break;
i = uptr->capac - uptr->u4 + 1; break; i = uptr->u6 - uptr->u4 + 1; break;
case 12: i = (uptr->capac/2) - uptr->u4; break; case 12: i = (uptr->u6/2) - uptr->u4; break;
} }
if (i == 0) if (i == 0)
break; break;
@ -377,7 +377,7 @@ uint32 lpr_cmd(UNIT * uptr, uint16 cmd, uint16 dev)
} }
break; break;
} }
if (uptr->u4 == uptr->capac) if (uptr->u4 == uptr->u6)
lpr_chan12[chan] = 1; lpr_chan12[chan] = 1;
#endif #endif
if (uptr->u4 == 1) if (uptr->u4 == 1)

4
I7000/i7000_mt.c
View file

@ -849,7 +849,7 @@ t_stat mt_srv(UNIT * uptr)
return mt_error(uptr, chan, MTSE_TMK, dptr); return mt_error(uptr, chan, MTSE_TMK, dptr);
} }
/* If at end of record, fill buffer */ /* If at end of record, fill buffer */
if (uptr->u6 == uptr->hwmark) { if (uptr->u6 == (int32)uptr->hwmark) {
sim_debug(DEBUG_DETAIL, dptr, "Read unit=%d ", unit); sim_debug(DEBUG_DETAIL, dptr, "Read unit=%d ", unit);
uptr->u3 += GAP_LEN; uptr->u3 += GAP_LEN;
if ((r = sim_tape_rdrecf(uptr, &mt_buffer[bufnum][0], &reclen, if ((r = sim_tape_rdrecf(uptr, &mt_buffer[bufnum][0], &reclen,
@ -1044,7 +1044,7 @@ t_stat mt_srv(UNIT * uptr)
return mt_error(uptr, chan, MTSE_TMK, dptr); return mt_error(uptr, chan, MTSE_TMK, dptr);
} }
/* If at end of record, fill buffer */ /* If at end of record, fill buffer */
if (uptr->u6 == uptr->hwmark) { if (uptr->u6 == (int32)uptr->hwmark) {
sim_debug(DEBUG_DETAIL, dptr, "Read unit=%d ", unit); sim_debug(DEBUG_DETAIL, dptr, "Read unit=%d ", unit);
if ((r = sim_tape_rdrecr(uptr, &mt_buffer[bufnum][0], &reclen, if ((r = sim_tape_rdrecr(uptr, &mt_buffer[bufnum][0], &reclen,
BUFFSIZE)) != MTSE_OK) { BUFFSIZE)) != MTSE_OK) {

10
I7000/i7010_cpu.c
View file

@ -562,12 +562,12 @@ sim_instr(void)
t_stat reason; t_stat reason;
uint16 t; uint16 t;
int temp; int temp;
int32 STAR; int32 STAR = 0;
uint8 op, op_info; uint8 op, op_info;
int state; int state;
uint8 ix; uint8 ix = 0;
uint8 br; uint8 br;
uint8 ar; uint8 ar = 0;
int sign, qsign; int sign, qsign;
uint8 ch; uint8 ch;
int cy; int cy;
@ -3759,9 +3759,7 @@ do_divide()
t_stat t_stat
rtc_srv(UNIT * uptr) rtc_srv(UNIT * uptr)
{ {
int32 t; (void)sim_rtcn_calb (rtc_tps, TMR_RTC);
t = sim_rtcn_calb (rtc_tps, TMR_RTC);
sim_activate_after(uptr, 1000000/rtc_tps); sim_activate_after(uptr, 1000000/rtc_tps);
if (timer_enable) { if (timer_enable) {

2
I7000/i7010_defs.h
View file

@ -28,7 +28,7 @@
/* Memory */ /* Memory */
#define AMASK 0x1ffff #define AMASK 0x1ffff
#define BBIT 0x80000000 #define BBIT 0x80000000
#define MEM_ADDR_OK(x) ((uint32)(x & AMASK) < MEMSIZE) #define MEM_ADDR_OK(x) ((uint32)((x) & AMASK) < MEMSIZE)
extern uint8 M[MAXMEMSIZE]; extern uint8 M[MAXMEMSIZE];
#define WM 0200 /* Word mark in memory */ #define WM 0200 /* Word mark in memory */

2
I7000/i701_chan.c
View file

@ -151,7 +151,7 @@ int
chan_cmd(uint16 dev, uint16 dcmd) chan_cmd(uint16 dev, uint16 dcmd)
{ {
UNIT *uptr; UNIT *uptr;
uint32 chan; int32 chan;
DEVICE **dptr; DEVICE **dptr;
DIB *dibp; DIB *dibp;
int j; int j;

2
I7000/i701_sys.c
View file

@ -398,7 +398,6 @@ t_stat
parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw) parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
{ {
int i; int i;
int f;
t_value d; t_value d;
t_addr tag; t_addr tag;
int sign; int sign;
@ -413,7 +412,6 @@ parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
i = 0; i = 0;
sign = 0; sign = 0;
f = 0;
next: next:
/* Skip blanks */ /* Skip blanks */
while (isspace(*cptr)) while (isspace(*cptr))

12
I7000/i7070_cpu.c
View file

@ -290,7 +290,7 @@ sim_instr(void)
uint8 op2 = 0; uint8 op2 = 0;
int iowait = 0; /* Wait for IO to start */ int iowait = 0; /* Wait for IO to start */
int chwait = 0; /* Wait for channel to be inactive */ int chwait = 0; /* Wait for channel to be inactive */
int sign; uint8 sign;
int instr_count = 0; /* Number of instructions to execute */ int instr_count = 0; /* Number of instructions to execute */
if (sim_step != 0) { if (sim_step != 0) {
@ -560,7 +560,7 @@ sim_instr(void)
temp &= ldmask[f2-f1+1]; temp &= ldmask[f2-f1+1];
/* Compute final sign */ /* Compute final sign */
if ((opcode & 0x10f) == (OP_AAS1 & 0x10f)) { if ((opcode & 0x10f) == (OP_AAS1 & 0x10f)) {
sign = utmp; sign = (uint8)(utmp & 0xf);
} else if (sign & 0xc) { } else if (sign & 0xc) {
sign = ASIGN >> 40; sign = ASIGN >> 40;
} else if (sign & 2) { } else if (sign & 2) {
@ -679,7 +679,7 @@ sim_instr(void)
case OP_M: case OP_M:
/* Multiplicand in AC[3] */ /* Multiplicand in AC[3] */
AC[1] = AC[2] = 0; AC[1] = AC[2] = 0;
sign = (MBR & SMASK) >> 40; sign = (uint8)(((MBR & SMASK) >> 40) & 0xf);
MBR = (rdmask[f1] & MBR) >> ((9 - f2) * 4); MBR = (rdmask[f1] & MBR) >> ((9 - f2) * 4);
sign = (((AC[3] & SMASK) >> 40) != sign) ? 6 : 9; sign = (((AC[3] & SMASK) >> 40) != sign) ? 6 : 9;
/* Multiply MBR * AC[3] result to AC[1],AC[2] <low> */ /* Multiply MBR * AC[3] result to AC[1],AC[2] <low> */
@ -714,7 +714,7 @@ sim_instr(void)
case OP_D: case OP_D:
/* dividend AC[1],AC[2] */ /* dividend AC[1],AC[2] */
/* divisor in MBR */ /* divisor in MBR */
sign = (MBR & SMASK) >> 40; sign = (uint8)(((MBR & SMASK) >> 40) & 0xf);
AC[3] = (rdmask[f1] & MBR) >> ((9 - f2) * 4); AC[3] = (rdmask[f1] & MBR) >> ((9 - f2) * 4);
if (AC[3] == 0) { if (AC[3] == 0) {
AC[3] |= ((t_uint64)sign) << 40; AC[3] |= ((t_uint64)sign) << 40;
@ -1536,7 +1536,7 @@ sim_instr(void)
hst[hst_p].before = MBR; hst[hst_p].before = MBR;
} }
temp = dec_bin_idx(MBR); temp = dec_bin_idx(MBR);
sign = ((MBR & SMASK)>> 40); sign = (uint8)(((MBR & SMASK)>> 40) & 0xf);
MBR &= DMASK; MBR &= DMASK;
switch(sign) { switch(sign) {
case 0x6: /* + - tc b add */ case 0x6: /* + - tc b add */
@ -1567,7 +1567,7 @@ sim_instr(void)
} }
temp = 0; temp = 0;
upd_idx(&temp, MA); upd_idx(&temp, MA);
sign = ((MBR & SMASK)>> 40); sign = (uint8)(((MBR & SMASK)>> 40) & 0xf);
MBR &= DMASK; MBR &= DMASK;
switch(sign) { switch(sign) {
default: default:

2
I7000/i7080_cpu.c
View file

@ -218,7 +218,7 @@ uint16 stop_flags = 0; /* Stop on error */
uint16 selreg; /* Last select address */ uint16 selreg; /* Last select address */
uint16 selreg2; /* RWW select address */ uint16 selreg2; /* RWW select address */
int chwait; /* Channel wait register */ int chwait; /* Channel wait register */
uint8 ioflags[5000/8] = {0}; /* IO Error flags */ uint8 ioflags[6200/8] = {0}; /* IO Error flags */
uint16 irqflags; /* IRQ Flags */ uint16 irqflags; /* IRQ Flags */
uint8 lpr_chan9[NUM_CHAN]; /* Line printer Channel 9 flag */ uint8 lpr_chan9[NUM_CHAN]; /* Line printer Channel 9 flag */
uint8 bkcmp = 0; /* Backwords compare */ uint8 bkcmp = 0; /* Backwords compare */

2
I7000/i7080_sys.c
View file

@ -273,7 +273,6 @@ sim_load(FILE * fileref, CONST char *cptr, CONST char *fnam, int flag)
} }
return SCPE_OK; return SCPE_OK;
} else if (match_ext(fnam, "dck")) { } else if (match_ext(fnam, "dck")) {
extern char ascii_to_six[128];
while (fgets(buffer, 160, fileref) != 0) { while (fgets(buffer, 160, fileref) != 0) {
uint8 image[80]; uint8 image[80];
/* Convert bits into image */ /* Convert bits into image */
@ -599,7 +598,6 @@ parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
int i; int i;
t_value d; t_value d;
char buffer[100]; char buffer[100];
extern char ascii_to_six[];
while (isspace(*cptr)) while (isspace(*cptr))
cptr++; cptr++;

9
I7000/i7090_chan.c
View file

@ -329,7 +329,9 @@ void
chan_proc() chan_proc()
{ {
int chan; int chan;
#ifdef I7090
int cmask; int cmask;
#endif
/* Scan channels looking for work */ /* Scan channels looking for work */
for (chan = 0; chan < NUM_CHAN; chan++) { for (chan = 0; chan < NUM_CHAN; chan++) {
@ -341,7 +343,9 @@ chan_proc()
if (chan_flags[chan] & DEV_DISCO) if (chan_flags[chan] & DEV_DISCO)
continue; continue;
#ifdef I7090
cmask = 0x0100 << chan; cmask = 0x0100 << chan;
#endif
switch (CHAN_G_TYPE(chan_unit[chan].flags)) { switch (CHAN_G_TYPE(chan_unit[chan].flags)) {
case CHAN_PIO: case CHAN_PIO:
if ((chan_flags[chan] & (DEV_REOR|DEV_SEL|DEV_FULL)) == if ((chan_flags[chan] & (DEV_REOR|DEV_SEL|DEV_FULL)) ==
@ -810,8 +814,7 @@ chan_proc()
uptr = (*dptr)->units; uptr = (*dptr)->units;
for (j = 0; j < num; j++, uptr++) { for (j = 0; j < num; j++, uptr++) {
if ((uptr->flags & UNIT_DIS) == 0 && if ((uptr->flags & UNIT_DIS) == 0 &&
UNIT_G_CHAN(uptr->flags) == UNIT_G_CHAN(uptr->flags) == chan &&
(unsigned int)chan &&
(sms[chan] & 1) == (sms[chan] & 1) ==
((UNIT_SELECT & uptr->flags) != 0)) { ((UNIT_SELECT & uptr->flags) != 0)) {
goto found; goto found;
@ -1243,7 +1246,7 @@ int
chan_cmd(uint16 dev, uint16 dcmd) chan_cmd(uint16 dev, uint16 dcmd)
{ {
UNIT *uptr; UNIT *uptr;
uint32 chan; int32 chan;
DEVICE **dptr; DEVICE **dptr;
DIB *dibp; DIB *dibp;
int j; int j;

5
I7000/i7090_cpu.c
View file

@ -723,7 +723,7 @@ sim_instr(void)
uint16 decr; uint16 decr;
uint16 xr; uint16 xr;
uint16 opinfo; uint16 opinfo;
int fptemp, fptemp2; int fptemp = 0, fptemp2;
uint8 f; uint8 f;
uint16 tbase; uint16 tbase;
int xeccnt = 15; int xeccnt = 15;
@ -4198,8 +4198,7 @@ t_stat
rtc_srv(UNIT * uptr) rtc_srv(UNIT * uptr)
{ {
if (cpu_unit.flags & OPTION_TIMER) { if (cpu_unit.flags & OPTION_TIMER) {
int32 t; (void)sim_rtcn_calb (rtc_tps, TMR_RTC);
t = sim_rtcn_calb (rtc_tps, TMR_RTC);
sim_activate_after(uptr, 1000000/rtc_tps); sim_activate_after(uptr, 1000000/rtc_tps);
M[5] += 1; M[5] += 1;
if (M[5] & MSIGN) if (M[5] & MSIGN)

4
I7000/i7090_drum.c
View file

@ -262,10 +262,6 @@ drm_detach(UNIT * uptr)
t_stat t_stat
drm_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr) drm_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
{ {
const char *cpu = cpu_description(&cpu_dev);
DIB *dibp = (DIB *) dptr->ctxt;
int ctype = dibp->ctype;
fprintf (st, "%s\n\n", drm_description(dptr)); fprintf (st, "%s\n\n", drm_description(dptr));
fprintf (st, "Up to %d units of drum could be used\n", NUM_UNITS_DR); fprintf (st, "Up to %d units of drum could be used\n", NUM_UNITS_DR);
fprintf (st, " sim> set %s UNITS=n to set number of units\n", dptr->name); fprintf (st, " sim> set %s UNITS=n to set number of units\n", dptr->name);

3
I7000/i7090_lpr.c
View file

@ -168,7 +168,6 @@ print_line(UNIT * uptr, int chan, int unit)
uint16 buff[80]; /* Temp conversion buffer */ uint16 buff[80]; /* Temp conversion buffer */
int i, j; int i, j;
int outsel = uptr->u3; int outsel = uptr->u3;
int prt_flg = 1;
if ((uptr->flags & (UNIT_ATT | ECHO)) == 0) if ((uptr->flags & (UNIT_ATT | ECHO)) == 0)
return SCPE_UNATT; /* attached? */ return SCPE_UNATT; /* attached? */
@ -670,8 +669,6 @@ lpr_attach(UNIT * uptr, CONST char *file)
t_stat t_stat
lpr_detach(UNIT * uptr) lpr_detach(UNIT * uptr)
{ {
int u = (uptr - lpr_unit);
return detach_unit(uptr); return detach_unit(uptr);
} }