haxor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293f0584494d168aa8bfe9d97871fc62fd11936b
-  data.tar.gz: 2a06187130337634f8a271d8d9a869928792919a
+  metadata.gz: aaec13d5834cb5769a776fb6c5acd91880848a5a
+  data.tar.gz: 0b48149b0b1688d740930bd5ecd2b6ec42345dbf
 SHA512:
-  metadata.gz: ef117dfbef1487268cf206d24dfd89aefcc909f9c8702c6e1502edbb9b2c498b023bb57fd89d73508278238a0c52a509f79d6dc240ea67143a2035bf31d6eccd
-  data.tar.gz: c853651c044c0d7c53a1b465b9116a0d33b919f14ccbb55f38e5eff02b9975c02db0f344f0b6c97fa98ec16925750547b2645f86939801cfc80010562c802db4
+  metadata.gz: 7d1b084b85d5fce1afdfe30dc5c520aabd3f02b1c3a1ab7fea33a6b62b71d9e3eb69885492f21454643764742102902557dbbfb1495c021de689472b2012520a
+  data.tar.gz: de72d7b52c53f58a6788631a0b060d58833f20e000b968ee9782b52690567eb789a202be23fa9fd636303555b93d60a73825a74b915cd57cc4ed2a6d468b712f

data/lib/haxor.rb

@@ -2,6 +2,7 @@
 require 'json'
 require 'io/console'
 require 'scanf'
+require 'digest'
 
 require_relative 'haxor/consts'
 require_relative 'haxor/header'

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

@@ -13,41 +13,31 @@ module Haxor
         end
 
         def cmd_add(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_ADD | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_ADD, a, b
         end
 
         def cmd_sub(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_SUB | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_SUB, a, b
         end
 
         def cmd_div(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_DIV | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_DIV, a
         end
 
         def cmd_mul(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_MUL | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_MUL, a
         end
 
         def cmd_cmp(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_CMP | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_CMP, a, b
         end
 
         def cmd_inc(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_INC | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_INC, a
         end
 
         def cmd_dec(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Arithmetic::OP_DEC | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Arithmetic::OP_DEC, a
         end
       end
     end

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

@@ -16,6 +16,10 @@ module Haxor
           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

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

@@ -23,71 +23,59 @@ module Haxor
         end
 
         def cmd_call(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_CALL | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_CALL, a
         end
 
         def cmd_ret(*_args)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_RET)
+          add_cmd Vm::Cpu::Unit::Jumps::OP_RET
         end
 
         def cmd_iret(*_args)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_IRET)
+          add_cmd Vm::Cpu::Unit::Jumps::OP_IRET
         end
 
         def cmd_jmp(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JMP | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JMP, a
         end
 
         def cmd_je(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JE, a
         end
 
         def cmd_jg(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JG)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JG, a
         end
 
         def cmd_jge(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JGE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JGE, a
         end
 
         def cmd_jl(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JL)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JL, a
         end
 
         def cmd_jle(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JLE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JLE, a
         end
 
         def cmd_jne(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JNE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JNE, a
         end
 
         def cmd_jng(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JNG)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JNG, a
         end
 
         def cmd_jnge(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JNGE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JNGE, a
         end
 
         def cmd_jnl(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JNL)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JNL, a
         end
 
         def cmd_jnle(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Jumps::OP_JNLE)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Jumps::OP_JNLE, a
         end
       end
     end

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

@@ -11,31 +11,23 @@ module Haxor
         end
 
         def cmd_and(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Logical::OP_AND | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Logical::OP_AND, a, b
         end
 
         def cmd_neg(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Logical::OP_NEG | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Logical::OP_NEG, a
         end
 
         def cmd_not(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Logical::OP_NOT | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Logical::OP_NOT, a
         end
 
         def cmd_or(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Logical::OP_OR | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Logical::OP_OR, a, b
         end
 
         def cmd_xor(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Logical::OP_XOR | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Logical::OP_XOR, a, b
         end
       end
     end

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

@@ -9,19 +9,15 @@ module Haxor
         end
 
         def cmd_push(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Transfer::OP_PUSH | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Transfer::OP_PUSH, a
         end
 
         def cmd_pop(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Transfer::OP_POP | offset_flags(a))
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Transfer::OP_POP, a
         end
 
         def cmd_mov(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Transfer::OP_MOV | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Transfer::OP_MOV, a, b
         end
       end
     end

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

@@ -10,22 +10,19 @@ module Haxor
         end
 
         def cmd_nop(*_args)
-          add Token::Cmd.new(Vm::Cpu::Unit::Various::OP_NOP)
+          add_cmd Vm::Cpu::Unit::Various::OP_NOP
         end
 
         def cmd_lea(a, b)
-          add Token::Cmd.new(Vm::Cpu::Unit::Various::OP_LEA | offset_flags(a, b))
-          parse_value a
-          parse_value b
+          add_cmd Vm::Cpu::Unit::Various::OP_LEA, a, b
         end
 
         def cmd_int(a)
-          add Token::Cmd.new(Vm::Cpu::Unit::Various::OP_INT)
-          parse_value a
+          add_cmd Vm::Cpu::Unit::Various::OP_INT, a
         end
 
         def cmd_syscall
-          add Token::Cmd.new(Vm::Cpu::Unit::Various::OP_SYSCALL)
+          add_cmd Vm::Cpu::Unit::Various::OP_SYSCALL
         end
       end
     end

data/lib/haxor/compiler/core.rb

@@ -55,7 +55,7 @@ module Haxor
       def compile(filename)
         input = File.read(filename, encoding: 'ASCII-8BIT')
 
-        @unit = Unit.new
+        @unit = Unit.new filename
 
         input.lines.map(&:chomp).each_with_index do |line, index|
           next if line.empty?
@@ -76,6 +76,13 @@ module Haxor
         @unit.add token
       end
 
+      def add_cmd(opcode, a = nil, b = nil)
+        opcode |= offset_flags(a, b)
+        add Token::Cmd.new(opcode)
+        parse_value a unless a.nil?
+        parse_value b unless b.nil?
+      end
+
       def parse_number(value)
         md = value.match(/\A([-+]?[0-9]+[0-9A-F]*)([bhd]?)\z/)
         fail if md.nil?
@@ -99,7 +106,7 @@ module Haxor
         begin
           number = parse_number(value)
           @autolabel += 1
-          label = "__autolabel_#{@autolabel}"
+          label = "__autolabel_#{@unit.hash}_#{@autolabel}"
 
           old_section = @unit.section
           @unit.section = :data
@@ -113,10 +120,15 @@ module Haxor
         end
       end
 
-      def offset_flags(a, b = nil)
+      def offset_flags(*operands)
         result = 0
-        result |= Consts::OPCODE_FLG_DA if offset?(a)
-        result |= Consts::OPCODE_FLG_DB if offset?(b)
+        flag = Consts::OPERAND_DEREFERENCE << Consts::OPCODE_FLG_OFFSET
+
+        operands.each do |operand|
+          result |= flag if offset?(operand)
+          flag << Consts::OPERAND_FLAGS
+        end
+
         result
       end
 

data/lib/haxor/compiler/unit.rb

@@ -2,14 +2,17 @@ module Haxor
   module Compiler
     class Unit
       attr_reader :section
+      attr_reader :hash
 
-      def initialize
+      def initialize(filename)
         @section = :text
         @sections = {
           text: [],
           data: [],
           bss: []
         }
+        @filename = filename
+        @hash = Digest::SHA1.hexdigest filename
       end
 
       def add(item)

data/lib/haxor/consts.rb

@@ -1,7 +1,7 @@
 module Haxor
   class Consts
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     PATCH = 0
     GEM_VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
     VERSION = (MAJOR << 16) | (MINOR << 8) | PATCH
@@ -16,10 +16,13 @@ module Haxor
 
     # OpCode
     OPCODE_CMD_MASK = 0x0000_0000_0000_00ff
-    OPCODE_FLG_MASK = 0xffff_ffff_ffff_ff00
+    OPCODE_FLG_MASK = 0xffff_ffff_ffff_ff00 # << 8
     OPCODE_FLG_OFFSET = 8
-    OPCODE_FLG_DA = 1 << OPCODE_FLG_OFFSET # dereference A operand
-    OPCODE_FLG_DB = 2 << OPCODE_FLG_OFFSET # dereference B operand
+    # 8 bits of flag - 1st operand
+    # 8 bits of flag - 2nd operand
+
+    OPERAND_FLAGS = 8 # how many bits per operand
+    OPERAND_DEREFERENCE = (1 << 0) # Dereference operand (aka *operand)
 
     # Flags Registry Flags
     FR_ZERO    = 1 << 0 # a-b == 0

data/lib/haxor/vm/cpu/core.rb

@@ -48,22 +48,22 @@ module Haxor
         end
 
         def operand
-          flg = (subsystem(:mem).read 'op') & Consts::OPCODE_FLG_MASK
-          a = subsystem(:mem).next_cell
-          a = subsystem(:mem).read a if (flg & Consts::OPCODE_FLG_DA != 0)
-          a
+          operands(1)[0]
         end
 
-        def operands
-          flg = (subsystem(:mem).read 'op') & Consts::OPCODE_FLG_MASK
+        def operands(n = 2)
+          flg = subsystem(:mem).read('op') & Consts::OPCODE_FLG_MASK
+          flg >> Consts::OPCODE_FLG_OFFSET
 
-          a = subsystem(:mem).next_cell
-          a = subsystem(:mem).read a if (flg & Consts::OPCODE_FLG_DA != 0)
-
-          b = subsystem(:mem).next_cell
-          b = subsystem(:mem).read b if (flg & Consts::OPCODE_FLG_DB != 0)
+          result = []
+          n.times do
+            v = subsystem(:mem).next_cell
+            v = subsystem(:mem).read a if (flg & Consts::OPERAND_DEREFERENCE != 0)
+            result << v
+            flg << Consts::OPERAND_FLAGS
+          end
 
-          [a, b]
+          result
         end
 
         private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haxor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler