Changeset 306 for asp3_wo_tecs/trunk/kernel/mempfix.trb

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/kernel/mempfix.trb (modified) (4 diffs)

asp3_wo_tecs/trunk/kernel/mempfix.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: mempfix.trb 588 2016-02-05 12:54:58Z ertl-hiro $
+#   $Id: mempfix.trb 672 2016-03-05 15:33:08Z ertl-hiro $
 # 
 
@@ -66 +66 @@
 
   def prepare(key, params)
+    # パラメータが省略された時のデフォルト値の設定
+    params[:mpf] ||= "NULL"
+    params[:mpfmb] ||= "NULL"
+
     # mpfatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2225ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -72 +76 @@
     end
 
-    # blkcntが0ä»¥ä¸‹ã®å ´åˆï¼ˆE_PAR）［NGKI2229ï¼½
-    if params[:blkcnt] <= 0
+    # blkcntが0ã®å ´åˆï¼ˆE_PAR）［NGKI2229ï¼½
+    if params[:blkcnt] == 0
       error_illegal_id("E_PAR", params, :blkcnt, :mpfid)
     end
 
-    # blkszが0ä»¥ä¸‹ã®å ´åˆï¼ˆE_PAR）［NGKI2230ï¼½
-    if params[:blksz] <= 0
+    # blkszが0ã®å ´åˆï¼ˆE_PAR）［NGKI2230ï¼½
+    if params[:blksz] == 0
       error_illegal_id("E_PAR", params, :blksz, :mpfid)
     end
@@ -84 +88 @@
     # å›ºå®šé•·ãƒ¡ãƒ¢ãƒªãƒ—ãƒ¼ãƒ«é ˜åŸŸ
     if params[:mpf] == "NULL"
-      $kernelCfgC.add("static MPF_T _kernel_mpf_#{params[:mpfid]}" \
+      mpfName = "_kernel_mpf_#{params[:mpfid]}"
+      $kernelCfgC.add("static MPF_T #{mpfName}" \
                                 "[#{params[:blkcnt]} * COUNT_MPF_T(#{params[:blksz]})];")
+      params[:mpfinib_mpf] = mpfName
+    else
+      params[:mpfinib_mpf] = "(void *)(#{params[:mpf]})"
     end
 
     # mpfmbがNULLã§ãªã„å ´åˆï¼ˆE_NOSPT）［ASPS0166ï¼½
     if params[:mpfmb] != "NULL"
-      error_illegal_id("E_PAR", params, :mpfmb, :mpfid)
+      error_illegal_id("E_NOSPT", params, :mpfmb, :mpfid)
     end
 
     # å›ºå®šé•·ãƒ¡ãƒ¢ãƒªãƒ—ãƒ¼ãƒ«ç®¡ç†é ˜åŸŸ
-    $kernelCfgC.add("static MPFMB _kernel_mpfmb_#{params[:mpfid]}" \
-                                                                                                "[#{params[:blkcnt]}];")
+    mpfmbName = "_kernel_mpfmb_#{params[:mpfid]}"
+    $kernelCfgC.add("static MPFMB #{mpfmbName}[#{params[:blkcnt]}];")
+    params[:mpfinib_mpfmb] = mpfmbName
   end
 
   def generateInib(key, params)
-    if params[:mpf] == "NULL"
-      mpf = "_kernel_mpf_#{params[:mpfid]}"
-    else
-      mpf = "(void *)(#{params[:mpf]})"
-    end
     return("(#{params[:mpfatr]}), (#{params[:blkcnt]}), " \
-                                        "ROUND_MPF_T(#{params[:blksz]}), #{mpf}, " \
-                                        "_kernel_mpfmb_#{params[:mpfid]}")
+                        "ROUND_MPF_T(#{params[:blksz]}), #{params[:mpfinib_mpf]}, " \
+                        "#{params[:mpfinib_mpfmb]}")
   end
 end