sexpir 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682317cfd3be1aa8cbdefa505279d36be704c833b4f9cfc1165dbfe6f17777c0
-  data.tar.gz: 739265b361bf8d05fa41c827d1db2b2a858306832343189eba1c5f368110000f
+  metadata.gz: d45365e286fe8bc9b4753ae19719cdeefd7658601a073815fb353261c2625291
+  data.tar.gz: 4520be485401dd92d359610bd35afd9381ffdc888e20ccda1c995766d4a3421e
 SHA512:
-  metadata.gz: 60bff8d21a153e2c9f919b07d24647b55233f67170789ce247625f4f8e4024d5756dd85b200840a121df202441d1003505b9e31cda1003755d52e11fe6a03433
-  data.tar.gz: 0d501270fe47eaa5a1d46d71686ce1e0aba1dc19921fa579cedd6b029ea98faaf64102e2149bf6b8418c64abacfc6462eeedfa5eadbb16cc40ea294888dedd16
+  metadata.gz: d83e7befa32854a2ba94e0305fd25143f273e3013f0a4d6269ba833371be725beca266bfee71bb70121fa85a123076293d3bd1b53ce31c5c9f27bb8abaf68fb7
+  data.tar.gz: e5f9ee42cb50813177a76bd79115faca88b2fcdc216121633cc6225f3fcb30d1c8aae219534825d5fdda4077da77814f964a00d3151a9dda6ccfa9d708a74993

data/lib/sexpir/ast.rb

@@ -18,6 +18,11 @@ module Sexpir
 
   class Signal < Ast
     attr_accessor :name,:type
+    attr_accessor :bits_sign
+    attr_accessor :reset
+    attr_accessor :reset_less
+    attr_accessor :name_override
+    attr_accessor :min,:max
   end
 
   class Io < Signal
@@ -63,6 +68,21 @@ module Sexpir
       @elsifs=[]
     end
   end
+
+  class Case < Ast
+    attr_accessor :expr,:whens,:default
+    def initialize
+      @whens=[]
+    end
+  end
+
+  class When < Ast
+    attr_accessor :expr,:body
+  end
+
+  class Default < Ast
+    attr_accessor :body
+  end
   #===============================
   class Component < Ast
     attr_accessor :name,:type
@@ -89,10 +109,15 @@ module Sexpir
     end
   end
 
-  class Const < Expression
+  class Const < Term
     attr_accessor :value
     def initialize value
       @value=value
     end
   end
+
+  class Slice < Term
+    attr_accessor :expr
+    attr_accessor :msb,:lsb
+  end
 end

data/lib/sexpir/ast_sexp.rb

@@ -7,6 +7,11 @@ class Symbol
 end
 
 module Sexpir
+  class Ast
+    def sexp
+       "(nyi sorry)"
+    end
+  end
 
   class Circuit < Ast
     def sexp
@@ -26,7 +31,12 @@ module Sexpir
 
   class Signal < Ast
     def sexp
-      "(signal  #{name} #{type})"
+      attrs=instance_variables.map do |ivar|
+        var=ivar[1..-1]
+        value=instance_variable_get(ivar)
+        "(#{var} #{value})"
+      end.join(' ')
+      "(signal #{attrs})"
     end
   end
 
@@ -38,13 +48,23 @@ module Sexpir
 
   class Input < Io
     def sexp
-      "(input  #{name} #{type})"
+      attrs=instance_variables.map do |ivar|
+        var=ivar[1..-1]
+        value=instance_variable_get(ivar)
+        "(#{var} #{value})"
+      end.join(' ')
+      "(input #{attrs})"
     end
   end
 
   class Output < Io
     def sexp
-      "(output #{name} #{type})"
+      attrs=instance_variables.map do |ivar|
+        var=ivar[1..-1]
+        value=instance_variable_get(ivar)
+        "(#{var} #{value})"
+      end.join(' ')
+      "(output #{attrs})"
     end
   end
 
@@ -110,6 +130,44 @@ module Sexpir
       code
     end
   end
+
+
+  class Case < Ast
+    def sexp
+      code=Code.new
+      code << "(case #{expr.sexp}"
+      code.indent=2
+      whens.each{|when_| code << when_.sexp}
+      code << self.default.sexp
+      code.indent=0
+      code << ")"
+      code
+    end
+  end
+
+  class When < Ast
+    def sexp
+      code=Code.new
+      code << "(when #{expr.sexp}"
+      code.indent=2
+      code << body.sexp
+      code.indent=0
+      code << ")"
+      code
+    end
+  end
+
+  class Default < Ast
+    def sexp
+      code=Code.new
+      code << "(default "
+      code.indent=2
+      code << body.sexp
+      code.indent=0
+      code << ")"
+      code
+    end
+  end
   #===============================
   class Component < Ast
     def sexp
@@ -136,7 +194,7 @@ module Sexpir
     end
   end
 
-  class Const < Expression
+  class Const < Term
     def sexp
       value
     end

data/lib/sexpir/parser.rb

@@ -70,7 +70,29 @@ module Sexpir
       sig=Signal.new
       sexp.shift
       sig.name=sexp.shift
-      sig.type=sexp.shift
+      case sexp.first
+      when Symbol
+        sig.type=sexp.shift
+      when Integer
+        val=sexp.shift
+        sig.type="bv#{val}"
+      end
+      while sexp.any?
+        case sexp.first
+        when Array
+          ary=sexp.shift
+          field_name=ary.shift
+          case field_name
+          when :bits_sign,:name,:reset,:reset_less,:name_override,:min,:max
+            sig.send("#{field_name}=",ary.shift)
+          else
+            raise "unknow signal attribut '#{field_name}'"
+          end
+        else
+          raise "unknown signal attribute '#{sexpr.first}'"
+        end
+      end
+
       sig
     end
 
@@ -78,7 +100,28 @@ module Sexpir
       input=Input.new
       sexp.shift
       input.name=sexp.shift
-      input.type=sexp.shift
+      case sexp.first
+      when Symbol
+        input.type=sexp.shift
+      when Integer
+        val=sexp.shift
+        input.type="bv#{val}"
+      end
+      while sexp.any?
+        case sexp.first
+        when Array
+          ary=sexp.shift
+          field_name=ary.shift
+          case field_name
+          when :bits_sign,:name,:reset,:reset_less,:name_override,:min,:max
+            input.send("#{field_name}=",ary.shift)
+          else
+            raise "unknow signal attribut '#{field_name}'"
+          end
+        else
+          raise "unknown signal attribute '#{sexpr.first}'"
+        end
+      end
       input
     end
 
@@ -86,7 +129,28 @@ module Sexpir
       output=Output.new
       sexp.shift
       output.name=sexp.shift
-      output.type=sexp.shift
+      case sexp.first
+      when Symbol
+        output.type=sexp.shift
+      when Integer
+        val=sexp.shift
+        output.type="bv#{val}"
+      end
+      while sexp.any?
+        case sexp.first
+        when Array
+          ary=sexp.shift
+          field_name=ary.shift
+          case field_name
+          when :bits_sign,:name,:reset,:reset_less,:name_override,:min,:max
+            output.send("#{field_name}=",ary.shift)
+          else
+            raise "unknow signal attribut '#{field_name}'"
+          end
+        else
+          raise "unknown signal attribute '#{sexpr.first}'"
+        end
+      end
       output
     end
 
@@ -129,6 +193,8 @@ module Sexpir
         parse_if(sexp)
       when :assign
         parse_assign(sexp)
+      when :case
+        parse_case(sexp)
       else
         raise "unknow statement starting with : #{sexp.first}"
       end
@@ -142,6 +208,14 @@ module Sexpir
       comb
     end
 
+    def parse_seq sexp
+      comb=Sequential.new
+      sexp.shift
+      label=sexp.shift
+      comb.body=parse_body(sexp)
+      comb
+    end
+
     def parse_body sexp
       body=Body.new
       while sexp.any?
@@ -195,6 +269,40 @@ module Sexpir
       assign
     end
 
+    def parse_case sexp
+      ret=Case.new
+      sexp.shift
+      ret.expr=parse_expression(sexp.shift)
+      while sexp.any?
+        ary=sexp.shift
+        case ary.first
+        when :when
+          ret.whens << parse_when(ary)
+        when :default
+          ret.default=parse_default(ary)
+        else
+          raise "unknown case alternative : '#{ary.first}'"
+        end
+      end
+
+      ret
+    end
+
+    def parse_when sexp
+      ret=When.new
+      sexp.shift
+      ret.expr=parse_expression(sexp.shift)
+      ret.body=parse_body(sexp)
+      ret
+    end
+
+    def parse_default sexp
+      ret=Default.new
+      sexp.shift
+      ret.body=parse_body(sexp)
+      ret
+    end
+
     # expressions
 
     def parse_expression sexp
@@ -214,6 +322,8 @@ module Sexpir
           ret=parse_unary(sexp)
         when 3
           ret=parse_binary(sexp)
+        when 4
+          ret=parse_slice(sexp)
         else
           raise "unknown expression '#{sexp}'(size = '#{sexp.size}')"
         end
@@ -270,5 +380,14 @@ module Sexpir
       ret.op=sexp.shift
       ret
     end
+
+    def parse_slice sexp
+      ret=Slice.new
+      sexp.shift
+      ret.expr=parse_expression(sexp.shift)
+      ret.msb=parse_expression(sexp.shift)
+      ret.lsb=parse_expression(sexp.shift)
+      ret
+    end
   end
 end

data/lib/sexpir/ruby_rtl_generator.rb

@@ -12,18 +12,27 @@ module Sexpir
       log "[+] generating RubyRTL '#{circuit.name}'"
       code=circuit.accept(self)
       puts code.finalize
+      filename=circuit.name.to_s+".rb"
+      code.save_as filename
     end
 
     def visitCircuit circuit,args=nil
       code=Code.new
       code << "require 'ruby_rtl'"
+      code.newline
+      code << "include RubyRTL"
+      code.newline
       code << "class #{circuit.name.capitalize} < Circuit"
       code.indent=2
+      code << "def initialize"
+      code.indent=4
       circuit.inputs.each{|input| code << input.accept(self)}
       circuit.outputs.each{|output| code << output.accept(self)}
       circuit.signals.each{|signal| code << signal.accept(self)}
       code.newline
       code << circuit.body.accept(self)
+      code.indent=2
+      code << "end"
       code.indent=0
       code << "end"
       code
@@ -107,18 +116,55 @@ module Sexpir
     def visitIf if_,args=nil
       cond=if_.cond.accept(self)
       code=Code.new
-      code << "if (#{cond}"
+      code << "If(#{cond}){"
       code.indent=2
       code << if_.then.accept(self)
       if if_.else
         code.indent=0
-        code << "else"
+        code << "Else{"
         code.indent=2
         code << if_.else.accept(self)
         code.indent=0
+        code << "}"
+      else
+        code.indent=0
+        code << "}"
       end
+      code
+    end
+
+    def visitCase case_,args=nil
+      expr=case_.expr.accept(self)
+      code=Code.new
+      code << "Case(#{expr}){"
+      code.indent=2
+      case_.whens.each do |when_|
+        code << when_.accept(self)
+      end
+      code << case_.default.accept(self)
       code.indent=0
-      code << "end"
+      code << "}"
+      code
+    end
+
+    def visitWhen when_,args=nil
+      expr=when_.expr.accept(self)
+      code=Code.new
+      code << "When(#{expr}){"
+      code.indent=2
+      code << when_.body.accept(self)
+      code.indent=0
+      code << "}"
+      code
+    end
+
+    def visitDefault default_,args=nil
+      code=Code.new
+      code << "Else{"
+      code.indent=2
+      code << default_.body.accept(self)
+      code.indent=0
+      code << "}"
       code
     end
 
@@ -164,6 +210,13 @@ module Sexpir
       const.value
     end
 
+    def visitSlice slice,args=nil
+      expr=slice.expr.accept(self)
+      msb=slice.msb.accept(self)
+      lsb=slice.lsb.accept(self)
+      "#{expr}[#{msb}..#{lsb}]"
+    end
+
 
   end
 end

data/lib/sexpir/version.rb

@@ -1,3 +1,3 @@
 module Sexpir
-  VERSION="0.0.2"
+  VERSION="0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sexpir
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution