Pull from Windows branch into MacOS

CHANGES.md

@@ -5,7 +5,8 @@ Unreleased changes
 ------------
 
 Contributors: Chris Needham, Mauro Varischetti, Bill Carr, Daniel Beardsmore,
-Steve Inglis, Alistair Cree, Ken Lowe, Mark Usher, Martin Mather, Tom Seddon
+Steve Inglis, Alistair Cree, Ken Lowe, Mark Usher, Martin Mather, Tom Seddon,
+Andrew Hague
 
 * Added support for FSD format disk images. This currently only works
   with the 8271 and not the 1770 disk controller.
@@ -25,6 +26,7 @@ Steve Inglis, Alistair Cree, Ken Lowe, Mark Usher, Martin Mather, Tom Seddon
   - Fixed potential buffer overflow bug.
   - Added support for immediate operations, used by the *VIEW and *NOTIFY
     commands. These currently only work under Master series emulation.
+  - Fixed CTS status bit.
 * Added Master ET support.
 * ROM config files (e.g., Roms.cfg) can now include comments. Note that
   files with comments are not backwards compatible with older BeebEm
@@ -40,10 +42,14 @@ Steve Inglis, Alistair Cree, Ken Lowe, Mark Usher, Martin Mather, Tom Seddon
 * Tape emulation improvements:
   - Improved tape input data carrier detect emulation.
   - Tape state is now preserved when loading and saving savestate files,
-    for both UEF and CSW files.
+    for both UEF and CSW files. Saving state is disabled while the tape
+	is recording.
   - Fixed loading CSW files from the command line.
+  - Fixed recording (appending) to existing tape image files.
 * Improved serial port emulation, and fixed data loss when using
   serial over a TCP connection.
+* Rewrote the Windows serial port implementation. Received characters
+  are now buffered to prevent being lost.
 * Added Set Keyboard Links command, which allows you to change the default
   screen mode and other options (Model B/B+ only).
 * Fixed installer to not delete Econet and key map config files.
@@ -81,8 +87,11 @@ Steve Inglis, Alistair Cree, Ken Lowe, Mark Usher, Martin Mather, Tom Seddon
   rendering after the host PC resumes from being suspended or in some cases
   enter a loop continually resetting the screen mode on entering full screen.
 * Fixed sound register reinitialisation after changing the sound sample rate.
+* Fixed sound muting when the BeebEm window loses focus.
+* Fixed teletext mode character alignment.
 * Fixed printing to the Windows clipboard, which would previously cause the
   emulator to slow down or stall.
+* When printing to file, the file is now appended to, not overwritten.
 * Lots of help documentation improvements.
 
 Version 4.19 (1 May 2023)

Help/65c02copro.html

@@ -53,7 +53,7 @@ <h1>Acorn 65C02 Co-Processor</h1>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>

Help/accessibility.html

@@ -201,7 +201,7 @@ <h2>Text to Speech</h2>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>

Help/armcopro.html

@@ -57,17 +57,26 @@ <h1>Acorn ARM Second Processor</h1>
         Processor</span> on the <span class="ui">Hardware &rarr; Second
         Processor</span> menu. The ARM Second Processor has no operating system
         but relies on a sideways ROM to provide a command line prompt to the
-        user. Once you see the <span class="cmd">A*</span> prompt, type <span
+        user.
+      </p>
+
+      <p>
+        Once you see the <span class="cmd">A*</span> prompt, type <span
         class="cmd">*HELP SUPERVISOR</span> to see what in-built commands are
         available.
       </p>
 
       <p>
         The ARM Evaluation System came with 6 discs full of software. Disc 3 is
-        included in the 'DiscIms' folder which contains ARM Basic. Load the
-        armdisc3.adl disc image (ensuring you are in ADFS mode), type <span
-        class="cmd">*MOUNT 4</span> and <span class="cmd">*AB</span> to load
-        ARM Basic. The remaining disc images plus a hard disc image containing
+        included in the <span class="file">DiscIms</span> folder which contains
+        ARM Basic. Load the <span class="file">armdisc3.adl</span> disc image
+        (ensuring you are in ADFS mode), type <span class="cmd">*MOUNT 4</span>
+        and <span class="cmd">*AB</span> to load ARM Basic. Type <span
+        class="cmd">HELP .</span> to list all BASIC commands.
+      </p>
+
+      <p>
+        The remaining disc images plus a hard disc image containing
         all 6 disc images can be downloaded from Jon Welch's website:
         <a href="http://www.g7jjf.com/acornArm_disc_images.htm">Acorn ARM
         Discs</a>.
@@ -92,10 +101,51 @@ <h1>Acorn ARM Second Processor</h1>
         site as well. If you have any manuals or other disc images that Jon
         does not have feel free to send them to Jon to add to the library.
       </p>
+
+      <p>To use the hard disc image:</p>
+
+      <ul>
+        <li>
+          While BeebEm is not running,
+          <a href="https://www.g7jjf.com/acornArm_disc_images.htm">download</a>
+          the hard disc image and copy the file <span class="file">scsi1.dat</span>
+          to your <span class="file">DiscIms</span> folder.
+        </li>
+        <li>
+          Start BeebEm.
+        </li>
+        <li>
+          Type <span class="cmd">CONFIGURE TUBE</span> to use the ARM
+          co-processor by default.
+        </li>
+        <li>
+          Type <span class="cmd">CONFIGURE FILE 13</span> to make ADFS the
+          default filing system (so you can read the disc image).
+        </li>
+        <li>
+          Type <span class="cmd">CONFIGURE MODE 0</span> to switch to a
+          screen mode with smaller font.
+        </li>
+        <li>
+          Press <kbd>Ctrl</kbd> + <kbd>F12</kbd> to reset the machine so
+          configuration changes take effect (presses <kbd>Ctrl</kbd> +
+          <kbd>Break</kbd> in the emulator).
+        </li>
+        <li>
+          Type <span class="cmd">MOUNT 1</span> to mount the hard disc image
+          as drive 1.
+        </li>
+      </ul>
+
+      <p>
+        To make sure all your settings are saved for next time so you don't
+        have to repeat the process, select the <span class="ui">Options &rarr;
+        Save Preferences</span> menu item.
+      </p>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>

Help/commandline.html

@@ -43,7 +43,7 @@ <h1>Command Line Options</h1>
         The following command line options can be passed to BeebEm:
       </p>
 
-      <table>
+      <table class="syntax">
         <tr>
           <th>Option</th>
           <th>Description</th>
@@ -403,7 +403,7 @@ <h2>Startup Key Sequence</h2>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>

Help/contents.html

@@ -106,7 +106,7 @@ <h1>Help Contents</h1>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>

Help/debugger.html

@@ -127,12 +127,6 @@ <h1>Built in Debugger</h1>
         </tr>
       </table>
 
-      <p>
-        To get a list of the debug commands available type ? into the
-        <span class="ui">Execute Command</span> box. Note that all values are
-        specified in hex!
-      </p>
-
       <p>
         The disassembler shows the following information:
       </p>
@@ -145,10 +139,202 @@ <h1>Built in Debugger</h1>
         Parasite instructions are shifted right so it's easier to follow both
         host and parasite when debugging tube code.
       </p>
+
+      <h2>Debugger Commands</h2>
+
+      <p>
+        Parameters in <span class="cmd">[]</span> are optional.
+        <span class="cmd">p</span> can be specified in some commands to specify
+        the parasite processor. Words preceded with a <span class="cmd">.</span>
+        are interpreted as labels and may be used in place of addresses.
+      </p>
+
+
+      <table class="syntax">
+        <tr>
+          <th>Command</th>
+          <th>Aliases</th>
+          <th>Description</th>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">breakpoint &lt;start&gt;[-&lt;end&gt;] [&lt;name&gt;]</span></td>
+          <td><span class="cmd">b</span>, <span class="cmd">bp</span></td>
+          <td>
+            Set or clear a breakpoint or break range
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">labels &lt;load|show&gt; [filename]</span></td>
+          <td><span class="cmd">l</span></td>
+          <td>
+            Load labels from VICE file, or display known labels
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">help &lt;item&gt;</span></td>
+          <td><span class="cmd">?</span>, <span class="cmd">q</span></td>
+          <td>
+            Display help for the specified command or memory address 
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">break</span></td>
+          <td><span class="cmd">.</span></td>
+          <td>
+            Break or continue
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">set &lt;option&gt; &lt;on|off&gt; </span></td>
+          <td></td>
+          <td>
+            Turn various UI checkboxes on or off. The <span class="cmd">option</span>
+            parameter should be one of the following:
+            <span class="cmd">host</span>,
+            <span class="cmd">parasite</span>,
+            <span class="cmd">rom</span>,
+            <span class="cmd">os</span>,
+            <span class="cmd">endian</span>,
+            <span class="cmd">breakpoints</span>,
+            <span class="cmd">decimal</span>,
+            <span class="cmd">brk</span>
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">next [&lt;count&gt;]</span></td>
+          <td><span class="cmd">n</span></td>
+          <td>
+            Execute the specified number instructions, default 1
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">over</span></td>
+          <td><span class="cmd">o</span></td>
+          <td>
+            Step over JSR (host only)
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">peek [p] [&lt;start&gt;] [&lt;count&gt;]</span></td>
+          <td><span class="cmd">m</span></td>
+          <td>
+            Dump memory to the console
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">code [p] [&lt;start&gt;] [&lt;count&gt;]</span></td>
+          <td><span class="cmd">d</span></td>
+          <td>
+            Disassemble the specified memory range
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">watch [p] &lt;addr&gt; [&lt;b|w|d&gt;] [&lt;name&gt;]</span></td>
+          <td><span class="cmd">e</span></td>
+          <td>
+            Set or clear a byte, word, or dword memory watch at a given address
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">state &lt;device&gt;</span></td>
+          <td><span class="cmd">s</span></td>
+          <td>
+            Display device state. The <span class="cmd">device</span> option is
+            one of:
+            <span class="cmd">v</span> (video),
+            <span class="cmd">u</span> (user VIA),
+            <span class="cmd">s</span> (system VIA),
+            <span class="cmd">e</span> (serial),
+            <span class="cmd">t</span> (Tube),
+            <span class="cmd">m</span> (memory),
+            <span class="cmd">r</span> (ROMs)
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">save [&lt;count&gt;] [&lt;filename&gt;]</span></td>
+          <td><span class="cmd">w</span></td>
+          <td>
+            Write console lines to file. If <span class="cmd">filename</span>
+            is not given, a file prompt is shown
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">poke [p] &lt;start&gt; &lt;byte&gt; [&lt;byte&gt; ...]</span></td>
+          <td><span class="cmd">c</span></td>
+          <td>
+            Write bytes to memory
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">goto [p] &lt;addr&gt;</span></td>
+          <td><span class="cmd">g</span></td>
+          <td>
+            Jump to address
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">file &lt;r|w&gt; &lt;addr&gt; [&lt;count&gt;] [&lt;filename&gt;]</span></td>
+          <td><span class="cmd">f</span></td>
+          <td>
+            Read or write memory at address from/to file. If <span
+            class="cmd">filename</span> is not given, a file prompt is shown
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">echo &lt;string&gt;</span></td>
+          <td><span class="cmd">!</span></td>
+          <td>
+            Write the given string to the console
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">script [&lt;filename&gt;]</span></td>
+          <td></td>
+          <td>
+            Execute a debugger script. If <span
+            class="cmd">filename</span> is not given, a file prompt is shown
+          </td>
+        </tr>
+
+        <tr>
+          <td><span class="cmd">clear</span></td>
+          <td></td>
+          <td>
+            Clear the console
+          </td>
+        </tr>
+      </table>
+
+      <h2>Scripting</h2>
+
+      <p>
+        Batches of debugger commands can be executed from script files, using
+        the <span class="cmd">script</span> command or the
+        <a href="commandline.html"><span class="cmd">-DebugScript</span></a>
+        command line option. Script files can contain comments, preceded by
+        either <span class="cmd">#</span> or <span class="cmd">;</span>.
+      </p>
     </main>
 
     <footer>
-      <p>Copyright &copy; 2024 BeebEm contributors</p>
+      <p>Copyright &copy; 2025 BeebEm contributors</p>
     </footer>
   </body>
 </html>