crokus 0.0.7 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '061769523e1b3d35501dd09d51cb609a75da50fb86a55f55f31fd47b12299eec'
-  data.tar.gz: e85164ce03f41a61627f8d1b84c92504f077e7757932ee17095c0eb2cc297fb7
+  metadata.gz: bca020ee93a39e7a8bea529c45ede29dc579f3a6536cea6999d497ffb985c1a0
+  data.tar.gz: 3d78efcd9e0b963791963ae7f02bd16dc51e3f22a7e13ceda0fc5552d775a7ac
 SHA512:
-  metadata.gz: a685f4bae55f560e066e3f28f4e1f5acafc347edcdbccabe0eaf5d4cba7664f4fdaa60009c1dc10b9ba26a3a72100411f9d19bca4e62ff4eb95ad2a1d596bc4f
-  data.tar.gz: a3b16a1ab6a5be70febb9417579f0ac9cd1eaf1a5fb3874e13e076915d5116a03e94b49eb1589b41f016608fe211e9f262e72914b7721683edcce07d2418020c
+  metadata.gz: 10d5d9e59e156d4426f5cfc6145e5268188eddf73e70c455986360d6d74782ceefcaadce3154b00aa5bed6f678fa5c77317983f3d4d3ac64f4742293fcf1cf44
+  data.tar.gz: a7eb869b9536a8932975efd2378d283a5e5a3fd9bf337a8be64e441929a53f28fa4daa59d06a51cca507840474cf2b6c96f67147bd6281bf56c75db723b63854

data/lib/crokus/ast.rb

@@ -178,6 +178,14 @@ module Crokus
     def collect(&block)
       @stmts.collect(&block)
     end
+
+    def select(&block)
+      @stmts.select(&block)
+    end
+
+    def size
+      @stmts
+    end
   end
 
   class Stmt < Ast

data/lib/crokus/cfg_random_gen.rb

@@ -16,7 +16,7 @@ module Crokus
     attr_accessor :cfg
 
     def run params
-      puts "[+] running random C generation"
+      puts "[+] running random Newage code generation"
       puts " |-->[+] reading parameters file '#{params}'"
       @params=YAML.load(File.read(params))
       init_cfg

data/lib/crokus/cleaner.rb

@@ -1,10 +1,13 @@
 module Crokus
   class Cleaner
     def clean str_c
+
       str_c.gsub!(";;",";")
       str_c.gsub!(";)",")")
-      str_c.gsub!(/\n\s*\;/,";")
+      str_c.gsub!(/\n+\s*\;/,";")
+      str_c.gsub!(/\;\s*\:/,":")
       #str_c.gsub!(/\n\s+\{/,"{")
+      str_c
     end
   end
 end

data/lib/crokus/compiler.rb

@@ -2,8 +2,9 @@ require_relative 'ast'
 require_relative 'ast_printer'
 require_relative 'parser'
 require_relative 'visitor'
-require_relative 'transformer'
 require_relative 'pretty_printer'
+require_relative 'trojan_inserter'
+
 require_relative 'cfg_builder'
 require_relative 'tac_builder'
 require_relative 'ir_dumper'
@@ -30,6 +31,12 @@ module Crokus
       build_cfg
       return true if options[:cfg]
 
+      pretty_print
+
+      if options[:trojan]
+        insert_trojan
+      end
+
       build_tac
       return true if options[:tac]
 
@@ -77,22 +84,35 @@ module Crokus
     def build_cfg
       puts "=> building CFGs" unless options[:mute]
       builder=CFGBuilder.new
-      builder.build(@ast)
+      builder.build(ast)
     end
 
     def build_tac
       puts "=> building TAC" unless options[:mute]
       builder=TACBuilder.new
-      builder.visit(@ast)
+      builder.visit(ast)
     end
 
     def emit_ir
       puts "=> emit textual IR " unless options[:mute]
-      IRDumper.new.visit(@ast)
+      IRDumper.new.visit(ast)
     end
 
     def execute params
       RandomGen.new.run(params)
     end
+
+    def insert_trojan
+      puts "=> inserting trojan" unless options[:mute]
+      infected_ast=TrojanInserter.new.insert(ast)
+      if infected_ast
+        code=PrettyPrinter.new.visit(infected_ast)
+        pp_c=@base_name+"_troj.c"
+        puts code
+        File.open(pp_c,'w'){|f| f.puts code}
+        puts "   |--> saved as #{pp_c}" unless options[:mute]
+      end
+    end
+
   end
 end

data/lib/crokus/generic_lexer.rb

@@ -30,7 +30,7 @@ class GenericLexer
   def next_token
     return [nil,nil,nil] if @ssc.empty?
     tok = get_token
-    return (tok.is_a? :skip) ? next_token : tok
+    return (tok.is? :skip) ? next_token : tok
   end
 
   def get_token

data/lib/crokus/ir_dumper.rb

@@ -3,31 +3,36 @@ module Crokus
   class IRDumper < Visitor
 
     def visitFunction func,args=nil
-      puts "IR for '#{func.name}'".center(40,'=')
-      dump func.cfg
+      puts "[+] IR for '#{func.name}'"
+      ir_code=dump(func.cfg)
+      filename=func.name.to_s+".ir"
+      ir_code.save_as filename
+      puts "\t generated #{filename}"
     end
 
     def dump cfg
       @visited=[]
+      @code=Code.new
       visit_rec cfg.starter
+      return @code
     end
 
     def visit_rec bb
-      print bb.label+":"
+      @code << bb.label+":"
       @visited << bb
       @current=bb
       bb.stmts.each do |stmt|
         unless stmt.is_a? Break or stmt.is_a? Continue
-          puts "\t"+stmt.str.gsub(/;/,'')
+          @code << "\t"+stmt.str.gsub(/;/,'')
         end
       end
       unless bb.stmts.last.is_a? Crokus::ITE
         if bb.succs.any?
-          puts "\tgoto #{bb.succs.first.label}"
+          @code << "\tgoto #{bb.succs.first.label}"
         end
       end
       if bb.succs.empty?
-        puts "\tstop"
+        @code << "\tstop"
       else
         bb.succs.each do |bb|
           unless @visited.include? bb
@@ -41,7 +46,7 @@ module Crokus
       cond=ite.cond.accept(self)
       label1=ite.trueBranch.label
       label2=ite.falseBranch.label
-      "\t"+"ite #{cond},#{label1},#{label2}"
+      @code << "\t"+"ite #{cond},#{label1},#{label2}"
     end
 
   end

data/lib/crokus/parser.rb

@@ -24,7 +24,7 @@ module Crokus
     end
 
     def maybe kind
-      return acceptIt if showNext.is_a? kind
+      return acceptIt if showNext.is? kind
     end
 
     def expect kind
@@ -68,10 +68,11 @@ module Crokus
       begin
         @str=str
         @tokens=Lexer.new.tokenize(str)
+        @tokens=@tokens.reject{|tok| tok==[nil,nil,nil]}
         @tokens=remove_comments()
-        warnings=@tokens.select{|tok| tok.is_a? :lexer_warning}
+        warnings=@tokens.select{|tok| tok.is? :lexer_warning}
         show_lexer_warnings(warnings)
-        @tokens=@tokens.select{|tok| !tok.is_a? [:newline]}
+        @tokens=@tokens.select{|tok| !tok.is? [:newline]}
         ast=design_unit()
       rescue Exception => e
         puts "PARSING ERROR : #{e}"
@@ -161,13 +162,13 @@ module Crokus
       indent "struct"
       expect :struct
       name=nil
-      if showNext.is_a? :ident
+      if showNext.is? :ident
         name=acceptIt
       end
       ret=Struct.new(name)
-      if showNext.is_a? :lbrace
+      if showNext.is? :lbrace
         acceptIt
-        while !showNext.is_a? :rbrace
+        while !showNext.is? :rbrace
           ret.decls << declaration()
         end
         ret.decls.flatten!
@@ -205,9 +206,9 @@ module Crokus
       indent "function_formal_args"
       args=[]
       expect :lparen
-      while !showNext.is_a? :rparen
+      while !showNext.is? :rparen
         args << func_formal_arg()
-        if !showNext.is_a? :rparen
+        if !showNext.is? :rparen
           expect :comma
         end
       end
@@ -217,12 +218,12 @@ module Crokus
     end
 
     def func_formal_arg
-      indent "function_arg"
       @current_type=type=parse_type()
       d=declarator
       a=arrayed?(type)
-      #parenthesized?
-      dedent
+      if a
+        type=a
+      end
       return FormalArg.new(type,d)
     end
 
@@ -280,7 +281,7 @@ module Crokus
           ret=expression_statement
         end
       when :const,:volatile
-        declaration
+        ret=declaration()
       when :semicolon
         acceptIt
         #ret=expression_statement
@@ -326,7 +327,7 @@ module Crokus
       ret=Switch.new(e,cases=[],default=nil)
       expect :rparen
       expect :lbrace
-      while showNext.is_a? :case
+      while showNext.is? :case
         expect :case
         case_e=expression
         case_body=Body.new
@@ -336,7 +337,7 @@ module Crokus
         end
         cases << Case.new(case_e,case_body)
       end
-      if showNext.is_a? :default
+      if showNext.is? :default
         acceptIt
         expect :colon
         default_body=Body.new
@@ -353,7 +354,7 @@ module Crokus
     def parse_return
       indent "parse_return"
       expect :return
-      unless showNext.is_a? :semicolon
+      unless showNext.is? :semicolon
         e=expression
       end
       dedent
@@ -388,7 +389,7 @@ module Crokus
       end
       init=initialization?
       ret << Decl.new(type,d,init)
-      while tokens.any? and showNext.is_a?(:comma)
+      while tokens.any? and showNext.is?(:comma)
         acceptIt
         ptr=pointed?
         if ptr
@@ -406,7 +407,7 @@ module Crokus
     end
 
     def declarator
-      if showNext.is_a? :ident
+      if showNext.is? :ident
         ret=@current_ident=Ident.new(acceptIt)
       end
       return ret
@@ -414,16 +415,16 @@ module Crokus
 
     def pointed?
       return if tokens.empty?
-      while showNext.is_a? :mul
+      while showNext.is? :mul
         acceptIt
       end
     end
 
     def arrayed?(type)
       return if tokens.empty?
-      while showNext.is_a? :lbrack
+      while showNext.is? :lbrack
         acceptIt
-        if showNext.is_a? :rbrack
+        if showNext.is? :rbrack
           acceptIt
           type=ArrayOf.new(type,IntLit.new(ZERO))
         else
@@ -437,7 +438,7 @@ module Crokus
 
     def initialization?
       return if tokens.empty?
-      if showNext.is_a? :assign
+      if showNext.is? :assign
         expect :assign
         e=expression
         return e
@@ -446,7 +447,7 @@ module Crokus
 
     def parenthesized?
       return if tokens.empty?
-      if showNext.is_a? :lparen
+      if showNext.is? :lparen
         f=function_decl(@current_ident,@current_type)
         return f
       end
@@ -457,14 +458,14 @@ module Crokus
       ret=Type.new(nil)
 
       ret.precisions << spec_qualifier?() # const, volatile
-      if showNext.is_a? [:signed,:unsigned]
+      if showNext.is? [:signed,:unsigned]
         ret.precisions << acceptIt
       end
 
       case showNext.kind
       when :ident,:char,:int,:short,:long,:float,:double,:void
         ret.name=acceptIt
-        while showNext.is_a? [:char,:int,:short,:long,:float,:double,:void]
+        while showNext.is? [:char,:int,:short,:long,:float,:double,:void]
           ret.precisions << ret.name
           ret.name=acceptIt
         end
@@ -477,14 +478,14 @@ module Crokus
         raise "Parsing ERROR in type declaration: '#{showNext}'"
       end
 
-      while showNext.is_a? [:mul,:lparen]
+      while showNext.is? [:mul,:lparen]
         case showNext.kind
         when :mul
           acceptIt
           ret=PointerTo.new(ret)
         when :lparen
           acceptIt
-          if showNext.is_a? :rparen
+          if showNext.is? :rparen
             acceptIt
           else
             expression
@@ -498,7 +499,7 @@ module Crokus
 
     def spec_qualifier?
       list=[]
-      while showNext.is_a? STARTERS_TYPE_QUALIFIER
+      while showNext.is? STARTERS_TYPE_QUALIFIER
         case showNext.kind
         when :volatile
           list << acceptIt
@@ -512,24 +513,24 @@ module Crokus
     def parse_if
       indent "parse_if"
       expect :if
-      if showNext.is_a? :lparen # helps wrt casting.
+      if showNext.is? :lparen # helps wrt casting.
         acceptIt
         lparen=true
       end
       cond=expression()
       expect :rparen if lparen
       body=Body.new
-      if showNext.is_a? :lbrace
+      if showNext.is? :lbrace
         lbrace=acceptIt
       end
       body << statement()
       if lbrace
-        until showNext.is_a? :rbrace
+        until showNext.is? :rbrace
           body << statement
         end
         expect :rbrace
       end
-      if showNext.is_a? :else
+      if showNext.is? :else
         else_=parse_else()
       end
       dedent
@@ -595,7 +596,7 @@ module Crokus
     def parse_body
       body=Body.new
       expect :lbrace
-      while !showNext.is_a? :rbrace
+      while !showNext.is? :rbrace
         body << statement()
       end
       expect :rbrace
@@ -603,7 +604,7 @@ module Crokus
     end
 
     def expression_statement
-      if showNext.is_a? :semicolon
+      if showNext.is? :semicolon
         acceptIt
       else
         e=expression
@@ -619,7 +620,7 @@ module Crokus
     def expression
       indent "expression : #{showNext}"
       e1=assign()
-      while showNext.is_a? :comma
+      while showNext.is? :comma
         acceptIt
         e2=assign()
         e1=CommaStmt.new(e1,e2)
@@ -637,7 +638,7 @@ module Crokus
     def assign
       indent "assign : #{showNext}"
       e1=cond_expr
-      while showNext.is_a? ASSIGN_OP
+      while showNext.is? ASSIGN_OP
         op=acceptIt
         e2=assign
         e1=Assign.new(e1,op,e2)
@@ -649,7 +650,7 @@ module Crokus
     def cond_expr
       indent "cond_expr : #{showNext}"
       e1=logor
-      while showNext.is_a? :qmark
+      while showNext.is? :qmark
         acceptIt
         e2=expression
         expect :colon
@@ -663,7 +664,7 @@ module Crokus
     def logor
       indent "logor : #{showNext}"
       e1=logand
-      while showNext.is_a? :oror
+      while showNext.is? :oror
         op=acceptIt
         e2=logand
         e1=Or2.new(e1,op,e2)
@@ -675,7 +676,7 @@ module Crokus
     def logand
       indent "logand : #{showNext}"
       e1=inclor
-      while showNext.is_a? :andand
+      while showNext.is? :andand
         op=acceptIt
         e2=inclor
         e1=Binary.new(e1,op,e2)
@@ -687,7 +688,7 @@ module Crokus
     def inclor
       indent "inclor : #{showNext}"
       e1=exclor
-      while showNext.is_a? :or
+      while showNext.is? :or
         op=acceptIt
         e2=exclor
         e1=Binary.new(e1,op,e2)
@@ -699,7 +700,7 @@ module Crokus
     def exclor
       indent "exclor : #{showNext}"
       e1=andexp
-      while showNext.is_a? :xor
+      while showNext.is? :xor
         op=acceptIt
         e2=andexp
         e1=Binary.new(e1,op,e2)
@@ -711,7 +712,7 @@ module Crokus
     def andexp
       indent "andexp : #{showNext}"
       e1=eqexp
-      while showNext.is_a? :and
+      while showNext.is? :and
         op=acceptIt
         e2=eqexp
         e1=Binary.new(e1,op,e2)
@@ -723,7 +724,7 @@ module Crokus
     def eqexp
       indent "eqexp : #{showNext}"
       e1=relexp
-      while showNext.is_a? [:eq,:neq]
+      while showNext.is? [:eq,:neq]
         op=acceptIt
         e2=relexp
         e1=Binary.new(e1,op,e2)
@@ -735,7 +736,7 @@ module Crokus
     def relexp
       indent "relexp : #{showNext}"
       e1=shiftexp
-      while showNext.is_a? [:lte,:lt,:gte,:gt ]
+      while showNext.is? [:lte,:lt,:gte,:gt ]
         op=acceptIt
         e2=shiftexp
         e1=Binary.new(e1,op,e2)
@@ -747,7 +748,7 @@ module Crokus
     def shiftexp
       indent "shiftexp : #{showNext}"
       e1=additive
-      while showNext.is_a? [:shift_l,:shift_r]
+      while showNext.is? [:shift_l,:shift_r]
         op=acceptIt
         e2=additive
         e1=Binary.new(e1,op,e2)
@@ -759,7 +760,7 @@ module Crokus
     def additive
       indent "addititve : #{showNext}"
       e1=multitive
-      while showNext.is_a? [:add,:sub]
+      while showNext.is? [:add,:sub]
         op=acceptIt
         e2=multitive
         e1=Binary.new(e1,op,e2)
@@ -771,7 +772,7 @@ module Crokus
     def multitive
       indent "multitive : #{showNext}"
       e1=castexp
-      while showNext.is_a? [:mul,:div,:mod]
+      while showNext.is? [:mul,:div,:mod]
         op=acceptIt
         e2=castexp
         e1=Binary.new(e1,op,e2)
@@ -806,8 +807,8 @@ module Crokus
         i+=1
       end
       tok=@tokens[i]
-      return false if tok.is_a? [:mul,:add,:sub]
-      return true if tok.is_a? STARTERS_UNARY-STARTERS_ARRAY_OR_STRUCT_INIT
+      return false if tok.is? [:mul,:add,:sub]
+      return true if tok.is? STARTERS_UNARY-STARTERS_ARRAY_OR_STRUCT_INIT
       return false
     end
 
@@ -833,7 +834,7 @@ module Crokus
     def typename
       indent "typename"
       type=specifier_qualifier
-      while showNext.is_a? STARTERS_ABSTRACT_DECLARATOR
+      while showNext.is? STARTERS_ABSTRACT_DECLARATOR
         list << abstract_decl
       end
       dedent
@@ -842,8 +843,8 @@ module Crokus
 
     def spec_qualifier_list
       indent "spec_qualifier_list #{showNext.inspect}"
-      while showNext.is_a? STARTERS_TYPE_SPECIFIER+STARTERS_TYPE_QUALIFIER
-        if showNext.is_a? STARTERS_TYPE_SPECIFIER
+      while showNext.is? STARTERS_TYPE_SPECIFIER+STARTERS_TYPE_QUALIFIER
+        if showNext.is? STARTERS_TYPE_SPECIFIER
           list << type_specifier
         else
           list << type_qualifier
@@ -857,7 +858,7 @@ module Crokus
     def type_specifier
       type=Type.new(nil,[])
       indent "type_specifier #{showNext}"
-      if showNext.is_a? STARTERS_TYPE_SPECIFIER
+      if showNext.is? STARTERS_TYPE_SPECIFIER
         ret=acceptIt
         type.name=ret
       else
@@ -875,7 +876,7 @@ module Crokus
     STARTERS_ABSTRACT_DECLARATOR=[:mul,:lparen,:lbrack]
     def abstract_decl
       indent "abstract_decl"
-      if showNext.is_a? STARTERS_ABSTRACT_DECLARATOR
+      if showNext.is? STARTERS_ABSTRACT_DECLARATOR
         case showNext.kind
         when :mul
           pointer
@@ -897,7 +898,7 @@ module Crokus
     STARTERS_TYPE_QUALIFIER=[:const,:volatile]
     def pointer
       expect :mul
-      while showNext.is_a? STARTERS_TYPE_QUALIFIER+[:mul]
+      while showNext.is? STARTERS_TYPE_QUALIFIER+[:mul]
         case showNext.kind
         when :volatile
           acceptIt
@@ -916,7 +917,7 @@ module Crokus
     def unary
       if STARTERS_PRIMARY.include? showNext.kind
         u=postfix
-      elsif showNext.is_a? [:and,:mul,:add,:sub,:tilde,:not]
+      elsif showNext.is? [:and,:mul,:add,:sub,:tilde,:not]
         op=acceptIt
         e=castexp
         u=Unary.new(op,e)
@@ -957,7 +958,7 @@ module Crokus
     def postfix
       indent "postfix : #{showNext}"
       e1=primary
-      while showNext.is_a? [:lbrack,:lparen,:dot,:inc_op,:dec_op,:ptr_op]
+      while showNext.is? [:lbrack,:lparen,:dot,:inc_op,:dec_op,:ptr_op]
         case showNext.kind
         when :lbrack
           acceptIt
@@ -967,7 +968,7 @@ module Crokus
         when :lparen
           acceptIt
           args=[]
-          if !showNext.is_a? :rparen
+          if !showNext.is? :rparen
             args=argument_expr_list
           end
           expect :rparen
@@ -1025,7 +1026,7 @@ module Crokus
     def argument_expr_list
       list=[]
       list << expression
-      while showNext.is_a? :comma
+      while showNext.is? :comma
         acceptIt
         list << expression
       end
@@ -1036,9 +1037,9 @@ module Crokus
       indent "array_or_struct_init"
       expect :lbrace
       elements=[]
-      while !showNext.is_a? :rbrace
+      while !showNext.is? :rbrace
         elements << (e=expression)
-        if showNext.is_a? :comma
+        if showNext.is? :comma
           acceptIt
         end
       end

data/lib/crokus/pretty_printer.rb

@@ -33,6 +33,7 @@ module Crokus
       dedent
     end
 
+    # WTF !?#
     def visitDecl decl,args=nil
       code=Code.new
       type=decl.type.accept(self)
@@ -67,9 +68,8 @@ module Crokus
 
         code << last_str
       else
-        ret = "#{type} #{vname}#{array_size}#{init}"
+        code << "#{type} #{vname}#{array_size}#{init}"
       end
-      code << ret
       code << ";"
       return code
     end
@@ -376,6 +376,13 @@ module Crokus
       return unary.postfix ? "#{e}#{op}" : "#{op}#{e}"
     end
 
+    def visitCondExpr ternary,args=nil
+      cond=ternary.cond.accept(self)
+      lhs=ternary.lhs.accept(self)
+      rhs=ternary.rhs.accept(self)
+      "#{cond} ? #{lhs} : #{rhs}"
+    end
+
     def visitParenth par,args=nil
       e=par.expr.accept(self)
       return "(#{e})"
@@ -396,10 +403,10 @@ module Crokus
     def visitArrayOrStructInit init,args=nil
       inits=init.elements.collect{|e| e.accept(self)}
       #handle imbrications
-      inits=inits.collect{|init| (init.is_a? Code) ? init.finalize : init}
+      #inits=inits.collect{|init| (init.is_a? Code) ? init.finalize : init}
       code=Code.new
       code << "{"+inits.join(",")+"}"
-      return code
+      return code.finalize
     end
 
     def visitAddressOf ao,args=nil

data/lib/crokus/runner.rb

@@ -69,6 +69,10 @@ 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("--vv", "verbose") do
         options[:verbose] = true
       end

data/lib/crokus/tac_builder.rb

@@ -28,12 +28,12 @@ module Crokus
       @visited << bb
       @current=bb
       @new_stmts=[]
-      @post_stmts=[]
+      #@post_stmts=[]
       bb.stmts.each do |stmt|
         @new_stmts << stmt.accept(self)
       end
       bb.stmts=@new_stmts
-      bb.stmts << @post_stmts
+      #bb.stmts << @post_stmts
       bb.stmts.flatten!
       bb.succs.each do |bb|
         unless @visited.include? bb
@@ -64,11 +64,15 @@ module Crokus
 
     def visitITE ite,args=nil
       ret=ITE.new(ite.cond,ite.trueBranch,ite.falseBranch)
-      if ite.cond.is_a?(Binary)
+      case ite.cond
+      when Binary
         cond=ite.cond.accept(self)
         tmp=new_tmp()
         @new_stmts << Assign.new(tmp,OP_ASSIGN,cond)
         ret.cond=tmp
+      when Parenth
+        cond=ite.cond.accept(self)
+        ret.cond=cond.expr
       end
       ret
     end
@@ -76,14 +80,14 @@ module Crokus
     def visitBinary bin,args=nil
       ret=Binary.new(bin.lhs,bin.op,bin.rhs)
       ret.lhs=bin.lhs.accept(self)
-      if bin.lhs.respond_to? :lhs #Binary,Indexed,etc
+      if bin.lhs.respond_to?(:lhs) or bin.lhs.is_a?(FunCall)#Binary,Indexed,etc
         #lhs=bin.lhs.accept(self)
         tmp=new_tmp()
         @new_stmts << Assign.new(tmp,OP_ASSIGN,ret.lhs)
         ret.lhs=tmp
       end
       ret.rhs=bin.rhs.accept(self)
-      if bin.rhs.respond_to? :lhs #Binary,Indexed,etc
+      if bin.rhs.respond_to?(:lhs) or bin.rhs.is_a?(FunCall) #Binary,Indexed,etc
         # rhs=bin.rhs.accept()
         tmp=new_tmp()
         @new_stmts << Assign.new(tmp,OP_ASSIGN,ret.rhs)
@@ -104,6 +108,30 @@ module Crokus
       return ret
     end
 
+    def visitParenth par,args=nil
+      ret=Parenth.new(par.expr)
+      e=par.expr.accept(self)
+      tmp=new_tmp()
+      @new_stmts << Assign.new(tmp,OP_ASSIGN,e)
+      ret.expr=tmp
+      return ret
+    end
+
+    # TBC
+    def visitCondExpr ternary,args=nil
+      cond=ternary.cond.accept(self)
+      lhs=ternary.lhs.accept(self)
+      rhs=ternary.rhs.accept(self)
+      CondExpr.new(cond,lhs,rhs)
+    end
+
+    # def visitFunCall fcall,args=nil
+    #   fcall_n=super(fcall)
+    #   fcall_n.args=fcall.args.collect{|arg| arg.accept(self)}
+    #   tmp=new_tmp()
+    #   @new_stmts << Assign.new(tmp,OP_ASSIGN,fcall_n)
+    #   return tmp
+    # end
 
   end
 end

data/lib/crokus/token.rb

@@ -4,7 +4,7 @@ class Token
     @kind,@val,@pos=*tab
   end
 
-  def is_a? kind
+  def is? kind
     case kind
     when Symbol
       return @kind==kind
@@ -37,9 +37,15 @@ class Token
   alias :str :val
 end
 
-ONE  = Token.new  [:int_lit,'1'  ,['na','na']]
-ZERO = Token.new  [:int_lit,'0'  ,['na','na']]
-DUMMY= Token.new  [:id     ,''   ,['na','na']]
-EQUAL= Token.new  [:eq     ,'==' ,['na','na']]
-ASSIGN= Token.new [:assign ,'='  ,['na','na']]
-MOD   = Token.new [:mod ,'%'  ,['na','na']]
+INT  = Token.new  [:int    ,'int'   ,['na','na']]
+ONE  = Token.new  [:int_lit,'1'     ,['na','na']]
+ZERO = Token.new  [:int_lit,'0'     ,['na','na']]
+T42  = Token.new  [:int_lit,'42'    ,['na','na']]
+DUMMY= Token.new  [:id     ,''      ,['na','na']]
+EQUAL= Token.new  [:eq     ,'=='    ,['na','na']]
+ASSIGN= Token.new [:assign ,'='     ,['na','na']]
+XOR   = Token.new [:xor    ,'^'     ,['na','na']]
+AND   = Token.new [:and    ,'&'     ,['na','na']]
+MOD   = Token.new [:mod    ,'%'     ,['na','na']]
+SUB   = Token.new [:sub    ,'%'     ,['na','na']]
+GT    = Token.new [:gt     ,'>'     ,['na','na']]

data/lib/crokus/transformer.rb

@@ -17,7 +17,7 @@ module Crokus
     end
 
     def transform ast
-      ast.accept(self)
+      new_ast=ast.accept(self)
     end
 
     alias :visit :transform
@@ -249,6 +249,13 @@ module Crokus
       Unary.new(op,rhs,unary.postfix)
     end
 
+    def visitCondExpr ternary,args=nil
+      cond=ternary.cond.accept(self)
+      lhs=ternary.lhs.accept(self)
+      rhs=ternary.rhs.accept(self)
+      CondExpr.new(cond,lhs,rhs)
+    end
+
     def visitParenth par,args=nil
       e=par.expr.accept(self)
       Parenth.new(e)

data/lib/crokus/trojan_inserter.rb

@@ -0,0 +1,134 @@
+require_relative 'code'
+require_relative 'transformer'
+
+module Crokus
+
+  class TrojanInserter < Transformer
+
+    def insert ast
+      @nb_trojans=0
+      new_ast=transform(ast)
+      if @nb_trojans>0
+        puts "insertion succeeded : #{@nb_trojans} trojan(s)"
+        return new_ast
+      else
+        puts "insertion failed"
+      end
+      nil
+    end
+
+    def new_ident
+      @tmp_id||=0
+      tok=Token.create "$"+@tmp_id.to_s
+      @tmp_id+=1
+      Ident.new(tok)
+    end
+
+    def visitFunction func,args=nil
+      puts "[+] func #{func.name}"
+      func_troj=super(func,args)
+      success=insert_trojan(func_troj)
+      @nb_trojans+=1 if success
+      func_troj
+    end
+
+    def bodies_collect func
+      bodies=[]
+      bodies << func.body
+      bodies << bodies_rec_collect(func.body)
+      bodies.flatten!
+      bodies
+    end
+
+    def bodies_rec_collect body
+      bodies=[]
+      body.each do |stmt|
+        case if_=for_=while_=dowhile_=switch_=stmt
+        when If
+          bodies << if_.body
+          if else_=if_.else
+            bodies << else_.body
+          end
+        when For
+          bodies << for_.body
+        when While, DoWhile
+          bodies << stmt.body
+        when Switch
+          bodies << switch_.cases.collect{|case_| case_.body}
+        end
+      end
+      result = []
+      result << bodies
+      result << bodies.collect{|bod| bodies_rec_collect(bod)}
+      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
+      trojan=Body.new
+      anchor_var=choose_anchor(func)
+      return unless anchor_var
+      u_=Ident.new(Token.create("u_"))
+      v_=Ident.new(Token.create("v_"))
+      i_=Ident.new(Token.create("i_"))
+      trojan << Assign.new(v_,ASSIGN,anchor_var)
+      trojan<< if_trigger=build_trigger(func)
+      return unless if_trigger
+      trojan << Assign.new(anchor_var,ASSIGN,v_)
+      ast_trojan=Crokus::Parser.new.parse(TROJAN)
+      body_trojan=ast_trojan.list.first.body # root/func/body
+      if_trigger.body=body_trojan
+      func.body.stmts.insert(0,Decl.new(INT_TYPE,u_))
+      func.body.stmts.insert(0,Decl.new(INT_TYPE,v_))
+      func.body.stmts.insert(0,Decl.new(INT_TYPE,i_))
+      trojan
+    end
+
+    def choose_anchor func
+      # find a var of type int in func local declaration
+      decls=func.body.select{|stmt| stmt.is_a? Decl}
+      int_decls=decls.select{|decl| decl.type.name.is_a?(Token) && decl.type.name.kind==:int}
+      vars=int_decls.map{|decl| decl.var}
+      return vars.sample
+    end
+
+    TROJAN=%{
+      void trojan(){
+        u_=v_>0?v_:-v_;
+        for(i_=0;i_<339;i_++)
+          u_=(u_%2==0)?u_/=2:3*u_+1;
+        while u_>1 u_=u_/2;
+        v_*=u_;
+      }
+    }
+
+    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)
+      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)
+      end
+    end
+
+  end
+end

data/lib/crokus/version.rb

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

data/lib/crokus/visitor.rb

@@ -59,7 +59,7 @@ module Crokus
 
     def visitType type,args=nil
       indent "Type"
-      type.specifiers.each{|spec| spec.accept(self)}
+      type.precisions.each{|precision| precision.accept(self)}
       type.name.accept(self)
       dedent
       type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution
@@ -70,6 +70,7 @@ files:
 - lib/crokus/tac_builder.rb
 - lib/crokus/token.rb
 - lib/crokus/transformer.rb
+- lib/crokus/trojan_inserter.rb
 - lib/crokus/version.rb
 - lib/crokus/visitor.rb
 homepage: https://github.com/JC-LL/crokus