Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecslib/core/componentobj.rb

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecslib/core/componentobj.rb (modified) (126 diffs)

EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecslib/core/componentobj.rb

@@ -4 +4 @@
 #      Generator for TOPPERS Embedded Component System
 #  
-#   Copyright (C) 2008-2016 by TOPPERS Project
+#   Copyright (C) 2008-2019 by TOPPERS Project
 #--
 #   上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -79 +79 @@
 #  @b_checked_as_allocator_signature:: bool:  アロケータシグニチャとしてチェック済み
 #  @b_empty:: Bool: 空(関数が一つもない状態)
+#  @descriptor_list:: nil | { Signature => ParamDecl }  最後の ParamDecl しか記憶しないことに注意
+#  @generate:: [ Symbol, String, Plugin ]  = [ PluginName, option, Plugin ] Plugin は生成後に追加される
+
+  include PluginModule
 
   @@nest_stack_index = -1
@@ -123 +127 @@
     @b_empty = false
     @b_checked_as_allocator_signature = false
+    @descriptor_list = nil
+    @generate = nil
     @@current_object = self
     set_specifier_list( Generator.get_statement_specifier )
@@ -136 +142 @@
     function_head_list.get_items.each{ |f|
       @func_name_to_id[ f.get_name ] = id
+      f.set_owner self
       id += 1
     }
@@ -142 +149 @@
     end
 
+    # set_descriptor_list ##
+
+    if @generate then
+      signature_plugin
+    end
+
     @@current_object = nil
+
     return self
   end
@@ -170 +184 @@
       when :DEVIATE
         @b_deviate = true
+      when :GENERATE
+        if @generate then
+          cdl_error( "S9999 generate specifier duplicate"  )
+        end
+        @generate = [ s[1], s[2] ] # [ PluginName, "option" ]
       else
         cdl_error( "S1002 \'$1\': unknown specifier for signature" , s[0] )
@@ -309 +328 @@
   end
 
-  #== Signature# 引数で参照されている Descriptor 型のリストを作成する
+  #=== Signature# シグニチャプラグイン (generate 指定子)
+  def signature_plugin
+    plugin_name = @generate[0]
+    option = @generate[1]
+    apply_plugin( plugin_name, option )
+  end
+
+  #== Signature#apply_plugin
+  def apply_plugin plugin_name, option
+    if is_empty? then
+      cdl_warning( "S9999 $1 is empty. cannot apply signature plugin. ignored" , @name )
+      return
+    end
+
+    plClass = load_plugin( plugin_name, SignaturePlugin )
+    return if plClass == nil
+    if $verbose then
+      print "new through: plugin_object = #{plClass.class.name}.new( #{@name}, #{option} )\n"
+    end
+
+    begin
+      plugin_object = plClass.new( self, option )
+      plugin_object.set_locale @locale
+    rescue Exception => evar
+      cdl_error( "S1150 $1: fail to new" , plugin_name )
+      print_exception( evar )
+    end
+    generate_and_parse plugin_object
+end
+
+  #== Signature# 引数で参照されている Descriptor 型のリストを
   #RETURN:: Hash { Signature => ParamDecl }:  複数の ParamDecl から参照されている場合、最後のものしか返さない
   def get_descriptor_list
+    @descriptor_list
+  end
+
+  @@set_descriptor_list = {}
+  def self.set_descriptor_list
+    Namespace.get_root.travers_all_signature{ |sig|
+      if @@set_descriptor_list[ sig ] == nil then
+        @@set_descriptor_list[ sig ] = true
+        sig.set_descriptor_list
+      end
+    }
+  end
+
+  #== Signature# 引数で参照されている Descriptor 型のリストを作成する
+  def set_descriptor_list
     desc_list = { }
     # p "has_desc #{@name}"
     fha = get_function_head_array                       # 呼び口または受け口のシグニチャの関数配列
     if fha == nil then                                  # nil の場合、自己参照によるケースと仮定
+      @descriptor_list = desc_list
       return desc_list
     end
@@ -330 +395 @@
             # p "has_desc #{param.get_name} #{t}"
             if t.kind_of? DescriptorType then
-              desc_list[t] = param
+              desc_list[ t.get_signature ] = param
+              # p self.get_name, t.get_signature.get_name
+              if t.get_signature == self then
+               # cdl_error( "S9999 Descriptor argument '$1' is the same signature as this parameter '$2' included", @name, param.get_name )
+              end
+              dir = param.get_direction
+              if dir != :IN && dir != :OUT && dir != :INOUT then
+                cdl_error( "S9999 Descriptor argument '$1' cannot be specified for $2 parameter", param.get_name, dir.to_s.downcase )
+              end
             end
           }
@@ -336 +409 @@
       end
     }
-    return desc_list
+    @descriptor_list = desc_list
   end
 
   #=== Signature# 引数に Descriptor があるか？
   def has_descriptor?
-    # p "has_desc #{@name}"
-    fha = get_function_head_array                       # 呼び口または受け口のシグニチャの関数配列
-    if fha == nil then                                  # nil の場合、自己参照によるケースと仮定
+    if get_descriptor_list == nil then
+      # end_of_parse が呼び出される前に has_descriptor? が呼び出された
+      # 呼び出し元は DescriptorType#initialize
+      # この場合、同じシグニチャ内の引数が Descriptor 型である
       return true
-    end
-    fha.each{ |fh|
-      fd = fh.get_declarator                            # fd: Decl  (関数頭部からDeclarotorを得る)
-      if fd.is_function? then                           # fd が関数でなければ、すでにエラー
-        params = fd.get_type.get_paramlist.get_items
-        if params then
-          params.each{ |param|
-            t = param.get_type.get_original_type
-            while( t.kind_of? PtrType )
-              t = t.get_referto
-            end
-            # p "has_desc #{param.get_name} #{t}"
-            if t.kind_of? DescriptorType then
-              return true
-            end
-          }
-        end
-      end
-    }
-    return false
+    elsif get_descriptor_list.length > 0 then
+      return true
+    else
+      return false
+    end
   end
 
@@ -411 +470 @@
 
 end
+
+module CelltypePluginModule
+  #=== Celltype# セルタイププラグイン (generate 指定子)
+  def celltype_plugin
+    plugin_name = @generate[0]
+    option = @generate[1]
+    @generate[2] = apply_plugin( plugin_name, option )
+  end
+
+  #=== Celltype# セルタイププラグインをこのセルタイプに適用
+  def apply_plugin( plugin_name, option )
+
+    # plClass = load_plugin( plugin_name, CelltypePlugin )
+    if kind_of? Celltype then
+      plugin_class = CelltypePlugin
+    elsif kind_of? CompositeCelltype then
+      plugin_class = CompositePlugin
+    else
+      raise "unknown class #{self.class.name}"
+    end
+    
+    plClass = load_plugin( plugin_name, plugin_class )
+    return if plClass == nil
+    if $verbose then
+      print "new celltype plugin: plugin_object = #{plClass.class.name}.new( #{@name}, #{option} )\n"
+    end
+
+    begin
+      plugin_object = plClass.new( self, option )
+      @generate_list << [ plugin_name, option, plugin_object ]
+      plugin_object.set_locale @locale
+      generate_and_parse plugin_object
+    rescue Exception => evar
+      cdl_error( "S1023 $1: fail to new" , plugin_name )
+      print_exception( evar )
+    end
+
+    # 既に存在するセルに new_cell を適用
+    @cell_list.each{ |cell|
+      apply_plugin_cell plugin_object, cell
+    }
+
+    return plugin_object
+  end
+
+  def apply_plugin_cell plugin, cell
+    begin
+      plugin.new_cell cell
+    rescue Exception => evar
+      cdl_error( "S1037 $1: celltype plugin fail to new_cell" , plugin.class.name )
+      print_exception( evar )
+    end
+  end
+
+  def celltype_plugin_new_cell cell
+    @generate_list.each{ |generate|
+      celltype_plugin = generate[2]
+      begin
+        celltype_plugin.new_cell cell
+      rescue Exception => evar
+        cdl_error( "S1037 $1: celltype plugin fail to new_cell" , celltype_plugin.class.name )
+        print_exception( evar )
+      end
+    }
+  end
+end #CelltypePluginModule
 
 class Celltype < NSBDNode # < Nestable
@@ -423 +548 @@
 # @ct_factory_list::    Factory[] :    celltype factory
 # @cell_list:: Cell[] : 定義のみ (V1.0.0.2 以降)
+# @ordered_cell_list:: Cell[] : ID 順に順序付けされたセルリスト、最適化以降有効 (リンク単位ごとに生成されなおす)
 # @singleton:: bool
 # @idx_is_id:: bool
 # @idx_is_id_act:: bool: actual value
+# @b_need_ptab:: bool: true if having cells in multi-domain
 # @active:: bool
 # @b_reuse:: bool :  reuse 指定されて import された(template 不要)
 # @generate:: [ Symbol, String, Plugin ]  = [ PluginName, option, Plugin ] Plugin は生成後に追加される
+# @generate_list:: [ [ Symbol, String, Plugin ], ... ]   generate 文で追加された generate
 #
 # @n_attribute_ro:: int >= 0    none specified
@@ -437 +565 @@
 # @n_var_omit:: int >= 0        # of [omit] specified vars # mikan var の omit は有？
 # @n_var_init:: int >= 0        # of vars with initializer
-# @n_call_port:: int >= 0
-# @n_call_port_array:: int >= 0
+# @n_call_port:: int >= 0       # dynamic ports are included
+# @n_call_port_array:: int >= 0  # dynamic ports are included
 # @n_call_port_omitted_in_CB:: int >= 0   最適化で省略される呼び口
+# @n_call_port_dynamic:: int >= 0  #
+# @n_call_port_array_dynamic:: int >= 0
+# @n_call_port_ref_desc:: int >= 0  #
+# @n_call_port_array_ref_desc:: int >= 0
 # @n_entry_port:: int >= 0
 # @n_entry_port_array:: int >= 0
@@ -455 +587 @@
 
   include PluginModule
-
+  include CelltypePluginModule
+  
   @@nest_stack_index = -1
   @@nest_stack = []
@@ -496 +629 @@
     @active = false
     @generate = nil
+    @generate_list = []
 
     @n_attribute_ro = 0
@@ -507 +641 @@
     @n_call_port_array = 0
     @n_call_port_omitted_in_CB = 0
+    @n_call_port_dynamic = 0
+    @n_call_port_array_dynamic = 0
+    @n_call_port_ref_desc = 0
+    @n_call_port_array_ref_desc = 0
     @n_entry_port = 0
     @n_entry_port_array = 0
@@ -528 +666 @@
     if $idx_is_id then
       @idx_is_id = true
+      @idx_is_id_act = true
+      @b_need_ptab = true
     else
       @idx_is_id = false
-    end
-    @idx_is_id_act = @idx_is_id
+      @idx_is_id_act = false
+      @b_need_ptab = false
+    end
 
     Namespace.new_celltype( self )
     set_namespace_path # @NamespacePath の設定
     set_specifier_list( Generator.get_statement_specifier )
-
-    if @singleton then
-      @idx_is_id_act = false
-    end
 
     @included_header = {}
@@ -577 +714 @@
       celltype_plugin
     end
+
+    # check_dynamic_join ##
 
     @@current_object = nil
@@ -592 +731 @@
       @n_call_port += 1
       @n_call_port_array += 1 if port.get_array_size != nil
+      if port.is_dynamic? then
+        @n_call_port_dynamic += 1
+        @n_call_port_array_dynamic += 1 if port.get_array_size != nil
+      end
+      if port.is_ref_desc? then
+        @n_call_port_ref_desc += 1
+        @n_call_port_array_ref_desc += 1 if port.get_array_size != nil
+      end
     else
       @n_entry_port += 1
@@ -753 +900 @@
       when :IDX_IS_ID
         @idx_is_id = true
+        @idx_is_id_act = true
+        @b_need_ptab = true
       when :ACTIVE
         @active = true
@@ -764 +913 @@
       end
     }
+    if @singleton then
+      @idx_is_id_act = false
+      @b_need_ptab = false
+    end
   end
 
@@ -863 +1016 @@
   end
 
-  #=== Celltype# セルタイププラグイン (generate 指定子)
-  def celltype_plugin
-
-    load_plugin( @generate[0], CelltypePlugin )
-
-    plugin_name = @generate[0]
-    option = @generate[1]
-    plugin_object = nil
-    eval_str = "plugin_object = #{plugin_name}.new( self, option )"
-    if $verbose then
-      print "new celltype : #{eval_str}\n"
-    end
-
-    begin
-      eval( eval_str )     # plugin を生成
-      plugin_object.set_locale @locale
-      @generate[ 2 ] = plugin_object
-      generate_and_parse plugin_object
-    rescue Exception => evar
-      cdl_error( "S1023 $1: fail to new" , plugin_name )
-      print "eval( #{eval_str} )\n"
-
-      print_exception( evar )
-    end
+  @@dynamic_join_checked_list = {}
+  def self.check_dynamic_join
+    Namespace.get_root.travers_all_celltype{ |ct|
+      if @@dynamic_join_checked_list[ ct ] == nil then
+        @@dynamic_join_checked_list[ ct ] = true
+        ct.check_dynamic_join
+      end
+    }
+  end
+
+  #=== Celltype#dynamic の適合性チェック
+  def check_dynamic_join
+    return if ! $verbose
+    @port.each{ |port|
+      signature = port.get_signature
+      next if signature == nil   # すでにエラー
+      if port.is_dynamic? then
+        dbgPrint( "[DYNAMIC] checking dynamic port: #{@global_name}.#{port.get_name}\n" )
+        # print( "[DYNAMIC] checking dynamic port: #{@global_name}.#{port.get_name}\n" )
+        next if find_ref_desc_port signature
+        next if find_descriptor_param signature, :DYNAMIC
+        cdl_warning( 'W9999 $1 cannot get information for dynamic port $2', @name, port.get_name )
+      elsif port.is_ref_desc? then
+        dbgPrint( "[DYNAMIC] checking ref_desc port: #{@global_name}.#{port.get_name}\n" )
+        # print( "[DYNAMIC] checking ref_desc port: #{@global_name}.#{port.get_name}\n" )
+        next if find_dynamic_port signature
+        next if find_descriptor_param signature, :REF_DESC
+        cdl_warning( 'W9999 $1 cannot put information from ref_desc port $2', @name, port.get_name )
+      elsif port.get_signature then
+        if port.get_signature.has_descriptor? then
+          port.get_signature.get_descriptor_list.each{ |signature, param|
+            dbgPrint( "[DYNAMIC] checking Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+            # print( "[DYNAMIC] checking Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+            if port.get_port_type == :CALL then
+              if param.get_direction == :IN
+                next if find_ref_desc_port signature
+                next if find_descriptor_param signature, :DYNAMIC
+              elsif param.get_direction == :OUT
+                next if find_dynamic_port signature
+                next if find_descriptor_param signature, :REF_DESC
+              end
+            else  # :ENTRY
+              if param.get_direction == :IN
+                next if find_dynamic_port signature
+                next if find_descriptor_param signature, :REF_DESC
+              elsif param.get_direction == :OUT
+                next if find_ref_desc_port signature
+                next if find_descriptor_param signature, :DYNAMIC
+              end
+            end
+            cdl_warning( 'W9999 "$1" cannot handle Descriptor "$2" information for port "$3"', @name, param.get_name, port.get_name )
+          }
+        end
+      end
+    }
+  end
+
+  def find_dynamic_port signature
+    dbgPrint "[DYNAMIC] find_dynamic_port signature=#{signature.get_name}"
+    @port.each{ |port|
+      dbgPrint "[DYNAMIC] port=#{port.get_name} signature=#{port.get_signature.get_name} dynamic=#{port.is_dynamic?}"
+      return port if port.is_dynamic? && port.get_signature == signature
+    }
+    return nil
+  end
+  def find_ref_desc_port signature
+    if signature == nil then  # すでにエラー
+      return nil
+    end
+    dbgPrint "[DYNAMIC] find_ref_desc_port signature=#{signature.get_name}"
+    @port.each{ |port|
+      dbgPrint "[DYNAMIC] port=#{port.get_name} signature=#{port.get_signature.get_name} ref_desc=#{port.is_ref_desc?}"
+      return port if port.is_ref_desc? && port.get_signature == signature
+    }
+    return nil
+  end
+  #=== Celltype#ディスクリプタ型でシグニチャが一致し dyn_ref に対応づく引数を探す
+  #dyn_ref::Symbol: :DYNAMIC=ディスクリプタを得る手段となる引数を探す．:REF_DESC=渡す手段となる引数を探す
+  def find_descriptor_param signature, dyn_ref
+    param_list = []
+    @port.each{ |port|
+      port.each_param{ |port, func, param|
+        type = param.get_type
+        while type.kind_of? PtrType
+          type = type.get_type
+        end
+        dbgPrint( "[DYNAMIC] dyn_ref=#{dyn_ref} port_type=#{port.get_port_type} dir=#{param.get_direction} paramName=#{param.get_name} paramType=#{type.class}\n" )
+        # print( "[DYNAMIC] dyn_ref=#{dyn_ref} port_type=#{port.get_port_type} dir=#{param.get_direction} paramName=#{param.get_name} paramType=#{type.class}\n" )
+        if type.kind_of? DescriptorType then
+          if type.get_signature == signature then
+            dir = param.get_direction
+            if dir == :INOUT then
+              dbgPrint( "[DYNAMIC] found INOUT Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+              # print( "[DYNAMIC] found INOUT Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+              return param
+            elsif dyn_ref == :DYNAMIC then
+              if dir == :IN && port.get_port_type == :ENTRY ||
+                 dir == :OUT && port.get_port_type == :CALL then
+                dbgPrint( "[DYNAMIC] found INBOUND Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+                # print( "[DYNAMIC] found INBOUND Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+                return param
+              end
+            elsif dyn_ref == :REF_DESC
+              if dir == :IN && port.get_port_type == :CALL ||
+                 dir == :OUT && port.get_port_type == :ENTRY then
+                dbgPrint( "[DYNAMIC] found OUTBOUND Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+                # print( "[DYNAMIC] found OUTBOUND Descriptor parameter: #{@global_name}.#{port.get_name} ... #{param.get_name}\n" )
+                return param
+              end
+            else
+              raise "unknown ref_desc"
+            end
+          end
+        end
+      }
+    }
+    return nil
   end
 
@@ -895 +1141 @@
   # シングルトンセルが同じ linkunit に複数ないかチェック
   def new_cell( cell )
+    dbgPrint "Celltype#new_cell( #{cell.get_name} )\n"
     # Celltype では Cell の set_owner しない
     # シングルトンで、プロトタイプ宣言でない場合、コード生成対象リージョンの場合
@@ -905 +1152 @@
     end
     @cell_list << cell
+
+    # プラグインにより生成されたセルタイプか ?
     if @plugin then
       @plugin.new_cell cell
     end
+
+    # セルタイププラグインの適用
+    celltype_plugin_new_cell cell
   end
 
@@ -919 +1171 @@
   #     呼び口（ただし、最適化で不要となるものは除く）
   def has_INIB?
-#    print "name=#{@name} @n_attribute_ro=#{@n_attribute_ro}  @n_var_size_is=#{@n_var_size_is} @n_call_port=#{@n_call_port} @n_call_port_omitted_in_CB=#{@n_call_port_omitted_in_CB} @n_entry_port_array_ns=#{@n_entry_port_array_ns}\n"
-    return $rom && (@n_attribute_ro > 0 || @n_var_size_is > 0 || ( @n_call_port - @n_call_port_omitted_in_CB ) > 0 || @n_entry_port_array_ns > 0)
-#    return $rom && (@n_attribute_ro > 0 || ( @n_call_port - @n_call_port_omitted_in_CB ) > 0)
+
+    result = $rom &&
+             (@n_attribute_ro > 0 ||
+              @n_var_size_is > 0 ||
+              ( @n_call_port - @n_call_port_omitted_in_CB - (@n_call_port_dynamic-@n_call_port_array_dynamic) ) > 0 ||
+              $ram_initializer && @n_call_port_dynamic > 0 ||
+              @n_entry_port_array_ns > 0)
+    # print "name=#{@name} n_attribute_ro=#{@n_attribute_ro}  n_var_size_is=#{@n_var_size_is} n_call_port=#{@n_call_port} n_call_port_omitted_in_CB=#{@n_call_port_omitted_in_CB} n_call_port_dynamic=#{@n_call_port_dynamic} n_call_port_array_dynamic=#{@n_call_port_array_dynamic} n_entry_port_array_ns=#{@n_entry_port_array_ns} has_INIB?=#{result}\n"
+
+    return result
   end
 
@@ -934 +1193 @@
   def has_CB?
     if $rom then
-      return @n_attribute_rw > 0 || (@n_var-@n_var_size_is) > 0
+      return @n_attribute_rw > 0 || (@n_var-@n_var_size_is) > 0 || (@n_call_port_dynamic - @n_call_port_array_dynamic) > 0
       # return @n_attribute_rw > 0 || @n_var > 0
     else
@@ -943 +1202 @@
   #=== Celltype# SET_CB_INIB_POINTER, INITIALIZE_CB が必要か
   def need_CB_initializer?
-    @n_var_init > 0 || has_CB?
+    @n_var_init > 0 || has_CB? || ( @n_call_port_dynamic && $ram_initializer )
   end
 
@@ -998 +1257 @@
   def is_active?
     @active
+  end
+
+  def idx_is_id_act?
+    @idx_is_id_act
+  end
+
+  def multi_domain?
+    @b_need_ptab
   end
 
@@ -1120 +1387 @@
 #                                               逆require ポートに対して複数の結合がないかチェックする
 # @generate:: [ Symbol, String, Plugin ]  = [ PluginName, option, Plugin ] Plugin は生成後に追加される
+# @b_post_code_generated:: Bool: true if generated in tmp_plugin_post_code.cdl
 #
 # composite のためインスタンス変数
@@ -1142 +1410 @@
 # @id:: Integer : コード生成直前に設定  (プロトタイプ宣言の場合は -1 のまま放置)
 # @id_specified::Integer : 指定された id
-# @restrict_list::{ entry_name => { func_name, [ region_name, ... ] } }
+# @restrict_list::{ entry_name => { func_name, [ region_path_str, ... ] } }
+# @restrict_list2::{ entry_name => { func_name, [ domain_root_region, ... ] } }
+# @b_restrict_referenced::Bool: restrict_list が参照れた
 
 =begin
@@ -1187 +1457 @@
   end
 
-
-  # composite で clone されたもの（子孫まで含む）
-  # Join.change_rhs_port にて CompoisteCelltype 内の Join の結合先を変更する際に使用
-  @@cloned_cell_list = {}
-  ### mikan BUG @@cloned_cell_list は composite の階層ごとに記憶していないため、同じ名前が内部に現れると、うまく動作しない
-  # change_rhs_port の実装は、こんな回りくどいことをする必要はなかった。右辺に現れるセル名には、composite のセル名を前につなげるだけでよかった
-
   def initialize( ct_path, in_composite = false )
     super()
@@ -1233 +1496 @@
     @referenced_port_list = {}
     @restrict_list = {}
+    @restrict_list2 = {}
+    @b_restrict_referenced = false
+    @b_post_code_generated = false
 
     @cell_list = {}
@@ -1258 +1524 @@
       cell_prev = CompositeCelltype.find( name )
       if cell_prev == nil then
-        CompositeCelltype.new_cell( self )
+        CompositeCelltype.new_cell_in_composite( self )
       end
     else
@@ -1437 +1703 @@
 
     else
+      dbgPrint "new_join: cell=#{@name} add_item=#{join.get_name}\n"
       # join
       @join_list.add_item( join )
@@ -1500 +1767 @@
 
         # 呼び口側のセルと、そのセルタイプ
-        cell = Namespace.find cp_cell_nsp
+        if ! @in_composite then
+          cell = Namespace.find cp_cell_nsp
+        else
+          cell = CompositeCelltype.find cp_cell_nsp.to_s.to_sym
+        end
+
         if ! cell.instance_of? Cell then
           cdl_error( "S9999 '$1': not cell for reverse join", cp_cell_nsp.get_path_str )
@@ -1510 +1782 @@
         end
 
-        ep_cell_nsp = get_namespace_path
+        if ! @in_composite then
+          ep_cell_nsp = get_namespace_path
+          ep_cell_nsp_str = ep_cell_nsp.get_path_str
+        else
+          ep_cell_nsp = NamespacePath.new @name, false
+          ep_cell_nsp_str = @name
+        end
         ep_subscript_val = ep_subscript ? ep_subscript.eval_const( nil ) : nil
         rhs = Expression.create_cell_join_expression( ep_cell_nsp, ep_subscript_val, ep_name, rj.get_locale )
@@ -1521 +1799 @@
           ss_str = ""
         end
-        dbgPrint "create_reverse_join: #{cell.get_name}.#{cp_name}#{ss_str} => #{ep_cell_nsp.get_path_str}.ep_name\n"
+        dbgPrint "create_reverse_join: #{cell.get_name}.#{cp_name}#{ss_str} => #{ep_cell_nsp_str}.#{ep_name}\n"
       }
     end
@@ -1565 +1843 @@
       set_specifier_list( Generator.get_statement_specifier )
     end
+    if TECSGEN.post_coded?
+      @b_post_code_generated = true
+    end
     set_f_def f_def
 
@@ -1581 +1862 @@
 
     if ! @in_composite then
-      if @celltype.instance_of? Celltype then
+      # if @celltype.instance_of? Celltype then
+      if @celltype then  # composite でも呼びだす, エラー時 nil
         @celltype.new_cell self
       end
@@ -1702 +1984 @@
   end
 
-  #=== Cell# セルタイププラグイン (generate 指定子)
+  #=== Cell# セルプラグイン (generate 指定子)
   def cell_plugin
-
-    load_plugin( @generate[0], CellPlugin )
-
     plugin_name = @generate[0]
     option = @generate[1]
-    plugin_object = nil
-    eval_str = "plugin_object = #{plugin_name}.new( self, option )"
+    @generate[2] = apply_plugin plugin_name, option
+  end
+
+  def apply_plugin plugin_name, option
+    if ! @b_defined then
+      cdl_error( "S9999 plugin cannot apply to prototype cell '$1'", @name )
+    end
+
+    plClass = load_plugin( plugin_name, CellPlugin )
+    # return if plClass == nil # 従来と仕様が変わるので、継続する
     if $verbose then
-      print "new cell : #{eval_str}\n"
+      print "new cell plugin: plugin_object = #{plClass.class.name}.new( #{@name}, #{option} )\n"
     end
 
     begin
-      eval( eval_str )     # plugin を生成
+      plugin_object = plClass.new( self, option )
       plugin_object.set_locale @locale
-      @generate[ 2 ] = plugin_object
       generate_and_parse plugin_object
     rescue Exception => evar
       cdl_error( "S1166 $1: fail to new", plugin_name )
-      print "eval( #{eval_str} )\n"
-
       print_exception( evar )
     end
+    return  plugin_object
   end
 
@@ -1742 +2027 @@
 
     # debug
-    dbgPrint "Cell#clone_for_composite : cloning: #{@name} #{global_name}  b_defined=#{@b_defined}\n"
+    dbgPrint "  CLONING Cell#clone_for_composite : cloning: #{@name} #{global_name}  b_defined=#{@b_defined} #{self}=>#{@my_clone} \n"
+    dbgPrint "              my_name=#{@name} name=#{name} owner class=#{@owner.class.name}\n"
 
     @my_clone = self.clone
-    @@cloned_cell_list[ self ] = @my_clone
 
     # clone したセルの内部に持つ名前情報を調整する
-
     @my_clone.set_cloned( name, global_name, namespacePath, join_array, ct_name, region, plugin, locale )
 
@@ -1772 +2056 @@
     # debug
     dbgPrint "cell.set_cloned : global_name: #{global_name}  name: #{name}  @name: #{@name}\n"
-
+    dbgPrint "set_cloned:  entry_array_max_subscript.len=#{@entry_array_max_subscript.length}\n"
     @global_name = :"#{global_name}_#{@name}"
     @name = :"#{name}_#{@name}"
@@ -1796 +2080 @@
     @alloc_list = []
     @require_joined_list = {}
-    @entry_array_max_subscript = {}
+    @entry_array_max_subscript = @entry_array_max_subscript.dup
     @cell_list = {}
     @cell_list2 = []
@@ -1805 +2089 @@
       @join_list.change_item j
     }
+  end
+
+  #=== clone されたセルが composite の場合、内部セルを展開する
+  #self:: clone されたセルでなければならない
+  def expand_inner
+    if ! @f_cloned then
+      raise "expnad_inner: not cloned cell"
+    end
 
     # clone しようとするセルが composit セルタイプ？
@@ -1811 +2103 @@
       @cell_list, @cell_list2 = @celltype.expand( @name, @global_name, @NamespacePath, @join_list, @region, @plugin, @locale )
     end
-
   end
 
   #=== Cell# clone された cell の join_list の右辺の変更
   #  呼び口の右辺の cell を他の clone された cell に置換え
-  def change_rhs_port
+  def change_rhs_port cloned_cell_list
 
     # debug
-    dbgPrint "Cell change_rhs_port: global_name: #{@global_name}\n"
+    dbgPrint "=====   Cell#change_rhs_port: name=#{@name}   =====\n"
 
     @join_list.get_items.each { |j|
-      j.change_rhs_port( @@cloned_cell_list, @celltype )
-    }
-
-    if @celltype.instance_of?( CompositeCelltype ) then
-
-      # 入れ子のセルについても変更
-      @cell_list.each{ |name,c|
-        c.change_rhs_port
-      }
-    end
+      j.change_rhs_port( cloned_cell_list, @celltype )
+    }
   end
 
@@ -1891 +2174 @@
   def is_in_composite?
     @in_composite
+  end
+
+  #=== Cell# composite のセルか？
+  def is_of_composite?
+    if @celltype.kind_of? CompositeCelltype
+      return true
+    else
+      return false
+    end
+  end
+
+  #=== Cell# tmp_plugin_post_code.cdl で生成されたセルか？
+  def post_code_generated?
+    @b_post_code_generated
   end
 
@@ -1980 +2277 @@
 
       # セルタイプ内で port_name の CompositeCelltypeJoin を探す（コード生成段階では必ず見つかる）
+      # print "get_real_cell: cell=#{@name} port=#{port_name}\n"
+      # pp @cell_list
       cj = @celltype.find_export( port_name )
 
@@ -1991 +2290 @@
   end
 
+  #=== Cell#get_real_celltype
+  #
+  def get_real_celltype( port_name )
+    if @celltype.instance_of?( CompositeCelltype ) then
+      return @celltype.get_real_celltype port_name
+    else
+      return @celltype
+    end
+  end
 
   #=== Cell# 受け口のport の参照カウントをアップする
@@ -2033 +2341 @@
   end
 
+  #Cell#属性の初期値を得る
+  #attr_name::Symbol  必ず初期化されていないと Ruby 例外となる
+  def get_attr_initializer attr_name
+    val = @join_list.get_item( attr_name )
+    if val == nil then
+      val = (@celltype.find  attr_name).get_initializer
+    else
+      val = val.get_rhs
+    end
+    return val
+  end
+
   def get_celltype
     @celltype
@@ -2075 +2395 @@
   #=== Cell# composite の内側セルの受け口配列の添数の最大値を設定
   def set_entry_inner_port_max_subscript( port, num )
-    if @cell_list == nil then   # mikan これって問題ない？
-      return    # プロトタイプ宣言しかされていなくて、内側セルが展開されていない
+    if @cell_list == nil then
+      return    # プロトタイプ宣言しかされていなくて、内側セルが展開されていない　or composite 展開前
     end
 
     # composite の内側のセルに伝播
     if @celltype.instance_of? CompositeCelltype then
+      dbgPrint "set_entry_inner_port_max_subscript #{@name} #{@port} #{num} cell_list.len=#{@cell_list.length}\n"
+      # @cell_list.each{ |c, p| print c, p, '\n' }
+
       cj = @celltype.find_export port.get_name
       if cj && @cell_list[ cj.get_cell_name.to_s ] then
@@ -2278 +2601 @@
         else
           cell = j.get_rhs_cell2
-          next if cell == nil     # 右辺が見つからなかった．既にエラー
+          next if cell == nil || cell.get_celltype == nil     # 右辺が見つからなかった．既にエラー
           port = cell.get_celltype.find( j.get_rhs_port2 )
+          if port == nil then
+            dbgPrint "set_port_ref: #{@name}.#{j.get_name} = #{cell.get_name}.#{j.get_rhs_port2}\n"
+            # through プラグインで生成されたセルの受け口が見つからないケース (のハズ)
+            cdl_error( "entry '$1' not found in '$2' refered from $3.$4", j.get_rhs_port2, cell.get_name, @name, j.get_name )
+            next
+          end
           dbgPrint( "set_port_reference_count: #{@name}.#{j.get_name} => #{cell.get_name}.#{port.get_name}\n")
           cell.port_referenced port
@@ -2672 +3001 @@
           }
         else
+          dbgPrint "set_definition_join: #{@name}.#{join.get_name} celltype=#{@celltype.get_name}\n"
           join.set_definition( @celltype.find(join.get_name) )
         end
@@ -2687 +3017 @@
       expand
     end
-
-    # celltype に generate が指定されされているか
-    celltype_plugin = @celltype.get_celltype_plugin
-    if celltype_plugin then
-      begin
-        celltype_plugin.new_cell self
-      rescue Exception => evar
-        cdl_error( "S1037 $1: celltype plugin fail to new_cell" , celltype_plugin.class.name )
-        print_exception( evar )
-      end
-    end
   end
 
@@ -2705 +3024 @@
 
     #debug
-    dbgPrint "expanding #{@name} #{@celltype.get_name}\n"
-
-    # 展開されたセルのリスト
-    @@cloned_cell_list = {}
+    dbgPrint "=====    expanding   #{@name}     =====\n"
 
     # composite celltype の cell を展開
@@ -2718 +3034 @@
       set_f_ref
     end
-
-    # 呼び口の右辺のセルを clone したものに変更
-    self.change_rhs_port
+  end
+
+  #=== Cell#内部セルの受け口添数最大値を設定
+  def set_max_entry_port_inner_cell
+    if @cell_list == nil then
+      return
+    end
+
+    dbgPrint "set_max_entry_port_inner_cell name=#{@name} entry_array_max_subscript.len=#{@entry_array_max_subscript.length}\n"
 
     # プロトタイプ宣言で設定されていたものを反映する
     @entry_array_max_subscript.each{ |port,name|
+      dbgPrint "set_entry_inner_port_max_subscript( #{port}, #{name} )\n"
       set_entry_inner_port_max_subscript( port, name )
     }
@@ -2730 +3053 @@
   #=== Cell#restrict を追加
   def add_restrict( entry_name, func_name, region_name_list )
-    if @restrict_list[ entry_name ] then
-      if @restrict_list[ entry_name ][ func_name ] then
-        @restrict_list[ entry_name ][ func_name ].each{ |rn|
-          if region_name_list.include? rn then
-            # p func_name
-            name = func_name ? entry_name : entry_name+"."+func_name
-            cdl_warning( "W9999 $1 restrict region duplicate $2", name, rn )
+    if @restrict_list[ entry_name ] == nil then
+      @restrict_list[ entry_name ] = {}
+      @restrict_list2[ entry_name ] = {}
+    end
+    if @restrict_list[ entry_name ][ func_name ] == nil then
+      @restrict_list[ entry_name ][ func_name ] = []
+      @restrict_list2[ entry_name ][ func_name ] = []
+    end
+    region_name_list.each { |rp|
+      @restrict_list[ entry_name ][ func_name ] << rp
+      # p "Class: " + rp.to_s
+      obj = Namespace.find rp
+      if ( obj.kind_of? Region ) then
+        @restrict_list2[ entry_name ][ func_name ] << obj.get_domain_root
+      else
+        cdl_error( "S9999 $1 not found or not region", rp.to_s )
+      end
+    }
+  end
+
+  #=== Cell#check_restrict_list
+  def check_restrict_list
+    # p "check_restrict_list"
+    @restrict_list.each{ |entry_name, func_hash|
+      func_hash.each{ |func_name, region_list|
+        region_list.each{ |rp|
+          obj = Namespace.find rp
+          if ( obj.kind_of? Region ) then
+            if obj.get_domain_root != @region.get_domain_root then
+            else
+              cdl_info( "I9999 $1: restrict calling domain to $2, which is same domain as the cell locates", @name, rp.to_s )
+              # restrict を同じドメインを指定してもよいこととする (HRP3)
+              # KernelDoamin 内のセルに対し、KernelDomain に restrict している場合、
+              # 無所属経由で結合されているが、KernelDomain から呼出すことを想定した許可
+            end
+          else
+            cdl_error( "S9999 $1 not region", rp.to_s )
+          end
+        }
+      }
+    }
+  end
+
+  #=== Cell#callable?
+  def callable?( callee_cell, entry_name, func_name )
+    # p "callable? #{@name}"
+    res = callee_cell.callable_from?( entry_name, func_name, self )
+    dbgPrint "callable? #{callee_cell.get_namespace_path}.#{entry_name}.#{func_name} from #{@NamespacePath} is #{res}\n"
+    return res
+  end
+
+  #=== Cell#callable_from? (private)
+  def callable_from?( entry_name, func_name, caller_cell )
+    @b_restrict_referenced = true
+    if @restrict_list.length == 0 then
+      return true
+    end
+
+    dr = caller_cell.get_region.get_domain_root
+    if @restrict_list[entry_name] then
+      if @restrict_list[entry_name][func_name] then
+        @restrict_list2[entry_name][func_name].each{ |region|
+          if dr == region then
+            return true
+          end
+        }
+      elsif @restrict_list[entry_name][nil] then
+        @restrict_list2[entry_name][nil].each{ |region|
+          if dr == region then
+            return true
           end
         }
       else
-        @restrict_list[ entry_name ][ func_name ] = region_name_list
-      end
-    else
-      func_list = { }
-      func_list[ func_name ] = region_name_list
-      @restrict_list[ entry_name ] = func_list
-    end
-    # pp @restrict_list
-  end
-
-  #=== Cell#check_restrict_list
-  def check_restrict_list
-    @restrict_list.each{ |entry_name, func_hash|
-      func_hash.each{ |func_name, region_list|
-        region_list.each{ |rn|
-          obj = Namespace.find [ rn ]
-          if ( obj.kind_of? Region ) then
-            if obj.get_domain_root != @region.get_domain_root then
-            else
-              cdl_warning( "W9999 $1 in same domain", rn )
-            end
-          else
-            cdl_error( "S9999 $1 not region", region )
-          end
-        }
-      }
-    }
-  end
-
-  #=== Cell#callable?
-  def callable?( callee_cell, entry_name, func_name )
-    res = callee_cell.callable_from?( entry_name, func_name, self )
-    dbgPrint "callable? #{callee_cell.get_namespace_path}.#{entry_name}.#{func_name} from #{@NamespacePath} is #{res}\n"
-    return res
-  end
-
-  #=== Cell#callable_from? (private)
-  def callable_from?( entry_name, func_name, caller_cell )
-    if @restrict_list.length == 0 then
+        return false
+      end
+    else
+      return false
+    end
+  end
+
+  #=== Cell#get_callable_regions( entry_name, func_name )
+  # func_name=nil の場合、entry_name の可否をチェック数る
+  # nil が返る場合、制限されていないことを意味する
+  def get_restricted_regions( entry_name, func_name )
+    # p "get_restricted_regions #{@name}"
+    @b_restrict_referenced = true
+    if @restrict_list[entry_name] then
+      if @restrict_list[entry_name][func_name] then
+        return @restrict_list2[entry_name][func_name]
+      else
+        return @restrict_list2[entry_name][nil]
+      end
+    end
+    return nil
+  end
+
+  #=== Cell#has_ineffective_restrict_specifier
+  # restrict 指定子が指定されていて、参照されていない場合 true
+  # 参照は、HRPSVCPlugin のみ
+  def has_ineffective_restrict_specifier
+    if @restrict_list.length != 0 && @b_restrict_referenced == false then
       return true
-    end
-
-    if @restrict_list[entry_name] then
-      if @restrict_list[entry_name][nil] &&
-         @restrict_list[entry_name][nil].include?( caller_cell.get_region.get_domain_root.get_name )then
-        return true
-      end
-      if @restrict_list[entry_name][func_name] &&
-         @restrict_list[entry_name][func_name].include?( caller_cell.get_region.get_domain_root.get_name )then
-        return true
-      else
-        return false
-      end
-    else
-      return true
-    end
-  end
-  
+    else
+      return false
+    end
+  end
+
   def show_tree( indent )
     indent.times { print "  " }
@@ -2857 +3219 @@
 # @name:: str
 # @global_name:: str
-# @cell_list:: NamedList   Cell
+# @cell_list_in_composite:: NamedList   Cell
+# @cell_list::Array :: [ Cell ] : cell of CompositeCelltype's cell
 # @export_name_list:: NamedList : CompositeCelltypeJoin
 # @port_list:: CompositeCelltypeJoin[]
@@ -2867 +3230 @@
 # @name_list:: NamedList item: Decl (attribute), Port エクスポート定義
 # @internal_allocator_list:: [ [cell, internal_cp_name, port_name, func_name, param_name, ext_alloc_ent], ... ]
+# @generate:: [ Symbol, String, Plugin ]  = [ PluginName, option, Plugin ] Plugin は生成後に追加される
+# @generate_list:: [ [ Symbol, String, Plugin ], ... ]   generate 文で追加された generate
 
   @@nest_stack_index = -1
   @@nest_stack = []
   @@current_object = nil
+
+  include CelltypePluginModule
+  include PluginModule
 
   def self.push
@@ -2889 +3257 @@
     super()
     @name = name
-    @cell_list = NamedList.new( nil, "in composite celltype #{name}" )
+    @cell_list_in_composite = NamedList.new( nil, "in composite celltype #{name}" )
+    @cell_list = []
     @export_name_list = NamedList.new( nil, "export in composite celltype #{name}" )
     @name_list = NamedList.new( nil, "in composite celltype #{name}" )
@@ -2910 +3279 @@
     @attr_list = []
     @internal_allocator_list = []
+    @generate_list = []
     set_specifier_list( Generator.get_statement_specifier )
   end
@@ -2920 +3290 @@
   # CompositeCelltype#end_of_parse
   def end_of_parse
-
     # singleton に関するチェック
     if @b_singleton && @real_singleton == nil then
@@ -2960 +3329 @@
     # mikan relay が正しく抜けているかチェックされていない
 
+    # callback 結合
+    @cell_list_in_composite.get_items.each{ |c|
+      ct = c.get_celltype
+      if ct then
+        c.create_reverse_join
+      end
+    }
+
     # 意味解析
-    @cell_list.get_items.each{ |c|
+    @cell_list_in_composite.get_items.each{ |c|
       c.set_definition_join
     }
 
     # cell の未結合の呼び口がないかチェック
-    @cell_list.get_items.each{ |c|
+    @cell_list_in_composite.get_items.each{ |c|
       c.check_join
       c.check_reverse_require
@@ -3004 +3381 @@
       }
     }
-  end
-
- ### cell (CompositeCelltype)
-  def self.new_cell( cell )
-    @@current_object.new_cell( cell )
-
-  end
-
-  def new_cell( cell )
+
+    # composite プラグイン
+    if @generate then
+      celltype_plugin
+    end
+  end
+
+ ### CompositeCelltype#new_cell_in_composite
+  def self.new_cell_in_composite( cell )
+    @@current_object.new_cell_in_composite( cell )
+
+  end
+
+  def new_cell_in_composite( cell )
     cell.set_owner self  # Cell (in_omposite)
-    @cell_list.add_item( cell )
+    @cell_list_in_composite.add_item( cell )
     if cell.get_celltype then    # nil ならば、すでにセルタイプなしエラー
       if cell.get_celltype.is_singleton? then
@@ -3031 +3413 @@
                                          internal_cell_elem_name, type )
     
+  end
+
+ ### CompositeCelltype#new_cell
+  def new_cell cell
+    @cell_list << cell
+
+    # セルタイププラグインの適用
+    celltype_plugin_new_cell cell
   end
 
@@ -3050 +3440 @@
     dbgPrint "new_join: #{export_name} #{internal_cell_name} #{internal_cell_elem_name}\n"
 
-    cell = @cell_list.get_item( internal_cell_name )
+    cell = @cell_list_in_composite.get_item( internal_cell_name )
     if cell == nil then
       cdl_error( "S1057 $1 not found in $2" , internal_cell_name, @name )
@@ -3107 +3497 @@
         elsif obj.is_omit? != obj2.is_omit? then
           cdl_error( "S9999 $1 : omit specifier mismatch with previous definition" , export_name )
+        elsif obj.is_dynamic? != obj2.is_dynamic? then
+          cdl_error( "S9999 $1 : dynamic specifier mismatch with previous definition" , export_name )
+        elsif obj.is_ref_desc? != obj2.is_ref_desc? then
+          cdl_error( "S9999 $1 : ref_desc specifier mismatch with previous definition" , export_name )
         end
       else
@@ -3292 +3686 @@
   def find name
     dbgPrint "CompositeCelltype: find in composite: #{name}\n"
-    cell = @cell_list.get_item( name )
+    cell = @cell_list_in_composite.get_item( name )
     return cell if cell
 
@@ -3333 +3727 @@
     clone_cell_list = {}
     clone_cell_list2 = []
+    clone_cell_list3 = {}
 
     #  composite 内部のすべての cell について
-    @cell_list.get_items.each { |c|
+    @cell_list_in_composite.get_items.each { |c|
 
       # debug
@@ -3359 +3754 @@
           # debug
           if j then
-            dbgPrint "expand : parent cell: #{name} child cell: #{c.get_name}:  parent's export port: #{cj.get_name}  join: #{j.get_name} #{j}\n"
+            dbgPrint "  REWRITE_EX parent cell: #{name} child cell: #{c.get_name}:  parent's export port: #{cj.get_name}  join: #{j.get_name}=>#{j.get_rhs.to_s}\n"
           else
             dbgPrint "expand : parent cell: #{name} child cell: #{c.get_name}:  parent's export port: #{cj.get_name}  join: nil\n"
@@ -3394 +3789 @@
       clone_cell_list[ "#{c.get_local_name}" ] = c2
       clone_cell_list2 << c2
+      clone_cell_list3[ c ] = c2
 
     }
@@ -3403 +3799 @@
         j.set_cloned( clone_cell_list[ "#{c.get_local_name}" ] )
       }
+      dbgPrint "change_rhs_port: inner cell #{c.get_name}\n"
+      c.change_rhs_port clone_cell_list3
+    }
+    clone_cell_list2.each { |c|
+      c.expand_inner
     }
     return [ clone_cell_list, clone_cell_list2 ]
@@ -3419 +3820 @@
       when :ACTIVE
         @b_active = true
+      when :GENERATE
+        if @generate then
+          cdl_error( "S9999 generate specifier duplicate"  )
+        end
+        @generate = [ s[1], s[2] ] # [ PluginName, "option" ]
       else
         cdl_error( "S1071 $1 cannot be specified for composite" , s[0] )
@@ -3429 +3835 @@
   end
 
+  def get_global_name
+    @global_name
+  end
+
   def get_port_list
     @port_list
@@ -3443 +3853 @@
   def get_internal_allocator_list
     @internal_allocator_list
+  end
+
+  #== CompositeCelltype#get_real_celltype
+  # port_name に接続されている内部のセルタイプを得る
+  def get_real_celltype( port_name )
+    cj = find_export port_name
+    inner_celltype = cj.get_cell.get_celltype
+    if inner_celltype.instance_of? CompositeCelltype then
+      return inner_celltype.get_real_celltype
+    else
+      return inner_celltype
+    end
   end
 
@@ -3465 +3887 @@
   def is_inactive?
     if @b_active == false then
-      @cell_list.get_items.each{ |c|
+      @cell_list_in_composite.get_items.each{ |c|
         if c.get_celltype && c.get_celltype.is_inactive? == false then
           # c.get_celltype == nil の場合はセルタイプ未定義ですでにエラー
@@ -3486 +3908 @@
     (indent+1).times { print "  " }
     puts "active: #{@b_active}, singleton: #{@b_singleton}"
-    @cell_list.show_tree( indent + 1 )
+    @cell_list_in_composite.show_tree( indent + 1 )
     (indent+1).times { print "  " }
     puts "name_list"
@@ -3532 +3954 @@
 # @b_omit:: bool : omit 指定子が指定された (call port のみ)
 # @b_optional:: bool : call port のみ
-# @b_ref_des:: bool :  ref_desc キーワードが指定された
+# @b_ref_desc:: bool :  ref_desc キーワードが指定された
 # @b_dynamic:: bool :  dynamic キーワードが指定された (呼び口のみ)
 #
@@ -3638 +4060 @@
     @b_inline = false
     @b_optional = false
+    @b_omit = false
     @b_ref_desc = false
     @b_dynamic = false
@@ -3655 +4078 @@
     else
       # entry port optimize
-      if $unopt then
+      if $unopt || $unopt_entry then
         # 最適化なし
         @b_VMT_useless = false                     # VMT 不要 (true の時 VMT を介することなく呼出す)
@@ -3786 +4209 @@
         @b_optional = true
       when :REF_DESC
+        if @port_type == :ENTRY then
+          cdl_error( "S9999 ref_desc: cannnot be specified for entry port" )
+          next
+        end
         @b_ref_desc = true
       when :DYNAMIC
@@ -3806 +4233 @@
       end
     }
+    if ( @b_dynamic || @b_ref_desc ) then
+      if @b_dynamic then
+        dyn_ref = "dynamic"
+      else
+        dyn_ref = "ref_desc"
+      end
+      if @b_omit then     # is_omit? は is_empty? も含んでいるので使えない
+        cdl_error( "S9999 omit cannot be specified with $1", dyn_ref  )
+      elsif @signature && @signature.is_empty? then
+        cdl_error( "S9999 $1 cannot be specified for empty signature", dyn_ref  )
+      elsif @signature && @signature.has_descriptor? then
+        # cdl_error( "S9999 $1 port '$2' cannot have Descriptor in its signature", dyn_ref, @name )
+      end
+
+    elsif @b_dynamic && @b_ref_desc then
+      cdl_error( "S9999 both dynamic & ref_desc cannot be specified simultaneously"  )
+    end
   end
 
@@ -3958 +4402 @@
 
   def is_VMT_useless?                     # VMT 関数テーブルを使用しない
-   @b_VMT_useless
+    if @port_type == :ENTRY && $unopt_entry == true then
+      # プラグインから $unopt_entry を設定するケースのため
+      # ここで読み出すときに、false を返す (reset_optimize での設定変更は速すぎる)
+      return false
+    else
+      return @b_VMT_useless
+    end
   end
 
   def is_skelton_useless?                 # スケルトン関数不要   (true の時、受け口関数を呼出す)
-    @b_skelton_useless
+    if @port_type == :ENTRY && $unopt_entry == true then
+      # プラグインから $unopt_entry を設定するケースのため
+      # ここで読み出すときに、false を返す (reset_optimize での設定変更は速すぎる)
+      return false
+    else
+      return @b_skelton_useless
+    end
   end
 
@@ -4078 +4534 @@
   def is_reverse_required?
     @reverse_require_cell_path != nil
+  end
+
+  #=== Port# is_dynamic?
+  def is_dynamic?
+    @b_dynamic
+  end
+
+  #=== Port# is_ref_desc?
+  def is_ref_desc?
+    @b_ref_desc
   end
 
@@ -4489 +4955 @@
       if ! c.get_f_def then   # Namespace の @cell_list にはプロトタイプが含まれるケースあり
         if c.get_f_ref then
-          cdl_error( "S1093 $1 : undefined cell" , c.get_namespace_path.get_path_str )
+          c.cdl_error( "S1093 $1 : undefined cell" , c.get_namespace_path.get_path_str )
         elsif $verbose then
-          cdl_warning( "W1006 $1 : only prototype, unused and undefined cell" , c.get_namespace_path.get_path_str )
+          c.cdl_warning( "W1006 $1 : only prototype, unused and undefined cell" , c.get_namespace_path.get_path_str )
         end
       else
@@ -4498 +4964 @@
         # if c.get_f_ref == false && c.is_generate? && ct && ct.is_inactive? then
         if c.get_f_ref == false && ct && ct.is_inactive? then
-          cdl_warning( "W1007 $1 : non-active cell has no entry join and no factory" , c.get_namespace_path.get_path_str )
+          c.cdl_warning( "W1007 $1 : non-active cell has no entry join and no factory" , c.get_namespace_path.get_path_str )
+        end
+        if c.has_ineffective_restrict_specifier then
+          c.cdl_warning( "W9999: $1 has ineffective restrict specifier", c.get_namespace_path.get_path_str )
         end
       end
@@ -4657 +5126 @@
   end
 
+  #=== Namespace# set_max_entry_port_inner_cell
+  # セルタイプに属するすべてのセルに対して実施
+  def set_max_entry_port_inner_cell
+    # celltype のコードを生成
+    @cell_list.each { |c|
+      c.set_max_entry_port_inner_cell
+    }
+    @namespace_list.each{ |ns|
+      ns.set_max_entry_port_inner_cell
+    }
+  end
+
   #=== Namespace# セルの結合をチェックする
   def check_join
@@ -4681 +5162 @@
   end
 
+  #== Namespace (Region) に属するセルのリスト
+  def get_cell_list
+    @cell_list
+  end
+
+  #== Namespace (Region)# 子リージョンのリスト
+  #
+  # リージョンは Namespace クラスで namespace として記憶されている
+  def get_region_list
+    @namespace_list
+  end
+  
   def show_tree( indent )
     indent.times { print "  " }
@@ -4904 +5397 @@
 
     if object == nil then                                             # (2)
-      cdl_error( "S1109 \'$1\' not found" , @cell_name )
+      cdl_error( "S1109 \'$1\' not found" , nsp.to_s )
     elsif ! object.instance_of?( Cell ) then                          # (3)
-      cdl_error( "S1110 \'$1\' not cell" , @cell_name )
+      cdl_error( "S1110 \'$1\' not cell" , nsp.to_s )
     else
       dbgPrint "set_definition: set_f_ref #{@owner.get_name}.#{@name} => #{object.get_name}\n"
@@ -5277 +5770 @@
           next_cell_nsp       = @through_generated_list[ i + 1 ].get_cell_namespace_path
           next_port_name      = @through_generated_list[ i + 1 ].get_through_entry_port_name
+          next_port_subscript = @through_generated_list[ i + 1 ].get_through_entry_port_subscript
         rescue Exception => evar
           cdl_error( "S1124 $1: plugin function failed: \'get_through_entry_port_name\'" , plugin_name )
@@ -5295 +5789 @@
         next_cell      = @cell
         next_port_name = @port_name
+        next_port_subscript = @rhs_subscript
 
         if next_cell == nil then
@@ -5306 +5801 @@
         # region から @cell_name.@port_name への through がないか探す
         # rp = @through_list[i][3].find_cell_port_through_plugin( @cell_name, @port_name ) #762
-        rp = @through_list[i][3].find_cell_port_through_plugin( @cell.get_global_name, @port_name )
+        rp = @through_list[i][3].find_cell_port_through_plugin( @cell.get_global_name, @port_name, @rhs_subscript )
            # @through_list[i] と @region_through_list[i-cp_len] は同じ
         # 共用しないようにするには、見つからなかったことにすればよい
@@ -5317 +5812 @@
 
       if rp == nil then
-        if( load_plugin( plugin_name, ThroughPlugin ) ) then
-          gen_through_cell_code_and_parse( plugin_name, i, next_cell, next_port_name )
+        plClass = load_plugin( plugin_name, ThroughPlugin )
+        if( plClass ) then
+          gen_through_cell_code_and_parse( plugin_name, i, next_cell, next_port_name, next_port_subscript, plClass )
         end
       else
@@ -5331 +5827 @@
           # 生成したものを region(@through_list[i][3]) のリストに追加
           # @through_list[i][3].add_cell_port_through_plugin( @cell_name, @port_name, @through_generated_list[i] ) #762
-          @through_list[i][3].add_cell_port_through_plugin( @cell.get_global_name, @port_name, @through_generated_list[i] )
+          @through_list[i][3].add_cell_port_through_plugin( @cell.get_global_name, @port_name, @rhs_subscript, @through_generated_list[i] )
         end
       end
@@ -5365 +5861 @@
 
   #=== Join# through プラグインを呼び出して CDL 生成させるとともに、import する
-  def gen_through_cell_code_and_parse( plugin_name, i, next_cell, next_port_name )
+  def gen_through_cell_code_and_parse( plugin_name, i, next_cell, next_port_name, next_port_subscript, plClass )
 
     through = @through_list[ i ]
@@ -5389 +5885 @@
     end
     @@plugin_creating_join = self
-
     caller_cell = @owner
 
-    plugin_object = nil
-    eval_str = "plugin_object = #{plugin_name}.new( '#{generating_cell_name}'.to_sym, plugin_arg.to_s, next_cell, '#{next_port_name}'.to_sym, @definition.get_signature, @celltype, caller_cell )"
-    if $verbose then
-      print "new through: #{eval_str}\n"
-    end
-
     begin
-      eval( eval_str )     # plugin を生成
+      plugin_object = plClass.new( generating_cell_name.to_sym, plugin_arg.to_s,
+                                   next_cell, next_port_name.to_sym, next_port_subscript,
+                                   @definition.get_signature, @celltype, caller_cell )
       plugin_object.set_locale @locale
     rescue Exception => evar
@@ -5406 +5897 @@
         print "signature: #{@definition.get_signature.get_name} from: #{caller_cell.get_name} to: #{next_cell.get_name} of celltype: #{@celltype.get_name}\n"
       end
-      print "eval( #{eval_str} )\n"
-
       print_exception( evar )
       return 
@@ -5596 +6085 @@
   end
 
-  def get_rhs_subscript
+  # 末尾数字1 : CDL で指定された、右辺のセルを返す
+  def get_rhs_cell1   # get_cell と同じ
+    @cell
+  end
+  def get_rhs_port1   # get_port_name 同じ
+    @port_name
+  end
+  def get_rhs_subscript1
     @rhs_subscript
   end
@@ -5606 +6102 @@
     # through 指定あり？
     if @through_list[0] then
-      # mikan through で生成したものが root namespace 限定
       # through で生成されたセルを探す
-#      cell = Namespace.find( [ "::", @through_generated_list[0].get_cell_name.to_sym ] )    #1
       cell = Namespace.find( @through_generated_list[0].get_cell_namespace_path )    #1
       # cell のプラグインで生成されたポート名のポートを探す (composite なら内部の繋がるポート)
@@ -5615 +6109 @@
       # ポートを返す(composite なら内部の繋がるポートを返す)
       return @cell.get_real_port( @port_name )
+    end
+  end
+
+  #=== Join# 右辺の配列添数を得る
+  #    右辺が through の場合は挿入されたセルの添数
+  #    右辺が composite の場合は、内部の繋がるセルのポートの添数 (composite では変わらない)
+  #    このメソッドは get_rhs_cell,  と対になっている
+  def get_rhs_subscript
+    if @through_list[0] then
+      return @through_generated_list[0].get_through_entry_port_subscript
+    else
+      return @rhs_subscript
     end
   end
@@ -5718 +6224 @@
   # composite cell を展開したセルの結合を clone したセルの名前に変更
   def change_rhs_port( clone_cell_list, celltype )
+    dbgPrint "change_rhs_port: name=#{@name}\n"
 
     # debug
     if $debug then
-      dbgPrint "change_rhs name: #{@name}  cell_name: #{@cell_name} #{@cell} #{self}\n"
+#    if @name == :cCallB then
+      # dbgPrint "change_rhs name: #{@name}  cell_name: #{@cell_name} #{@cell} #{self}\n"
+      print "============\n"
+      print "CHANGE_RHS change_rhs name: #{@owner.get_name}.#{@name}  rhs cell_name: #{@cell_name} #{@cell} #{self}\n"
 
       clone_cell_list.each{ |cell, ce|
-        dbgPrint "change_rhs:  #{cell.get_name}=#{cell} : #{ce.get_name}\n"
+        # dbgPrint "=== change_rhs:  #{cell.get_name}=#{cell} : #{ce.get_name}\n"
+        print "   CHANGE_RHS  change_rhs:  #{cell.get_name}=#{cell} : #{ce.get_name}\n"
       }
+      print "============\n"
     end
 
@@ -5732 +6244 @@
 
     # debug
-    dbgPrint "  cell_name:   #{@cell_name} => #{c.get_global_name}, #{c.get_name}\n"
+    dbgPrint "  REWRITE cell_name:  #{@owner.get_name}   #{@cell_name} => #{c.get_global_name}, #{c.get_name}\n"
 
     # @rhs の内容を調整しておく（この内容は、subscript を除いて、後から使われていない）
@@ -5756 +6268 @@
 
       # debug
-      # p "array_member2.len : #{@array_member.length}"
+      dbgPrint "array_member2.len : #{@array_member.length}\n"
 
       i = 0
@@ -5764 +6276 @@
         # 無駄に設定されているものについては、再帰的に呼び出す必要はない（clone_for_composite では対策している）
         if @array_member2[i] != self && @array_member[i] != nil then
+          dbgPrint "change_rhs array_member #{i}: #{@name}  #{@cell_name}\n"
           @array_member2[i].change_rhs_port( clone_cell_list, celltype )
         end
@@ -5779 +6292 @@
   # @through_list などもコピーされるので、これが呼び出される前に確定する必要がある
   def clone_for_composite( ct_name, cell_name, locale, b_need_recursive = true )
-
     # debug
-    dbgPrint "join.clone_for_composite : #{@name} #{@cell_name} #{self}\n"
+    dbgPrint "=====  clone_for_composite: #{@name} #{@cell_name} #{self}   =====\n"
     cl = self.clone
 
     if @array_member2 && b_need_recursive then
-      cl.clone_array_member( @array_member, @array_member2, ct_name, cell_name, self, locale )
+      cl.clone_array_member( ct_name, cell_name, self, locale )
     end
 
@@ -5796 +6308 @@
   end
 
-  def clone_array_member( array_member, array_member2, ct_name, cell_name, prev, locale )
+  def clone_array_member( ct_name, cell_name, prev, locale )
     # 配列のコピーを作る
-    am  = array_member.clone
-    am2 = array_member2.clone
+    am  = @array_member.clone
+    am2 = @array_member2.clone
 
     # 配列要素のコピーを作る
     i = 0
     while i < am2.length
-      if array_member2[i] == prev then
+      if @array_member2[i] == prev then
         # 自分自身である（ので、呼出すと無限再帰呼出しとなる）
         am2[i] = self
-      elsif array_member2[i] then
-        am2[i] = array_member2[i].clone_for_composite( ct_name, cell_name, locale, false )
+        am[i] = am2[i].get_rhs
+      elsif @array_member2[i] then
+#        am2[i] = @array_member2[i].clone_for_composite( ct_name, cell_name, locale, false )
+        am2[i] = @array_member2[i].clone_for_composite( ct_name, cell_name, locale, true )
+        am[i] = am2[i].get_rhs
       else
         # 以前のエラーで array_member2[i] は nil になっている
@@ -5814 +6329 @@
 
       # debug
-      dbgPrint "clone_array_member: #{@name} #{am2[i]} #{array_member2[i]}\n"
+      dbgPrint "clone_array_member: #{@name} subsript=#{i} #{am2[i]} #{@array_member2[i]}\n"
 
       i += 1
@@ -5840 +6355 @@
     dbgPrint "Join#set_cloned: #{@name}  prev owner: #{@owner.get_name} new owner: #{owner.get_name}\n"
     @owner = owner
+    if @array_member2 then
+      @array_member2.each{ |join|
+        dbgPrint "Joinarray#set_cloned: #{@name}  prev owner: #{join.get_owner.get_name} new owner: #{owner.get_name}\n"
+        join.set_owner owner
+      }
+    end
   end
 
@@ -5905 +6426 @@
         if j then
           (indent+2).times { print "  " }
-          puts "[#{i}]: #{j.get_name}  id: #{j}"
+          puts "[#{i}]: #{j.get_name}  id: #{j} owner=#{j.get_owner.get_name}"
           j.get_rhs.show_tree(indent+3)
-          (indent+3).times { print "  " }
-          puts "cell global name: #{j.get_cell_global_name}"
-          (indent+3).times { print "  " }
-          puts "port global name: #{j.get_port_global_name}"
+#          (indent+3).times { print "  " }
+#          puts "cell global name: #{j.get_cell_global_name}"
+#          puts "cell global name: #{j.get_rhs_cell.get_global_name}"
+#          (indent+3).times { print "  " }
+#          puts "port global name: #{j.get_port_global_name}"
+#          puts "port global name: #{j.get_rhs_port.get_name}"
         else
           (indent+2).times { print "  " }
@@ -6235 +6758 @@
 end
 
-#== Domain
+#== DomainType
 #
 # region の domain を記憶するクラス
@@ -6256 +6779 @@
     @name = name
     @plugin_name = (name.to_s + "Plugin").to_sym
-    load_plugin( @plugin_name, DomainPlugin )
+    plClass = load_plugin( @plugin_name, DomainPlugin )
     @region = region
     @option = option
@@ -6272 +6795 @@
     if ! @plugin then
       pluginClass = Object.const_get @plugin_name
+      return if pluginClass == nil
       @plugin = pluginClass.new( @region, @name, @option )
+      @plugin.set_locale @locale
     end
   end
@@ -6290 +6815 @@
   end
 
-  #== Domain リージョンの Hash を得る
+  #== DomainType リージョンの Hash を得る
   # @@domain_regions の説明参照
   def self.get_domain_regions
@@ -6302 +6827 @@
   def get_option
     @option
+  end
+
+  #== DomainType#ドメイン種別を得る
+  #return::Symbol :kernel, :user, :OutOfDomain
+  def get_kind
+    @plugin.get_kind
   end
 
@@ -6363 +6894 @@
 
     if @@domain_name then
+      dbgPrint "Region=#{name} domain_type=#{@@domain_name} option=#{@@domain_option}\n"
       domain_option = CDLString.remove_dquote @@domain_option.to_s
       @domain_type = DomainType.new( self, @@domain_name, domain_option )
@@ -6401 +6933 @@
 
         # 再出現時に specifier が指定されているか？
-        if( @in_through_list.length != 0 || @out_through_list.length != 0 || @to_through_list.length != 0 || @region_type != nil )then
+        if( @in_through_list.length != 0 || @out_through_list.length != 0 || @to_through_list.length != 0 ||
+            @region_type != nil || @domain_type != nil )then
           cdl_error( "S1140 $1: region specifier must place at first appearence" , name )
         end
@@ -6610 +7143 @@
   end
 
+  #== Region# ルートリージョン
+  # ルートリージョンは、namespace のルートと同じインスタンス
+  def selfget_root
+    Namespace.get_root
+  end
+
   def next_in_through_count
     @in_through_count += 1
@@ -6643 +7182 @@
   #=== Region# through プラグインで、この region から cell_name.port_name へのプラグインオブジェクトを登録
   # mikan namesppace 対応 (cell_name)
-  def add_cell_port_through_plugin( cell_name, port_name, through_plugin_object )
-    @cell_port_throug_plugin_list[ "#{cell_name}.#{port_name}" ] = through_plugin_object
-  end
-
-  def find_cell_port_through_plugin( cell_name, port_name )
-    return @cell_port_throug_plugin_list[ "#{cell_name}.#{port_name}" ]
+  def add_cell_port_through_plugin( cell_name, port_name, subscript, through_plugin_object )
+    if subscript then
+      subscript = '[' + subscript.to_s + ']'
+    end
+    @cell_port_throug_plugin_list[ "#{cell_name}.#{port_name}#{subscript}" ] = through_plugin_object
+  end
+
+  def find_cell_port_through_plugin( cell_name, port_name, subscript )
+    if subscript then
+      subscript = '[' + subscript.to_s + ']'
+    end
+    return @cell_port_throug_plugin_list[ "#{cell_name}.#{port_name}#{subscript}" ]
   end
 
@@ -6779 +7324 @@
 end
 
+#== Importable class
+# this module is included by Import_C and Import
+module Importable
+#@last_base_dir::String
+
+  #=== Importable#find_file
+  #file::String : file name to find
+  #return::String | Nil: path to file or nil if not found
+  #find file in 
+  def find_file file
+    $import_path.each{ |path|
+      if path == "."
+        pt = file
+      else
+        pt = "#{path}/#{file}"
+      end
+      if File.exist?( pt )
+        if ! $base_dir[ Dir.pwd ]
+          $base_dir[ Dir.pwd ] = true
+        end
+        if $verbose then
+          print "#{file} is found in #{path}\n"
+        end
+        @last_base_dir = nil
+        dbgPrint "base_dir=. while searching #{file}\n"
+        return pt
+      end
+    }
+
+    $base_dir.each_key{ |bd|
+      $import_path.each{ |path|
+#        if path =~ /\A\// || path =~ /\A[a-zA-Z]:/
+          pt = "#{path}/#{file}"
+#        else
+#          pt = "#{bd}/#{path}/#{file}"
+#        end
+        begin
+          Dir.chdir $run_dir
+          Dir.chdir bd
+          if File.exist?( pt )
+            if $verbose then
+              print "#{file} is found in #{bd}/#{path}\n"
+            end
+            @last_base_dir = bd
+            dbgPrint "base_dir=#{bd} while searching #{file}\n"
+            $base_dir[ bd ] = true
+            return pt
+          end
+        rescue
+        end
+      }
+    }
+    @last_base_dir = nil
+    dbgPrint "base_dir=. while searching #{file}\n"
+    return nil
+  end
+
+  def get_base_dir
+    return @last_base_dir
+    $base_dir.each{ |bd, flag|
+      if flag == true
+        return bd
+      end
+    }
+    return nil
+  end
+end
+
 class Import_C < Node
 
@@ -6785 +7398 @@
   @@header_list2 = []
   @@define_list = {}
+
+  include Importable
 
   #=== Import_C# import_C の生成（ヘッダファイルを取込む）
@@ -6823 +7438 @@
     }
 
+    header_path = find_file header
+
+=begin
     include_opt = ""
     found = false
@@ -6844 +7462 @@
 
     if found == false then
+=end
+    if header_path == nil then
       cdl_error( "S1142 $1 not found in search path" , header )
       return
     end
+
+    include_opt = ""
+    if get_base_dir then
+      base = get_base_dir + "/"
+    else
+      base = ""
+    end
+    $import_path.each{ |path|
+      include_opt = "#{include_opt} -I #{base}#{path}"
+    }
 
     # 読込み済み？
@@ -6862 +7492 @@
     @@header_list2 << header
     @@define_list[ header ] = define
+
+    if $verbose then
+      print "import_C header=#{header_path}, define=#{define}\n"
+    end
 
     begin
@@ -6940 +7574 @@
  * --no-gcc-extension-support for tecsgen.
  */
+#ifdef __GNUC__
+
 #ifndef __attribute__
 #define __attribute__(x)
@@ -6956 +7592 @@
 #endif
 
+#ifndef restrict
+#define restrict
+#endif
+
+#endif /* ifdef __GNUC__ */
 #endif /* TECS_NO_GCC_EXTENSION_SUPPORT */
 EOT
@@ -6983 +7624 @@
 # @cdl_path:: string:   CDL のパス
 # @b_imported:: bool:   import された(コマンドライン指定されていない)
+
+  include Importable
 
   # ヘッダの名前文字列のリスト  添字：expand したパス、値：Import
@@ -7023 +7666 @@
     @b_reuse_real = @b_reuse || Generator.is_reuse?
 
-    if Generator.get_plugin then
-      # plugin から import されている場合 gen をサーチパスの先頭に加える
-      search_path = [ $gen ] + $import_path
-    else
-      search_path = $import_path
-    end
-
-    search_path.each{ |path|
-      dbgPrint "import: searching #{path}/#{@cdl}"
-      begin
-        if path == "."
-          cdl_path =  @cdl
-        else
-          cdl_path = "#{path}/#{@cdl}"
-        end
-
-        # ファイルの stat を取ってみる(なければ例外発生)
-        File.stat( cdl_path )
-
-        # cdl を見つかったファイルパスに再設定
-        @cdl_path = cdl_path
+    if( Generator.get_plugin ) &&( File.exist? "#{$gen}/#{@cdl}" ) then
+      @cdl_path = "#{$gen}/#{@cdl}"
+      found = true
+    else
+      path = find_file @cdl
+      if path then
         found = true
-        dbgPrint ": found\n"
-        break
-      rescue => evar
-        found = false
-        dbgPrint ": not found\n"
-        # print_exception( evar )
-      end
-    }
+        @cdl_path = path
+      end
+    end
 
     if found == false then
@@ -7118 +7741 @@
 end
 
-#== generate: signature プラグインのロードと実行
+#== generate: signature, celltype, cell へのプラグインのロードと適用
 class Generate < Node
 #@plugin_name:: Symbol
-#@signature_nsp:: NamespacePath
+#@object_nsp:: NamespacePath
 #@option::         String '"', '"' で囲まれている
+#@plugin_object:: Plugin
 
   include PluginModule
 
-  def initialize( plugin_name, signature_nsp, option )
+  def initialize( plugin_name, object_nsp, option )
     super()
     @plugin_name = plugin_name
-    @signature_nsp = signature_nsp
+    @object_nsp = object_nsp
     option = option.to_s    # option は Token
     @option = option
-
-    signature = Namespace.find( signature_nsp ) #mikan Namespace   #1
-    if ! signature.instance_of? Signature then
-      cdl_error( "S1149 $1 not signature" , signature_nsp )
+    @plugin_object = nil
+
+    dbgPrint "generate: #{plugin_name} #{object_nsp.to_s} option=#{option}\n"
+
+    object = Namespace.find( object_nsp )
+    if object.kind_of?( Signature ) ||
+       object.kind_of?( Celltype ) ||
+       object.kind_of?( CompositeCelltype ) ||
+       object.kind_of?( Cell )then
+      @plugin_object = object.apply_plugin( @plugin_name, @option )
+    elsif object then
+      # V1.5.0 以前の仕様では、signature のみ可能だった
+#      cdl_error( "S1149 $1 not signature" , signature_nsp )
+      cdl_error( "S9999 generate: '$1' neither signature, celltype nor cell", object_nsp )
       return
-    elsif signature.is_empty? then
-      cdl_warning( "S9999 $1 is empty. cannot apply signature plugin. ignored" , signature_nsp )
-      return
-    end
-
-    load_plugin( plugin_name, SignaturePlugin )
-
-    plugin_object = nil
-    eval_str = "plugin_object = #{plugin_name}.new( signature, option )"
-    if $verbose then
-      print "new through: #{eval_str}\n"
-    end
-
-    begin
-      eval( eval_str )     # plugin を生成
-      plugin_object.set_locale @locale
-    rescue Exception => evar
-      cdl_error( "S1150 $1: fail to new" , plugin_name )
-      print "eval( #{eval_str} )\n"
-
-      print_exception( evar )
-    end
-    generate_and_parse plugin_object
+    else
+      cdl_error( "S9999 generate: '$1' not found", object_nsp )
+    end
   end
 end