haxor 0.3.0 → 0.4.0

data/lib/haxor/vm/mem.rb

@@ -1,7 +1,7 @@
 module Haxor
   module Vm
     class Mem < Subsystem
-      attr_accessor :memory
+      #attr_accessor :memory
 
       def initialize(bytes)
         @memory = Array.new(bytes, 0).pack('C*')
@@ -56,44 +56,9 @@ module Haxor
         @memory[addr...x] = data
       end
 
-      # (see #read)
-      def dereference(addr)
-        read addr
-      end
-
-      # Reads data pointed by IP register and moves IP forward
-      #
-      # @return [Integer] Data stored under address pointed by IP
-      def next_word
-        data = read ip
-        move_ip Consts::WORD_SIZE
-        data
-      end
-
-      # TODO: BC
-      def next_cell
-        next_word
-      end
-
-      def ip
-        read 'ip'
-      end
-
-      def move_ip(step)
-        write 'ip', ip + step
-      end
-
-      def label(name)
-        @labels[addr]
-      end
-
       private
 
       def resolve(addr)
-        if addr.is_a? String
-          fail "Unknown label #{addr}." unless @labels.key? addr
-          addr = @labels[addr]
-        end
         Range.new(addr, addr + Consts::WORD_SIZE, true)
       end
     end

data/lib/haxor/vm/os.rb

@@ -2,14 +2,13 @@ module Haxor
   module Vm
     class Os < Subsystem
       TABLE = {
-        0x01 => :sys_exit,
-        0x02 => :sys_printf,
-        0x03 => :sys_scanf,
-        0x04 => :sys_rand
+        0x01 => :sys_printf,
+        0x02 => :sys_scanf,
+        0x03 => :sys_rand
       }
 
       def syscall
-        func = subsystem(:mem).read 'sc'
+        func = subsystem(:cpu).reg(Vm::Cpu::Core::REG_SYSCALL)
         send(TABLE[func])
       end
 
@@ -50,14 +49,8 @@ module Haxor
         types
       end
 
-      def sys_exit
-        code = subsystem(:stack).pop_value
-        exit code
-      end
-
       def sys_printf
         fd = subsystem(:stack).pop_value
-
         x = subsystem(:stack).pop_value
         fmt = collect_string x
         args = []
@@ -85,7 +78,7 @@ module Haxor
         result = file.scanf fmt
 
         if result.size != types.size
-          subsystem(:mem).write 'sc', -1
+          subsystem(:cpu).reg Vm::Cpu::Core::REG_SYSCALL, -1
           return
         end
 
@@ -108,7 +101,8 @@ module Haxor
         max = subsystem(:stack).pop_value
 
         prng = Random.new
-        subsystem(:stack).push_value prng.rand(min..max)
+        v = prng.rand(min..max)
+        subsystem(:stack).push_value v
       end
     end
   end

data/lib/haxor/vm/stack.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haxor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,7 +42,7 @@ description: Please follow to GitHub repository for more information.
 email:
 - krzysztof@magosa.pl
 executables:
-- hcc
+- hc
 - hld
 - hvm
 extensions: []
@@ -54,21 +54,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/hcc
+- bin/hc
 - bin/hld
 - bin/hvm
 - examples/build.sh
 - examples/guess-the-number.hax
 - haxor.gemspec
 - lib/haxor.rb
-- lib/haxor/compiler/component/arithmetic.rb
-- lib/haxor/compiler/component/base.rb
-- lib/haxor/compiler/component/data.rb
-- lib/haxor/compiler/component/jumps.rb
-- lib/haxor/compiler/component/logical.rb
-- lib/haxor/compiler/component/other.rb
-- lib/haxor/compiler/component/transfer.rb
-- lib/haxor/compiler/component/various.rb
 - lib/haxor/compiler/core.rb
 - lib/haxor/compiler/section.rb
 - lib/haxor/compiler/unit.rb
@@ -81,21 +73,15 @@ files:
 - lib/haxor/token/int64.rb
 - lib/haxor/token/label.rb
 - lib/haxor/token/pointer.rb
+- lib/haxor/utils.rb
 - lib/haxor/vm/core.rb
 - lib/haxor/vm/cpu/core.rb
-- lib/haxor/vm/cpu/unit/arithmetic.rb
-- lib/haxor/vm/cpu/unit/base.rb
-- lib/haxor/vm/cpu/unit/jumps.rb
-- lib/haxor/vm/cpu/unit/logical.rb
-- lib/haxor/vm/cpu/unit/transfer.rb
-- 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
-- media/vm.png
 homepage: https://github.com/krzysztof-magosa/haxor
 licenses:
 - BSD-3

data/lib/haxor/compiler/component/arithmetic.rb

@@ -1,45 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Arithmetic < Base
-        def register
-          bind_cmd 'inc', :cmd_inc
-          bind_cmd 'dec', :cmd_dec
-          bind_cmd 'add', :cmd_add
-          bind_cmd 'sub', :cmd_sub
-          bind_cmd 'div', :cmd_div
-          bind_cmd 'mul', :cmd_mul
-          bind_cmd 'cmp', :cmd_cmp
-        end
-
-        def cmd_add(a, b)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_ADD, a, b
-        end
-
-        def cmd_sub(a, b)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_SUB, a, b
-        end
-
-        def cmd_div(a)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_DIV, a
-        end
-
-        def cmd_mul(a)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_MUL, a
-        end
-
-        def cmd_cmp(a, b)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_CMP, a, b
-        end
-
-        def cmd_inc(a)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_INC, a
-        end
-
-        def cmd_dec(a)
-          add_cmd Vm::Cpu::Unit::Arithmetic::OP_DEC, a
-        end
-      end
-    end
-  end
-end

data/lib/haxor/compiler/component/base.rb

@@ -1,41 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Base
-        attr_accessor :compiler
-
-        def register
-          fail 'this method must be implemented.'
-        end
-
-        def bind_cmd(cmd, method)
-          compiler.bind_cmd cmd, self, method
-        end
-
-        def add(token)
-          compiler.add token
-        end
-
-        def add_cmd(opcode, a = nil, b = nil)
-          compiler.add_cmd opcode, a, b
-        end
-
-        def parse_value(value)
-          compiler.parse_value value
-        end
-
-        def offset_flags(a, b = nil)
-          compiler.offset_flags(a, b)
-        end
-
-        def offset?(value)
-          compiler.offset? value
-        end
-
-        def strip_offset(value)
-          compiler.strip_offset value
-        end
-      end
-    end
-  end
-end

data/lib/haxor/compiler/component/data.rb

@@ -1,32 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Data < Base
-        def register
-          bind_cmd 'dw', :cmd_dw
-          bind_cmd 'resw', :cmd_resw
-        end
-
-        def cmd_dw(*args)
-          add Token::Label.new(args[0])
-
-          (1...args.size).each do |i|
-            begin
-              add Token::Int64.new(Integer(args[i]))
-            rescue
-              args[i][1...-1].each_char do |c|
-                add Token::Int64.new(c.ord)
-              end
-            end
-          end
-        end
-
-        def cmd_resw(*args)
-          (1..args[0].to_i).each do
-            add Token::Int64.new(0)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/haxor/compiler/component/jumps.rb

@@ -1,83 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Jumps < Base
-        def register
-          bind_cmd 'call', :cmd_call
-          bind_cmd 'ret', :cmd_ret
-          bind_cmd 'iret', :cmd_iret
-
-          bind_cmd 'jmp', :cmd_jmp
-
-          bind_cmd 'je',  :cmd_je
-          bind_cmd 'jg',  :cmd_jg
-          bind_cmd 'jge', :cmd_jge
-          bind_cmd 'jl',  :cmd_jl
-          bind_cmd 'jle', :cmd_jle
-
-          bind_cmd 'jne',  :cmd_jne
-          bind_cmd 'jng',  :cmd_jng
-          bind_cmd 'jnge', :cmd_jnge
-          bind_cmd 'jnl',  :cmd_jnl
-          bind_cmd 'jnle', :cmd_jnle
-        end
-
-        def cmd_call(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_CALL, a
-        end
-
-        def cmd_ret(*_args)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_RET
-        end
-
-        def cmd_iret(*_args)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_IRET
-        end
-
-        def cmd_jmp(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JMP, a
-        end
-
-        def cmd_je(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JE, a
-        end
-
-        def cmd_jg(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JG, a
-        end
-
-        def cmd_jge(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JGE, a
-        end
-
-        def cmd_jl(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JL, a
-        end
-
-        def cmd_jle(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JLE, a
-        end
-
-        def cmd_jne(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JNE, a
-        end
-
-        def cmd_jng(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JNG, a
-        end
-
-        def cmd_jnge(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JNGE, a
-        end
-
-        def cmd_jnl(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JNL, a
-        end
-
-        def cmd_jnle(a)
-          add_cmd Vm::Cpu::Unit::Jumps::OP_JNLE, a
-        end
-      end
-    end
-  end
-end

data/lib/haxor/compiler/component/logical.rb

@@ -1,35 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Logical < Base
-        def register
-          bind_cmd 'and', :cmd_and
-          bind_cmd 'neg', :cmd_neg
-          bind_cmd 'not', :cmd_not
-          bind_cmd 'or',  :cmd_or
-          bind_cmd 'xor', :cmd_xor
-        end
-
-        def cmd_and(a, b)
-          add_cmd Vm::Cpu::Unit::Logical::OP_AND, a, b
-        end
-
-        def cmd_neg(a)
-          add_cmd Vm::Cpu::Unit::Logical::OP_NEG, a
-        end
-
-        def cmd_not(a)
-          add_cmd Vm::Cpu::Unit::Logical::OP_NOT, a
-        end
-
-        def cmd_or(a, b)
-          add_cmd Vm::Cpu::Unit::Logical::OP_OR, a, b
-        end
-
-        def cmd_xor(a, b)
-          add_cmd Vm::Cpu::Unit::Logical::OP_XOR, a, b
-        end
-      end
-    end
-  end
-end

data/lib/haxor/compiler/component/other.rb

@@ -1,21 +0,0 @@
-module Haxor
-  module Compiler
-    module Component
-      class Other < Base
-        def register
-          bind_cmd 'label', :cmd_label
-          bind_cmd 'rem', :cmd_rem
-          bind_cmd '#', :cmd_rem
-        end
-
-        def cmd_rem(*_args)
-          # nothing
-        end
-
-        def cmd_label(*args)
-          add Token::Label.new(args[0])
-        end
-      end
-    end
-  end
-end