diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f930e3f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,51 @@
+__pycache__
+*.egg-info
+*~
+*.bak
+*.code-workspace
+.history
+.vscode
+*.csv
+**/_bin/*
+**/_obj/*
+**/_lib/*
+~*
+*.diff
+*.patch
+*.orig
+*.rej
+
+.#*
+*#
+
+*.flt
+*.gmo
+*.info
+*.la
+*.lo
+*.o
+*.pyc
+*.swp
+*.tmp
+*.sdmp
+*.bdmp
+*.trace
+*.elf
+*.map
+*.dmp
+*.out
+
+.deps
+.libs
+
+*.img
+CON0
+clrymp
+dump/*
+krn_11.*
+mfboot
+mfchkye
+mfsysdmp
+grsysdmp
+ram_fs
+**/.vs/*
diff --git a/simulator/bcpio_extractor/bcpio_extractor.vcxproj b/simulator/bcpio_extractor/bcpio_extractor.vcxproj
index 0da42b8..e1d3b4a 100644
--- a/simulator/bcpio_extractor/bcpio_extractor.vcxproj
+++ b/simulator/bcpio_extractor/bcpio_extractor.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/bin_patch/bin_patch.vcxproj b/simulator/bin_patch/bin_patch.vcxproj
index c76c5e7..7eb791f 100644
--- a/simulator/bin_patch/bin_patch.vcxproj
+++ b/simulator/bin_patch/bin_patch.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/common.props b/simulator/common.props
index e3eb375..2a24ecf 100644
--- a/simulator/common.props
+++ b/simulator/common.props
@@ -26,7 +26,7 @@
false
- 1_75
+ 1_81
..
$(BASEDIR)\_lib\msvc_$(Platform)_$(Configuration)\$(TargetName)\
$(BASEDIR)\_bin\msvc_$(Platform)_$(Configuration)\$(TargetName)\
diff --git a/simulator/cray_disasm/cray_disasm.vcxproj b/simulator/cray_disasm/cray_disasm.vcxproj
index 3c1a418..6143167 100644
--- a/simulator/cray_disasm/cray_disasm.vcxproj
+++ b/simulator/cray_disasm/cray_disasm.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/cray_sim/cray_sim.vcxproj b/simulator/cray_sim/cray_sim.vcxproj
index 1df7403..0fd5852 100644
--- a/simulator/cray_sim/cray_sim.vcxproj
+++ b/simulator/cray_sim/cray_sim.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
@@ -111,10 +111,4 @@
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
\ No newline at end of file
diff --git a/simulator/ddisk_extractor/ddisk_extractor.vcxproj b/simulator/ddisk_extractor/ddisk_extractor.vcxproj
index cb0d02e..d87eec6 100644
--- a/simulator/ddisk_extractor/ddisk_extractor.vcxproj
+++ b/simulator/ddisk_extractor/ddisk_extractor.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/ds_edit/ds_edit.vcxproj b/simulator/ds_edit/ds_edit.vcxproj
index 3138c3e..d9e0702 100644
--- a/simulator/ds_edit/ds_edit.vcxproj
+++ b/simulator/ds_edit/ds_edit.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/dump/dump.vcxproj b/simulator/dump/dump.vcxproj
index 4ef32c1..dd2c884 100644
--- a/simulator/dump/dump.vcxproj
+++ b/simulator/dump/dump.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/exp_disk_create/exp_disk_create.vcxproj b/simulator/exp_disk_create/exp_disk_create.vcxproj
index 519975d..e5996fd 100644
--- a/simulator/exp_disk_create/exp_disk_create.vcxproj
+++ b/simulator/exp_disk_create/exp_disk_create.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/file_splitter/file_splitter.vcxproj b/simulator/file_splitter/file_splitter.vcxproj
index a5e5604..44fd137 100644
--- a/simulator/file_splitter/file_splitter.vcxproj
+++ b/simulator/file_splitter/file_splitter.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/fp_test/fp_test.vcxproj b/simulator/fp_test/fp_test.vcxproj
index f6171d0..43af128 100644
--- a/simulator/fp_test/fp_test.vcxproj
+++ b/simulator/fp_test/fp_test.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/httpd/httpd.vcxproj b/simulator/httpd/httpd.vcxproj
index 75cafe5..800779d 100644
--- a/simulator/httpd/httpd.vcxproj
+++ b/simulator/httpd/httpd.vcxproj
@@ -54,22 +54,22 @@
StaticLibrary
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/iop_disasm/iop_disasm.vcxproj b/simulator/iop_disasm/iop_disasm.vcxproj
index e2a5342..2f0882d 100644
--- a/simulator/iop_disasm/iop_disasm.vcxproj
+++ b/simulator/iop_disasm/iop_disasm.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/mkfs_unicos/mkfs_unicos.vcxproj b/simulator/mkfs_unicos/mkfs_unicos.vcxproj
index 266a4b3..8dbda65 100644
--- a/simulator/mkfs_unicos/mkfs_unicos.vcxproj
+++ b/simulator/mkfs_unicos/mkfs_unicos.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/ovl_split/ovl_split.vcxproj b/simulator/ovl_split/ovl_split.vcxproj
index 1b19053..cee4726 100644
--- a/simulator/ovl_split/ovl_split.vcxproj
+++ b/simulator/ovl_split/ovl_split.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/pdcurses/pdcurses.vcxproj b/simulator/pdcurses/pdcurses.vcxproj
index e33725e..bf020d6 100644
--- a/simulator/pdcurses/pdcurses.vcxproj
+++ b/simulator/pdcurses/pdcurses.vcxproj
@@ -34,22 +34,22 @@
StaticLibrary
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/pl_extractor/pl_extractor.cpp b/simulator/pl_extractor/pl_extractor.cpp
index b405b2c..21896ac 100644
--- a/simulator/pl_extractor/pl_extractor.cpp
+++ b/simulator/pl_extractor/pl_extractor.cpp
@@ -355,7 +355,8 @@ int main(int argc, const char* argv[])
}
if (OutputBaseFileName.length() == 0) {
//Figure out base-name from input
- OutputBaseFileName = boost::filesystem::basename(InFileName);
+ boost::filesystem::path Path(InFileName);
+ OutputBaseFileName = Path.stem().string();
}
errno = 0;
diff --git a/simulator/pl_extractor/pl_extractor.vcxproj b/simulator/pl_extractor/pl_extractor.vcxproj
index 77e9d13..789d1b6 100644
--- a/simulator/pl_extractor/pl_extractor.vcxproj
+++ b/simulator/pl_extractor/pl_extractor.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/sim_lib/iop_expander.cpp b/simulator/sim_lib/iop_expander.cpp
index eb6a43a..06bfee5 100644
--- a/simulator/sim_lib/iop_expander.cpp
+++ b/simulator/sim_lib/iop_expander.cpp
@@ -4,7 +4,7 @@
#include
#include
#include
-#include
+//#include
#include "commands.h"
//////////////////////////////////////////////////////////////////////////////////////////
diff --git a/simulator/sim_lib/sim_lib.vcxproj b/simulator/sim_lib/sim_lib.vcxproj
index 76836f0..bacfa32 100644
--- a/simulator/sim_lib/sim_lib.vcxproj
+++ b/simulator/sim_lib/sim_lib.vcxproj
@@ -34,22 +34,22 @@
StaticLibrary
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/sim_lib/vtap_win32.cpp b/simulator/sim_lib/vtap_win32.cpp
index f1416c5..18caaa3 100644
--- a/simulator/sim_lib/vtap_win32.cpp
+++ b/simulator/sim_lib/vtap_win32.cpp
@@ -11,6 +11,7 @@
#include
+#include
#include
#include
@@ -415,8 +416,11 @@ std::vector EnumTaps() {
if (
(RetVal != ERROR_SUCCESS) ||
(Type != REG_SZ) ||
- (strcmp(Entry, TAP_COMPONENT_ID1) != 0 && strcmp(Entry, TAP_COMPONENT_ID2) != 0)
- ) {
+ (
+ !boost::algorithm::ends_with(std::string(Entry), std::string(TAP_COMPONENT_ID1)) &&
+ !boost::algorithm::ends_with(std::string(Entry), std::string(TAP_COMPONENT_ID2))
+ )
+ ) {
continue;
}
diff --git a/simulator/tap_edit/tap_edit.vcxproj b/simulator/tap_edit/tap_edit.vcxproj
index f5f44dc..b6a684c 100644
--- a/simulator/tap_edit/tap_edit.vcxproj
+++ b/simulator/tap_edit/tap_edit.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/simulator/tap_extractor/tap_extractor.cpp b/simulator/tap_extractor/tap_extractor.cpp
index 566badb..edebceb 100644
--- a/simulator/tap_extractor/tap_extractor.cpp
+++ b/simulator/tap_extractor/tap_extractor.cpp
@@ -167,7 +167,8 @@ int main(int argc, const char* argv[])
}
if (OutputBaseFileName.length() == 0) {
//Figure out base-name from input
- OutputBaseFileName = boost::filesystem::basename(InFileName);
+ boost::filesystem::path Path(InFileName);
+ OutputBaseFileName = Path.stem().string();
}
errno = 0;
diff --git a/simulator/tap_extractor/tap_extractor.vcxproj b/simulator/tap_extractor/tap_extractor.vcxproj
index 64177ba..9089373 100644
--- a/simulator/tap_extractor/tap_extractor.vcxproj
+++ b/simulator/tap_extractor/tap_extractor.vcxproj
@@ -34,22 +34,22 @@
Application
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
- v142
+ v143
diff --git a/unicos.bat b/unicos.bat
new file mode 100644
index 0000000..76bb910
--- /dev/null
+++ b/unicos.bat
@@ -0,0 +1,5 @@
+set PATH=%PATH%;simulator\_bin\msvc_x64_Release;bin
+mkdir dump
+mkdir disk
+mkdir tape
+start cray_sim unicos.cfg
diff --git a/unicos.cfg b/unicos.cfg
index d22c347..90ef060 100644
--- a/unicos.cfg
+++ b/unicos.cfg
@@ -95,8 +95,8 @@ IopClusters {
}
EthInterfaces {
en0 {
- InterfaceNameLinux tap1 ; Tap interface name to connect to on Linux
- InterfaceNameWindows "Cray Ethernet" ; WinTap interface name to connect to on Windows
+ InterfaceNameLinux tap1 ; Tap interface name to connect to on Linux
+ InterfaceNameWindows "OpenVPN TAP-Windows6" ; WinTap interface name to connect to on Windows
SimMacAddr 0x020143524159
Channel 020
IopNumber 0
@@ -165,7 +165,7 @@ IopClusters {
NewTerminalCommand "xterm -e {cmd}&"
; NewTerminalCommand "tmux split-window {cmd}&"
ConsoleCommandLinux "telnet {host} {port}"
- ConsoleCommandWindows "putty.exe -load Unicos -telnet -P {port} {host}"
+ ConsoleCommandWindows "putty.exe -telnet -P {port} {host}"
MapBackspace no
LogFile auto
}
diff --git a/unicos_ramfs.bat b/unicos_ramfs.bat
new file mode 100644
index 0000000..9af917c
--- /dev/null
+++ b/unicos_ramfs.bat
@@ -0,0 +1,5 @@
+set PATH=%PATH%;simulator\_bin\msvc_x64_Release;bin
+mkdir dump
+mkdir disk
+mkdir tape
+start cray_sim unicos_ramfs.cfg
diff --git a/unicos_ramfs.cfg b/unicos_ramfs.cfg
index 30c1b53..c7ec41b 100644
--- a/unicos_ramfs.cfg
+++ b/unicos_ramfs.cfg
@@ -95,8 +95,8 @@ IopClusters {
}
EthInterfaces {
en0 {
- InterfaceNameLinux tap1 ; Tap interface name to connect to on Linux
- InterfaceNameWindows "Cray Ethernet" ; WinTap interface name to connect to on Windows
+ InterfaceNameLinux tap1 ; Tap interface name to connect to on Linux
+ InterfaceNameWindows "OpenVPN TAP-Windows6" ; WinTap interface name to connect to on Windows
SimMacAddr 0x020143524159
Channel 020
IopNumber 0
@@ -165,7 +165,7 @@ IopClusters {
NewTerminalCommand "xterm -e {cmd}&"
; NewTerminalCommand "tmux split-window {cmd}&"
ConsoleCommandLinux "telnet {host} {port}"
- ConsoleCommandWindows "putty.exe -load Unicos -telnet -P {port} {host}"
+ ConsoleCommandWindows "putty.exe -telnet -P {port} {host}"
MapBackspace no
LogFile auto
}