Changeset 305 for asp3_wo_tecs/trunk/kernel

Timestamp:

Jun 26, 2017, 6:45:41 PM (7 years ago)

Author:

ertl-honda

Message:

3.0.0のリリース版に追従

Location:

asp3_wo_tecs/trunk/kernel

Files:

• alarm.trb (modified) (3 diffs)
• cyclic.trb (modified) (3 diffs)
• dataqueue.trb (modified) (3 diffs)
• eventflag.trb (modified) (3 diffs)
• exception.trb (modified) (4 diffs)
• interrupt.trb (modified) (11 diffs)
• kernel.trb (modified) (12 diffs)
• kernel_check.trb (modified) (7 diffs)
• kernel_sym.def (modified) (1 diff)
• mempfix.trb (modified) (3 diffs)
• mutex.trb (modified) (3 diffs)
• pridataq.trb (modified) (3 diffs)
• semaphore.trb (modified) (3 diffs)
• task.trb (modified) (6 diffs)
• time_event.c (modified) (1 diff)

asp3_wo_tecs/trunk/kernel/alarm.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: alarm.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: alarm.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # almatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2491ï¼½
     #（TA_STAä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -74 +74 @@
     # 通知æƒ
 å ±ã®å‡¦ç†
-    params[:nfyhdr] = generateNotifyHandler(id, params, :almid)
+    params[:nfyhdr] = generateNotifyHandler(key, params, :almid)
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     return("(#{params[:almatr]}), (intptr_t)(#{params[:par1]}), " \
                                                                                                 "#{params[:nfyhdr]}")

asp3_wo_tecs/trunk/kernel/cyclic.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: cyclic.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: cyclic.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # cycatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2383ï¼½
     #（TA_STAä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -84 +84 @@
     # 通知æƒ
 å ±ã®å‡¦ç†
-    params[:nfyhdr] = generateNotifyHandler(id, params, :cycid)
+    params[:nfyhdr] = generateNotifyHandler(key, params, :cycid)
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     return("(#{params[:cycatr]}), (intptr_t)(#{params[:par1]}), " \
                         "#{params[:nfyhdr]}, (#{params[:cyctim]}), (#{params[:cycphs]})")

asp3_wo_tecs/trunk/kernel/dataqueue.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: dataqueue.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: dataqueue.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # dtqatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1669ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -84 +84 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     if params[:dtqcnt] > 0
       dtqmb = "_kernel_dtqmb_#{params[:dtqid]}"

asp3_wo_tecs/trunk/kernel/eventflag.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: eventflag.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: eventflag.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # flgatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1562ï¼½
     #（TA_TPRI，TA_WMUL，TA_CLRä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -78 +78 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     return("(#{params[:flgatr]}), (#{params[:iflgptn]})")
   end

asp3_wo_tecs/trunk/kernel/exception.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: exception.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: exception.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -68 +68 @@
 #  CPU例外ハンドラに関するエラーチェック
 #
-$cfgData[:DEF_EXC].each do |id, params|
+$cfgData[:DEF_EXC].each do |key, params|
   # excnoがCPUä¾‹å¤–ãƒãƒ³ãƒ‰ãƒ©ç•ªå·ã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼ˆE_PAR）［NGKI3134ï¼½
   if $EXCNO_VALID.index(params[:excno]).nil?
@@ -99 +99 @@
     #  CPU例外ハンドラのエントリ
     #
-    $cfgData[:DEF_EXC].each do |id, params|
+    $cfgData[:DEF_EXC].each do |key, params|
       $kernelCfgC.add("EXCHDR_ENTRY(#{params[:excno]}, " \
                                                 "#{params[:excno].val}, #{params[:exchdr]})")
@@ -109 +109 @@
     #
     $kernelCfgC.add("const EXCINIB _kernel_excinib_table[TNUM_DEF_EXCNO] = {")
-    $cfgData[:DEF_EXC].each_with_index do |(id, params), index|
+    $cfgData[:DEF_EXC].each_with_index do |(key, params), index|
       $kernelCfgC.add(",") if index > 0
       $kernelCfgC.append("\t{ (#{params[:excno]}), (#{params[:excatr]}), " \

asp3_wo_tecs/trunk/kernel/interrupt.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: interrupt.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: interrupt.trb 612 2016-02-08 04:27:57Z ertl-hiro $
 # 
 
@@ -65 +65 @@
 $kernelCfgH.add("#define TNUM_ISRID\t#{$cfgData[:CRE_ISR].size}")
 
-$cfgData[:CRE_ISR].sort.each do |id, params|
+$cfgData[:CRE_ISR].sort.each do |key, params|
   $kernelCfgH.add("#define #{params[:isrid]}\t#{params[:isrid].val}")
 end
@@ -127 +127 @@
 #  割込み要求ラインに関するエラーチェック
 #
-$cfgData[:CFG_INT].each do |id, params|
+$cfgData[:CFG_INT].each do |key, params|
   #     intnoãŒå‰²è¾¼ã¿ç•ªå·ã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼ˆE_PAR）［NGKI2972ï¼½
   if $INTNO_VALID.index(params[:intno]).nil?
@@ -172 +172 @@
 #  割込みハンドラに関するエラーチェック
 #
-$cfgData[:DEF_INH].each do |id, params|
+$cfgData[:DEF_INH].each do |key, params|
   # inhnoãŒå‰²è¾¼ã¿ãƒãƒ³ãƒ‰ãƒ©ç•ªå·ã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼ˆE_PAR）［NGKI3055ï¼½
   if $INHNO_VALID.index(params[:inhno]).nil?
@@ -243 +243 @@
 #  割込みサービスルーチン（ISR）に関するエラーチェックと割込みハンドラの生成
 #
-$cfgData[:CRE_ISR].sort.each do |id, params|
+$cfgData[:CRE_ISR].sort.each do |key, params|
   #     isratrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2998ï¼½
   #（TARGET_ISRATRä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -264 +264 @@
 
 $INTNO_CREISR_VALID.each do |intnoVal|
-  inhnoVal = $toInhnoVal[intnoVal]
-
   # 割込み番号intnoに対して登録されたISRのリストの作成
   isrParamsList = []
-  $cfgData[:CRE_ISR].sort.each do |id, params|
-    if params[:intno] == intnoVal
+  $cfgData[:CRE_ISR].sort.each do |key, params|
+    if params[:intno].val == intnoVal
       isrParamsList.push(params)
     end
@@ -276 +274 @@
   #     割込み番号intnoに対して登録されたISRãŒå­˜åœ¨ã™ã‚‹å ´åˆ
   if isrParamsList.size > 0
+    inhnoVal = $toInhnoVal[intnoVal]
+
     # intnoに対応するinhnoに対してDEF_INHãŒã‚ã‚‹å ´åˆï¼ˆE_OBJ）［NGKI3013ï¼½
     if $cfgData[:DEF_INH].has_key?(inhnoVal)
@@ -312 +312 @@
     $cfgData[:DEF_INH][inhnoVal] = params
 
-    # ISR用の割込みハンドラ
+    # 割込みサービスルーチン用の割込みハンドラ
     $kernelCfgC.add("void")
     $kernelCfgC.add("_kernel_inthdr_#{intnoVal}(void)")
     $kernelCfgC.add("{")
-    # ISRを優å
+    # 割込みサービスルーチンを優å
 ˆåº¦é †ã«å‘¼ã³å‡ºã™
-    isrParamsList.sort_by {|params| params[:isrpri]}.each_with_index \
-                                                                                                                do |params, index|
+    i = 0               # stable sortを行うための変数
+    isrParamsList.sort_by {|params| [ params[:isrpri].val, i += 1 ]} \
+                                                                                .each_with_index do |params, index|
       if index > 0
         $kernelCfgC.add
@@ -353 +354 @@
     #  割込みハンドラのエントリ
     #
-    $cfgData[:DEF_INH].each do |id, params|
+    $cfgData[:DEF_INH].each do |key, params|
       if (params[:inhatr] & $TA_NONKERNEL) == 0
         $kernelCfgC.add("INTHDR_ENTRY(#{params[:inhno]}, " \
@@ -365 +366 @@
     #
     $kernelCfgC.add("const INHINIB _kernel_inhinib_table[TNUM_DEF_INHNO] = {")
-    $cfgData[:DEF_INH].each_with_index do |(id, params), index|
+    $cfgData[:DEF_INH].each_with_index do |(key, params), index|
       $kernelCfgC.add(",") if index > 0
       if (params[:inhatr] & $TA_NONKERNEL) == 0
@@ -402 +403 @@
   if $cfgData[:CFG_INT].size != 0
     $kernelCfgC.add("const INTINIB _kernel_intinib_table[TNUM_CFG_INTNO] = {")
-    $cfgData[:CFG_INT].each_with_index do |(id, params), index|
+    $cfgData[:CFG_INT].each_with_index do |(key, params), index|
       $kernelCfgC.add(",") if index > 0
       $kernelCfgC.append("\t{ (#{params[:intno]}), (#{params[:intatr]}), " \

asp3_wo_tecs/trunk/kernel/kernel.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 #
-#   $Id: kernel.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: kernel.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 #
 
@@ -136 +136 @@
 
     # オブジェクトのID番号のマクロ定義の生成
-    $cfgData[@api].sort.each do |id, params|
+    $cfgData[@api].sort.each do |key, params|
       $kernelCfgH.add("#define #{params[@objid]}\t#{params[@objid].val}")
     end
@@ -142 +142 @@
 
     # オブジェクトのID番号を保持する変数
-    if $USE_EXTERNAL_ID
-      $cfgData[@api].sort.each do |id, params|
+    if !$USE_EXTERNAL_ID.nil?
+      $cfgData[@api].sort.each do |key, params|
         $kernelCfgC.add("const ID #{params[@objid]}_id" \
                                                                                 " = #{params[@objid].val};")
@@ -157 +157 @@
     if $cfgData[@api].size > 0
       # äº‹å‰æº–å‚™ï¼ˆã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ï¼Œãƒ¡ãƒ¢ãƒªé ˜åŸŸã®ç”Ÿæˆï¼‰
-      $cfgData[@api].sort.each do |id, params|
-        prepare(id, params)
+      $cfgData[@api].sort.each do |key, params|
+        prepare(key, params)
       end
 
@@ -171 +171 @@
       $kernelCfgC.add("const #{@OBJ_S}INIB _kernel_#{@obj_s}inib_table" \
                                                                                                         "[TNUM_#{@OBJ}ID] = {")
-      $cfgData[@api].sort.each_with_index do |(id, params), index|
+      $cfgData[@api].sort.each_with_index do |(key, params), index|
         $kernelCfgC.add(",") if index > 0
-        $kernelCfgC.append("\t{ " + generateInib(id, params) + " }")
+        $kernelCfgC.append("\t{ " + generateInib(key, params) + " }")
       end
       $kernelCfgC.add
@@ -197 +197 @@
 #  通知ハンドラの生成関数
 #
-def generateNotifyHandler(id, params, objid)
+def generateNotifyHandler(key, params, objid)
   # ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’å¤‰æ•°ã«æ ¼ç´
   nfymode = params[:nfymode]
@@ -376 +376 @@
 
   # DEF_ICSãŒã‚ã‚‹å ´åˆã®å‡¦ç†
-  params = $cfgData[:DEF_ICS].values[0]
+  params = $cfgData[:DEF_ICS][1]
 
   # istkszがターゲット定義の最小値（TARGET_MIN_ISTKSZï¼Œæœªå®šç¾©ã®å ´åˆã¯1）
@@ -439 +439 @@
 
 # エラーチェック
-$cfgData[:ATT_INI].each do |id, params|
+$cfgData[:ATT_INI].each do |key, params|
   # iniatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI3241ï¼½
   #（TA_NULLã§ãªã„å ´åˆï¼‰
@@ -453 +453 @@
 {
 EOS
-$cfgData[:ATT_INI].each do |id, params|
+$cfgData[:ATT_INI].each do |key, params|
   $kernelCfgC.add("\t((INIRTN)(#{params[:inirtn]}))" \
                                                                 "((intptr_t)(#{params[:exinf]}));")
@@ -465 +465 @@
 
 # エラーチェック
-$cfgData[:ATT_TER].each do |id, params|
+$cfgData[:ATT_TER].each do |key, params|
   # teratrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI3248ï¼½
   #（TA_NULLã§ãªã„å ´åˆï¼‰
@@ -479 +479 @@
 {
 EOS
-$cfgData[:ATT_TER].reverse_each do |id, params|
+$cfgData[:ATT_TER].reverse_each do |key, params|
   $kernelCfgC.add("\t((TERRTN)(#{params[:terrtn]}))" \
                                                                 "((intptr_t)(#{params[:exinf]}));")
@@ -489 +489 @@
 #
 $kernelCfgH.append(<<EOS)
-
 #endif /* TOPPERS_KERNEL_CFG_H */
 EOS

asp3_wo_tecs/trunk/kernel/kernel_check.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: kernel_check.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: kernel_check.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 #  
 
@@ -92 +92 @@
 $tmax_dtqid = PEEK(SYMBOL("_kernel_tmax_dtqid"), $sizeof_ID)
 
-def checkNotifyHandler(id, params, objid, exinf, nfyhdr)
+def checkNotifyHandler(key, params, objid, exinf, nfyhdr)
   # ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’å¤‰æ•°ã«æ ¼ç´
   nfymode = params[:nfymode]
@@ -244 +244 @@
 # 
 tinib = SYMBOL("_kernel_tinib_table")
-$cfgData[:CRE_TSK].each do |id, params|
+$cfgData[:CRE_TSK].each do |key, params|
   # タスクのå
 ˆé ­ç•ªåœ°ã®ãƒã‚§ãƒƒã‚¯ï¼»NGKI1033ï¼½
@@ -258 +258 @@
 ˆé ­ç•ªåœ°ã®ãƒã‚§ãƒƒã‚¯ï¼»NGKI1056ï¼½
   if $USE_TSKINICTXB == 1
-    stk = GetStackTskinictxb(id, params)
+    stk = GetStackTskinictxb(key, params)
   else
     stk = PEEK(tinib + $offsetof_TINIB_stk, $sizeof_void_ptr)
@@ -273 +273 @@
 
 # 
-#  周期通知に関するチェック
-# 
-cycinib = SYMBOL("_kernel_cycinib_table")
-$cfgData[:CRE_CYC].each do |id, params|
-  exinf = PEEK(cycinib + $offsetof_CYCINIB_exinf, $sizeof_intptr_t)
-  nfyhdr = PEEK(cycinib + $offsetof_CYCINIB_nfyhdr, $sizeof_FP)
-
-  #     通知æƒ
-å ±ã®ãƒã‚§ãƒƒã‚¯
-  checkNotifyHandler(id, params, :cycid, exinf, nfyhdr)
-
-  cycinib += $sizeof_CYCINIB
-end
-
-# 
-#  アラーム通知に関するチェック
-# 
-alminib = SYMBOL("_kernel_alminib_table")
-$cfgData[:CRE_ALM].each do |id, params|
-  exinf = PEEK(alminib + $offsetof_ALMINIB_exinf, $sizeof_intptr_t)
-  nfyhdr = PEEK(alminib + $offsetof_ALMINIB_nfyhdr, $sizeof_FP)
-
-  #     通知æƒ
-å ±ã®ãƒã‚§ãƒƒã‚¯
-  checkNotifyHandler(id, params, :almid, exinf, nfyhdr)
-
-  alminib += $sizeof_ALMINIB
-end
-
-# 
 #  固定長メモリプールに関するチェック
 # 
 mpfinib = SYMBOL("_kernel_mpfinib_table")
-$cfgData[:CRE_MPF].each do |id, params|
-  mpf = PEEK(alminib + $offsetof_MPFINIB_mpf, $sizeof_void_ptr)
+$cfgData[:CRE_MPF].each do |key, params|
+  mpf = PEEK(mpfinib + $offsetof_MPFINIB_mpf, $sizeof_void_ptr)
 
   # å›ºå®šé•·ãƒ¡ãƒ¢ãƒªãƒ—ãƒ¼ãƒ«é ˜åŸŸã®å
@@ -322 +292 @@
 
 # 
+#  周期通知に関するチェック
+# 
+cycinib = SYMBOL("_kernel_cycinib_table")
+$cfgData[:CRE_CYC].each do |key, params|
+  exinf = PEEK(cycinib + $offsetof_CYCINIB_exinf, $sizeof_intptr_t)
+  nfyhdr = PEEK(cycinib + $offsetof_CYCINIB_nfyhdr, $sizeof_FP)
+
+  #     通知æƒ
+å ±ã®ãƒã‚§ãƒƒã‚¯
+  checkNotifyHandler(key, params, :cycid, exinf, nfyhdr)
+
+  cycinib += $sizeof_CYCINIB
+end
+
+# 
+#  アラーム通知に関するチェック
+# 
+alminib = SYMBOL("_kernel_alminib_table")
+$cfgData[:CRE_ALM].each do |key, params|
+  exinf = PEEK(alminib + $offsetof_ALMINIB_exinf, $sizeof_intptr_t)
+  nfyhdr = PEEK(alminib + $offsetof_ALMINIB_nfyhdr, $sizeof_FP)
+
+  #     通知æƒ
+å ±ã®ãƒã‚§ãƒƒã‚¯
+  checkNotifyHandler(key, params, :almid, exinf, nfyhdr)
+
+  alminib += $sizeof_ALMINIB
+end
+
+# 
 #  éžã‚¿ã‚¹ã‚¯ã‚³ãƒ³ãƒ†ã‚­ã‚¹ãƒˆç”¨ã®ã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã«é–¢ã™ã‚‹ãƒã‚§ãƒƒã‚¯
 # 
@@ -329 +329 @@
 ˆé ­ç•ªåœ°ã®ãƒã‚§ãƒƒã‚¯ï¼»NGKI3222ï¼½
 if (istk & ($CHECK_STACK_ALIGN - 1)) != 0
-  error_wrong("E_PAR", $cfgData[:DEF_ICS][0], :istk, "not aligned")
+  error_wrong("E_PAR", $cfgData[:DEF_ICS][1], :istk, "not aligned")
 end
 if $CHECK_STACK_NONNULL == 1 && istk == 0
-  error_wrong("E_PAR", $cfgData[:DEF_ICS][0], :istk, "null")
-end
+  error_wrong("E_PAR", $cfgData[:DEF_ICS][1], :istk, "null")
+end

asp3_wo_tecs/trunk/kernel/kernel_sym.def

@@ +1 @@
+USE_EXTERNAL_ID,1,,defined(USE_EXTERNAL_ID)
 SIL_ENDIAN_BIG,1,,defined(SIL_ENDIAN_BIG)
 SIL_ENDIAN_LITTLE,1,,defined(SIL_ENDIAN_LITTLE)

asp3_wo_tecs/trunk/kernel/mempfix.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: mempfix.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: mempfix.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # mpfatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2225ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -98 +98 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     if params[:mpf] == "NULL"
       mpf = "_kernel_mpf_#{params[:mpfid]}"

asp3_wo_tecs/trunk/kernel/mutex.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: mutex.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: mutex.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # mtxatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI2025ï¼½
     # （TA_NULL，TA_TPRI，TA_CEILINGã®ã„ãšã‚Œã§ã‚‚ãªã„å ´åˆï¼‰
@@ -98 +98 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     return("(#{params[:mtxatr]}), INT_PRIORITY(#{params[:ceilpri]})")
   end

asp3_wo_tecs/trunk/kernel/pridataq.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: pridataq.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: pridataq.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -66 +66 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # pdqatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1804ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -92 +92 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     if params[:pdqcnt] > 0
       pdqmb = "_kernel_pdqmb_#{params[:pdqid]}"

asp3_wo_tecs/trunk/kernel/semaphore.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: semaphore.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: semaphore.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # sematrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1456ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -83 +83 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     return("(#{params[:sematr]}), (#{params[:isemcnt]}), (#{params[:maxsem]})")
   end

asp3_wo_tecs/trunk/kernel/task.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: task.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: task.trb 596 2016-02-06 17:08:56Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # tskatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1028ï¼½
     #（TA_ACT，TA_NOACTQUE，TARGET_TSKATRä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -83 +83 @@
     end
 
-    # stkszãŒã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®ã‚µã‚¤ã‚ºã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼»NGKI1056ï¼½
-    if (params[:stksz] & ($CHECK_STKSZ_ALIGN - 1)) != 0
-      error_wrong_id("E_PAR", params, :stksz, :tskid, "not aligned")
-    end
-
     # ã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®è¨­å®šï¼»NGKI1041ï¼½
     if params[:stk] == "NULL"
@@ -94 +89 @@
       params[:tinib_stk] = "_kernel_stack_#{params[:tskid]}"
     else
+      # stkszãŒã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®ã‚µã‚¤ã‚ºã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼»NGKI1056ï¼½
+      if (params[:stksz] & ($CHECK_STKSZ_ALIGN - 1)) != 0
+        error_wrong_id("E_PAR", params, :stksz, :tskid, "not aligned")
+      end
+
       params[:tinib_stksz] = params[:stksz]
       params[:tinib_stk] = "(void *)(#{params[:stk]})"
@@ -99 +99 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     if $USE_TSKINICTXB == 1
-      tskinictxb = GenerateTskinictxb(id, params)
+      tskinictxb = GenerateTskinictxb(key, params)
     else
       tskinictxb = "#{params[:tinib_stksz]}, #{params[:tinib_stk]}"
@@ -124 +124 @@
 $kernelCfgC.add("const ID _kernel_torder_table[TNUM_TSKID] = { ")
 $kernelCfgC.append("\t")
-$cfgData[:CRE_TSK].each_with_index do |(id, params), index|
+$cfgData[:CRE_TSK].each_with_index do |(key, params), index|
   $kernelCfgC.append(", ") if index > 0
   $kernelCfgC.append("#{params[:tskid]}")

asp3_wo_tecs/trunk/kernel/time_event.c

@@ -85 +85 @@
 /*
  *  タイムイベントヒープ操作マクロ
- *
- *  PARENTとCHILDã®ç´ ç›´ãªå®šç¾©ã¯æ¬¡ã®é€šã‚Šã§ã‚ã‚‹ãŒï¼Œã‚ˆã‚Šå®Ÿè¡ŒåŠ¹çŽ‡ã®è‰¯ã„ãƒžã‚¯
- *  ロ定義としている．
- *  #define PARENT(p_tmevtn) (tmevt_heap + (((p_tmevtn) - tmevt_heap) >> 1))
- *  #define LCHILD(p_tmevtn) (tmevt_heap + (((p_tmevtn) - tmevt_heap) << 1))
- *
- *  下のPARENTの定義は，TMEVTNのé
-åˆ—が，sizeof(TMEVTN)の単位でアライン
- *  ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’æƒ³å®šã—ã¦ã„ã‚‹ï¼Žã“ã®å‰æãŒæˆç«‹ã—ãªã„å ´åˆã¯ï¼Œä¸Šã®å®šç¾©
- *  を使用するå¿
-要がある．
- */
-#define PARENT(p_tmevtn)                                /* 親ノードを求める */          \
-                ((TMEVTN *)(((((uintptr_t) tmevt_heap)                                          \
-                                + ((uintptr_t)(p_tmevtn))) >> 1) & ~(sizeof(TMEVTN) - 1)))
-#define LCHILD(p_tmevtn)                                /* 左の子ノードを求める */    \
-                ((TMEVTN *)((((uintptr_t)(p_tmevtn)) << 1) - ((uintptr_t) tmevt_heap)))
-
+ */
+#define PARENT(p_tmevtn)        (tmevt_heap + (((p_tmevtn) - tmevt_heap) >> 1))
+                                                                                                        /* 親ノードを求める */
+#define LCHILD(p_tmevtn)        (tmevt_heap + (((p_tmevtn) - tmevt_heap) << 1))
+                                                                                                        /* 左の子ノードを求める */
 /*
  *  タイムイベントヒープ中のå