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

Fix simh/simh Issue#21: tx-0 won't build under MinGW compiler

Browse source 
Follow proposal described in issue and change LP register to LPEN.  LP
is still the name of the register when using SIMH to examine or deposit
to this register.
This commit is contained in:
Howard M. Harte 2013-03-19 17:00:50 -07:00
parent c6691b6ff3
commit de6bf7bc92
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
TX-0/tx0_cpu.c
View file

@ -266,7 +266,7 @@ int32 TAC = 0; /* Toggle Switch Accumul
int32 iosta = 0; /* status reg */ int32 iosta = 0; /* status reg */
int32 ios = 0; /* I/O Stop */ int32 ios = 0; /* I/O Stop */
int32 ch = 0; /* Chime Alarm */ int32 ch = 0; /* Chime Alarm */
int32 LP = 0; /* Light Pen / Light Gun flops */ int32 LPEN = 0; /* Light Pen / Light Gun flops */
int32 mode_tst = 1; /* Test Mode Flip-flop */ int32 mode_tst = 1; /* Test Mode Flip-flop */
int32 mode_rdin = 1; /* Read-In Mode Flip-flop */ int32 mode_rdin = 1; /* Read-In Mode Flip-flop */
@ -331,7 +331,7 @@ REG cpu_reg[] = {
{ ORDATA (PCQP, pcq_p, 6), REG_HRO }, { ORDATA (PCQP, pcq_p, 6), REG_HRO },
{ FLDATA (IOS, ios, 0) }, /* In Out Stop */ { FLDATA (IOS, ios, 0) }, /* In Out Stop */
{ FLDATA (CH, ch, 0) }, /* Chime Alarm */ { FLDATA (CH, ch, 0) }, /* Chime Alarm */
{ ORDATA (LP, LP, 2) }, /* Light Pen */ { ORDATA (LP, LPEN, 2) }, /* Light Pen */
{ FLDATA (R, mode_rdin, 0), REG_HRO }, /* Mode "R" (Read In) Flip-Flop */ { FLDATA (R, mode_rdin, 0), REG_HRO }, /* Mode "R" (Read In) Flip-Flop */
{ FLDATA (T, mode_tst, 0), REG_HRO }, /* Mode "T" (Test) Flip-Flop */ { FLDATA (T, mode_tst, 0), REG_HRO }, /* Mode "T" (Test) Flip-Flop */
{ NULL } { NULL }
@ -796,10 +796,10 @@ t_stat sim_instr (void)
MBR |= TBR; MBR |= TBR;
break; break;
case IOS_PEN: case IOS_PEN:
TRACE_PRINT(IOS_MSG, ("[%06o] Light Pen %01o\n", PC-1, LP)); TRACE_PRINT(IOS_MSG, ("[%06o] Light Pen %01o\n", PC-1, LPEN));
AC &= AMASK; AC &= AMASK;
AC |= (LP & 1) << 17; AC |= (LPEN & 1) << 17;
AC |= (LP & 2) << 16; AC |= (LPEN & 2) << 16;
AC &= DMASK; AC &= DMASK;
break; break;
case IOS_SEL: case IOS_SEL:
@ -832,7 +832,7 @@ t_stat sim_instr (void)
break; break;
case IOS_DIS: case IOS_DIS:
#ifdef USE_DISPLAY #ifdef USE_DISPLAY
LP = dpy (AC); /* Display point on the CRT */ LPEN = dpy (AC); /* Display point on the CRT */
#endif /* USE_DISPLAY */ #endif /* USE_DISPLAY */
break; break;
case IOS_R3L: case IOS_R3L:
@ -1373,7 +1373,7 @@ t_stat sim_opr_orig(int32 op)
break; break;
case OOPR_DIS: case OOPR_DIS:
#ifdef USE_DISPLAY #ifdef USE_DISPLAY
LP = dpy (AC); /* Display point on the CRT */ LPEN = dpy (AC); /* Display point on the CRT */
#endif /* USE_DISPLAY */ #endif /* USE_DISPLAY */
break; break;
} }
@ -1381,10 +1381,10 @@ t_stat sim_opr_orig(int32 op)
/* 1.1 TAC and PEN */ /* 1.1 TAC and PEN */
if ((op & OOPR_PEN_MASK) == OOPR_PEN) { /* pen 1.1 Read the light pen flip flops 1 and 2 into AC0 and AC1 */ if ((op & OOPR_PEN_MASK) == OOPR_PEN) { /* pen 1.1 Read the light pen flip flops 1 and 2 into AC0 and AC1 */
TRACE_PRINT(IOS_MSG, ("[%06o] Light Pen %01o\n", PC-1, LP)); TRACE_PRINT(IOS_MSG, ("[%06o] Light Pen %01o\n", PC-1, LPEN));
AC &= AMASK; AC &= AMASK;
AC |= (LP & 1) << 17; AC |= (LPEN & 1) << 17;
AC |= (LP & 2) << 16; AC |= (LPEN & 2) << 16;
AC &= DMASK; AC &= DMASK;
} }