From 652639921596206d8e4b82bdfaa0a62a3ea9b6fe Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Mon, 25 Jul 2016 07:11:39 -0700 Subject: [PATCH] KA10, KI10: Cleanup compiler warnings and add build support for card reader and punch --- PDP10/ka10_cp.c | 1 - PDP10/ka10_cpu.c | 8 ++++++++ Visual Studio Projects/PDP10-KA.vcproj | 12 ++++++++++-- Visual Studio Projects/PDP10-KI.vcproj | 12 ++++++++++-- makefile | 8 ++++---- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/PDP10/ka10_cp.c b/PDP10/ka10_cp.c index 7c0b595..fe05d91 100644 --- a/PDP10/ka10_cp.c +++ b/PDP10/ka10_cp.c @@ -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; diff --git a/PDP10/ka10_cpu.c b/PDP10/ka10_cpu.c index 12a436e..5c8265b 100644 --- a/PDP10/ka10_cpu.c +++ b/PDP10/ka10_cpu.c @@ -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]; diff --git a/Visual Studio Projects/PDP10-KA.vcproj b/Visual Studio Projects/PDP10-KA.vcproj index ff2f68a..1fb33fa 100644 --- a/Visual Studio Projects/PDP10-KA.vcproj +++ b/Visual Studio Projects/PDP10-KA.vcproj @@ -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" > + + + + diff --git a/Visual Studio Projects/PDP10-KI.vcproj b/Visual Studio Projects/PDP10-KI.vcproj index 96b1577..7b467e7 100644 --- a/Visual Studio Projects/PDP10-KI.vcproj +++ b/Visual Studio Projects/PDP10-KI.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="./;../;../PDP10/;"../../windows-build/PCRE/include/"" - 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/;"../../windows-build/PCRE/include/"" - 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" > + + + + diff --git a/makefile b/makefile index 5a8d919..d152520 100644 --- a/makefile +++ b/makefile @@ -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