Changeset 305 for asp3_wo_tecs/trunk/kernel/kernel_check.trb

Timestamp:

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

Author:

ertl-honda

Message:

3.0.0のリリース版に追従

File:

• asp3_wo_tecs/trunk/kernel/kernel_check.trb (modified) (7 diffs)

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