ucisc 0.1.3 → 0.1.4

data/lib/micro_cisc/version.rb

@@ -1,3 +1,3 @@
 module MicroCisc
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/micro_cisc/vm/color_lcd_display.rb

@@ -0,0 +1,115 @@
+require 'gtk2'
+
+module MicroCisc
+  module Vm
+    class ColorLcdDisplay < Device
+      COLOR_MODE_12BIT = 1
+      COLOR_MODE_16BIT = 2
+      COLOR_MODES = [COLOR_MODE_16BIT, COLOR_MODE_12BIT].freeze
+
+      def initialize(device_id, mem_blocks, width, height, bit_mode)
+        super(device_id, Device::TYPE_BLOCK_MEMORY, mem_blocks)
+        @w = width
+        @h = height
+        @bit_mode = COLOR_MODES.include?(bit_mode) ? bit_mode : COLOR_MODES.first
+        @image_data = Array.new(@w * @h * 3).map { 0 }
+        @scale =
+          if @w <= 320
+            4
+          elsif @w <= 640
+            2
+          else
+            1
+          end
+        @control_mem[6] = @w
+        @control_mem[7] = @h
+        @privileged_read = @privileged_read | 0x0C0
+
+        Gtk.init
+
+        @window = Gtk::Window.new.set_default_size(@w * @scale, @h * @scale)
+        @window.set_title("uCISC Virtual Machine")
+        @window.set_resizable(false)
+
+        update_screen
+
+        @window.signal_connect("destroy") do
+          Gtk.main_quit
+        end
+        GLib::Timeout.add(5) do
+          do_update
+          true
+        end
+        @window.show
+
+        @window_thread = Thread.new do
+          Gtk.main
+        end
+      end
+
+      def join
+        @window_thread.join
+      end
+
+      def update_screen
+        pixel_buffer = GdkPixbuf::Pixbuf.new(
+          data: @image_data.pack("C*"),
+          colorspace: GdkPixbuf::Colorspace::RGB,
+          has_alpha: false,
+          bits_per_sample: 8,
+          width: @w,
+          height: @h
+        )
+        pixel_buffer = pixel_buffer.scale_simple(@w * @scale, @h * @scale, 0)
+        new_image = Gtk::Image.new(pixel_buffer)
+        @window.remove(@image) if @image
+        @window.add(new_image)
+        new_image.show
+        @window.show
+        @image = new_image
+      end
+
+      def do_update
+        @t0 ||= Time.now
+        @tcount ||= 0
+
+        update_image_data
+        update_screen
+ 
+        @tcount += 1
+        if @tcount == 60
+          delta = Time.now - @t0
+          #puts "60 frames in #{delta}s (#{60 / delta} fps)"
+          @t0 = Time.now
+          @tcount = 0
+        end
+      rescue Interrupt
+      end
+
+      def update_image_data
+        (0...@w).each do |x|
+          (0...@h).each do |y|
+            word_offset = y * @w + x
+            pixel_offset = word_offset * 3
+            word = read_mem(@id, word_offset, true)
+            if (@bit_mode == COLOR_MODE_16BIT)
+              r = (word & 0x0F00) >> 8
+              @image_data[pixel_offset] = r + (r >> 5)
+              g = (word & 0x07E0) >> 3
+              @image_data[pixel_offset + 1] = g + (g >> 5)
+              b = (word & 0x001F) << 3
+              @image_data[pixel_offset + 2] = b + (b >> 5)
+            elsif (@bit_mode == COLOR_MODE_12BIT)
+              r = (word & 0x0F00) >> 4
+              @image_data[pixel_offset] = r + (r >> 4)
+              g = word & 0x00F0
+              @image_data[pixel_offset + 1] = g + (g >> 4)
+              b = (word & 0x000F) << 4
+              @image_data[pixel_offset + 2] = b + (b >> 4)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/micro_cisc/vm/device.rb

@@ -4,21 +4,30 @@ module MicroCisc
     #
     # From the docs, the control word layout is as follows:
     #
-    # * 0x0 - Device ID, read only. Unique system wide.
-    # * 0x1 - Bank address (MSB) | Device type (LSB)
-    # * 0x2 - Bus access device ID
-    # * 0x3 - Interrupt code (MSB) | Device status (LSB)
-    # * 0x4 - Local register with interrupt handler address (read/write)
-    # * 0x5 to 0xF - Device type specific
+    # * 0x0 - Device ID - read only. Unique system wide.
+    # * 0x1 - Local bank block (MSB) | Device type (LSB) - read only
+    # * 0x2 - Init device ID - read only if set, writable if 0 or by init device
+    # * 0x3 - Accessed device block address (LSB) - writable by init device
+    # * 0x4 - <Reserved> (MSB) | Device status (LSB)
+    # * 0x5 - Local register with interrupt handler address (read/write)
+    # * 0x6 to 0xF - Device type specific (see below)
     class Device
+      TYPE_INVALID = 0
+      TYPE_PROCESSOR = 1
+      TYPE_BLOCK_MEMORY = 2
+      TYPE_BLOCK_IO = 3
+      TYPE_SERIAL = 4
+      TYPE_HID = 5
+      TYPE_TERMINAL = 6
+
       attr_reader :id
 
       def initialize(id, type, local_blocks, rom_blocks = [])
         @id = id
-        @external_read = 0x001F
-        @privileged_read = 0x001F
-        @privileged_write = 0x0010
-        @internal_write = 0x000C
+        @external_read = 0x003F
+        @privileged_read = 0x003F
+        @privileged_write = 0x002C
+        @internal_write = 0x0010
 
         @local_blocks = local_blocks
         rom_blocks.each { |block| block.freeze }
@@ -31,6 +40,7 @@ module MicroCisc
         @control_mem = Array.new(16).map { 0 }
         @control_mem[0] = id
         @control_mem[1] = type & 0xFF
+        @control_mem[2] = 0
 
         @devices = [self]
       end
@@ -44,17 +54,16 @@ module MicroCisc
         @devices.each_with_index { |device, index| device.bank_index = index }
       end
 
-      def source_halted(source_device_id)
-        @control_mem[2] = 0 if source_device_id == @control_mem[2]
-      end
-
       def write_control(source_device_id, address, value)
         address = address & 0xF
         return if address == 0
         if source_device_id == @id
           return if (1 << (address - 1)) & @internal_write == 0
           @control_mem[address] = value
-        elsif source_device_id == @control_mem[2]
+        elsif @control_mem[2] == 0 || source_device_id == @control_mem[2]
+          # Special case where a processor can "claim" the device
+          @control_mem[2] = source_device_id
+
           return if (1 << (address - 1)) & @privileged_write == 0
           @control_mem[address] = value
           handle_control_update(address, value)
@@ -62,8 +71,10 @@ module MicroCisc
       end
 
       def read_control(source_device_id, address)
-        return @control_mem[0] if address == 0
-        if source_device_id == @id || source_device_id == @control_mem[2]
+        if address == 0
+          handle_control_read(address)
+          @control_mem[0]
+        elsif source_device_id == @id || source_device_id == @control_mem[2]
           return 0 if (1 << (address - 1)) & @privileged_read == 0
           handle_control_read(address)
           @control_mem[address]
@@ -106,11 +117,11 @@ module MicroCisc
             @local_mem[page][address & 0xFF] = value
           end
         elsif !banked && source_device_id == @id
-          page = (address & 0xFF00) >> 8
-          @local_mem[page][address & 0xFF] = value
+          block = (address & 0xFF00) >> 8
+          @local_mem[block][address & 0xFF] = value
         elsif source_device_id == @control_mem[2]
-          page = (@control_mem[3] & 0xFF00) >> 8
-          @local_mem[page][address & 0xFF] = value
+          block = @control_mem[3]
+          @local_mem[block][address & 0xFF] = value if @local_mem[block]
         end
       end
 

data/lib/micro_cisc/vm/processor.rb

@@ -55,6 +55,7 @@ module MicroCisc
         @run = false
         @pc_modified = false
         @count = 0
+        @clocks_per_second = 200_000
       end
 
       def handle_control_update(address, value)
@@ -134,13 +135,13 @@ module MicroCisc
       def source_value(source, immediate)
         case source
         when 0
-          @pc + immediate
+          (@pc + immediate) & 0xFFFF
         when 1,2,3
-          read_mem(@id, @registers[source] + immediate)
+          read_mem(@id, (@registers[source] + immediate) & 0xFFFF)
         when 4
           immediate
         else
-          @registers[source - 4] + immediate
+          (@registers[source - 4] + immediate) & 0xFFFF
         end
       end
 
@@ -149,7 +150,7 @@ module MicroCisc
         when 0
           @pc
         when 1,2,3
-          read_mem(@id, @registers[destination] + immediate)
+          read_mem(@id, (@registers[destination] + immediate) & 0xFFFF)
         when 4
           @control
         else
@@ -177,7 +178,14 @@ module MicroCisc
         store_result(result, source, destination, immediates, push, 0)
 
         # Detect halt instruction
-        return 1 if immediates.first == 0 && source == 0 && destination == 0
+        if immediates.first == 0 && source == 0 && destination == 0
+          if alu == 0
+            return 1
+          else
+            @pc += 1
+            return 2
+          end
+        end
         0
       end
 
@@ -347,9 +355,12 @@ module MicroCisc
             @pc += 1
           end
           @count += 1
-          # if count & 0xFF == 0
-          #   read_from_processor
-          # end
+
+          allowed_count = (Time.now - @t0) * @clocks_per_second
+          while @count >= allowed_count
+            sleep(1.0 / @clocks_per_second)
+            allowed_count = (Time.now - @t0) * @clocks_per_second
+          end
         end
       end
 
@@ -440,7 +451,7 @@ module MicroCisc
         ins = is_copy ? 'copy' : 'compute'
 
 
-        "Stack: #{stack_string}\n#{ins} #{alu}#{src} #{imm0} #{dest} #{imm1}#{eff} #{push}# value: #{value} (0x#{'%04x' % value}), result: #{result} (0x#{'%04x' % result}), #{'not ' if !store}stored"
+        "Stack: #{stack_string}\n#{ins} #{alu}#{src} #{imm0} #{dest} #{imm1}#{eff} #{push}# value: #{value} (0x#{'%04x' % (value & 0xFFFF)}), result: #{result} (0x#{'%04x' % (result & 0xFFFF)}), #{'not ' if !store}stored"
       end
     end
   end

data/lib/micro_cisc/vm/term_device.rb

@@ -2,14 +2,10 @@ module MicroCisc
   module Vm
     class TermDevice < Device
       def initialize(device_id)
-        super(device_id, 9, 1)
+        super(device_id, Device::TYPE_TERMINAL, 1)
         # Init device specific read/write controls
-        @privileged_read = @privileged_read | 0xE0
-        @privileged_write = @privileged_write | 0x20
-      end
-
-      def host_device=(device_id)
-        @control_mem[2] = device_id
+        @privileged_read = @privileged_read | 0x1C0
+        @privileged_write = @privileged_write | 0x40
       end
 
       def handle_control_read(address)
@@ -22,7 +18,7 @@ module MicroCisc
       end
 
       def handle_control_update(address, value)
-        if address == 5
+        if address == 6
           # value is number of bytes to send
           words = (value + 1) / 2
           string = @local_mem[0][0...words].pack("S>*")[0...value]

data/ucisc.gemspec

@@ -29,6 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "byebug"
   spec.add_runtime_dependency "tty-screen"
   spec.add_runtime_dependency "gtk2"
+  spec.add_runtime_dependency "chunky_png"
+  spec.add_runtime_dependency "bundler"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/ucisc.vim

@@ -14,19 +14,22 @@ set cpo&vim
 setlocal formatoptions-=t  " allow long lines
 setlocal formatoptions+=c  " but comments should still wrap
 
-setlocal iskeyword+=-,?,<,>
+" setlocal iskeyword+=-,?,<,>
 
-syntax keyword uciscOpcode copy compute
-highlight link uciscOpcode Function
+" syntax keyword uciscOpcode copy compute
+" highlight link uciscOpcode Function
 
 syntax match uciscComment /#.*/
 syntax match uciscComment /\/[^\/]*\//
 syntax match uciscComment /'[^ ]*/
 highlight link uciscComment Comment
 
-syntax match uciscLabel /\([^a-zA-Z_:&@!]*\)\@=[a-zA-Z_:&@!][a-zA-Z0-9_:&@!]*:/
+syntax match uciscLabel /&[a-zA-Z0-9_:&@!?]\+/
 highlight link uciscLabel Identifier
 
+syntax match uciscFunction /\([^a-zA-Z_:&@!]*\)\@=[a-zA-Z_:&@!][a-zA-Z0-9_:&@!\.]*:/
+highlight link uciscFunction Function
+
 syntax match uciscControl /[(){}]/
 syntax match uciscControl /\(break\|loop\)/
 highlight link uciscControl Statement
@@ -34,14 +37,17 @@ highlight link uciscControl Statement
 syntax match uciscImmediate /\<\((\)\?\(-\)\?\(0x\)\?[0-9a-fA-F]\+\([/.]\|\s\|,\)\@=/
 highlight link uciscImmediate Number
 
-syntax match uciscArg /\(\$\|&\)[a-zA-Z0-9_:&@!?*]\+/
-highlight link uciscArg Type
+syntax match uciscArg /\$[a-zA-Z0-9_:&@!?]\+/
+highlight link uciscArg Define
+
+syntax match uciscAssign /=/
+syntax keyword uciscAssign push pop as
+highlight link uciscAssign Function
 
-syntax keyword uciscOption push pop as
 syntax match uciscOption /\(.\)\@=\<\(disp\|imm\)\>\(\/\|\s\|,\|)\|$\)\@=/
 syntax match uciscOption /\(.\)\@=\<\(reg\|mem\|val\)\>\(\/\|\s\|,\|)\|$\)\@=/
 syntax match uciscOption /\(.\)\@=\<\(op\|inc\|eff\)\>\(\/\|\s\|$\)\@=/
-highlight link uciscOption Define
+highlight link uciscOption Comment
 
 syntax match uciscData /^[ ]*% *\([0-9a-fA-F][0-9a-fA-F][ ]*\)*/
 highlight link uciscData Number

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucisc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +112,7 @@ description:
 email:
 - robert at grokthiscommunity.net
 executables:
+- png_to_hex
 - ucisc
 extensions: []
 extra_rdoc_files: []
@@ -98,10 +127,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- core/stdlib.ucisc
+- examples/everest_12bit.ucisc
 - examples/factorial.ucisc
 - examples/fib.ucisc
 - examples/hello_world.ucisc
-- examples/image.ucisc
+- examples/paint_image.ucisc
+- exe/png_to_hex
 - exe/ucisc
 - lib/micro_cisc.rb
 - lib/micro_cisc/compile/compiler.rb
@@ -109,11 +141,11 @@ files:
 - lib/micro_cisc/compile/label_generator.rb
 - lib/micro_cisc/compile/statement.rb
 - lib/micro_cisc/version.rb
+- lib/micro_cisc/vm/color_lcd_display.rb
 - lib/micro_cisc/vm/device.rb
 - lib/micro_cisc/vm/empty_device.rb
 - lib/micro_cisc/vm/processor.rb
 - lib/micro_cisc/vm/term_device.rb
-- lib/micro_cisc/vm/video.rb
 - ucisc.gemspec
 - ucisc.vim
 homepage: https://github.com/grokthis/ucisc-ruby