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

B5500: Promote sim_card to a top level simh library

Browse source 
Rich Cornwell's sim_card module is about to be used by another new simulator
so it is being promoted.
This commit is contained in:
Mark Pizzolato 2016-05-15 18:01:38 -07:00
parent 504bc7c61f
commit 03445f5f94
5 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Visual Studio Projects/B5500.vcproj
View file

@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/" AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SIM_CARD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
KeepComments="false" KeepComments="false"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -125,7 +125,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/" AdditionalIncludeDirectories="./;../;../../windows-build/PCRE/include/"
PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC" PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SIM_CARD;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -225,7 +225,7 @@
> >
</File> </File>
<File <File
RelativePath="..\B5500\sim_card.c" RelativePath="..\sim_card.c"
> >
</File> </File>
<File <File
@ -282,7 +282,7 @@
> >
</File> </File>
<File <File
RelativePath="..\B5500\sim_card.h" RelativePath="..\sim_card.h"
> >
</File> </File>
<File <File

4
descrip.mms
View file

@ -671,8 +671,8 @@ B5500_DIR = SYS$DISK:[.B5500]
B5500_LIB = $(LIB_DIR)B5500-$(ARCH).OLB B5500_LIB = $(LIB_DIR)B5500-$(ARCH).OLB
B5500_SOURCE = $(B5500_DIR)B5500_CPU.C,$(B5500_DIR)B5500_DK.C,$(B5500_DIR)B5500_DR.C,\ B5500_SOURCE = $(B5500_DIR)B5500_CPU.C,$(B5500_DIR)B5500_DK.C,$(B5500_DIR)B5500_DR.C,\
$(B5500_DIR)B5500_DTC.C,$(B5500_DIR)B5500_IO.C,$(B5500_DIR)B5500_MT.C,\ $(B5500_DIR)B5500_DTC.C,$(B5500_DIR)B5500_IO.C,$(B5500_DIR)B5500_MT.C,\
$(B5500_DIR)B5500_SYS.C,$(B5500_DIR)B5500_UREC.C,$(B5500_DIR)SIM_CARD.C $(B5500_DIR)B5500_SYS.C,$(B5500_DIR)B5500_UREC.C,$(SIMH_DIR)SIM_CARD.C
B5500_OPTIONS = /INCL=($(SIMH_DIR),$(B5500_DIR))/DEF=($(CC_DEFS),"USE_INT64=1") B5500_OPTIONS = /INCL=($(SIMH_DIR),$(B5500_DIR))/DEF=($(CC_DEFS),"USE_INT64=1","USE_SIM_CARD=1")
# #
# Digital Equipment VAX 3900 Simulator Definitions. # Digital Equipment VAX 3900 Simulator Definitions.

6
makefile
View file

@ -991,7 +991,7 @@ LDFLAGS := $(OS_LDFLAGS) $(NETWORK_LDFLAGS) $(LDFLAGS_O)
BIN = BIN/ BIN = BIN/
SIM = scp.c sim_console.c sim_fio.c sim_timer.c sim_sock.c \ SIM = scp.c sim_console.c sim_fio.c sim_timer.c sim_sock.c \
sim_tmxr.c sim_ether.c sim_tape.c sim_disk.c sim_serial.c \ sim_tmxr.c sim_ether.c sim_tape.c sim_disk.c sim_serial.c \
sim_video.c sim_imd.c sim_video.c sim_imd.c sim_card.c
DISPLAYD = display DISPLAYD = display
@ -1356,8 +1356,8 @@ SSEM_OPT = -I ${SSEMD}
B5500D = B5500 B5500D = B5500
B5500 = ${B5500D}/b5500_cpu.c ${B5500D}/b5500_io.c ${B5500D}/b5500_sys.c \ B5500 = ${B5500D}/b5500_cpu.c ${B5500D}/b5500_io.c ${B5500D}/b5500_sys.c \
${B5500D}/b5500_dk.c ${B5500D}/b5500_mt.c ${B5500D}/b5500_urec.c \ ${B5500D}/b5500_dk.c ${B5500D}/b5500_mt.c ${B5500D}/b5500_urec.c \
${B5500D}/b5500_dr.c ${B5500D}/b5500_dtc.c ${B5500D}/sim_card.c ${B5500D}/b5500_dr.c ${B5500D}/b5500_dtc.c
B5500_OPT = -I.. -DUSE_INT64 -DB5500 B5500_OPT = -I.. -DUSE_INT64 -DB5500 -DUSE_SIM_CARD
### ###
### Experimental simulators ### Experimental simulators

3
B5500/sim_card.c → sim_card.c
View file

@ -61,6 +61,8 @@
The card module uses up7 to hold a buffer for the card being translated The card module uses up7 to hold a buffer for the card being translated
and the backward translation table. Which is generated from the table. and the backward translation table. Which is generated from the table.
*/ */
#if defined(USE_SIM_CARD)
#include <ctype.h> #include <ctype.h>
#include "sim_defs.h" #include "sim_defs.h"
@ -1034,3 +1036,4 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
} }
#endif /* USE_SIM_CARD */

12
B5500/sim_card.h → sim_card.h
View file

@ -59,6 +59,12 @@
or card format binary. or card format binary.
*/ */
#ifndef SIM_CARD_H_
#define SIM_CARD_H_ 0
#ifdef __cplusplus
extern "C" {
#endif
#define DEBUG_CARD 0x0000010 /* Show details */ #define DEBUG_CARD 0x0000010 /* Show details */
@ -111,3 +117,9 @@ t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, cons
extern const char sim_six_to_ascii[64]; extern const char sim_six_to_ascii[64];
extern const char sim_ascii_to_six[128]; extern const char sim_ascii_to_six[128];
extern const uint8 sim_parity_table[64]; extern const uint8 sim_parity_table[64];
#ifdef __cplusplus
}
#endif
#endif