Changeset 50 for asp_wo_cfg/trunk/kernel

Timestamp:

Sep 7, 2012, 12:47:18 PM (12 years ago)

Author:

ertl-hiro

Message:

ターゲット依存のエラーチェックコードを追加。

Location:

asp_wo_cfg/trunk/kernel

Files:

• exception.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)
• task_manage.c (modified) (2 diffs)

asp_wo_cfg/trunk/kernel/exception.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2011 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2012 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -122 +122 @@
                 ercd = E_OBJ;
         }
-        else {
+        else if ((ercd = target_check_dexc(excno, pk_dexc)) == E_OK) {
                 p_excinib->excatr = pk_dexc->excatr;
                 p_excinib->exchdr = pk_dexc->exchdr;
-                ercd = E_OK;
         }
 

asp_wo_cfg/trunk/kernel/interrupt.c

@@ -316 +316 @@
         p_intinib = get_intinib(intno);
 
-        p_intinib->intatr = pk_cint->intatr;
-        p_intinib->intpri = pk_cint->intpri;
-        ercd = E_OK;
+        if ((ercd = target_check_cint(intno, pk_cint)) == E_OK) {
+                p_intinib->intatr = pk_cint->intatr;
+                p_intinib->intpri = pk_cint->intpri;
+        }
 
   error_exit:
@@ -351 +352 @@
                 ercd = E_OBJ;
         }
-        else {
+        else if ((ercd = target_check_dinh(inhno, pk_dinh)) == E_OK) {
                 p_inhinib->inhatr = pk_dinh->inhatr;
                 p_inhinib->inthdr = (IINTHDR)(pk_dinh->inthdr);
-                ercd = E_OK;
         }
 

asp_wo_cfg/trunk/kernel/task_manage.c

@@ -164 +164 @@
                         ercd = E_NOMEM;
                 }
-                else {
+                else if ((ercd = target_check_ctsk(tskid, pk_ctsk)) == E_OK) {
                         p_tinib = (TINIB *)(p_tcb->p_tinib);
                         p_tinib->tskatr = tskatr;
@@ -184 +184 @@
                                 make_active(p_tcb);
                         }
-                        ercd = E_OK;
                 }
         }