crokus 0.1.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b12095d7e84e7b72f5e38eaa2901dc98044ffd7c42b582a80a72364be03ef29
-  data.tar.gz: 43dbd24919d3ec3e73981d8b9f22345a6f0885b5d1487ace5fbcc00d84070394
+  metadata.gz: b690523ea19dfb9b7eaa5f0569ab5b4d9cba857ca8e4a451907af3b28c7749c7
+  data.tar.gz: 2313aac03fc005f09dbee2925a64738e0c85fe0a343f1de0a426ce73a9307eab
 SHA512:
-  metadata.gz: 43c1ab8d6bf5f8a798c8d97ca65de2b04e12ed6f6ce6e76f45ab91813c7484a8c37726c4133056c940cf2366386d8bbd3020afac5ed663dbc14809b7de58f5af
-  data.tar.gz: ada4e46905d24b2cda56582b03f8569baac7bce9b104f548cba1fb594799c901b54c3f7722478dd3a2275b918c0a0f6b962d1f3d74df11d7d562b35ddcee6c46
+  metadata.gz: 3b8be391422d91f28ffc75c0d86f00098f9ba17f2d64a277a28dee774348bb725b558a1a469d11831d07ac58f9dbab3a08a37779f3c4a3672aa06f6f94374041
+  data.tar.gz: 89aeab45274244cadd1758cd17a2ca2364db45ec3b3f1ed748caf2c6a6840cf9c9a9a99cf0e4f6a90844a2c623f0315bb26c7195650dd55c2675367f805b164e

data/lib/crokus/ast.rb

@@ -35,6 +35,10 @@ module Crokus
     def to_s
       @tok.val
     end
+
+    def self.create str
+      Ident.new(Token.create(str))
+    end
   end
 
   class Include < Ast

data/lib/crokus/cfg.rb

@@ -35,7 +35,7 @@ module Crokus
       @bbs << bb
     end
 
-    def print
+    def print versbose=false
       CFGPrinter.new.print(self,5)
     end
 

data/lib/crokus/cfg_builder.rb

@@ -1,5 +1,6 @@
 require_relative 'cfg'
 require_relative 'cfg_cleaner'
+require_relative 'cfg_optim'
 
 require_relative 'visitor'
 require_relative 'cleaner'
@@ -24,6 +25,7 @@ module Crokus
       func.body.accept(self)
       @cfg.print
       @cfg=CFGCleaner.new.clean(@cfg)
+      @cfg=CFGOptimizer.new.clean(@cfg)
       @cfg.name=Ident.new(Token.create "#{@cfg.name}_clean")
       func.cfg=@cfg
       puts " "*5+"|--[+] cfg size for '#{func.name}' : #{@cfg.size}" unless $options[:mute]
@@ -126,6 +128,10 @@ module Crokus
       @current=falseBranch
     end
 
+    def visitFunCall fcall,args=nil
+      @current << fcall
+    end
+
     def visitFor for_,args=nil
       for_.init.each{|stmt| stmt.accept(self)}
       cond=for_.cond.accept(self)
@@ -148,6 +154,10 @@ module Crokus
       @current=falseBranch
     end
 
+    def visitReturn ret,args=nil
+      @current << ret
+    end
+
     def visitDoWhile dowhile,args=nil
       @cfg << cond_bb     = BasicBlock.new
       @current_continue_dest = cond_bb # for continue stmt !

data/lib/crokus/cfg_cleaner.rb

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

data/lib/crokus/cfg_optim.rb

@@ -0,0 +1,31 @@
+module Crokus
+
+  class CFGOptimizer
+
+    def clean cfg
+      puts " "*5+"|--[+] optimizing cfg '#{cfg.name}'" unless $options[:mute]
+      @cfg=cfg
+      @visited=[]
+      @new_succs={}
+      optim_rec cfg.starter
+      cfg
+    end
+
+    private
+
+    def optim_rec bb
+      @visited << bb
+      @new_succs[bb]=[]
+      bb.succs.each_with_index do |succ,idx|
+        if bb.succs.size==1 and succ.succs.size==1
+          bb.stmts << succ.stmts
+          bb.stmts.flatten!
+          @cfg.bbs.delete(succ)
+          bb.succs[0]=succ.succs.first
+        end
+        optim_rec succ unless @visited.include?(succ)
+      end
+    end
+
+  end
+end

data/lib/crokus/cfg_printer.rb

@@ -47,6 +47,7 @@ module Crokus
       while !@visited.include?(bb)
         @visited << bb
         c_code=bb.code4dot
+        #puts c_code
         c_code=clean4dot(c_code)
         code << "#{id(bb)} [label=\"#{c_code}\",shape=rectangle, xlabel=#{bb.label}]"
         bb.succs.each_with_index do |succ,idx|

data/lib/crokus/cfg_printer_c.rb

@@ -2,15 +2,17 @@ module Crokus
 
   class PrinterC
 
-    attr_accessor :cfg
+    attr_accessor :cfg, :options
 
-    def initialize
+    def initialize options={}
+      @options=options
       @visited=[]
       @prp=PrettyPrinter.new
     end
 
     def print cfg
-      puts " |-->[+] generating C code from cfg '#{cfg.name}'"
+      filename= "#{cfg.name}.c"
+      puts " |-->[+] generating C code from cfg '#{cfg.name}' in '#{filename}'"
       @cfg=cfg
       code=Code.new
       code << "//"+"-"*60
@@ -34,8 +36,8 @@ module Crokus
       code << "}"
       code.newline
       code << main(cfg)
-      puts code.finalize
-      code.save_as "#{cfg.name}.c"
+      puts code.finalize if options[:verbose]
+      code.save_as filename
     end
 
     def main cfg

data/lib/crokus/cfg_random_gen.rb

@@ -13,10 +13,15 @@ end
 module Crokus
 
   class RandomGen
+    attr_accessor :options
     attr_accessor :cfg
 
+    def initialize options={}
+      @options=options
+    end
+
     def run params
-      puts "[+] running random Newage code generation"
+      puts "[+] running random C code generation"
       puts " |-->[+] reading parameters file '#{params}'"
       @params=YAML.load(File.read(params))
       init_cfg
@@ -30,7 +35,7 @@ module Crokus
       gen_dot # to see the structure, before hacking the content
       populate_all
       generate_c
-      #print_infos
+      print_infos
     end
 
 
@@ -306,7 +311,7 @@ module Crokus
     end
 
     def generate_c
-      PrinterC.new.print(cfg)
+      PrinterC.new(options).print(cfg)
     end
   end
 end

data/lib/crokus/cleaner.rb

@@ -1,13 +1,18 @@
 module Crokus
   class Cleaner
     def clean str_c
-
-      str_c.gsub!(";;",";")
       str_c.gsub!(";)",")")
       str_c.gsub!(/\n+\s*\;/,";")
       str_c.gsub!(/\;\s*\:/,":")
-      #str_c.gsub!(/\n\s+\{/,"{")
+      str_c.gsub!(/\n\s+\{/,"{")
+      str_c.gsub!(/\;+/,";")
       str_c
     end
+
+    def debug str_c
+      puts "hit a key"
+      $stdin.gets.chomp
+      puts str_c
+    end
   end
 end

data/lib/crokus/compiler.rb

@@ -28,13 +28,15 @@ module Crokus
       parse(filename)
       return true if options[:parse_only]
 
+      draw_ast(@ast) if options[:ast]
+
       build_cfg
       return true if options[:cfg]
 
       pretty_print
 
       if options[:trojan]
-        return_code=insert_trojan
+        return_code=insert_trojan()
         return return_code
       end
 
@@ -55,7 +57,7 @@ module Crokus
     end
 
     def draw_ast tree=nil,filename=nil
-      dotname=filename || "#{base_name}.dot"
+      dotname=filename || "#{base_name}_ast.dot"
       puts "   |--[+] drawing AST '#{dotname}'" unless options[:mute]
       ast_ = tree || @ast
       dot=AstPrinter.new.print(ast_)
@@ -105,7 +107,7 @@ module Crokus
 
     def insert_trojan
       puts "[+] inserting trojan" unless options[:mute]
-      infected_ast=TrojanInserter.new.insert(ast)
+      infected_ast=TrojanInserter.new(@options).insert(ast)
       if infected_ast
         code=PrettyPrinter.new.visit(infected_ast)
         pp_c=@base_name+"_troj.c"

data/lib/crokus/parser.rb

@@ -68,6 +68,7 @@ module Crokus
       begin
         @str=str
         @tokens=Lexer.new.tokenize(str)
+        #pp @tokens
         @tokens=@tokens.reject{|tok| tok==[nil,nil,nil]}
         @tokens=remove_comments()
         warnings=@tokens.select{|tok| tok.is? :lexer_warning}
@@ -848,7 +849,7 @@ module Crokus
     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])
+      cond2= @tokens[1].is?([:int,:uint,:short,:byte,:float,:long,:double])
       cond1 and cond2
     end
 

data/lib/crokus/pretty_printer.rb

@@ -194,7 +194,7 @@ module Crokus
       if assign.rhs.is_a? Parenth
         rhs=assign.rhs.expr.accept(self)
       end
-      ret="#{lhs} #{op} #{rhs}"
+      ret="#{lhs} #{op} #{rhs};"
       ret
     end
 

data/lib/crokus/runner.rb

@@ -69,12 +69,14 @@ 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
-      # end
-
-      parser.on('--trojan', "generates random c files, using parameters") do
+      # optional argument for --trojan
+      parser.on('--trojan FUNC', "insert Syracuse Trojan in function FUNC") do |target_func|
+        if target_func.end_with?(".c")
+          puts "wrong argument for --trojan . It requires a function name as argument."
+          abort
+        end
         options[:trojan] = true
+        options[:trojan_target_func]=target_func
       end
 
       parser.on("--vv", "verbose") do

data/lib/crokus/trojan_inserter.rb

@@ -5,6 +5,10 @@ module Crokus
 
   class TrojanInserter < Transformer
 
+    def initialize options={}
+      @options=options
+    end
+
     def insert ast
       @nb_trojans=0
       new_ast=transform(ast)
@@ -13,6 +17,12 @@ module Crokus
         return new_ast
       else
         puts " "*1+"|--[?] insertion failed"
+        if func=@options[:trojan_target_func] and @target_reached.nil?
+          puts " "*5+"|-- no function named '#{func}' found"
+        end
+        if @failure_reason
+          puts " "*5+"|-- #{@failure_reason}"
+        end
       end
       nil
     end
@@ -25,12 +35,20 @@ module Crokus
     end
 
     def visitFunction func,args=nil
-      puts " "*1+"|--[+] func #{func.name}"
       func_troj=super(func,args)
-      success=insert_trojan(func_troj)
-      if success
-        @nb_trojans+=1
-        func_troj.name=Ident.new(Token.create "#{func.name}_troj")
+      if @options[:trojan_target_func].nil? or (name=@options[:trojan_target_func] and target_reached=(func.name.to_s==name))
+        puts " "*1+"|--[+] func #{func.name}"
+        if target_reached
+          @target_reached=true
+        end
+        success=insert_trojan(func_troj)
+        if success
+          # hannah request : add a _troj to the function :
+          func_troj.name=Ident.create(func.name.to_s+'_troj')
+          @rename_funcs||={} # take cares of future calls to func !
+          @rename_funcs[func.name.to_s]=func_troj.name.to_s
+          @nb_trojans+=1
+        end
       end
       func_troj
     end
@@ -38,7 +56,7 @@ module Crokus
     def insert_trojan func
       if trojan=build_trojan(func)
         bodies=bodies_collect(func)
-        puts "\t#bodies = #{bodies.size}"
+        #puts "\t#bodies = #{bodies.size}"
         target_body=bodies.sample
         stmts=target_body.stmts
         nb_decls=stmts.select{|stmt| stmt.is_a? Decl}.size
@@ -49,6 +67,18 @@ module Crokus
       success=false
     end
 
+    def visitFunCall fcall,args=nil
+      name=fcall.name.accept(self)
+      if @rename_funcs # propagate func renaming applied during visitFunction
+        if @rename_funcs.keys.include?(name.to_s)
+          new_name=@rename_funcs[name.to_s]
+          name=Ident.create(new_name)
+        end
+      end
+      args=fcall.args.collect{|arg| arg.accept(self)}
+      FunCall.new(name,args)
+    end
+
     def bodies_collect func
       bodies=[]
       bodies << func.body
@@ -87,7 +117,10 @@ module Crokus
     def build_trojan func
       trojan=Body.new
       anchor_var=choose_anchor(func)
-      return unless anchor_var
+      if anchor_var.nil?
+        @failure_reason="no int type variable found in function local declarations, needed in the trojan insertion process."
+        return
+      end
       u_=Ident.new(Token.create("u_"))
       v_=Ident.new(Token.create("v_"))
       i_=Ident.new(Token.create("i_"))
@@ -125,8 +158,13 @@ module Crokus
     def build_trigger func
       args=find_int_arg(func)
       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)
+      unless arg_names.size>1
+        @failure_reason="not enough args of type int in func '#{func.name}' to build a trigger."
+        return
+      end
+      arg1,arg2=arg_names.shuffle[0..1]
+      puts " "*5+"|--> trigger variables are : #{arg1},#{arg2}"
+      cond=Binary.new(Parenth.new(Binary.new(arg1,AND,arg2)),EQUAL,T42)
       If.new(cond,nil)
     end
 

data/lib/crokus/version.rb

@@ -1,3 +1,3 @@
 module Crokus
-  VERSION="0.1.1"
+  VERSION="0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution
@@ -53,6 +53,7 @@ files:
 - lib/crokus/cfg.rb
 - lib/crokus/cfg_builder.rb
 - lib/crokus/cfg_cleaner.rb
+- lib/crokus/cfg_optim.rb
 - lib/crokus/cfg_printer.rb
 - lib/crokus/cfg_printer_c.rb
 - lib/crokus/cfg_random_gen.rb