tem_ruby 0.10.3 → 0.11

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.11. Procedure calls (fw 1.11) and improved TEM exception information dump.
+
 v0.10.3. Fixed benchmarking via the tem_bench binary.
 
 v0.10.2. More internal refactorings.

data/lib/tem/definitions/isa.rb

@@ -129,14 +129,20 @@ module Tem::Isa
                                  :reladdr => 2}
     isa.instruction 0x25, :jle, {:name => :to, :type => :tem_ushort,
                                  :reladdr => 2}
+                                 
+    # 0 ST -> 1 ST; IP
+    isa.instruction 0x3E, :call, {:name => :proc, :type => :tem_ushort,
+                                  :reladdr => 2}
+    # 1 ST -> 0 ST; IP (without IM)
+    isa.instruction 0x3F, :ret
   
     # 1 IM_B -> 1 ST
     isa.instruction 0x30, :ldbc, {:name => :const, :type => :tem_byte}
     # 1 IM -> 1 ST
     isa.instruction 0x31, :ldwc, {:name => :const, :type => :tem_short}
-    # 1 ST -> 1 ST
+    # 0 ST -> 1 ST
     isa.instruction 0x32, :ldb, {:name => :from, :type => :tem_ushort}
-    # 1 ST -> 1 ST
+    # 0 ST -> 1 ST
     isa.instruction 0x33, :ldw, {:name => :from, :type => :tem_ushort}
     # 1 ST -> 1 ST
     isa.instruction 0x36, :ldbv

data/lib/tem/sec_exec_error.rb

@@ -4,20 +4,43 @@ class Tem::SecExecError < StandardError
   attr_reader :buffer_state, :key_state
   attr_reader :trace
   
-  def initialize(line_info, tem_trace, buffer_state, key_state)
+  def initialize(secpack, tem_trace, buffer_state, key_state)
     super 'SEC execution failed on the TEM'
-    @line_info = line_info
-    line_ip, atom, backtrace = *line_info
-    @atom = atom
+    
+    if tem_trace
+      if tem_trace[:ip]
+        @ip_line_info = secpack.line_info_for_addr tem_trace[:ip]
+        @ip_label_info = secpack.label_info_for_addr tem_trace[:ip]
+      end
+      if tem_trace[:sp]
+        @sp_line_info = secpack.line_info_for_addr tem_trace[:sp]
+      end
+    end
+    @ip_line_info ||= [0, :unknown, []]
+    @ip_label_info ||= [0, :unknown]
+    @sp_line_info ||= [0, :unknown, []]
+    
+    line_ip, atom, backtrace = *@ip_line_info
+    set_backtrace backtrace
+    @ip_atom = atom
+    @ip_label = @ip_label_info[1]
     if tem_trace and tem_trace[:ip]
       @ip_delta = tem_trace[:ip] - line_ip
+      @ip_label_delta = tem_trace[:ip] - @ip_label_info[0]
     else
-      @ip_delta = 0
+      @ip_delta = @ip_label_delta = 0
     end
+    line_sp, atom, backtrace = *@sp_line_info
+    @sp_atom = atom
+    if tem_trace and tem_trace[:sp]
+      @sp_delta = tem_trace[:sp] - line_sp
+    else
+      @sp_delta = 0
+    end
+    
     @trace = tem_trace
     @buffer_state = buffer_state
     @key_state = key_state
-    set_backtrace backtrace
   end
   
   def bstat_str
@@ -40,7 +63,10 @@ class Tem::SecExecError < StandardError
     if @trace.nil?
       "no trace available"
     else
-      "ip=#{'%04x' % @trace[:ip]} sp=#{'%04x' % @trace[:sp]} out=#{'%04x' % @trace[:out]} pscell=#{'%04x' % @trace[:pscell]}"
+      "ip=#{'%04x' % @trace[:ip]} (#{@ip_atom}+0x#{'%x' % @ip_delta}) " +
+      "sp=#{'%04x' % @trace[:sp]} (#{@sp_atom}+0x#{'%x' % @sp_delta}) " +
+      "out=#{'%04x' % @trace[:out]} " +
+      "pscell=#{'%04x' % @trace[:pscell]}"
     end
   end
   
@@ -52,7 +78,7 @@ TEM Trace: #{trace_str}
 TEM Buffer Status:#{bstat_str}
 TEM Key Status:#{kstat_str}
 
-TEM execution error at #{@atom}+#{@ip_delta}
+TEM execution error at #{@ip_label}+0x#{'%x' % @ip_label_delta}:
 ENDSTRING
     string.strip
   end

data/lib/tem/seclosures.rb

@@ -54,12 +54,7 @@ module Tem::SeClosures
         b_stat = stat_buffers() rescue nil
         k_stat = stat_keys() rescue nil
         trace = sec_trace()
-        if trace and trace[:ip]
-          line_info = secpack.line_info_for_ip(trace[:ip])
-        else
-          line_info = [0, :unknown, Kernel.caller]
-        end
-        sec_exception = Tem::SecExecError.new line_info, trace, b_stat, k_stat
+        sec_exception = Tem::SecExecError.new secpack, trace, b_stat, k_stat
         break
       when 4 # persistent store fault
         solve_psfault

data/lib/tem/secpack.rb

@@ -94,14 +94,38 @@ class Tem::SecPack
     [tem_header, @body, [0] * @extra_bytes].flatten
   end
   
-  def line_info_for_ip(ip)
+  def line_info_for_addr(addr)
     return nil unless @lines
 
     @lines.reverse_each do |info|
       # If something breaks, it's likely to happen after the opcode of the 
       # offending instruction has been read, so assume offending_ip < ip.
-      return info if ip >= info[0]
+      return info if addr >= info[0]
     end
     return info.first
   end
+  
+  def label_info_for_addr(addr)
+    @labels.to_a.reverse_each do |info|
+      return info.reverse if addr >= info[1]
+    end
+  end
+  
+  # Methods for interacting with the plaintext content of a SECpack. 
+    
+  def set_value(label, abi_type, value)
+    expand_extra_bytes
+    raise "Unknown label #{label}" unless addr = @labels[label]
+    bytes = Tem::Abi.send :"to_#{abi_type}", value
+    @body[addr, bytes.length] = bytes
+    #trim_extra_bytes
+  end
+  
+  def get_value(label, abi_type)
+    expand_extra_bytes
+    raise "Unknown label #{label}" unless addr = @labels[label]
+    value = Tem::Abi.send :"read_#{abi_type}", @body, addr
+    #trim_extra_bytes
+    value
+  end
 end

data/tem_ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_ruby}
-  s.version = "0.10.3"
+  s.version = "0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/test/tem_unit/test_tem_bound_secpack.rb

@@ -18,13 +18,13 @@ module TemBoundSecpackTestCase
         # Make sure the zero_bytes optimization doesn't screw things up.
         s.zeros :tem_ubyte, 60
         s.label :plain
+        s.zeros :tem_ubyte, 20
         s.stack 4
     }
 
     sb = bound_sec.body
-    secret_found = false
-    0.upto(sb.length - 1) { |i| if secret == sb[i, secret.length] then secret_found = true; break; end }
-    assert secret_found, 'test_bound_secpack needs rethinking: the unbound secpack does not contain the secret'
+    secret_offset = (0...sb.length).find { |i| secret == sb[i, secret.length] }    
+    assert secret_offset, 'The unbound secpack does not contain the secret.'
 
     bound_sec.bind pubk, :secret, :plain
     if yaml_roundtrip
@@ -36,11 +36,18 @@ module TemBoundSecpackTestCase
     assert_equal secret, result, 'TEM failed to decrypt secpack'
 
     sb = bound_sec.body
-    0.upto(sb.length - 1) { |i| assert_not_equal secret, sb[i, secret.length], 'secret found unencrypted in bound secpack' }
+    assert !(0...sb.length).find { |i| secret == sb[i, secret.length] },
+           'Secret found unencrypted in bound secpack'
 
-    bound_sec.body[bound_sec.label_address(:mess_place)] += 1
-    assert_raise(RuntimeError, 'secpack validation isn\'t working') { @tem.execute bound_sec }
-  end  
+    assert_equal 0, bound_sec.get_value(:plain, :tem_ushort),
+                 'SecPack plaintext corrupted during binding'
+
+    bound_sec.set_value :mess_place, :tem_ubyte,
+                        bound_sec.get_value(:mess_place, :tem_ubyte) + 1
+    assert_raise(RuntimeError, "secpack validation isn't working") do
+      @tem.execute bound_sec
+    end
+  end
 end
 
 class TemBoundSecpackTest < TemTestCase

data/test/tem_unit/test_tem_branching.rb

@@ -53,4 +53,30 @@ class TemBranchingTest < TemTestCase
                   0x10, 0x11, 0x12],
                  result, 'the branching unit isn\'t working well'        
   end
+  
+  def test_calls
+    secpack = @tem.assemble { |s|
+      s.ldbc 4
+      s.outnew
+      s.call :proc1
+      s.call :proc1
+      s.call :proc1
+      s.call :proc1
+      s.halt
+      
+      s.label :proc1
+      s.ldw :proc1var
+      s.dupn :n => 1
+      s.outb
+      s.ldbc 1
+      s.add
+      s.stw :proc1var
+      s.ret
+      s.label :proc1var
+      s.data :tem_short, 5
+      s.stack 3
+    }
+    result = @tem.execute secpack
+    assert_equal [5, 6, 7, 8], result, 'the branching unit isn\'t working well'    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.10.3
+  version: "0.11"
 platform: ruby
 authors: 
 - Victor Costan