Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/cfg/pass2.rb

Timestamp:

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

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/cfg/pass2.rb (modified) (17 diffs)

EcnlProtoTool/trunk/asp3_dcre/cfg/pass2.rb

@@ -4 +4 @@
 #
 #  Copyright (C) 2015 by FUJI SOFT INCORPORATED, JAPAN
-#  Copyright (C) 2015-2017 by Embedded and Real-Time Systems Laboratory
+#  Copyright (C) 2015-2018 by Embedded and Real-Time Systems Laboratory
 #              Graduate School of Information Science, Nagoya Univ., JAPAN
 #
@@ -36 +36 @@
 #  の責任を負わない．
 #
-#  $Id$
+#  $Id: pass2.rb 175 2019-06-19 01:51:58Z ertl-hiro $
 #
 
@@ -59 +59 @@
 
   #
+  #  Sレコードファイルからシンボルの文字列を取り出す
+  #
+  def self.GetSymbolString(symbol)
+    if @symbolAddress.has_key?(symbol) \
+                        && !(address = @cfg1SRec.get_value(@symbolAddress[symbol], \
+                                                                                                $sizeOfCharPtr, false)).nil?
+      return(@cfg1SRec.get_string(address))
+    else
+      return(nil)
+    end
+  end
+
+  #
   #  パス1の生成物の読み込み（メインの処理）
   #
@@ -72 +85 @@
     end
 
-    # マジックナンバーの取得
+    # マジックナンバーの取得とエンディアンの設定
     if @symbolAddress.has_key?(CFG1_MAGIC_NUM)
       $asmLabel = ""
@@ -95 +108 @@
     # 固定出力した変数の取得
     $sizeOfSigned = GetSymbolValue($asmLabel + CFG1_SIZEOF_SIGNED, 4, false)
+    $sizeOfIntptr = GetSymbolValue($asmLabel + CFG1_SIZEOF_INTPTR, 4, false)
+    $sizeOfCharPtr = GetSymbolValue($asmLabel + CFG1_SIZEOF_CHARPTR, 4, false)
 
     # 値取得シンボルの取得
@@ -106 +121 @@
         end
       else
-        value = GetSymbolValue(symbol, $sizeOfSigned, \
+        if symbolData.has_key?(:INTPTR)
+          value = GetSymbolValue(symbol, $sizeOfIntptr, \
                                                                                 symbolData.has_key?(:SIGNED))
+        else
+          value = GetSymbolValue(symbol, $sizeOfSigned, \
+                                                                                symbolData.has_key?(:SIGNED))
+        end
         if !value.nil?
           symbolData[:VALUE] = value
         end
+      end
+    end
+
+    # SILによるエンディアン定義のチェック
+    if $symbolValueTable["SIL_ENDIAN_BIG"].has_key?(:VALUE)
+      if $symbolValueTable["SIL_ENDIAN_LITTLE"].has_key?(:VALUE)
+        error_exit("Both SIL_ENDIAN_BIG and SIL_ENDIAN_LITTLE are defined.")
+      else
+        if $endianLittle
+          error_exit("Definition of SIL_ENDIAN_BIG seems to be wrong.")
+        end
+      end
+    else
+      if $symbolValueTable["SIL_ENDIAN_LITTLE"].has_key?(:VALUE)
+        if !$endianLittle
+          error_exit("Definition of SIL_ENDIAN_LITTLE seems to be wrong.")
+        end
+      else
+        # 両方が未定義の場合のエラーチェックは，sil.hで実施する
       end
     end
@@ -133 +172 @@
 
     #
-    #  ドメイン生成データをコンフィギュレーションデータ（$cfgData）に格納
-    #
-    $cfgData[:CRE_DOM] = {}
-    $domainId.each do |domainName, domainVal|
-      domid = NumStr.new(domainVal, domainName)
-      $cfgData[:CRE_DOM][domainVal] = { :domid => domid }
+    #  ドメインデータ（$domData）を生成
+    #
+    if $supportDomain
+      $domData = {}
+      $domainId.each do |domainName, domainVal|
+        domid = NumStr.new(domainVal, domainName)
+        $domData[domainVal] = { :domid => domid }
+      end
+      $globalVars.push("domData")
     end
 
@@ -146 +188 @@
   #
   #  パラメータの値を取り出す
+  #
+  #  生成スクリプト内で追加された静的APIの場合には，apiIndexがnilになる．
   #
   def self.GetParamValue(paramName, param, apiIndex, index, apiParam, cfgInfo)
@@ -160 +204 @@
         value = nil
       end
+    elsif apiParam.has_key?(:STRING)                    # 文字列パラメータ
+      if !apiIndex.nil?
+        symbol = "#{$cfg1_prefix}valueof_#{paramName}_#{apiIndex}#{index}"
+        return(GetSymbolString(symbol))
+      else
+        return(param)
+      end
     elsif apiParam.has_key?(:EXPTYPE)                   # 整数定数式パラメータ
-      if apiIndex.nil?
+      if !apiIndex.nil?
+        symbol = "#{$cfg1_prefix}valueof_#{paramName}_#{apiIndex}#{index}"
+        if apiParam.has_key?(:INTPTR)
+          value = GetSymbolValue(symbol, $sizeOfIntptr, \
+                                                                                apiParam.has_key?(:SIGNED))
+        else
+          value = GetSymbolValue(symbol, $sizeOfSigned, \
+                                                                                apiParam.has_key?(:SIGNED))
+        end
+      else
         if param.is_a?(NumStr)
           return(param)
@@ -167 +227 @@
           return(NumStr.new(param))
         end
-      else
-        symbol = "#{$cfg1_prefix}valueof_#{paramName}_#{apiIndex}#{index}"
-        value = GetSymbolValue(symbol, $sizeOfSigned, \
-                                                                        apiParam.has_key?(:SIGNED))
-      end
-    else                                                                                # 一般定数式／文字列パラメータ
+      end
+    else                                                                                # 一般定数式パラメータ
       return(param)
     end
@@ -201 +257 @@
 
     # ID番号割り当ての前処理
-    objidParamNameList = []
     $cfgFileInfo.each do |cfgInfo|
       # プリプロセッサディレクティブは読み飛ばす
@@ -228 +283 @@
             @objidValues[objidParamName][objName] = nil
           end
-          objidParamNameList.push(objidParamName)
         end
       end
@@ -234 +288 @@
 
     # ID番号の割当て処理
-    objidParamNameList.each do |objidParamName|
-      objidList = @objidValues[objidParamName]
-
+    @objidValues.each do |objidParamName, objidList|
       # 未使用のID番号のリスト（使用したものから消していく）
       unusedObjidList = (1.upto(objidList.keys.size)).to_a
@@ -311 +363 @@
       # クラスIDを追加
       if cfgInfo.has_key?(:CLASS)
-        if apiIndex.nil?
-          params[:class] = cfgInfo[:CLASS]
-        else
+        if !apiIndex.nil?
           symbol = "#{$cfg1_prefix}valueof_CLASS_#{apiIndex}"
           value = GetSymbolValue(symbol, $sizeOfSigned, true)
           params[:class] = NumStr.new(value, cfgInfo[:CLASS])
+        else
+          params[:class] = cfgInfo[:CLASS]
         end
       end
@@ -343 +395 @@
 
   #
+  #  ID番号の割当て結果の上書き
+  #
+  def self.SetObjidList(objidParamName, objidList)
+    @objidValues[objidParamName] = objidList
+  end
+
+  #
   #  ID番号出力ファイルの生成
   #
@@ -364 +423 @@
   db = PStore.new(CFG1_OUT_DB)
   db.transaction(true) do
-    $apiDefinition = db[:apiDefinition]
-    $symbolValueTable = db[:symbolValueTable]
-    $cfgFileInfo = db[:cfgFileInfo]
-    $includeFiles = db[:includeFiles]
-    $domainId = db[:domainId]
-  end
-  $cfg2Data = {}
+    db.roots.each do |var|
+      eval("$#{var} = db[:#{var}]")
+    end
+  end
+
+  #
+  #  パス3以降に引き渡す情報の定義
+  #
+  $globalVars = [ "globalVars",
+                  "apiDefinition",
+                  "symbolValueTable",
+                  "cfgFileInfo",
+                  "cfgData",
+                  "asmLabel",
+                  "endianLittle" ]
 
   #
@@ -404 +471 @@
   #  パス3に引き渡す情報をファイルに生成
   #
-  if $omitOutputDb.nil?
+  if !$omitOutputDb
     db = PStore.new(CFG2_OUT_DB)
     db.transaction do
-      db[:apiDefinition] = $apiDefinition
-      db[:symbolValueTable] = $symbolValueTable
-      db[:cfgFileInfo] = $cfgFileInfo
-      db[:includeFiles] = $includeFiles
-      db[:cfgData] = $cfgData
-      db[:asmLabel] = $asmLabel
-      db[:endianLittle] = $endianLittle
-      db[:cfg2Data] = $cfg2Data
+      $globalVars.each do |var|
+        eval("db[:#{var}] = $#{var}")
+      end
     end
   end