crokus 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b690523ea19dfb9b7eaa5f0569ab5b4d9cba857ca8e4a451907af3b28c7749c7
-  data.tar.gz: 2313aac03fc005f09dbee2925a64738e0c85fe0a343f1de0a426ce73a9307eab
+  metadata.gz: 16ac10dda4aa48100822c10d91bb98b51c35ca9066bacec035d5506c1933d75b
+  data.tar.gz: 02eef79bfb835434b1291b0a455815af0033bd492df11380859bf52357117d10
 SHA512:
-  metadata.gz: 3b8be391422d91f28ffc75c0d86f00098f9ba17f2d64a277a28dee774348bb725b558a1a469d11831d07ac58f9dbab3a08a37779f3c4a3672aa06f6f94374041
-  data.tar.gz: 89aeab45274244cadd1758cd17a2ca2364db45ec3b3f1ed748caf2c6a6840cf9c9a9a99cf0e4f6a90844a2c623f0315bb26c7195650dd55c2675367f805b164e
+  metadata.gz: c07b2bdc63d8a2394e5e1ad4aa1d04e78d1eff0ac6d0c3848a694170ab9aa1752db4b12d39e78decb314aa096ec42474ced16325b29079dfdf189c7c414b8c3a
+  data.tar.gz: b4256b738357558184a059600495bd97d9a3157f214ab9c5781a98737131b679d3fb81a46d8b43510cc4fe892791ad4c91caf2d02b9cb9766c6877fd543040b1

data/lib/crokus/ast.rb

@@ -443,6 +443,9 @@ module Crokus
   end
 
   class StrLit < Literal
+    def self.create str
+      StrLit.new( Token.new [:string_lit,"\"#{str}\"",[0,0]] )
+    end
   end
 
   class CharLit < Literal

data/lib/crokus/cfg_printer_only.rb

@@ -0,0 +1,24 @@
+module Crokus
+
+  class CFGOnlyPrinter < Visitor
+
+    def visitFunction func,format
+      puts " "*1+"|--[+] print CFG for '#{func.name}'"
+      ir_code=dump(func.cfg)
+      format=ir_code.lines.first.start_with?("digraph") ? "dot" : "json"
+      filename=func.name.to_s+".#{format}"
+      ir_code.save_as filename
+      puts " "*5+"|--[+] generated #{filename}"
+    end
+
+    def dump cfg
+      @visited=[]
+      @code=Code.new
+      header
+      visit_rec(cfg.starter)
+      footer
+      return @code
+    end
+
+  end
+end

data/lib/crokus/cfg_printer_only_dot.rb

@@ -0,0 +1,54 @@
+require_relative "cfg_printer_only"
+
+module Crokus
+
+  class CFGOnlyPrinterDot < CFGOnlyPrinter
+
+    def header
+      @code << "digraph ControlFlowGraph {"
+      @code.indent=2
+      @code << "forcelabels=true;"
+      @code << "graph [ label=\"\","
+      @code << "        bgcolor=\"white\","
+      @code << "        fontname=\"Arial\","
+      @code << "        rankdir=\"TB\"]"
+      @code.newline
+      @code << "node  [ fontname=\"Arial\","
+      @code << "        shape=\"box\","
+      @code << "        style=\"filled\","
+      @code << "        fillcolor=\"AliceBlue\"]"
+      @code.newline
+      @code << "edge  [ fontname=\"Arial\","
+      @code << "        color=\"Blue\","
+      @code << "        dir=\"forward\"]"
+    end
+
+    def visit_rec bb
+      @visited << bb
+      @code << "bb_#{bb.label} [label=\"\",shape=rectangle, xlabel=#{bb.label}]"
+      @current=bb
+      if (ite=bb.stmts.last).is_a? ITE
+
+        unless @visited.include? (bb_t=ite.trueBranch)
+            visit_rec(bb_t)
+        end
+        unless @visited.include? (bb_f=ite.falseBranch)
+            visit_rec(bb_f)
+        end
+        @code << "bb_#{bb.label} -> bb_#{(bb_t=ite.trueBranch).label} [label=\"T\"]"
+        @code << "bb_#{bb.label} -> bb_#{(bb_f=ite.falseBranch).label} [label=\"F\"]"
+      else
+        bb.succs.each do |succ|
+          unless @visited.include? succ
+            visit_rec(succ)
+          end
+          @code << "bb_#{bb.label} -> bb_#{succ.label}"
+        end
+      end
+    end
+
+    def footer
+      @code << "}"
+    end
+  end
+end

data/lib/crokus/cfg_printer_only_json.rb

@@ -0,0 +1,45 @@
+require_relative "cfg_printer_only"
+
+module Crokus
+
+  class CFGOnlyPrinterJson < CFGOnlyPrinter
+
+    def header
+      @code << "{"
+      @code.indent=2
+    end
+
+    def visit_rec bb
+      @visited << bb
+      @current=bb
+      if (ite=bb.stmts.last).is_a? ITE
+        @code << "\"#{bb.label}\": {"
+        @code.indent=4
+        @code << "\"true\":  \"#{(bb_t=ite.trueBranch).label}\""
+        @code << "\"false\": \"#{(bb_f=ite.falseBranch).label}\""
+        @code.indent=2
+        @code << "}"
+        unless @visited.include? bb_t
+            visit_rec(bb_t)
+        end
+        unless @visited.include? bb_t
+            visit_rec(bb_t)
+        end
+      else
+        bb.succs.each do |succ|
+          @code << "\"#{bb.label}\": \"#{succ.label}\""
+          unless @visited.include? succ
+            visit_rec(succ)
+          end
+        end
+      end
+    end
+
+    def footer
+      @code.indent=0
+      @code << "}"
+    end
+
+  end
+
+end

data/lib/crokus/cfg_random_gen.rb

@@ -131,8 +131,14 @@ module Crokus
       end
     end
 
+    def bb_track bb
+      bb << fcall=FunCall.new(Ident.create("printf"),[StrLit.create("cfg track : %s\\n"),StrLit.create(bb.label)])
+      bb << SemicolonStmt.new(nil)
+    end
+
     def gen_plain_block level
       @cfg << bb=BasicBlock.new
+      bb_track(bb)
       @current.to bb
       @current=bb
     end
@@ -143,6 +149,11 @@ module Crokus
       @cfg << trueBranch =BasicBlock.new
       @cfg << falseBranch=BasicBlock.new
       @cfg << mergeBranch=BasicBlock.new
+
+      bb_track(trueBranch)
+      bb_track(falseBranch)
+      bb_track(mergeBranch)
+
       @current.to trueBranch
       @current.to falseBranch
 
@@ -162,6 +173,12 @@ module Crokus
       cond_bb.infos[:cond]=create_condition
       @cfg << trueBranch  = BasicBlock.new
       @cfg << falseBranch = BasicBlock.new
+
+
+      bb_track(cond_bb)
+      bb_track(trueBranch)
+      bb_track(falseBranch)
+
       @current.to cond_bb
       cond_bb.to trueBranch
       cond_bb.to falseBranch
@@ -183,6 +200,13 @@ module Crokus
       @cfg << trueBranch  = BasicBlock.new
       @cfg << falseBranch = BasicBlock.new
       @cfg << postBranch  = BasicBlock.new(:loop_body_end => true)
+
+      # control flow tracking
+      bb_track(cond_bb)
+      bb_track(trueBranch)
+      bb_track(falseBranch)
+      bb_track(postBranch)
+
       @current.to cond_bb
       cond_bb.to trueBranch
       cond_bb.to falseBranch

data/lib/crokus/compiler.rb

@@ -6,6 +6,8 @@ require_relative 'pretty_printer'
 require_relative 'trojan_inserter'
 
 require_relative 'cfg_builder'
+require_relative 'cfg_printer_only_dot'
+require_relative 'cfg_printer_only_json'
 require_relative 'tac_builder'
 require_relative 'ir_dumper'
 require_relative 'cfg_random_gen' # random C generation
@@ -33,6 +35,16 @@ module Crokus
       build_cfg
       return true if options[:cfg]
 
+      if options[:print_cfg_dot]
+        print_cfg_only(:dot)
+        return true
+      end
+
+      if options[:print_cfg_json]
+        print_cfg_only(:json)
+        return true
+      end
+
       pretty_print
 
       if options[:trojan]
@@ -101,6 +113,16 @@ module Crokus
       IRDumper.new.visit(ast)
     end
 
+    def print_cfg_only format
+      puts "[+] print textual CFG only format #{format}" unless options[:mute]
+      case format
+      when :dot
+        CFGOnlyPrinterDot.new.visit(ast)
+      when :json
+        CFGOnlyPrinterJson.new.visit(ast)
+      end
+    end
+
     def execute params
       RandomGen.new.run(params)
     end

data/lib/crokus/pretty_printer.rb

@@ -187,6 +187,11 @@ module Crokus
       ret
     end
 
+    def visitSemicolonStmt stmt,args=nil
+      ret=";"
+      ret
+    end
+
     def visitAssign assign,args=nil
       lhs=assign.lhs.accept(self)
       op =assign.op.accept(self)

data/lib/crokus/runner.rb

@@ -23,7 +23,7 @@ module Crokus
     end
 
     def header
-      puts "Crokus (#{VERSION})- (c) JC Le Lann 2016-20"
+      puts "Crokus (#{VERSION})- (c) JC Le Lann 2016-today"
     end
 
     private
@@ -65,6 +65,14 @@ module Crokus
         options[:emit_ir] = true
       end
 
+      parser.on("--print-cfg-dot", "print textual CFG ONLY in Graphviz format") do
+        options[:print_cfg_dot] = true
+      end
+
+      parser.on("--print-cfg-json", "print textual CFG ONLY in JSON format") do
+        options[:print_cfg_json] = true
+      end
+
       parser.on('--random PARAMS', "generates random c files, using parameters", String) do |params_filename|
         options[:random] = params_filename
       end
@@ -74,6 +82,7 @@ module Crokus
         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

data/lib/crokus/token.rb

@@ -1,5 +1,7 @@
 class Token
+
   attr_accessor :kind,:val,:pos
+
   def initialize tab
     @kind,@val,@pos=*tab
   end

data/lib/crokus/version.rb

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

data/lib/crokus/visitor.rb

@@ -10,8 +10,8 @@ module Crokus
       @verbose=false
     end
 
-    def visit ast
-      ast.accept(self)
+    def visit ast,args=nil
+      ast.accept(self,args)
     end
 
     def visitToken tok, args=nil
@@ -20,62 +20,62 @@ module Crokus
 
     def visitDesignUnit du,args=nil
       indent "DesignUnit"
-      du.list.each{|e| e.accept(self)}
+      du.list.each{|e| e.accept(self,args)}
       dedent
       du
     end
 
     def visitDecl decl,args=nil
       indent "Decl"
-      decl.type.accept(self)
-      decl.var.accept(self) if decl.var #case of struct decl only.
-      decl.init.accept(self) if decl.init
+      decl.type.accept(self,args)
+      decl.var.accept(self,args) if decl.var #case of struct decl only.
+      decl.init.accept(self,args) if decl.init
       dedent
       decl
     end
 
     def visitInclude include,args=nil
       indent "Include"
-      include.name.accept(self)
+      include.name.accept(self,args)
       dedent
       include
     end
 
     def visitDefine define,args=nil
       indent "Define"
-      define.name.accept(self)
-      define.expr.accept(self)
+      define.name.accept(self,args)
+      define.expr.accept(self,args)
       dedent
       define
     end
 
     def visitTypedef typdef,args=nil
       indent "Typdef"
-      typdef.type.accept(self)
-      typdef.name.accept(self)
+      typdef.type.accept(self,args)
+      typdef.name.accept(self,args)
       dedent
       typdef
     end
 
     def visitType type,args=nil
       indent "Type"
-      type.precisions.each{|precision| precision.accept(self)}
-      type.name.accept(self)
+      type.precisions.each{|precision| precision.accept(self,args)}
+      type.name.accept(self,args)
       dedent
       type
     end
 
     def visitPointerTo pto,args=nil
       indent "PointerTo"
-      pto.type.accept(self)
+      pto.type.accept(self,args)
       dedent
       pto
     end
 
     def visitArrayOf aof,args=nil
       indent "ArrayOf"
-      aof.type.accept(self)
-      aof.size.accept(self) if aof.size
+      aof.type.accept(self,args)
+      aof.size.accept(self,args) if aof.size
       dedent
       aof
     end
@@ -88,15 +88,15 @@ module Crokus
 
     def visitCasting cast,args=nil
       indent "Casting"
-      cast.type.accept(self)
+      cast.type.accept(self,args)
       dedent
       cast
     end
 
     def visitCastedExpr cexpr,args=nil
       indent "CastedExpr"
-      cexpr.type.accept(self)
-      cexpr.expr.accept(self)
+      cexpr.type.accept(self,args)
+      cexpr.expr.accept(self,args)
       dedent
       cexpr
     end
@@ -105,118 +105,118 @@ module Crokus
 
     def visitFunction func,args=nil
       indent "Function"
-      func.type.accept(self)
-      func.name.accept(self)
-      func.args.each{|arg| arg.accept(self)}
-      func.body.accept(self)
+      func.type.accept(self,args)
+      func.name.accept(self,args)
+      func.args.each{|arg| arg.accept(self,args)}
+      func.body.accept(self,args)
       dedent
       func
     end
 
     def visitFunctionProto func,args=nil
       indent "FunctionProto"
-      func.type.accept(self)
-      func.name.accept(self)
-      func.args.each{|arg| arg.accept(self)}
+      func.type.accept(self,args)
+      func.name.accept(self,args)
+      func.args.each{|arg| arg.accept(self,args)}
       dedent
       func
     end
 
     def visitFormalArg formalArg,args=nil
       indent "FormalArg"
-      formalArg.name.accept(self) if formalArg.name # e.g : main(void)
-      formalArg.type.accept(self)
+      formalArg.name.accept(self,args) if formalArg.name # e.g : main(void)
+      formalArg.type.accept(self,args)
       dedent
       formalArg
     end
 
     #...........stmts...............
     def visitCommaStmt comma,args=nil
-      lhs=comma.lhs.accept(self)
-      rhs=comma.rhs.accept(self)
+      lhs=comma.lhs.accept(self,args)
+      rhs=comma.rhs.accept(self,args)
       comma
     end
 
     def visitAssign assign,args=nil
-      assign.lhs.accept(self)
-      assign.op.accept(self)
-      assign.rhs.accept(self)
+      assign.lhs.accept(self,args)
+      assign.op.accept(self,args)
+      assign.rhs.accept(self,args)
       assign
     end
 
     def visitPostFixAccu accu,args=nil
       lhs=accu.lhs.accept(self,args) if accu.lhs #++i
-      op =accu.op.accept(self)
+      op =accu.op.accept(self,args)
       accu
     end
 
     def visitPreFixAccu accu,args=nil
       lhs=accu.lhs.accept(self,args) if accu.lhs #++i
-      op =accu.op.accept(self)
+      op =accu.op.accept(self,args)
       accu
     end
 
     def visitFunCall fcall,args=nil
       indent "FunCall"
-      fcall.name.accept(self)
-      fcall.args.each{|arg| arg.accept(self)}
+      fcall.name.accept(self,args)
+      fcall.args.each{|arg| arg.accept(self,args)}
       dedent
       fcall
     end
 
     def visitFor for_,args=nil
       indent "For"
-      for_.init.each{|stmt| stmt.accept(self)}
-      for_.cond.accept(self)
-      for_.increment.accept(self)
-      for_.body.accept(self)
+      for_.init.each{|stmt| stmt.accept(self,args)}
+      for_.cond.accept(self,args)
+      for_.increment.accept(self,args)
+      for_.body.accept(self,args)
       dedent
       for_
     end
 
     def visitReturn ret,args=nil
       indent "Return"
-      ret.expr.accept(self) if ret.expr
+      ret.expr.accept(self,args) if ret.expr
       dedent
       ret
     end
 
     def visitIf if_,args=nil
       indent "If"
-      if_.cond.accept(self)
-      if_.body.accept(self)
+      if_.cond.accept(self,args)
+      if_.body.accept(self,args)
       dedent
       if_
     end
 
     def visitSwitch sw_,args=nil
       indent "Switch"
-      sw_.expr.accept(self)
-      sw_.cases.each{|case_| case_.accept(self)}
+      sw_.expr.accept(self,args)
+      sw_.cases.each{|case_| case_.accept(self,args)}
       dedent
       sw_
     end
 
     def visitCase case_,args=nil
       indent "Case"
-      case_.expr.accept(self)
-      case_.body.accept(self)
+      case_.expr.accept(self,args)
+      case_.body.accept(self,args)
       dedent
       case_
     end
 
     def visitWhile while_,args=nil
       indent "While"
-      while_.cond.accept(self)
-      while_.body.each{|stmt| stmt.accept(self)}
+      while_.cond.accept(self,args)
+      while_.body.each{|stmt| stmt.accept(self,args)}
       dedent
       while_
     end
 
     def visitDoWhile while_,args=nil
       indent "DoWhile"
-      while_.cond.accept(self)
-      while_.body.each{|stmt| stmt.accept(self)}
+      while_.cond.accept(self,args)
+      while_.body.each{|stmt| stmt.accept(self,args)}
       dedent
       while_
     end
@@ -241,7 +241,7 @@ module Crokus
 
     def visitGoto goto,args=nil
       indent "Goto"
-      goto.label.accept(self)
+      goto.label.accept(self,args)
       dedent
       goto
     end
@@ -268,7 +268,7 @@ module Crokus
 
     def visitCondExpr cexpr,args=nil
       indent "condexpr"
-      cexpr.cond.accept(self)
+      cexpr.cond.accept(self,args)
       cexpr.lhs.accept(self,args)
       cexpr.rhs.accept(self,args)
       dedent
@@ -278,7 +278,7 @@ module Crokus
     def visitBinary expr,args=nil
       indent "Binary"
       expr.lhs.accept(self,args)
-      expr.op.accept(self)
+      expr.op.accept(self,args)
       expr.rhs.accept(self,args)
       dedent
       expr
@@ -292,28 +292,28 @@ module Crokus
 
     def visitParenth par,args=nil
       indent "Parenth"
-      par.expr.accept(self)
+      par.expr.accept(self,args)
       dedent
       par
     end
 
     def visitArrow arrow,args=nil
       indent "arrow"
-      arrow.lhs.accept(self)
-      arrow.rhs.accept(self)
+      arrow.lhs.accept(self,args)
+      arrow.rhs.accept(self,args)
       dedent
     end
 
     def visitIndexed index,args=nil
       indent "Index"
-      index.lhs.accept(self)
-      index.rhs.accept(self)
+      index.lhs.accept(self,args)
+      index.rhs.accept(self,args)
       dedent
     end
 
     def visitArrayOrStructInit init,args=nil
       indent "ArrayOrStructInit"
-      init.elements.each{|e| e.accept(self)}
+      init.elements.each{|e| e.accept(self,args)}
       dedent
     end
 
@@ -324,14 +324,14 @@ module Crokus
 
     def visitPointed pointed,args=nil
       indent "Pointed"
-      pointed.lhs.accept(self)
-      pointed.rhs.accept(self)
+      pointed.lhs.accept(self,args)
+      pointed.rhs.accept(self,args)
       dedent
     end
 
     def visitSizeof sizeof,args=nil
       indent "Sizeof"
-      sizeof.type.accept(self)
+      sizeof.type.accept(self,args)
       dedent
       sizeof
     end
@@ -343,7 +343,7 @@ module Crokus
 
     def visitBody body,args=nil
       indent "body"
-      body.stmts.each{|stmt| stmt.accept(self)}
+      body.stmts.each{|stmt| stmt.accept(self,args)}
       dedent
     end
   end #class Visitor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: distribution
@@ -56,6 +56,9 @@ files:
 - lib/crokus/cfg_optim.rb
 - lib/crokus/cfg_printer.rb
 - lib/crokus/cfg_printer_c.rb
+- lib/crokus/cfg_printer_only.rb
+- lib/crokus/cfg_printer_only_dot.rb
+- lib/crokus/cfg_printer_only_json.rb
 - lib/crokus/cfg_random_gen.rb
 - lib/crokus/cleaner.rb
 - lib/crokus/code.rb
@@ -93,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Simple parser for a subset of C language, for experimental purposes