Changeset eeaf667 in mainline

Timestamp:

2008-06-14T11:45:40Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c7511ec

Parents:

d5087aa

Message:

Maintain cache coherence after arm32 installs exception handlers.

File:

• kernel/arch/arm32/src/exception.c (modified) (10 diffs)

kernel/arch/arm32/src/exception.c

@@ -41 +41 @@
 #include <arch/machine.h>
 #include <arch/mm/page_fault.h>
+#include <arch/barrier.h>
 #include <print.h>
 #include <syscall/syscall.h>
@@ -210 +211 @@
  *  Addresses of handlers are stored in memory following exception vectors.
  */
-static void install_handler (unsigned handler_addr, unsigned* vector)
+static void install_handler(unsigned handler_addr, unsigned *vector)
 {
         /* relative address (related to exc. vector) of the word
@@ -220 +221 @@
         /* make it LDR instruction and store at exception vector */
         *vector = handler_address_ptr | LDR_OPCODE;
+        smc_coherence(*vector);
         
         /* store handler's address */
@@ -227 +229 @@
 
 /** Low-level Reset Exception handler. */
-static void reset_exception_entry()
+static void reset_exception_entry(void)
 {
         PROCESS_EXCEPTION(EXC_RESET);
@@ -233 +235 @@
 
 /** Low-level Software Interrupt Exception handler. */
-static void swi_exception_entry()
+static void swi_exception_entry(void)
 {
         PROCESS_EXCEPTION(EXC_SWI);
@@ -239 +241 @@
 
 /** Low-level Undefined Instruction Exception handler. */
-static void undef_instr_exception_entry()
+static void undef_instr_exception_entry(void)
 {
         PROCESS_EXCEPTION(EXC_UNDEF_INSTR);
@@ -245 +247 @@
 
 /** Low-level Fast Interrupt Exception handler. */
-static void fiq_exception_entry()
+static void fiq_exception_entry(void)
 {
         PROCESS_EXCEPTION(EXC_FIQ);
@@ -251 +253 @@
 
 /** Low-level Prefetch Abort Exception handler. */
-static void prefetch_abort_exception_entry()
+static void prefetch_abort_exception_entry(void)
 {
         asm("sub lr, lr, #4");
@@ -258 +260 @@
 
 /** Low-level Data Abort Exception handler. */
-static void data_abort_exception_entry()
+static void data_abort_exception_entry(void)
 {
         asm("sub lr, lr, #8");
@@ -270 +272 @@
  * would overwrite (and thus spoil) stack pointer.
  */
-static void irq_exception_entry()
+static void irq_exception_entry(void)
 {
         asm("sub lr, lr, #4");