haxor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86dcbbd321e0c9f81e94620624119b709967430b
-  data.tar.gz: b6aa04aa13522e6de177628276de6f4503913d29
+  metadata.gz: 293f0584494d168aa8bfe9d97871fc62fd11936b
+  data.tar.gz: 2a06187130337634f8a271d8d9a869928792919a
 SHA512:
-  metadata.gz: ffa365bb3a8118366f4179e77f10b4723a40c44f7ef2751142336412ada1711bd848958b641740b94f1278b61b18c592bdbde8fbba58bb7649fa736b1b92d887
-  data.tar.gz: 5eaeef6044009fe4709d2b85d7cf7a587010233e13106ad640f6c0a0311bd53974bf96ceb68ce5fe79ce4aab560d96e1e904019fa3b556ef3af200ec3e965416
+  metadata.gz: ef117dfbef1487268cf206d24dfd89aefcc909f9c8702c6e1502edbb9b2c498b023bb57fd89d73508278238a0c52a509f79d6dc240ea67143a2035bf31d6eccd
+  data.tar.gz: c853651c044c0d7c53a1b465b9116a0d33b919f14ccbb55f38e5eff02b9975c02db0f344f0b6c97fa98ec16925750547b2645f86939801cfc80010562c802db4

data/README.md

@@ -1,4 +1,7 @@
 # Haxor VM
+[![Gem Version](https://badge.fury.io/rb/haxor.svg)](https://badge.fury.io/rb/haxor)
+[![Code Climate](https://codeclimate.com/github/krzysztof-magosa/haxor/badges/gpa.svg)](https://codeclimate.com/github/krzysztof-magosa/haxor)
+
 Haxor consists of compiler _hcc_, linker _hld_ and virtual machine _hvm_.
 _hcc_ translates asm-like code into tokens, _hld_ links them into bytecode, while _hvm_ runs it.
 
@@ -405,6 +408,7 @@ Generates random integer from specified range.
 Arguments:
 * minimum (inclusive)
 * maximum (inclusive)
+
 Generated number is pushed onto stack.
 ```
 mov sc, 04h

data/bin/hcc

@@ -1,10 +1,28 @@
 #! /usr/bin/env ruby
 
 require_relative '../lib/haxor'
+require 'optparse'
 
-if ARGV[0].nil?
-  puts "You must specify .hax file to be compiled."
-  exit 1
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: hcc [options] [file.hax]'
+
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+
+  opts.on_tail('-v', '--version', 'Show version') do
+    puts "Haxor, version #{Haxor::Consts::GEM_VERSION}, version id #{Haxor::Consts::VERSION}."
+    exit
+  end
+end
+
+parser.parse!
+
+if ARGV.empty?
+  puts 'You must specify .hax file to be compiled.'
+  puts parser
+  exit
 end
 
 source = File.absolute_path ARGV[0]

data/bin/hld

@@ -19,6 +19,11 @@ parser = OptionParser.new do |opts|
     puts opts
     exit
   end
+
+  opts.on_tail('-v', '--version', 'Show version') do
+    puts "Haxor, version #{Haxor::Consts::GEM_VERSION}, version id #{Haxor::Consts::VERSION}."
+    exit
+  end
 end
 
 parser.parse!

data/bin/hvm

@@ -2,9 +2,28 @@
 
 require_relative '../lib/haxor'
 
+require 'optparse'
+
+parser = OptionParser.new do |opts|
+  opts.banner = 'Usage: hvm [options] [file.hax.e]'
+
+  opts.on_tail('-h', '--help', 'Show this message') do
+    puts opts
+    exit
+  end
+
+  opts.on_tail('-v', '--version', 'Show version') do
+    puts "Haxor, version #{Haxor::Consts::GEM_VERSION}, version id #{Haxor::Consts::VERSION}."
+    exit
+  end
+end
+
+parser.parse!
+
 if ARGV[0].nil?
-  puts "You must specify .hax.e file to be run."
-  exit 1
+  puts 'You must specify .hax.e file to be run.'
+  puts parser
+  exit
 end
 
 vm = Haxor::Vm::Core.new

data/lib/haxor.rb

@@ -12,6 +12,7 @@ require_relative 'haxor/vm/subsystem'
 require_relative 'haxor/vm/mem'
 require_relative 'haxor/vm/stack'
 require_relative 'haxor/vm/os'
+require_relative 'haxor/vm/registers'
 require_relative 'haxor/vm/cpu/core'
 require_relative 'haxor/vm/cpu/unit/base'
 require_relative 'haxor/vm/cpu/unit/logical'

data/lib/haxor/consts.rb

@@ -1,7 +1,7 @@
 module Haxor
   class Consts
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     GEM_VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
     VERSION = (MAJOR << 16) | (MINOR << 8) | PATCH

data/lib/haxor/vm/core.rb

@@ -9,9 +9,11 @@ module Haxor
         register_subsystem :mem, Mem.new(Consts::RESERVED_MEM)
         register_subsystem :stack, Stack.new
         register_subsystem :os, Os.new
+        register_subsystem :registers, Registers.new
 
         subsystem(:cpu).labels.each do |_, label|
           subsystem(:mem).add_label label.label, label.absolute_addr
+          subsystem(:registers).add_register label.label, label.absolute_addr
         end
 
         @units = []
@@ -43,10 +45,10 @@ module Haxor
 
         exe = exe[@hdr.size..-1] # cut off header
         subsystem(:mem).replace_region Consts::RESERVED_MEM, exe
-        subsystem(:mem).write 'ip', @hdr.entry_point # instruction pointer
+        subsystem(:registers).write 'ip', @hdr.entry_point # instruction pointer
         subsystem(:mem).enlarge @hdr.bss_size
         subsystem(:mem).enlarge @hdr.stack_size
-        subsystem(:mem).write 'sp', subsystem(:mem).size
+        subsystem(:registers).write 'sp', subsystem(:mem).size
       end
     end
   end

data/lib/haxor/vm/cpu/unit/arithmetic.rb

@@ -38,16 +38,16 @@ module Haxor
         def op_div
           a = operand
           av = @vm.subsystem(:mem).read a
-          arv = @vm.subsystem(:mem).read 'ar'
-          @vm.subsystem(:mem).write 'ar', (arv / av)
-          @vm.subsystem(:mem).write 'dr', (arv % av)
+          arv = @vm.subsystem(:registers).read 'ar'
+          @vm.subsystem(:registers).write 'ar', (arv / av)
+          @vm.subsystem(:registers).write 'dr', (arv % av)
         end
 
         def op_mul
           a = operand
           av = @vm.subsystem(:mem).read a
-          arv = @vm.subsystem(:mem).read 'ar'
-          @vm.subsystem(:mem).write 'ar', (arv * av)
+          arv = @vm.subsystem(:registers).read 'ar'
+          @vm.subsystem(:registers).write 'ar', (arv * av)
         end
 
         def op_inc
@@ -67,23 +67,9 @@ module Haxor
           av = @vm.subsystem(:mem).read a
           bv = @vm.subsystem(:mem).read b
           v = av - bv
-          fr_set Consts::FR_ZERO, (v == 0)
-          fr_set Consts::FR_SIGN, v < 0
-        end
-
-        def fr_set(b, enable)
-          flags = fetch_cell 'fr'
-          if enable
-            flags |= b
-          else
-            flags &= ~b
-          end
-          replace_cell 'fr', flags
-        end
 
-        def fr_if(b)
-          flags = fetch_cell 'fr'
-          (flags & b) > 0
+          @vm.subsystem(:registers).flag Consts::FR_ZERO, v == 0
+          @vm.subsystem(:registers).flag Consts::FR_SIGN, v < 0
         end
       end
     end

data/lib/haxor/vm/cpu/unit/jumps.rb

@@ -37,11 +37,6 @@ module Haxor
           bind_opcode OP_IRET,   :op_iret
         end
 
-        def fr_if(b)
-          flags = fetch_cell 'fr'
-          (flags & b) > 0
-        end
-
         def op_call
           a = operand
           @vm.subsystem(:stack).push 'ip'
@@ -55,52 +50,52 @@ module Haxor
 
         def op_je
           a = operand
-          jmp a if fr_if Consts::FR_ZERO
+          jmp a if @vm.subsystem(:registers).check_flag Consts::FR_ZERO
         end
 
         def op_jg
           a = operand
-          jmp a if !fr_if(Consts::FR_ZERO) && !fr_if(Consts::FR_SIGN)
+          jmp a if !@vm.subsystem(:registers).check_flag(Consts::FR_ZERO) && !@vm.subsystem(:registers).check_flag(Consts::FR_SIGN)
         end
 
         def op_jge
           a = operand
-          jmp a if !fr_if(Consts::FR_SIGN) || fr_if(Consts::FR_ZERO)
+          jmp a if !@vm.subsystem(:registers).check_flag(Consts::FR_SIGN) || @vm.subsystem(:registers).check_flag(Consts::FR_ZERO)
         end
 
         def op_jl
           a = operand
-          jmp a if !fr_if(Consts::FR_ZERO) && fr_if(Consts::FR_SIGN)
+          jmp a if !@vm.subsystem(:registers).check_flag(Consts::FR_ZERO) && @vm.subsystem(:registers).check_flag(Consts::FR_SIGN)
         end
 
         def op_jle
           a = operand
-          jmp a if fr_if(Consts::FR_SIGN) || fr_if(Consts::FR_ZERO)
+          jmp a if @vm.subsystem(:registers).check_flag(Consts::FR_SIGN) || @vm.subsystem(:registers).check_flag(Consts::FR_ZERO)
         end
 
         def op_jne
           a = operand
-          jmp a unless fr_if Consts::FR_ZERO
+          jmp a unless @vm.subsystem(:registers).check_flag Consts::FR_ZERO
         end
 
         def op_jng
           a = operand
-          jmp a unless !fr_if(Consts::FR_ZERO) && !fr_if(Consts::FR_SIGN)
+          jmp a unless !@vm.subsystem(:registers).check_flag(Consts::FR_ZERO) && !@vm.subsystem(:registers).check_flag(Consts::FR_SIGN)
         end
 
         def op_jnge
           a = operand
-          jmp a unless !fr_if(Consts::FR_SIGN) || fr_if(Consts::FR_ZERO)
+          jmp a unless !@vm.subsystem(:registers).check_flag(Consts::FR_SIGN) || @vm.subsystem(:registers).check_flag(Consts::FR_ZERO)
         end
 
         def op_jnl
           a = operand
-          jmp a unless !fr_if(Consts::FR_ZERO) && fr_if(Consts::FR_SIGN)
+          jmp a unless !@vm.subsystem(:registers).check_flag(Consts::FR_ZERO) && @vm.subsystem(:registers).check_flag(Consts::FR_SIGN)
         end
 
         def op_jnle
           a = operand
-          jmp a unless fr_if(Consts::FR_SIGN) || fr_if(Consts::FR_ZERO)
+          jmp a unless @vm.subsystem(:registers).check_flag(Consts::FR_SIGN) || @vm.subsystem(:registers).check_flag(Consts::FR_ZERO)
         end
 
         def op_ret
@@ -114,7 +109,7 @@ module Haxor
         private
 
         def jmp(addr)
-          @vm.subsystem(:mem).write 'ip', addr
+          @vm.subsystem(:registers).write 'ip', addr
         end
       end
     end

data/lib/haxor/vm/registers.rb

@@ -0,0 +1,42 @@
+module Haxor
+  module Vm
+    class Registers < Subsystem
+      def initialize
+        @registers = {}
+      end
+
+      def flag(flag, enabled)
+        flags = read 'fr'
+        if enabled
+          flags |= flag
+        else
+          flags &= ~flag
+        end
+        write 'fr', flags
+      end
+
+      def check_flag(flag)
+        flags = read 'fr'
+        (flags & flag) > 0
+      end
+
+      def read(register)
+        addr = resolve register
+        @vm.subsystem(:mem).read addr
+      end
+
+      def write(register, value)
+        addr = resolve register
+        @vm.subsystem(:mem).write addr, value
+      end
+
+      def resolve(register)
+        @registers[register]
+      end
+
+      def add_register(register, addr)
+        @registers[register] = addr
+      end
+    end
+  end
+end

data/lib/haxor/vm/stack.rb

@@ -7,9 +7,9 @@ module Haxor
       end
 
       def push_value(value)
-        sp = @vm.subsystem(:mem).read 'sp'
+        sp = @vm.subsystem(:registers).read 'sp'
         sp -= Consts::WORD_SIZE
-        @vm.subsystem(:mem).write 'sp', sp
+        @vm.subsystem(:registers).write 'sp', sp
         @vm.subsystem(:mem).write sp, value
       end
 
@@ -19,10 +19,10 @@ module Haxor
       end
 
       def pop_value
-        sp = @vm.subsystem(:mem).read 'sp'
+        sp = @vm.subsystem(:registers).read 'sp'
         value = @vm.subsystem(:mem).read sp
         sp += Consts::WORD_SIZE
-        @vm.subsystem(:mem).write 'sp', sp
+        @vm.subsystem(:registers).write 'sp', sp
 
         value
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haxor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/haxor/vm/cpu/unit/various.rb
 - lib/haxor/vm/mem.rb
 - lib/haxor/vm/os.rb
+- lib/haxor/vm/registers.rb
 - lib/haxor/vm/stack.rb
 - lib/haxor/vm/subsystem.rb
 - media/memory.png