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

KA10, KI10: Cleanup compiler warnings and add build support for card reader and punch

Browse Source
This commit is contained in:
Mark Pizzolato 2016-07-25 07:11:39 -07:00
parent 9ca9fdcea5
commit 6526399215
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PDP10/ka10_cp.c
View File

@ -111,7 +111,6 @@ DEVICE cp_dev = {
*/
t_stat cp_devio(uint32 dev, uint64 *data) {
uint64 res;
UNIT *uptr = &cp_unit;
struct _card_data *dp;

8
PDP10/ka10_cpu.c
View File

@ -1173,7 +1173,9 @@ int Mem_read(int flag, int cur_context) {
#endif
MB = get_reg(AB);
} else {
#if KI | KL
read:
#endif
sim_interval--;
if (!page_lookup(AB, flag, &addr, 0, cur_context))
return 1;
@ -1215,7 +1217,9 @@ int Mem_write(int flag, int cur_context) {
#endif
set_reg(AB, MB);
} else {
#if KI | KL
write:
#endif
sim_interval--;
if (!page_lookup(AB, flag, &addr, 1, cur_context))
return 1;
@ -1330,9 +1334,13 @@ if ((reason = build_dev_tab ()) != SCPE_OK) /* build, chk dib_tab */
}
if (f_inst_fetch) {
#if !(KI | KL)
fetch:
#endif
Mem_read(pi_cycle | uuo_cycle, 1);
#if KI | KL
no_fetch:
#endif
IR = (MB >> 27) & 0777;
AC = (MB >> 23) & 017;
i_flags = opflags[IR];

12
Visual Studio Projects/PDP10-KA.vcproj
View File

@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./;../;../GRI/;"../../windows-build/PCRE/include/""
PreprocessorDefinitions="USE_INT64;KA=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
PreprocessorDefinitions="USE_INT64;USE_SIM_CARD;KA=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
KeepComments="false"
MinimalRebuild="true"
BasicRuntimeChecks="0"
@ -125,7 +125,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="./;../;../GRI/;"../../windows-build/PCRE/include/""
PreprocessorDefinitions="USE_INT64;KA=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
PreprocessorDefinitions="USE_INT64;USE_SIM_CARD;KA=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@ -188,10 +188,18 @@
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\PDP10\ka10_cp.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cpu.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cr.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cty.c"
>

12
Visual Studio Projects/PDP10-KI.vcproj
View File

@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./;../;../PDP10/;&quot;../../windows-build/PCRE/include/&quot;"
PreprocessorDefinitions="USE_INT64;KI=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
PreprocessorDefinitions="USE_INT64;USE_SIM_CARD;KI=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
KeepComments="false"
MinimalRebuild="true"
BasicRuntimeChecks="0"
@ -125,7 +125,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="./;../;../PDP10/;&quot;../../windows-build/PCRE/include/&quot;"
PreprocessorDefinitions="USE_INT64;KI=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
PreprocessorDefinitions="USE_INT64;USE_SIM_CARD;KI=1;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;SIM_NEED_GIT_COMMIT_ID;HAVE_PCREPOSIX_H;PCRE_STATIC"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@ -188,10 +188,18 @@
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\PDP10\ka10_cp.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cpu.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cr.c"
>
</File>
<File
RelativePath="..\PDP10\ka10_cty.c"
>

8
makefile
View File

@ -1172,8 +1172,8 @@ KA10 = ${KA10D}/ka10_cpu.c ${KA10D}/ka10_sys.c ${KA10D}/ka10_df.c \
${KA10D}/ka10_dp.c ${KA10D}/ka10_mt.c ${KA10D}/ka10_cty.c \
${KA10D}/ka10_lp.c ${KA10D}/ka10_pt.c ${KA10D}/ka10_dc.c \
${KA10D}/ka10_rp.c ${KA10D}/ka10_rc.c ${KA10D}/ka10_dt.c \
${KA10D}/ka10_dk.c
KA10_OPT = -DKA=1 -DUSE_INT64 -I $(KA10D)
${KA10D}/ka10_dk.c ${KA10D}/ka10_cr.c ${KA10D}/ka10_cp.c
KA10_OPT = -DKA=1 -DUSE_INT64 -I $(KA10D) -DUSE_SIM_CARD
KI10D = PDP10
@ -1181,8 +1181,8 @@ KI10 = ${KA10D}/ka10_cpu.c ${KA10D}/ka10_sys.c ${KA10D}/ka10_df.c \
${KA10D}/ka10_dp.c ${KA10D}/ka10_mt.c ${KA10D}/ka10_cty.c \
${KA10D}/ka10_lp.c ${KA10D}/ka10_pt.c ${KA10D}/ka10_dc.c \
${KA10D}/ka10_rp.c ${KA10D}/ka10_rc.c ${KA10D}/ka10_dt.c \
${KA10D}/ka10_dk.c
KI10_OPT = -DKI=1 -DUSE_INT64 -I $(KA10D)
${KA10D}/ka10_dk.c ${KA10D}/ka10_cr.c ${KA10D}/ka10_cp.c
KI10_OPT = -DKI=1 -DUSE_INT64 -I $(KA10D) -DUSE_SIM_CARD
PDP8D = PDP8