crokus 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7712eb73a1d5f62f9b9b7a63eae496dbd67a346b5a17b56b4e31d60fd9deee3d
-  data.tar.gz: fed83c851d88bc36a18bd060883644be97ffe4c6cddf7765aedd4a1c37da3add
+  metadata.gz: b690523ea19dfb9b7eaa5f0569ab5b4d9cba857ca8e4a451907af3b28c7749c7
+  data.tar.gz: 2313aac03fc005f09dbee2925a64738e0c85fe0a343f1de0a426ce73a9307eab
 SHA512:
-  metadata.gz: c2d3dd5f960229807f20310e10554c69dd65e030c1f36460a78d49662d7abfa91e2f4aa9ac6fc6f6690276372b191c13c475042c2aeaaca23f898f4aaf841676
-  data.tar.gz: fb152f1af14c00705fc59940b99a8cf506898a37cfbadfee28eb9b61c3db6bd4b62b43b3622c3c0b77452561d415a82a0c88851ef66b45f79bd2ec776f51d3c4
+  metadata.gz: 3b8be391422d91f28ffc75c0d86f00098f9ba17f2d64a277a28dee774348bb725b558a1a469d11831d07ac58f9dbab3a08a37779f3c4a3672aa06f6f94374041
+  data.tar.gz: 89aeab45274244cadd1758cd17a2ca2364db45ec3b3f1ed748caf2c6a6840cf9c9a9a99cf0e4f6a90844a2c623f0315bb26c7195650dd55c2675367f805b164e

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crokus
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jean-Christophe Le Lann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 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