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

BESM6 and VAX: Cleanup for building on VMS

Browse source
This commit is contained in:
Mark Pizzolato 2015-02-12 12:32:39 -08:00
parent 3dce4e1210
commit 9accae5905
9 changed files with 63 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BESM6/besm6_mmu.c
View file

@ -56,7 +56,7 @@ uint32 BRSLRU;
t_value RP[8];
uint32 TLB[32];
unsigned iintr_data; /* protected page number or parity check location */
uint32 iintr_data; /* protected page number or parity check location */
/* There were several hardwired configurations of registers
* corresponding to up to 7 first words of the memory space, selected by

1
BESM6/besm6_panel.c
View file

@ -620,6 +620,7 @@ t_stat besm6_close_panel (UNIT *u, int32 val, char *cptr, void *desc)
t_stat besm6_show_panel (FILE *st, struct sim_unit *up, int32 v, void *dp)
{
return SCPE_NOTATT;
}
void besm6_draw_panel (int force)

4
VAX/vax_lk.c
View file

@ -829,4 +829,6 @@ switch (mode) {
}
}
#endif /* !VAX_620 */
#else /* defined(VAX_620) */
static char *dummy_declaration = "Something to compile";
#endif /* !defined(VAX_620) */

4
VAX/vax_vc.c
View file

@ -1097,4 +1097,6 @@ char *vc_description (DEVICE *dptr)
return "VCB01 Monochrome Graphics Adapter";
}
#endif /* !VAX_620 */
#else /* defined(VAX_620) */
static char *dummy_declaration = "Something to compile";
#endif /* !defined(VAX_620) */

4
VAX/vax_vs.c
View file

@ -240,4 +240,6 @@ if (vs_state == VSXXX_IDLE) {
}
}
#endif /* !VAX_620 */
#else /* defined(VAX_620) */
static char *dummy_declaration = "Something to compile";
#endif /* !defined(VAX_620) */

43
descrip.mms
View file

@ -9,14 +9,16 @@
# the SIMH package for OpenVMS using DEC C v6.0-001(AXP), v6.5-001(AXP),
# HP C V7.3-009-48GBT (AXP), HP C V7.2-001 (IA64) and v6.4-005(VAX).
#
# Notes: On VAX, the PDP-10, Eclipse and IBM 7094 simulators will not be
# built due to the fact that INT64 is required for these simulators.
# Notes: On VAX, the PDP-10, Eclipse, IBM 7094 and BESM6 simulators will
# not be built due to the fact that INT64 is required for these
# simulators.
#
# This build script will accept the following build options.
#
# ALL Just Build "Everything".
# ALTAIR Just Build The MITS Altair.
# ALTAIRZ80 Just Build The MITS Altair Z80.
# BESM6 Just Build The BESM-6.
# ECLIPSE Just Build The Data General Eclipse.
# GRI Just Build The GRI Corporation GRI-909.
# LGP Just Build The Royal-McBee LGP-30.
@ -627,6 +629,18 @@ SWTP6800MP_A2_SOURCE = $(SWTP6800MP_A2_COMMON)mp-a2.c,$(SWTP6800MP_A2_COMMON)m68
$(SWTP6800MP_A2_COMMON)mp-8m.c,$(SWTP6800MP_A2_COMMON)i2716.c
SWTP6800MP_A2_OPTIONS = /INCL=($(SIMH_DIR),$(SWTP6800MP_A2_DIR))/DEF=($(CC_DEFS))
#
# BESM6
#
BESM6_DIR = SYS$DISK:[.BESM6]
BESM6_LIB = $(LIB_DIR)BESM6-$(ARCH).OLB
BESM6_SOURCE = $(BESM6_DIR)BESM6_CPU.C,$(BESM6_DIR)BESM6_SYS.C,$(BESM6_DIR)BESM6_MMU.C,\
$(BESM6_DIR)BESM6_ARITH.C,$(BESM6_DIR)BESM6_DISK.C,$(BESM6_DIR)BESM6_DRUM.C,\
$(BESM6_DIR)BESM6_TTY.C,$(BESM6_DIR)BESM6_PANEL.C,$(BESM6_DIR)BESM6_PRINTER.C,\
$(BESM6_DIR)BESM6_PUNCH.C
BESM6_OPTIONS = /INCL=($(SIMH_DIR),$(BESM6_DIR))/DEF=($(CC_DEFS),"USE_INT64=1")
#
# Digital Equipment VAX 3900 Simulator Definitions.
#
@ -889,7 +903,7 @@ I7094_OPTIONS = /INCL=($(SIMH_DIR),$(I7094_DIR))/DEF=($(CC_DEFS))
ALL : ALTAIR ALTAIRZ80 ECLIPSE GRI LGP H316 HP2100 I1401 I1620 IBM1130 ID16 \
ID32 NOVA PDP1 PDP4 PDP7 PDP8 PDP9 PDP10 PDP11 PDP15 S3 \
VAX MICROVAX3900 MICROVAX1 RTVAX1000 MICROVAX2 VAX730 VAX750 VAX780 VAX8600 \
SDS I7094 SWTP6800MP-A SWTP6800MP-A2 SSEM
SDS I7094 SWTP6800MP-A SWTP6800MP-A2 SSEM BESM6
$! No further actions necessary
.ELSE
#
@ -1314,6 +1328,17 @@ $(SWTP6800MP_A2_LIB) : $(SWTP6800MP_A2_SOURCE)
$ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
$ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
$(BESM6_LIB) : $(BESM6_SOURCE)
$!
$! Building The $(BESM6_LIB) Library.
$!
$ $(CC)$(BESM6_OPTIONS) -
/OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
$ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
LIBRARY/CREATE $(MMS$TARGET)
$ LIBRARY/REPLACE $(MMS$TARGET) $(BLD_DIR)*.OBJ
$ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
$(VAX_LIB1) : $(VAX_SOURCE1)
$!
$! Building The $(VAX_LIB1) Library.
@ -1878,6 +1903,18 @@ $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800M
$(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
$ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
BESM6 : $(BIN_DIR)BESM6-$(ARCH).EXE
$! BESM6 done
$(BIN_DIR)BESM6-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(BESM6_LIB)
$!
$! Building The $(BIN_DIR)BESM6-$(ARCH).EXE Simulator.
$!
$ $(CC)$(BESM6_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
$ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)BESM6-$(ARCH).EXE -
$(BLD_DIR)SCP.OBJ,$(BESM6_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
$ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
VAX : MICROVAX3900
$! MICROVAX3900 aka VAX done

4
sim_console.c
View file

@ -1797,7 +1797,7 @@ return sim_show_send_input (st, &sim_con_send);
t_stat sim_poll_kbd (void)
{
int32 c;
t_stat c;
if (sim_send_poll_data (&sim_con_send, &c)) /* injected input characters available? */
return c;
@ -1820,7 +1820,7 @@ if (!sim_rem_master_mode) {
}
}
tmxr_poll_rx (&sim_con_tmxr); /* poll for input */
if ((c = tmxr_getc_ln (&sim_con_ldsc))) /* any char? */
if ((c = (t_stat)tmxr_getc_ln (&sim_con_ldsc))) /* any char? */
return (c & (SCPE_BREAK | 0377)) | SCPE_KFLAG;
return SCPE_OK;
}

3
sim_tmxr.c
View file

@ -1539,7 +1539,8 @@ return (lp->rxbpi - lp->rxbpr);
int32 tmxr_getc_ln (TMLN *lp)
{
int32 j, val = 0;
int32 j;
t_stat val = 0;
uint32 tmp;
tmxr_debug_trace_line (lp, "tmxr_getc_ln()");

10
sim_video.c
View file

@ -1818,13 +1818,13 @@ while (_show_stat == -1)
return _show_stat;
}
#else
#else /* !defined(HAVE_LIBSDL) */
/* Non-implemented versions */
uint32 vid_mono_palette[2]; /* Monochrome Color Map */
t_stat vid_open (DEVICE *dptr, uint32 width, uint32 height, int32 flags)
t_stat vid_open (DEVICE *dptr, uint32 width, uint32 height, int flags)
{
return SCPE_NOFNC;
}
@ -1886,6 +1886,8 @@ fprintf (st, "video support unavailable");
return SCPE_OK;
}
#endif
#endif /* defined(HAVE_LIBSDL) */
#endif /* USE_SIM_VIDEO */
#else /* !defined(USE_SIM_VIDEO) */
static char *dummy_declaration = "Something to compile";
#endif /* defined(USE_SIM_VIDEO) */