crokus 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bca020ee93a39e7a8bea529c45ede29dc579f3a6536cea6999d497ffb985c1a0
-  data.tar.gz: 3d78efcd9e0b963791963ae7f02bd16dc51e3f22a7e13ceda0fc5552d775a7ac
+  metadata.gz: be5b5ebda83413fed630ed6069d00528c985cc2a29b7d977e5a3ce31b781e267
+  data.tar.gz: 2f450a1c765c7aed5f4707f50b83bdf6d3ec1f9b8e4e5bc2173a41f1c21be556
 SHA512:
-  metadata.gz: 10d5d9e59e156d4426f5cfc6145e5268188eddf73e70c455986360d6d74782ceefcaadce3154b00aa5bed6f678fa5c77317983f3d4d3ac64f4742293fcf1cf44
-  data.tar.gz: a7eb869b9536a8932975efd2378d283a5e5a3fd9bf337a8be64e441929a53f28fa4daa59d06a51cca507840474cf2b6c96f67147bd6281bf56c75db723b63854
+  metadata.gz: 1b0788d72e8c057b4c2a01581a164e106b33c21c122e2de6a77751e264fdd173f11b5a43044dced72e389eceabf78c4d601912067c486b7a6fc794d94e1c17b7
+  data.tar.gz: 8ff0cc75ee7c2866f611e324439ac278b9c01d57e9df14bfc14cdd8d7c6047ffad0f6a1991caf03f126bce65e098946bb6ece4811e777d02a0fe4416169cdbab

data/lib/crokus/ast.rb

@@ -1,3 +1,4 @@
+
 module Crokus
 
   class Ast
@@ -46,9 +47,9 @@ module Crokus
   end
 
   class Define < Ast
-    attr_accessor :name,:expr
-    def initialize n,e
-      @name,@expr=n,e
+    attr_accessor :name,:args,:expr
+    def initialize n,a,e
+      @name,@args,@expr=n,a,e
     end
   end
 
@@ -425,7 +426,14 @@ module Crokus
   end
 
   class IntLit < Literal
+    def to_i
+      tok.val.to_i
+    end
   end
+  require_relative 'token'
+
+  ZERO_LIT=IntLit.new(ZERO)
+  ONE_LIT=IntLit.new(ONE)
 
   class FloatLit < Literal
   end

data/lib/crokus/cfg.rb

@@ -35,8 +35,8 @@ module Crokus
       @bbs << bb
     end
 
-    def print verbose=true
-      CFGPrinter.new.print(self,verbose)
+    def print
+      CFGPrinter.new.print(self,5)
     end
 
   end

data/lib/crokus/cfg_builder.rb

@@ -18,7 +18,7 @@ module Crokus
     end
 
     def visitFunction func,args=nil
-      puts "   |--> visitFunction '#{func.name}'" unless $options[:mute]
+      puts " |--[+] visitFunction '#{func.name}'" unless $options[:mute]
       @cfg=CFG.new(func.name)
       @current=@cfg.starter
       func.body.accept(self)
@@ -26,7 +26,7 @@ module Crokus
       @cfg=CFGCleaner.new.clean(@cfg)
       @cfg.name=Ident.new(Token.create "#{@cfg.name}_clean")
       func.cfg=@cfg
-      puts "\t|--> cfg size for '#{func.name}' : #{@cfg.size}" unless $options[:mute]
+      puts " "*5+"|--[+] cfg size for '#{func.name}' : #{@cfg.size}" unless $options[:mute]
       @cfg.print
     end
 
@@ -38,6 +38,10 @@ module Crokus
       @current << assign
     end
 
+    def visitLabeledStmt assign,args=nil
+      @current << assign
+    end
+
     def visitPreFixAccu accu,args=nil
       @current << accu
     end

data/lib/crokus/cfg_cleaner.rb

@@ -3,7 +3,7 @@ module Crokus
   class CFGCleaner
 
     def clean cfg
-      puts "\t|--> cleaning '#{cfg.name}'" unless $options[:mute]
+      puts " "*5+"|--[+] cleaning '#{cfg.name}'" unless $options[:mute]
       @cfg=cfg
       @visited=[]
       @new_succs={}

data/lib/crokus/cfg_printer.rb

@@ -6,7 +6,7 @@ module Crokus
 
     attr_accessor :code
 
-    def print cfg,verbose=$options[:mute]!=true
+    def print cfg,pos=0
       @code=Code.new
       @code << header
       @visited=[]
@@ -14,7 +14,7 @@ module Crokus
       @code << footer
       dot_name="cfg_#{cfg.name}.dot"
       @code.save_as dot_name
-      puts "\t|--> graphviz file saved as '#{dot_name}'" if verbose
+      puts " "*pos+"|--[+] graphviz file saved as '#{dot_name}'"
     end
 
     def header

data/lib/crokus/code.rb

@@ -28,6 +28,10 @@ class Code
     ""
   end
 
+  def to_s
+    finalize
+  end
+
   def newline
     @lines << " "
   end

data/lib/crokus/compiler.rb

@@ -47,7 +47,7 @@ module Crokus
     def parse filename
       @base_name=File.basename(filename, ".c")
       code=IO.read(filename)
-      puts "=> parsing #{filename}" unless options[:mute]
+      puts "[+] parsing #{filename}" unless options[:mute]
       @ast=Parser.new.parse(code)
       draw_ast     if options[:draw_ast]
       pretty_print if options[:pp]
@@ -55,46 +55,46 @@ module Crokus
 
     def draw_ast tree=nil,filename=nil
       dotname=filename || "#{base_name}.dot"
-      puts "   |--> drawing AST '#{dotname}'" unless options[:mute]
+      puts "   |--[+] drawing AST '#{dotname}'" unless options[:mute]
       ast_ = tree || @ast
       dot=AstPrinter.new.print(ast_)
       dot.save_as dotname
     end
 
     def transform
-      puts "=> dummy transform" unless options[:mute]
+      puts "[+] dummy transform" unless options[:mute]
       ast_t= Transformer.new.transform(ast)
       dotname="#{base_name}_trans.dot"
       draw_ast ast_t,dotname
     end
 
     def visit
-      puts "=> dummy visit" unless options[:mute]
+      puts "[+] dummy visit" unless options[:mute]
       Visitor.new.visit(ast)
     end
 
     def pretty_print
-      puts "=> pretty_print" unless options[:mute]
+      puts "[+] pretty_print" unless options[:mute]
       code=PrettyPrinter.new.visit(ast)
       pp_c=@base_name+"_pp.c"
       File.open(pp_c,'w'){|f| f.puts code}
-      puts "   |--> saved as #{pp_c}" unless options[:mute]
+      puts " "*1+"|--[+] saved as #{pp_c}" unless options[:mute]
     end
 
     def build_cfg
-      puts "=> building CFGs" unless options[:mute]
+      puts "[+] building CFGs" unless options[:mute]
       builder=CFGBuilder.new
       builder.build(ast)
     end
 
     def build_tac
-      puts "=> building TAC" unless options[:mute]
+      puts "[+] building TAC" unless options[:mute]
       builder=TACBuilder.new
       builder.visit(ast)
     end
 
     def emit_ir
-      puts "=> emit textual IR " unless options[:mute]
+      puts "[+] emit textual IR " unless options[:mute]
       IRDumper.new.visit(ast)
     end
 
@@ -103,7 +103,7 @@ module Crokus
     end
 
     def insert_trojan
-      puts "=> inserting trojan" unless options[:mute]
+      puts "[+] inserting trojan" unless options[:mute]
       infected_ast=TrojanInserter.new.insert(ast)
       if infected_ast
         code=PrettyPrinter.new.visit(infected_ast)

data/lib/crokus/ir_dumper.rb

@@ -3,11 +3,11 @@ module Crokus
   class IRDumper < Visitor
 
     def visitFunction func,args=nil
-      puts "[+] IR for '#{func.name}'"
+      puts " "*1+"|--[+] IR for '#{func.name}'"
       ir_code=dump(func.cfg)
       filename=func.name.to_s+".ir"
       ir_code.save_as filename
-      puts "\t generated #{filename}"
+      puts " "*5+"|--[+] generated #{filename}"
     end
 
     def dump cfg

data/lib/crokus/lexer.rb

@@ -91,7 +91,7 @@ module Crokus
 
       token :ident            => /\A[a-zA-Z]\w*/i
       token :float_lit        => /\A\d*(\.\d+)(E([+-]?)\d+)?/
-      token :integer_lit      => /\A(0x[0-9a-fA-F]+)|\d+/
+      token :integer_lit      => /\A((0x[0-9a-fA-F]+)|\d+)L?/
       token :string_lit       => /\A"[^"]*"/
       token :char_lit         => /\A'\\?.'/
       token :lexer_warning    => /./

data/lib/crokus/parser.rb

@@ -153,9 +153,20 @@ module Crokus
       expect :sharp
       expect :ident #define
       name=expect :ident
+      args=[]
+      if showNext.is? :lparen
+        acceptIt
+        while !showNext.is?(:rparen)
+          args << acceptIt
+          if showNext.is?(:comma)
+            acceptIt
+          end
+        end
+        expect :rparen
+      end
       e=expression()
       dedent
-      return Define.new(name,e)
+      return Define.new(name,args,e)
     end
 
     def parse_struct
@@ -297,8 +308,9 @@ module Crokus
     end
 
     def parse_label
-      expect :ident
-      expect :colon
+      id=expect(:ident)
+      expect(:colon)
+      Ident.new(id)
     end
 
     def parse_goto
@@ -475,7 +487,7 @@ module Crokus
       when :typedef
         ret=typedef()
       else
-        raise "Parsing ERROR in type declaration: '#{showNext}'"
+        raise "Parsing ERROR in type declaration: '#{showNext}' #{showNext.pos}"
       end
 
       while showNext.is? [:mul,:lparen]
@@ -541,7 +553,13 @@ module Crokus
       indent "parse else"
       expect :else
       ret=Else.new
-      ret.body=statement()
+      stmt=statement()
+      case stmt
+      when Body
+        ret.body=stmt
+      else
+        ret.body=Body.new([stmt])
+      end
       dedent
       return ret
     end
@@ -550,8 +568,13 @@ module Crokus
       indent "parse_while"
       expect :while
       cond=expression()
-      body=[]
-      body=statement()
+      stmt=statement()
+      case stmt
+      when Body
+        body=stmt
+      else
+        body=Body.new([stmt])
+      end
       dedent
       return While.new(cond,body)
     end
@@ -566,7 +589,13 @@ module Crokus
       expect :semicolon
       forloop.increment=expression()
       expect :rparen
-      forloop.body=statement()
+      stmt=statement()
+      case stmt
+      when Body
+        forloop.body=stmt
+      else
+        forloop.body=Body.new([stmt])
+      end
       dedent
       forloop
     end
@@ -667,7 +696,7 @@ module Crokus
       while showNext.is? :oror
         op=acceptIt
         e2=logand
-        e1=Or2.new(e1,op,e2)
+        e1=Binary.new(e1,op,e2)
       end
       dedent
       return e1
@@ -786,7 +815,6 @@ module Crokus
       case showNext.kind
       when :lparen # parenth expr OR casting !
         res=is_casting?
-        puts "casting? : #{res}" if $options[:verbose]
         if res
           e=casting
         else
@@ -799,23 +827,48 @@ module Crokus
       return e
     end
 
-    def is_casting?
-      i=0
-      tok=DUMMY
-      while tok.kind!=:rparen
-        tok=@tokens[i]
-        i+=1
+    def castexp
+      #puts "castexpr : #{pp @tokens[0..3]}"
+      case showNext.kind
+      when :lparen # parenth expr OR casting !
+        res=is_casting?
+        #puts "casting=#{res}"
+        if res
+          e=casting
+        else
+          e=parenthesized
+        end
+      else
+        e=unary
       end
-      tok=@tokens[i]
-      return false if tok.is? [:mul,:add,:sub]
-      return true if tok.is? STARTERS_UNARY-STARTERS_ARRAY_OR_STRUCT_INIT
-      return false
+      dedent
+      return e
     end
 
+    def is_casting?
+      #puts "is_casting? : #{pp @tokens[0..1]}"
+      cond1= @tokens[0].is?(:lparen)
+      cond2= @tokens[1].is?([:int,:uint,:short,:byte,:float,:long])
+      cond1 and cond2
+    end
+
+    # def is_casting?
+    #   i=0
+    #   tok=DUMMY
+    #   while tok.kind!=:rparen
+    #     tok=@tokens[i]
+    #     i+=1
+    #   end
+    #   pp tok=@tokens[i]
+    #   return false if tok.is? [:mul,:add,:sub]
+    #   pp cond=STARTERS_UNARY-STARTERS_ARRAY_OR_STRUCT_INIT
+    #   return true if tok.is? cond
+    #   return false
+    # end
+
     def casting
       puts "casting : #{showNext}" if $options[:verbose]
       expect :lparen
-      #typename
       t=parse_type
       expect :rparen
       u=unary
@@ -934,7 +987,7 @@ module Crokus
         when :sizeof
           u=sizeof()
         else
-          raise "not an unary"
+          raise "not an unary. showNext : #{showNext}"
         end
       end
       return u

data/lib/crokus/pretty_printer.rb

@@ -329,11 +329,10 @@ module Crokus
       return "continue;"
     end
 
-    def visitLabeledStmt label,args=nil
-      stmt=label.stmt.accept(self)
-      code=Code.new
-      code << stmt
-      return code
+    def visitLabeledStmt lstmt,args=nil
+      label=lstmt.label.accept(self)
+      stmt =lstmt.stmt.accept(self)
+      ret="#{label} : #{stmt.to_s}"
     end
 
     def visitGoto goto,args=nil

data/lib/crokus/runner.rb

@@ -69,8 +69,12 @@ module Crokus
         options[:random] = params_filename
       end
 
-      parser.on('--trojan PARAMS', "generates random c files, using parameters", String) do |params_filename|
-        options[:trojan] = params_filename
+      # parser.on('--trojan PARAMS', "generates random c files, using parameters", String) do |params_filename|
+      #   options[:trojan] = params_filename
+      # end
+
+      parser.on('--trojan', "generates random c files, using parameters") do
+        options[:trojan] = true
       end
 
       parser.on("--vv", "verbose") do

data/lib/crokus/tac_builder.rb

@@ -5,7 +5,7 @@ module Crokus
     OP_ASSIGN=Token.new([:assign,"=",[0,0]])
 
     def visitFunction func,args=nil
-      puts "   |--> tac builder for '#{func.name}'"
+      puts " "*1+"|--[+] tac builder for '#{func.name}'"
       build func.cfg
     end
 
@@ -19,6 +19,7 @@ module Crokus
     end
 
     def new_tmp
+      @tmp_id||=0
       tok=Token.create "$"+@tmp_id.to_s
       @tmp_id+=1
       tok
@@ -112,6 +113,7 @@ module Crokus
       ret=Parenth.new(par.expr)
       e=par.expr.accept(self)
       tmp=new_tmp()
+      @new_stmts||=[]
       @new_stmts << Assign.new(tmp,OP_ASSIGN,e)
       ret.expr=tmp
       return ret

data/lib/crokus/transformer.rb

@@ -42,8 +42,9 @@ module Crokus
 
     def visitDefine define,args=nil
       name=define.name.accept(self)
+      args=define.args.map{|arg| arg.accept(self)}
       expr=define.expr.accept(self)
-      Define.new(name,expr)
+      Define.new(name,args,expr)
     end
 
     def visitTypedef typdef,args=nil
@@ -113,6 +114,12 @@ module Crokus
     end
 
     #...........stmts...............
+    def visitLabeledStmt lstmt,args=nil
+      label=lstmt.label.accept(self)
+      stmt=lstmt.stmt.accept(self)
+      LabeledStmt.new(label,stmt)
+    end
+
     def visitCommaStmt comma,args=nil
       lhs=comma.lhs.accept(self)
       rhs=comma.rhs.accept(self)

data/lib/crokus/trojan_inserter.rb

@@ -9,10 +9,10 @@ module Crokus
       @nb_trojans=0
       new_ast=transform(ast)
       if @nb_trojans>0
-        puts "insertion succeeded : #{@nb_trojans} trojan(s)"
+        puts " "*1+"|--[+] insertion succeeded : #{@nb_trojans} trojan(s)"
         return new_ast
       else
-        puts "insertion failed"
+        puts " "*1+"|--[?] insertion failed"
       end
       nil
     end
@@ -25,13 +25,27 @@ module Crokus
     end
 
     def visitFunction func,args=nil
-      puts "[+] func #{func.name}"
+      puts " "*1+"|--[+] func #{func.name}"
       func_troj=super(func,args)
       success=insert_trojan(func_troj)
       @nb_trojans+=1 if success
       func_troj
     end
 
+    def insert_trojan func
+      if trojan=build_trojan(func)
+        bodies=bodies_collect(func)
+        puts "\t#bodies = #{bodies.size}"
+        target_body=bodies.sample
+        stmts=target_body.stmts
+        nb_decls=stmts.select{|stmt| stmt.is_a? Decl}.size
+        pos=rand(nb_decls-1..stmts.size-1)+1
+        target_body.stmts=stmts.insert(pos,trojan)
+        return success=true
+      end
+      success=false
+    end
+
     def bodies_collect func
       bodies=[]
       bodies << func.body
@@ -55,6 +69,8 @@ module Crokus
           bodies << stmt.body
         when Switch
           bodies << switch_.cases.collect{|case_| case_.body}
+        when Body
+          bodies << bodies_rec_collect(stmt)
         end
       end
       result = []
@@ -63,20 +79,6 @@ module Crokus
       result.flatten
     end
 
-    def insert_trojan func
-      bodies=bodies_collect(func)
-      puts "#bodies = #{bodies.size}"
-      target_body=bodies.sample
-      stmts=target_body.stmts
-      nb_decls=stmts.select{|stmt| stmt.is_a? Decl}.size
-      pos=rand(nb_decls..stmts.size-1)
-      if trojan=build_trojan(func)
-        target_body.stmts=stmts.insert(pos,trojan)
-        return success=true
-      end
-      success=false
-    end
-
     INT_TYPE=Type.new(INT)
 
     def build_trojan func
@@ -119,16 +121,39 @@ module Crokus
 
     def build_trigger func
       args=find_int_arg(func)
-      return unless args.size>1
-      cond=Binary.new(Parenth.new(Binary.new(args[0],AND,args[1])),EQUAL,T42)
+      arg_names=get_arg_names(args)
+      return unless arg_names.size>1
+      cond=Binary.new(Parenth.new(Binary.new(arg_names[0],AND,arg_names[1])),EQUAL,T42)
       If.new(cond,nil)
     end
 
     def find_int_arg func
       func.args.select do |arg|
-        (tok=arg.type.name).is_a?(Token) && tok.is?(:int)
+        cond1=(tok=arg.type.name).is_a?(Token) && tok.is?(:int)
+        cond2=(atype=arg.type).is_a?(ArrayOf) && (tok=atype.name.name).is_a?(Token) && tok.is?(:int)
+        cond1 or cond2
       end
     end
 
+    def get_arg_names args
+      ret=[]
+      ret << args.map{|formal_arg|
+        case (type=formal_arg.type)
+        when ArrayOf
+          if type.size.is_a?(IntLit)
+            array_size=type.size.to_i
+            if array_size>1
+              ret << Indexed.new(formal_arg.name,ZERO_LIT)
+              ret << Indexed.new(formal_arg.name,ONE_LIT)
+            end
+          end
+        else
+          formal_arg.name
+        end
+      }
+      ret.flatten!
+    end
+
+
   end
 end

data/lib/crokus/version.rb

@@ -1,3 +1,3 @@
 module Crokus
-  VERSION="0.0.10"
+  VERSION="0.1.0"
 end

data/lib/crokus/visitor.rb

@@ -266,6 +266,15 @@ module Crokus
       lit
     end
 
+    def visitCondExpr cexpr,args=nil
+      indent "condexpr"
+      cexpr.cond.accept(self)
+      cexpr.lhs.accept(self,args)
+      cexpr.rhs.accept(self,args)
+      dedent
+      cexpr
+    end
+
     def visitBinary expr,args=nil
       indent "Binary"
       expr.lhs.accept(self,args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution