1
0
mirror of https://github.com/rcornwell/sims.git synced 2026-01-13 15:27:04 +00:00

I7000: Cleanup some conflicting external definitions.

This commit is contained in:
Richard Cornwell 2018-06-01 15:09:29 -04:00
parent c755299813
commit d30dd7d768
5 changed files with 7 additions and 7 deletions

View File

@ -446,7 +446,7 @@ parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
i = 0;
while (*cptr != '\0' && i < 6) {
d <<= 6;
if (sim_ascii_to_six[0177 & *cptr] != -1)
if (sim_ascii_to_six[0177 & *cptr] != (const char)-1)
d |= sim_ascii_to_six[0177 & *cptr];
cptr++;
i++;

View File

@ -1068,7 +1068,7 @@ parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
i = 0;
while (*cptr != '\0' && i < 5) {
d <<= 8;
if (sim_ascii_to_six[0177 & *cptr] != -1)
if (sim_ascii_to_six[0177 & *cptr] != (const char)-1)
d |= bcd_mem[(int)sim_ascii_to_six[0177 & *cptr]];
cptr++;
i++;

View File

@ -57,7 +57,7 @@ extern uint16 iotraps;
extern uint8 iocheck;
extern UNIT cpu_unit;
extern uint16 IC;
extern uint8 AC[5 * 512];
extern uint8 AC[6 * 512];
extern int chwait;
extern uint16 selreg;
extern uint16 selreg2;

View File

@ -55,7 +55,7 @@ extern UNIT cpu_unit;
extern uint16 IC;
extern t_uint64 MQ;
extern uint32 drum_addr;
extern uint32 hsdrm_addr;
extern t_uint64 hsdrm_addr;
t_stat chan_reset(DEVICE * dptr);
void chan_fetch(int chan);
@ -356,10 +356,10 @@ chan_proc()
/* On first command, copy it to drum address and load another */
if ((chan_info[chan] & (CHAINF_RUN | CHAINF_START)) ==
CHAINF_START) {
hsdrm_addr = (int)M[location[chan] - 1];
hsdrm_addr = M[location[chan] - 1];
chan_info[chan] |= CHAINF_RUN;
if (chan_dev.dctrl & cmask)
sim_debug(DEBUG_DETAIL, &chan_dev, "chan %d HDaddr %06o\n",
sim_debug(DEBUG_DETAIL, &chan_dev, "chan %d HDaddr %012llo\n",
chan, hsdrm_addr);
chan_fetch(chan);
continue;

View File

@ -1025,7 +1025,7 @@ parse_sym(CONST char *cptr, t_addr addr, UNIT * uptr, t_value * val, int32 sw)
i = 0;
while (*cptr != '\0' && i < 6) {
d <<= 6;
if (ascii_to_mem[0177 & *cptr] != -1)
if (ascii_to_mem[0177 & *cptr] != (const char)-1)
d |= ascii_to_mem[0177 & *cptr];
cptr++;
i++;