badline 0.17.0 → 0.18.0

data/lib/badline/status.rb

@@ -36,7 +36,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x01 : @value & ~0x01
     end
 
-    def carry? = @value & 0x01 != 0
+    def carry? = @value.anybits?(0x01)
 
     def carry = @value.nobits?(0x01) ? 0 : 1
 
@@ -44,7 +44,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x02 : @value & ~0x02
     end
 
-    def zero? = @value & 0x02 != 0
+    def zero? = @value.anybits?(0x02)
 
     def zero = @value.nobits?(0x02) ? 0 : 1
 
@@ -52,7 +52,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x04 : @value & ~0x04
     end
 
-    def interrupt? = @value & 0x04 != 0
+    def interrupt? = @value.anybits?(0x04)
 
     def interrupt = @value.nobits?(0x04) ? 0 : 1
 
@@ -60,7 +60,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x08 : @value & ~0x08
     end
 
-    def decimal? = @value & 0x08 != 0
+    def decimal? = @value.anybits?(0x08)
 
     def decimal = @value.nobits?(0x08) ? 0 : 1
 
@@ -68,7 +68,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x10 : @value & ~0x10
     end
 
-    def break? = @value & 0x10 != 0
+    def break? = @value.anybits?(0x10)
 
     def break = @value.nobits?(0x10) ? 0 : 1
 
@@ -76,7 +76,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x40 : @value & ~0x40
     end
 
-    def overflow? = @value & 0x40 != 0
+    def overflow? = @value.anybits?(0x40)
 
     def overflow = @value.nobits?(0x40) ? 0 : 1
 
@@ -84,7 +84,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x80 : @value & ~0x80
     end
 
-    def negative? = @value & 0x80 != 0
+    def negative? = @value.anybits?(0x80)
 
     def negative = @value.nobits?(0x80) ? 0 : 1
   end
@@ -95,7 +95,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x01 : @value & ~0x01
     end
 
-    def basic? = @value & 0x01 != 0
+    def basic? = @value.anybits?(0x01)
 
     def basic = @value.nobits?(0x01) ? 0 : 1
 
@@ -103,7 +103,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x02 : @value & ~0x02
     end
 
-    def kernal? = @value & 0x02 != 0
+    def kernal? = @value.anybits?(0x02)
 
     def kernal = @value.nobits?(0x02) ? 0 : 1
 
@@ -111,7 +111,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x04 : @value & ~0x04
     end
 
-    def io? = @value & 0x04 != 0
+    def io? = @value.anybits?(0x04)
 
     def io = @value.nobits?(0x04) ? 0 : 1
 
@@ -119,7 +119,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x08 : @value & ~0x08
     end
 
-    def tape_out? = @value & 0x08 != 0
+    def tape_out? = @value.anybits?(0x08)
 
     def tape_out = @value.nobits?(0x08) ? 0 : 1
 
@@ -127,7 +127,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x10 : @value & ~0x10
     end
 
-    def tape_switch? = @value & 0x10 != 0
+    def tape_switch? = @value.anybits?(0x10)
 
     def tape_switch = @value.nobits?(0x10) ? 0 : 1
 
@@ -135,7 +135,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x20 : @value & ~0x20
     end
 
-    def tape_motor? = @value & 0x20 != 0
+    def tape_motor? = @value.anybits?(0x20)
 
     def tape_motor = @value.nobits?(0x20) ? 0 : 1
   end
@@ -146,7 +146,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x01 : @value & ~0x01
     end
 
-    def start? = @value & 0x01 != 0
+    def start? = @value.anybits?(0x01)
 
     def start = @value.nobits?(0x01) ? 0 : 1
 
@@ -154,7 +154,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x02 : @value & ~0x02
     end
 
-    def output? = @value & 0x02 != 0
+    def output? = @value.anybits?(0x02)
 
     def output = @value.nobits?(0x02) ? 0 : 1
 
@@ -162,7 +162,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x04 : @value & ~0x04
     end
 
-    def out_mode? = @value & 0x04 != 0
+    def out_mode? = @value.anybits?(0x04)
 
     def out_mode = @value.nobits?(0x04) ? 0 : 1
 
@@ -170,7 +170,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x08 : @value & ~0x08
     end
 
-    def run_mode? = @value & 0x08 != 0
+    def run_mode? = @value.anybits?(0x08)
 
     def run_mode = @value.nobits?(0x08) ? 0 : 1
 
@@ -178,7 +178,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x10 : @value & ~0x10
     end
 
-    def load? = @value & 0x10 != 0
+    def load? = @value.anybits?(0x10)
 
     def load = @value.nobits?(0x10) ? 0 : 1
 
@@ -186,7 +186,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x20 : @value & ~0x20
     end
 
-    def in_mode? = @value & 0x20 != 0
+    def in_mode? = @value.anybits?(0x20)
 
     def in_mode = @value.nobits?(0x20) ? 0 : 1
 
@@ -194,7 +194,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x40 : @value & ~0x40
     end
 
-    def serial_mode? = @value & 0x40 != 0
+    def serial_mode? = @value.anybits?(0x40)
 
     def serial_mode = @value.nobits?(0x40) ? 0 : 1
 
@@ -202,7 +202,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x80 : @value & ~0x80
     end
 
-    def clock_frequency? = @value & 0x80 != 0
+    def clock_frequency? = @value.anybits?(0x80)
 
     def clock_frequency = @value.nobits?(0x80) ? 0 : 1
 
@@ -210,7 +210,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x20 : @value & ~0x20
     end
 
-    def in_cnt? = @value & 0x20 != 0
+    def in_cnt? = @value.anybits?(0x20)
 
     def in_cnt = @value.nobits?(0x20) ? 0 : 1
 
@@ -218,7 +218,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x40 : @value & ~0x40
     end
 
-    def in_timer_a? = @value & 0x40 != 0
+    def in_timer_a? = @value.anybits?(0x40)
 
     def in_timer_a = @value.nobits?(0x40) ? 0 : 1
 
@@ -226,7 +226,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x80 : @value & ~0x80
     end
 
-    def alarm? = @value & 0x80 != 0
+    def alarm? = @value.anybits?(0x80)
 
     def alarm = @value.nobits?(0x80) ? 0 : 1
   end
@@ -237,7 +237,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x01 : @value & ~0x01
     end
 
-    def timer_a? = @value & 0x01 != 0
+    def timer_a? = @value.anybits?(0x01)
 
     def timer_a = @value.nobits?(0x01) ? 0 : 1
 
@@ -245,7 +245,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x02 : @value & ~0x02
     end
 
-    def timer_b? = @value & 0x02 != 0
+    def timer_b? = @value.anybits?(0x02)
 
     def timer_b = @value.nobits?(0x02) ? 0 : 1
 
@@ -253,7 +253,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x04 : @value & ~0x04
     end
 
-    def alarm? = @value & 0x04 != 0
+    def alarm? = @value.anybits?(0x04)
 
     def alarm = @value.nobits?(0x04) ? 0 : 1
 
@@ -261,7 +261,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x08 : @value & ~0x08
     end
 
-    def serial? = @value & 0x08 != 0
+    def serial? = @value.anybits?(0x08)
 
     def serial = @value.nobits?(0x08) ? 0 : 1
 
@@ -269,7 +269,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x10 : @value & ~0x10
     end
 
-    def flag? = @value & 0x10 != 0
+    def flag? = @value.anybits?(0x10)
 
     def flag = @value.nobits?(0x10) ? 0 : 1
 
@@ -277,7 +277,7 @@ module Badline
       @value = enabled && enabled != 0 ? @value | 0x80 : @value & ~0x80
     end
 
-    def interrupt? = @value & 0x80 != 0
+    def interrupt? = @value.anybits?(0x80)
 
     def interrupt = @value.nobits?(0x80) ? 0 : 1
   end

data/lib/badline/storage/d67_image.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Badline
+  module Storage
+    # A 2040's disk, as DOS 1 formats it: the 1541's 35 tracks and speed
+    # zones, with 20 sectors on tracks 18 to 24 in place of 19, 690 blocks
+    # in all. The BAM and the directory are where a 1541's are, on 18/0
+    # and 18/1, but the BAM's format byte is $01 and the header has no DOS
+    # type after the ID, as c1541 formats a .d67.
+    class D67Image < DiskImage
+      ERROR_TABLES = { 177_330 => 690 }.freeze
+
+      # The sectors a track holds in each of the 1541's speed zones, by its
+      # number, from zone 0, the innermost.
+      ZONE_SECTORS = [17, 18, 20, 21].freeze
+
+      # The tracks the image holds.
+      def track_count = 35
+
+      def sides = 1
+
+      def sectors_in(track) = ZONE_SECTORS[D64Image.zone(track)]
+
+      private
+
+      def error_tables = ERROR_TABLES
+
+      def header_name = 0x90
+      def directory_track = 18
+      def directory_sector = 1
+      def directory_interleave = 3
+      def interleave = 10
+      def reserved_tracks = [18]
+
+      def bam_tracks = 1..35
+      def bam_count(track) = [18, 0, 4 * track]
+      def bam_bitmap(track) = [18, 0, (4 * track) + 1]
+      def bitmap_size = 3
+
+      def header_link = [18, 1]
+      def dos_type = "  "
+      def header_tail = 5
+      def bam_headers(_id) = []
+
+      # The link to the directory, the format byte $01, and after the name
+      # the ID and two spaces.
+      def write_header(name, id)
+        write_at(*header_block, 0, [*header_link, 0x01, 0])
+        write_at(*header_block, header_name,
+                 encode_name(name) + [NAME_PADDING, NAME_PADDING] + id + dos_type.bytes +
+                 Array.new(header_tail, NAME_PADDING))
+      end
+    end
+  end
+end

data/lib/badline/storage/d90_image.rb

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+module Badline
+  module Storage
+    # A D9060 or D9090 hard disk: 153 cylinders of 32 blocks a head, four
+    # heads on the D9060 and six on the D9090. DOS 3.0 numbers a block by
+    # its cylinder as the track, from 0, and by head × 32 + sector as the
+    # sector. The controller numbers the same block by its place in the
+    # image (LBA), and reads and writes it there.
+    #
+    # The image's size tells the two apart. One of another size, such as an
+    # empty file to format, takes the heads it's given, or four, and reads as
+    # zeros past its end.
+    class D90Image < DiskImage
+      CYLINDERS = 153
+      SECTORS_PER_HEAD = 32
+
+      # The heads of each drive, by the size of its image.
+      HEADS = { 5_013_504 => 4, 7_520_256 => 6 }.freeze
+
+      # The BAM entry of a head: a free count and a four-byte bitmap.
+      ENTRY = 5
+
+      # The heads of the drive an image of the size belongs to, or nil for
+      # a size neither has.
+      def self.heads_for(size) = HEADS[size]
+
+      attr_reader :heads
+
+      def initialize(path, read_only: false, bytes: nil, heads: nil)
+        super(path, read_only:, bytes:)
+        @heads = heads || HEADS.fetch(@bytes.length, 4)
+        size = block_count * SECTOR_SIZE
+        @bytes.concat(Array.new(size - @bytes.length, 0)) if @bytes.length < size
+      end
+
+      def sectors_in(_track) = @heads * SECTORS_PER_HEAD
+
+      # The blocks the disk holds.
+      def block_count = CYLINDERS * sectors_in(0)
+
+      # The controller's number for the block.
+      def lba(track, sector) = (track * sectors_in(track)) + sector
+
+      def header_block = [76, 20]
+
+      # Whether the disk holds the blocks from the LBA on.
+      def blocks?(lba, count) = lba >= 0 && lba + count <= block_count
+
+      # The bytes of the blocks from the LBA on, or nil when the disk
+      # doesn't hold them all.
+      def read_blocks(lba, count)
+        @bytes[lba * SECTOR_SIZE, count * SECTOR_SIZE] if blocks?(lba, count)
+      end
+
+      # Writes whole blocks from the LBA on, straight to the host file. It
+      # writes nothing when the disk doesn't hold them all. A disk that
+      # takes no writes raises WRITE PROTECT ON and keeps its blocks.
+      def write_blocks(lba, bytes)
+        return unless (bytes.length % SECTOR_SIZE).zero? && blocks?(lba, bytes.length / SECTOR_SIZE)
+        raise WriteError, WriteError::WRITE_PROTECT_ON unless writable?
+
+        store(lba * SECTOR_SIZE, bytes)
+        @bytes[lba * SECTOR_SIZE, bytes.length] = bytes
+        @entries = nil
+      end
+
+      def bam_block?(track, sector) = block?(track, sector)
+
+      def block_free?(track, sector)
+        block?(track, sector) && @bytes[bitmap_byte(track, sector)][sector % 8] == 1
+      end
+
+      private
+
+      def error_tables = {}
+
+      def store(offset, bytes)
+        File.open(@path, "r+b") do |file|
+          file.seek(offset)
+          file.write(bytes.pack("C*"))
+        end
+      rescue SystemCallError
+        raise WriteError, WriteError::WRITE_PROTECT_ON
+      end
+
+      def block?(track, sector)
+        track.between?(0, CYLINDERS - 1) && sector.between?(0, sectors_in(track) - 1)
+      end
+
+      def track_offset(track) = track * sectors_in(track)
+
+      def clear_blocks
+        header = sector_offset(*header_block)
+        @bytes.fill(0, 0, header)
+        @bytes.fill(0, header + SECTOR_SIZE, (block_count * SECTOR_SIZE) - header - SECTOR_SIZE)
+      end
+
+      # The header at 76/20 holds the disk name at $06 and the ID at $18,
+      # after the link to the directory's first block, 76/10.
+      def header_name = 0x06
+      def directory_track = 76
+      def directory_sector = 10
+      def directory_interleave = 3
+      def interleave = 10
+      def reserved_tracks = [76]
+
+      # A link to track 0 ends a chain, so files never go there.
+      def allocation_order = super - [0]
+
+      def bam_tracks = 0..(CYLINDERS - 1)
+      def header_link = [76, 10]
+      def dos_type = "3A"
+      def header_tail = 4
+
+      # The header holds no format letter after its link.
+      def write_header(name, id)
+        super
+        write_at(*header_block, 2, [0])
+      end
+
+      # The BAM takes sector 0 of a cylinder for each group of cylinders
+      # its entries fit in, twelve on a D9060 and eight on a D9090: the
+      # cylinder after the group's first, or the last one for a group of
+      # one at the end.
+      def tracks_per_bam_block = (SECTOR_SIZE - 16) / (@heads * ENTRY)
+
+      def bam_block_track(track)
+        first = track - (track % tracks_per_bam_block)
+        [first + 1, CYLINDERS - 1].min
+      end
+
+      def entry_offset(track, sector)
+        group = track % tracks_per_bam_block
+        sector_offset(bam_block_track(track), 0) + 16 +
+          (((group * @heads) + (sector / SECTORS_PER_HEAD)) * ENTRY)
+      end
+
+      def bitmap_byte(track, sector) = entry_offset(track, sector) + 1 + ((sector % SECTORS_PER_HEAD) / 8)
+
+      def mark(track, sector, free)
+        return if !block?(track, sector) || block_free?(track, sector) == free
+
+        entry = entry_offset(track, sector)
+        byte = bitmap_byte(track, sector)
+        bit = 1 << (sector % 8)
+        @bytes[byte] = free ? @bytes[byte] | bit : @bytes[byte] & ~bit
+        @bytes[entry] = (@bytes[entry] + (free ? 1 : -1)) & 0xff
+      end
+
+      def free_track(track)
+        @heads.times do |head|
+          @bytes[entry_offset(track, head * SECTORS_PER_HEAD), ENTRY] = [SECTORS_PER_HEAD, 0xff, 0xff, 0xff, 0xff]
+        end
+      end
+
+      def blocks_free
+        (bam_tracks.to_a - reserved_tracks).sum do |track|
+          (0...@heads).sum { |head| @bytes[entry_offset(track, head * SECTORS_PER_HEAD)] }
+        end
+      end
+
+      # Block 0/0 points at the bad-block list in 0/1, the directory, the
+      # header and the BAM's first block, and holds the ID. Each BAM block
+      # links the next and the one before it, $FF $FF at either end, and
+      # names the first cylinder it covers and the one past its last.
+      def bam_headers(id)
+        groups = bam_tracks.each_slice(tracks_per_bam_block).to_a
+        blocks = groups.map { |tracks| bam_block_track(tracks.first) }
+        bam = groups.each_with_index.map do |tracks, i|
+          following = i == groups.length - 1 ? [0xff, 0xff] : [blocks[i + 1], 0]
+          previous = i.zero? ? [0xff, 0xff] : [blocks[i - 1], 0]
+          [blocks[i], 0, [*following, *previous, tracks.first, tracks.last + 1]]
+        end
+        [[0, 0, [0, 1, 0, 0xff, *header_link, *header_block, blocks.first, 0, *id]],
+         [0, 1, Array.new(SECTOR_SIZE, 0xff)], *bam]
+      end
+    end
+  end
+end

data/lib/badline/storage/disk_image/writing.rb

@@ -151,8 +151,8 @@ module Badline
         end
 
         def put_sector(track, sector, data)
-          block = data.first(SECTOR_SIZE)
-          @bytes[sector_offset(track, sector), SECTOR_SIZE] = block + Array.new(SECTOR_SIZE - block.length, 0)
+          offset = sector_offset(track, sector)
+          SECTOR_SIZE.times { |i| @bytes[offset + i] = data[i] || 0 }
           @errors[track_offset(track) + sector] = 1 if @errors
         end
       end