badline 0.3.0 → 0.4.1

data/README.md

@@ -10,22 +10,36 @@ are modelled at the cycle level.
 
 It runs programs, disk and tape images, cartridges and SID tunes, and
 the SDL2 front end supports the keyboard, joysticks, game controllers,
-paddles and a 1351 mouse. Emulation runs slower than a real C64, so
-live sound, which is off by default, stutters. See
-[What's emulated](#whats-emulated) for the details.
+paddles and a 1351 mouse. See [What's emulated](#whats-emulated) for the
+details.
 
-## Requirements
+It comes in two builds of the same emulator:
 
-Ruby 4.0 or newer, and SDL2:
+- **`badline`**, compiled ahead of time with
+  [Spinel](https://github.com/matz/spinel). It runs in real time with
+  sound, so it's the one to play games with.
+- **`badline-ruby`**, which comes with the Ruby gem and runs on CRuby. It
+  runs slower than a real C64, so its sound is off by default. The gem is
+  also a library, which runs a `Badline::Computer` from Ruby without a
+  window.
+
+## Installation
+
+The native `badline`, with Homebrew:
 
 ```sh
-brew install sdl2           # macOS
-apt install libsdl2-dev     # Debian/Ubuntu
+brew install elektronaut/tap/badline
 ```
 
-## Installation
+The formula builds it from the release's generated C, so it needs no
+Spinel or Ruby. To build it from a checkout instead, see
+[native/README.md](native/README.md).
+
+The gem needs Ruby 4.0 or newer and the SDL2 library:
 
 ```sh
+brew install sdl2           # macOS
+apt install libsdl2-2.0-0   # Debian/Ubuntu
 gem install badline
 ```
 
@@ -37,22 +51,27 @@ Run `badline` with no arguments to boot to the BASIC prompt, or give it
 something to load:
 
 ```sh
-badline                     # READY.
-badline game.prg            # Load and run a program
-badline game.d64            # Mount a disk image as device 8 and load it
-badline game.tap            # Insert a tape and load it
-badline game.crt            # Attach a cartridge
-badline tune.sid            # Play a SID tune
-badline ~/c64               # Mount a directory as device 8
+badline                # READY.
+badline game.prg       # Load and run a program
+badline game.d64       # Mount a disk image as device 8 and load it
+badline game.tap       # Insert a tape and load it
+badline game.crt       # Attach a cartridge
+badline tune.sid       # Play a SID tune
+badline ~/c64          # Mount a directory as device 8
 ```
 
+`badline-ruby` takes the same media and the same options, with the
+differences noted below.
+
 Programs, disk and tape images and SID tunes start automatically, and
 a cartridge starts itself. A mounted directory waits for you to `LOAD`
 from it. `--no-autostart` attaches the media and stops at `READY.`, so
-you can type the `LOAD` yourself. `--song N` picks a subtune of a
-`.sid` file, `--sid 8580` fits the newer SID, and `--disable-jit` runs
-without YJIT, which is otherwise switched on at startup.
-`badline --help` lists the options.
+you can type the `LOAD` yourself. `--read-only` mounts a disk image
+write-protected, so the drive reports `26,WRITE PROTECT ON` for any
+write and the image file stays as it was. `--song N` picks a subtune of a
+`.sid` file and `--sid 8580` fits the newer SID. `badline-ruby` also
+takes `--disable-jit`, which runs without YJIT, otherwise switched on at
+startup. `--help` lists the options.
 
 The KERNAL, BASIC and character ROMs come with the gem. To run other
 images, such as a patched KERNAL, point `BADLINE_ROM_PATH` at a
@@ -61,20 +80,22 @@ plus `eapi/eapi-am29f040-14` if you attach EasyFlash cartridges. From
 Ruby, `Badline.rom_path = dir` does the same before a
 `Badline::Computer` is built, and `nil` restores the bundled set.
 
-`--sound` plays the SID through the host's audio device, and `F10`
-mutes and unmutes it. Sound is off by default. While it plays, the
-audio device sets the pace instead of the display, so the machine never
-runs ahead of the sound or drifts behind it. The whole machine runs
-below real time, though, so the sound stutters: it plays in bursts with
-silent gaps between them, at the right pitch, and never slows the
-emulation down.
+`badline` plays the SID through the host's audio device, and `F10`
+mutes and unmutes it. `--no-sound` turns it off. The window is paced by
+the display's vsync; `--no-vsync` paces it by a timer, or by the sound
+while it plays.
+
+In `badline-ruby` sound is off by default, and `--sound` turns it on.
+The machine runs below real time there, so the sound stutters: it plays
+in bursts with silent gaps between them, at the right pitch, and never
+slows the emulation down.
 
 ## Media
 
 | Format | Handling |
 |--------|----------|
 | `.prg`, `.p00` | Loaded into memory after boot. A program at the BASIC start (`$0801`) is `RUN`, anything else is left for you to `SYS` |
-| `.d64`, `.d71`, `.d81` | Mounted read-only as device 8, then `LOAD"*",8,1` and `RUN` |
+| `.d64`, `.d71`, `.d81` | Mounted read-write as device 8, then `LOAD"*",8,1` and `RUN`. Writes go straight back to the image file. With `--read-only`, or an image the host can't write, it acts as a write-protected disk |
 | `.t64` | Mounted read-only as device 8 and loaded like a disk image. The files load by name, and no tape is involved |
 | `.tap` | Inserted in the datasette with PLAY pressed, then `LOAD` and `RUN`. It loads at the speed of a real tape |
 | `.crt` | The hardware types listed under [Cartridges](#whats-emulated). Other types are rejected |
@@ -85,36 +106,47 @@ There is no 1541. Device 8 works by trapping the KERNAL's `LOAD` and
 `SAVE` routines and its serial bus primitives, so files open by name
 through `OPEN` and `CHRIN` as well. The command channel answers `I`,
 `B-P` and `U1` block reads, which covers loaders that read blocks
-directly. Loaders that upload their own code to the drive with `M-W` and
-`M-E`, and copy protection that reads raw GCR, won't work.
+directly. On a disk image it also takes `SAVE` (with `@0:` to replace a
+file), files opened for writing or appending, `S` to scratch, `U2` and
+`B-W` block writes, and `B-A` and `B-F`. Loaders that upload their own
+code to the drive with `M-W` and `M-E`, and copy protection that reads
+raw GCR, won't work.
+
+`Badline::Media.insert_disk(computer, path)` swaps the disk image or
+directory in device 8 while the machine runs, for software that asks for
+another disk. It takes `read_only: true`, and `Badline::Media.attach`
+takes `disk: { read_only: true }`, to mount a disk image write-protected,
+as the test harnesses under `bin/` do.
 
 ## Playing and rendering SID tunes
 
-`badline-sid` plays a `.sid` tune on the host's audio device, or with
-`--output` (or `-o`) renders it to a 16-bit PCM file instead. The
-output extension picks the format, `.wav` or `.aiff`.
+`badline-ruby --headless` plays a `.sid` tune on the host's audio
+device without opening the window, and `--audio-out` renders it to a
+16-bit PCM file instead. The file's extension picks the format, `.wav`
+or `.aiff`. The native `badline` has both modes too.
 
 ```sh
-badline-sid tune.sid                           # play, length from HVSC
-badline-sid -s 3 tune.sid                      # play the third subtune
-badline-sid --seconds 180 tune.sid -o out.aiff
-badline-sid -s 3 --rate 48000 tune.sid -o out.wav
-badline-sid --sid 8580 tune.sid
-badline-sid --filter-chunk 1 tune.sid -o out.wav   # exact filter, slower
+badline-ruby --headless tune.sid                             # play, length from HVSC
+badline-ruby --headless -s 3 tune.sid                        # play the third subtune
+badline-ruby --seconds 180 tune.sid --audio-out out.aiff
+badline-ruby -s 3 --rate 48000 tune.sid --audio-out out.wav
+badline-ruby --headless --sid 8580 tune.sid
+badline-ruby --filter-chunk 1 tune.sid --audio-out out.wav   # exact filter, slower
 ```
 
-Both modes take the same options. `--song` (or `-s`) picks the subtune,
-counting from 1 as HVSC does, and defaults to the tune's own start
-song. Playback asks the device for 44.1 kHz and takes whatever rate it
+Both modes take the same options. The window's own, `--no-autostart`
+and `--sound`, don't apply to them. `--song` (or `-s`) picks the
+subtune, counting from 1 as HVSC does, and defaults to the tune's own
+start song. Playback asks the device for 44.1 kHz and takes whatever rate it
 offers, unless `--rate` says otherwise. Ctrl-C stops it.
 
-Played on a terminal, `badline-sid` shows the tune's name, author and
+Played on a terminal, `--headless` shows the tune's name, author and
 release, the song number and the time played against the song's
 length. `n` or → skips to the next song, `p` or ← goes back one, space
 pauses and `q` quits. `--no-tui`, or output that isn't a terminal,
 gives plain progress output instead.
 
-A `.sid` file doesn't store its length, so `badline-sid` looks the
+A `.sid` file doesn't store its length, so `badline-ruby` looks the
 tune up by MD5 in HVSC's `Songlengths.md5`. It finds the database
 through `--songlengths`, in a `DOCUMENTS` directory in any of the
 tune's parent directories (the layout of an HVSC collection), or under
@@ -124,10 +156,15 @@ tune's parent directories (the layout of an HVSC collection), or under
 PSID tunes run on a CPU and RAM with only the SID clocked, at about
 twice real time, so they play smoothly. RSID tunes set up their own
 interrupts, so they boot a full C64 first and run at about half real
-time. They render fine but stutter when played, and `badline-sid` says
+time. They render fine but stutter when played, and `badline-ruby` says
 so when it falls behind. The filter steps four cycles at a time;
 `--filter-chunk 1` steps it every cycle, which is exact and takes about
-twice as long. `badline-sid --help` lists the options.
+twice as long. `badline-ruby --help` lists the options.
+
+The native `badline` takes the same options and runs the same code, so
+it renders the same file sample for sample, and it plays RSID tunes
+without stuttering. See
+[native/README.md](native/README.md#without-the-window).
 
 ## Input
 
@@ -140,15 +177,15 @@ same-named host key:
 | `RUN/STOP` | `Escape` |
 | `CLR/HOME` | `Home` |
 | `INST/DEL` | `Backspace` |
-| `CRSR ⇔` / `CRSR ⇕` | `Right` / `Down` (add Shift for left and up) |
-| `←` / `↑` | `Left` / `Up` |
+| `CRSR ⇔` / `CRSR ⇕` | `Right` / `Down`, and `Left` / `Up` for the shifted directions |
+| `←` / `↑` | `` ` `` / `]` |
 | `CTRL` | `Left Ctrl` |
 | `C=` | `Left Alt` |
 | `@` | `\` |
 | `:` | `'` |
 | `£` | `End` |
 | `+` / `*` | Keypad `+` / Keypad `*` |
-| `RESTORE` | Not mapped |
+| `RESTORE` | `Page Up` |
 
 `Tab` steps through the input modes and `Shift-Tab` steps back. The
 window title shows the current mode:
@@ -175,8 +212,8 @@ Control port 1's fire line is also the VIC-II's light pen input, so
 joystick 1's fire button and the 1351's left button in port 1 latch the
 light pen registers.
 
-With `--sound`, `F10` mutes and unmutes the sound, and the window
-title shows `[MUTED]` while it's off.
+`F10` mutes and unmutes the sound, and the window title shows `[MUTED]`
+while it's off.
 
 ## What's emulated
 
@@ -185,14 +222,21 @@ title shows `[MUTED]` while it's off.
   [65x02 single step tests](https://github.com/SingleStepTests/65x02).
   `JAM` opcodes halt the CPU until reset.
 - **Memory**: banking through the 6510 port, including the cartridge
-  `EXROM`/`GAME` lines and Ultimax mode.
+  `EXROM`/`GAME` lines and Ultimax mode. The +60K and +256K RAM
+  expansions fit with `Badline::Computer.new(ram_expansion: :plus60k)` or
+  `:plus256k`, banked through their register at `$D100`.
 - **VIC-II** (PAL 6569): the five standard graphics modes and the
   invalid ones, sprites with multicolour, expansion, priority and
   pixel-level collisions, raster interrupts, bad lines, sprite DMA, the
   border, VIC banks and the light pen.
+  `Badline::Computer.new(vic_model: :mos8565)` fits the C64C's 8565
+  instead, with its grey dots on colour register writes and its own
+  timing for mode splits, sprite multicolour splits and the light pen.
 - **CIA 1 and 2**: timers, time-of-day clocks with alarms, the serial
   shift register, interrupts, the keyboard matrix with its ghost keys,
-  the control ports and the paddle multiplexer.
+  the control ports and the paddle multiplexer. The machine has the
+  original 6526s; `Badline::Computer.new(cia_model: :mos6526a)` fits the
+  C64C's 6526As instead, whose interrupt register timing differs.
 - **SID**: the 6581 and the 8580, with oscillators, ring modulation and
   sync, the envelope generator including the ADSR delay bug, the filter,
   and the RC network on the board that removes the DC offset from the
@@ -217,24 +261,30 @@ title shows `[MUTED]` while it's off.
   `Media.attach(computer, path, cartridge: { flash_jumper: true })`, with
   `bank_jumper: true` to run from the second 64K of a 128K image. The
   GMod2 EEPROM and the Retro Replay clock port aren't there.
+- **GEO-RAM**: 64K to 4M of RAM seen through the `$DE00` page, with the
+  `$DFFE`/`$DFFF` page and block registers. It takes the expansion port,
+  so it can't sit alongside a cartridge:
+  `computer.attach_cartridge(Badline::Cartridge::GeoRAM.new(size: 512))`.
+  Its contents are lost when the emulator quits.
 
 Known gaps:
 
-- Live audio in the emulator window stutters, because the whole machine
-  runs below real time. `badline-sid` plays PSID tunes smoothly on
-  their own.
+- `badline-ruby` runs below real time, so its live audio stutters.
+  `badline` plays smoothly, and so do PSID tunes under
+  `badline-ruby --headless`.
 - No drive emulation, so fast loaders and anything else that runs code
-  on the drive won't work (see [Media](#media)). Disk images are
-  read-only.
-- No NTSC machine, no REU, and no `RESTORE` key.
+  on the drive won't work (see [Media](#media)). The command channel
+  doesn't rename, copy, format or validate disks, and `LOAD"$",8`
+  doesn't list a disk's directory yet.
+- No NTSC machine and no REU.
 - The emulator window has no freeze button yet, so a freezer cartridge
   runs its menu but can't freeze a program.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on
-[GitHub](https://github.com/elektronaut/badline).
-[CONTRIBUTING.md](CONTRIBUTING.md) covers running the tests and the
+Bug reports, feature requests, and pull requests are welcome. Read [CONTRIBUTING.md](CONTRIBUTING.md) first. Report security vulnerabilities privately as described in [SECURITY.md](SECURITY.md).
+
+[CONTRIBUTING.md](CONTRIBUTING.md) also covers running the tests and the
 commit format, and the project has a
 [code of conduct](CODE_OF_CONDUCT.md).
 

data/SECURITY.md

@@ -0,0 +1,9 @@
+# Security policy
+
+## Reporting a vulnerability
+
+Don't report security vulnerabilities in public issues, pull requests, or discussions.
+
+Report them privately through GitHub: open the repository's **Security** tab and choose **Report a vulnerability**, or go directly to https://github.com/elektronaut/badline/security/advisories/new.
+
+The principles in [CONTRIBUTING.md](CONTRIBUTING.md) apply here too: describe what you observed, give minimal steps you actually ran, and include raw output. Report what you verified; the maintainers will assess the impact.