From e62070ad8fe111d60645669c2ddc9cd5365b9f78 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Mon, 29 Mar 2021 17:10:52 -0700 Subject: [PATCH] SCP: Clean up formatting of EXAMINE/DEPOST help text --- scp.c | 63 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/scp.c b/scp.c index e185e73b..05e290ff 100644 --- a/scp.c +++ b/scp.c @@ -904,26 +904,26 @@ static const char simh_help1[] = " The \"object list\" consists of one or more of the following, separated by\n" " commas:\n\n" /***************** 80 character line width template *************************/ - "++register the specified register\n" - "++register[sub1-sub2] the specified register array locations,\n" - "++ starting at location sub1 up to and\n" - "++ including location sub2\n" - "++register[sub1/length] the specified register array locations,\n" - "++ starting at location sub1 up to but\n" - "++ not including sub1+length\n" - "++register[ALL] all locations in the specified register\n" - "++ array\n" - "++register1-register2 all the registers starting at register1\n" - "++ up to and including register2\n" - "++address the specified location\n" - "++address1-address2 all locations starting at address1 up to\n" - "++ and including address2\n" - "++address/length all location starting at address up to\n" - "++ but not including address+length\n" - "++STATE all registers in the device\n" - "++ALL all locations in the unit\n" - "++$ the last value displayed by an EXAMINE command\n" - " interpreted as an address\n" + "++register the specified register\n" + "++register[sub1-sub2] the specified register array locations,\n" + "++++++++ starting at location sub1 up to and\n" + "++++++++ including location sub2\n" + "++register[sub1/length] the specified register array locations,\n" + "++++++++ starting at location sub1 up to but\n" + "++++++++ not including sub1+length\n" + "++register[ALL] all locations in the specified register\n" + "++++++++ array\n" + "++register1-register2 all the registers starting at register1\n" + "++++++++ up to and including register2\n" + "++address the specified location\n" + "++address1-address2 all locations starting at address1 up to\n" + "++++++++ and including address2\n" + "++address/length all location starting at address up to\n" + "++++++++ but not including address+length\n" + "++STATE all registers in the device\n" + "++ALL all locations in the unit\n" + "++$ the last value displayed by an EXAMINE\n" + "++++++++ command interpreted as an address\n" "3Switches\n" " Switches can be used to control the format of display information:\n\n" /***************** 80 character line width template *************************/ @@ -938,17 +938,17 @@ static const char simh_help1[] = " simulator).\n\n" "3Examples\n" " Examples:\n\n" - "++ex 1000-1100 examine 1000 to 1100\n" - "++de PC 1040 set PC to 1040\n" - "++ie 40-50 interactively examine 40:50\n" - "++ie >1000 40-50 interactively examine the subset\n" - "++ of locations 40:50 that are >1000\n" - "++ex rx0 50060 examine 50060, RX unit 0\n" - "++ex rx sbuf[3-6] examine SBUF[3] to SBUF[6] in RX\n" - "++de all 0 set main memory to 0\n" - "++de &77>0 0 set all addresses whose low order\n" - "++ bits are non-zero to 0\n" - "++ex -m @memdump.txt 0-7777 dump memory to file\n\n" + "++ex 1000-1100 examine 1000 to 1100\n" + "++de PC 1040 set PC to 1040\n" + "++ie 40-50 interactively examine 40:50\n" + "++ie >1000 40-50 interactively examine the subset\n" + "+++++++++ of locations 40:50 that are >1000\n" + "++ex rx0 50060 examine 50060, RX unit 0\n" + "++ex rx sbuf[3-6] examine SBUF[3] to SBUF[6] in RX\n" + "++de all 0 set main memory to 0\n" + "++de &77>0 0 set all addresses whose low order\n" + "+++++++++ bits are non-zero to 0\n" + "++ex -m @memdump.txt 0-7777 dump memory to file\n\n" " Note: to terminate an interactive command, simply type a bad value\n" " (eg, XYZ) when input is requested.\n" #define HLP_EVALUATE "*Commands Evaluating_Instructions" @@ -9071,6 +9071,7 @@ if (sim_dfunit == NULL) /* got a unit? */ return SCPE_NXUN; cptr = get_glyph (cptr, gbuf, 0); /* get list */ if ((flag == EX_D) && (*cptr == 0)) /* deposit needs more */ + return SCPE_2FARG; ofile = sim_ofile? sim_ofile: stdout; /* no ofile? use stdout */