Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/core_kernel_impl.c

Timestamp:

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

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/core_kernel_impl.c (modified) (6 diffs)

EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/core_kernel_impl.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2006-2016 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2006-2019 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -73 +73 @@
  */
 Inline void
-config_section_entry(ARM_MMU_CONFIG *p_ammuc)
+config_section_entry(const ARM_MMU_CONFIG *p_ammuc)
 {
         uint32_t        vaddr = p_ammuc->vaddr;
@@ -80 +80 @@
         uint_t          i;
 
+        assert(vaddr % ARM_SECTION_SIZE == 0);
+        assert(paddr % ARM_SECTION_SIZE == 0);
+        assert(size % ARM_SECTION_SIZE == 0);
         while (size > 0) {
 #ifdef USE_ARM_SSECTION
@@ -170 +173 @@
 
 /*
+ *  FPUの初期化
+ */
+#ifdef USE_ARM_FPU
+
+void
+arm_fpu_initialize(void)
+{
+        uint32_t        reg;
+
+        /*
+         *  CP10とCP11をアクセス可能に設定する．
+         */
+        CP15_READ_CPACR(reg);
+        reg |= (CP15_CPACR_CP10_FULLACCESS | CP15_CPACR_CP11_FULLACCESS);
+        CP15_WRITE_CPACR(reg);
+
+        /*
+         *  FPUをディスエーブルする．
+         */
+        set_fpexc(current_fpexc() & ~FPEXC_ENABLE);
+}
+
+#endif /* USE_ARM_FPU */
+
+/*
  *  コア依存の初期化
  */
@@ -187 +215 @@
         arm_mmu_initialize();
 #endif /* USE_ARM_MMU */
+
+        /*
+         *  FPUの初期化
+         */
+#ifdef USE_ARM_FPU
+        arm_fpu_initialize();
+#endif /* USE_ARM_FPU */
 
         /*
@@ -306 +341 @@
                 syslog_0(LOG_EMERG, "FIQ exception occurs.");
                 break;
+        case EXCNO_FATAL:
+                syslog_0(LOG_EMERG, "Fatal Data Abort exception occurs.");
+                break;
         }
         xlog_sys(p_excinf);
 
-        if (excno == EXCNO_PABORT || excno == EXCNO_DABORT) {
+        if (excno == EXCNO_PABORT || excno == EXCNO_DABORT
+                                                                                || excno == EXCNO_FATAL) {
                 uint32_t        fsr, far;