diff --git a/README.md b/README.md index a9421b53..335a8aa0 100644 --- a/README.md +++ b/README.md @@ -73,9 +73,10 @@ All Simulator updates on Open SIMH will be present in this repository, and any c - Extended video component version information displayed in SHOW VERSION output. - Add a global SET AUTOZAP command or per drive SET AUTOZAP which removes metadata from disk containers at detach time if the container has metadata. - DISKINFO command displays disk container metadata (if present) and container size along with detected file system information if a known file system type is present. -- makefile builds which have potentially useful dependencies not found will prompt to install these components prior to building. MacOS Brew dependencies can be directly done from within the makefile. Other platforms (or package management systems) which require root access to install will display the appropriate package management commands and and exit. +- makefile builds which have potentially useful dependencies not found will prompt to install these components prior to building. MacOS Brew dependencies can be directly done from within the makefile. Other platforms (or package management systems) which require root access to install will display the appropriate package management commands and and exit. Support for macOS (HomeBrew and MacPorts), Linux (Ubuntu/Debian, RedHat/Fedora), NetBSD, FreeBSD, OpenBSD. - SHOW VERSION show the host system type that build the runing simulator when it is not the same as the current host system. - Support for building simulators without built-in boot or ROM code when building with DONT_USE_INTERNAL_ROM is defined, but to automatically and transparently fetch the needed ROM or other boot code when it is needed. This is possibly useful for systems which don't want to distribute simulators with build-in binary code which may have unknown copyright status. +- Reasonable output produced for all simulators from HELP BOOT. #### Changes to the PDP-11 and VAX simulators @@ -611,6 +612,18 @@ Fedora/RedHat: # yum install libpcap-dev libvdeplug-dev libpcre3-dev libedit-dev libsdl2-dev libpng-dev libsdl2-ttf-dev +###### NetBSD - Dependencies + + # pkgin install pcre editline SDL2 png SDL2_ttf + +###### FreeBSD - Dependencies + + # pkg install libedit sdl2 png sdl2_ttf + +###### OpenBSD - Dependencies + + # pkg install sdl2 png sdl2-ttf + #### Windows Compiling on windows is supported with recent versions of Microsoft Visual Studio (Standard or Express) and using GCC via the MinGW32 environment. Things may also work under Cygwin, but that is not the preferred windows environment. Not all features will be available as well as with either Visual Studio or MinGW32. diff --git a/scp.c b/scp.c index 1b0969f9..b53e620a 100644 --- a/scp.c +++ b/scp.c @@ -1047,7 +1047,7 @@ static const char simh_help1[] = " There are two forms of execution stop criteria:\n" "+1. A temporary breakpoint (which exists only until it is encountered).\n" "+2. A string which will stop execution when the simulator has output\n" - "++the indicated string.\n" + "++the indicated string.\n\n" #define HLP_GO "*Commands Running_A_Simulated_Program GO" "3GO {start_pc_addr} {UNTIL stop_pc_addr|\"output-string\"}\n" " The GO command does not reset devices, deposits its argument (if given)\n" @@ -1057,11 +1057,11 @@ static const char simh_help1[] = " There are two forms of execution stop criteria:\n" "+1. A temporary breakpoint (which exists only until it is encountered).\n" "+2. A string which will stop execution when the simulator has output\n" - "++the indicated string.\n" + "++the indicated string.\n\n" #define HLP_CONTINUE "*Commands Running_A_Simulated_Program CONTINUE" "3CONTINUE\n" " The CONT command (abbreviated CO) does not reset devices and resumes\n" - " execution at the current PC.\n" + " execution at the current PC.\n\n" #define HLP_STEP "*Commands Running_A_Simulated_Program STEP" "3STEP\n" " The STEP command (abbreviated S) resumes execution at the current PC for\n" @@ -1075,12 +1075,12 @@ static const char simh_help1[] = " The NEXT command (abbreviated N) resumes execution at the current PC for\n" " one instruction, attempting to execute through a subroutine calls.\n" " If the next instruction to be executed is not a subroutine call,\n" - " one instruction is executed.\n" + " one instruction is executed.\n\n" #define HLP_BOOT "*Commands Running_A_Simulated_Program BOOT" - "3BOOT\n" + "3BOOT {dev|unit}\n" " The BOOT command (abbreviated BO) resets all devices and bootstraps the\n" " device and unit given by its argument. If no unit is supplied, unit 0 is\n" - " bootstrapped. The specified unit must be attached.\n" + " bootstrapped. The specified unit, generally, must be attached.\n\n" /***************** 80 character line width template *************************/ "2Stopping The Simulator\n" " Programs run until the simulator detects an error or stop condition, or\n" @@ -3987,7 +3987,7 @@ if (*cptr) { } else { if (((cmdp->action == &exdep_cmd) || (0 == strcmp(cmdp->name, "BOOT"))) && - sim_dflt_dev->help) { + (cmdp->help == NULL) && (sim_dflt_dev->help != NULL)) { sim_dflt_dev->help (stdout, sim_dflt_dev, sim_dflt_dev->units, 0, cmdp->name); if (sim_log && (!sim_oline)) sim_dflt_dev->help (sim_log, sim_dflt_dev, sim_dflt_dev->units, 0, cmdp->name);