Changeset 88e43bc in mainline

Timestamp:

2018-11-09T22:02:53Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

436a0a5, c0ea739

Parents:

c5fe7f7

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 21:50:12)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:02:53)

Message:

Mark unreachable consistently in kernel

At least in places that were commented as such.

Location:

kernel

Files:

• arch/amd64/src/userspace.c (modified) (1 diff)
• arch/arm32/src/userspace.c (modified) (1 diff)
• arch/ia32/src/userspace.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• generic/include/panic.h (modified) (1 diff)
• generic/src/proc/task.c (modified) (1 diff)
• generic/src/sysinfo/sysinfo.c (modified) (1 diff)

kernel/arch/amd64/src/userspace.c

@@ -75 +75 @@
         );
 
-        /* Unreachable */
-        while (true)
-                ;
+        unreachable();
 }
 

kernel/arch/arm32/src/userspace.c

@@ -114 +114 @@
         );
 
-        /* unreachable */
-        while (true)
-                ;
+        unreachable();
 }
 

kernel/arch/ia32/src/userspace.c

@@ -79 +79 @@
             : "eax");
 
-        /* Unreachable */
-        while (true)
-                ;
+        unreachable();
 }
 

kernel/arch/ppc32/src/ppc32.c

@@ -297 +297 @@
             (uintptr_t) kernel_uarg->uspace_entry);
 
-        /* Unreachable */
-        while (true)
-                ;
+        unreachable();
 }
 

kernel/generic/include/panic.h

@@ -53 +53 @@
         panic_common(PANIC_MEMTRAP, istate, access, addr, fmt, ##__VA_ARGS__)
 
+#define unreachable() \
+        panic_assert("%s() at %s:%u:\nUnreachable line reached.", \
+            __func__, __FILE__, __LINE__);
+
 typedef enum {
         PANIC_OTHER,

kernel/generic/src/proc/task.c

@@ -628 +628 @@
 {
         task_kill_self(notify);
-
-        /* Unreachable */
-        return EOK;
+        unreachable();
 }
 

kernel/generic/src/sysinfo/sysinfo.c

@@ -294 +294 @@
         }
 
-        /* Unreachable */
-        assert(false);
-        return NULL;
+        unreachable();
 }