فهرست منبع

Kernel: Remove unneeded kassert.h.

Andreas Kling 6 سال پیش
والد
کامیت
ac46e45f6e
3فایلهای تغییر یافته به همراه14 افزوده شده و 16 حذف شده
  1. 1 1
      AK/Assertions.h
  2. 13 1
      Kernel/Assertions.h
  3. 0 14
      Kernel/kassert.h

+ 1 - 1
AK/Assertions.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #ifdef KERNEL
-#include <Kernel/kassert.h>
+#include <Kernel/Assertions.h>
 #else
 #include <LibC/assert.h>
 #endif

+ 13 - 1
Kernel/Assertions.h

@@ -1,2 +1,14 @@
 #pragma once
-#include "kassert.h"
+
+#include "kprintf.h"
+#include "i386.h"
+
+[[noreturn]] void __assertion_failed(const char* msg, const char* file, unsigned line, const char* func);
+
+#define ASSERT(expr) (static_cast<bool>(expr) ? (void)0 : __assertion_failed(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__))
+#define CRASH() do { asm volatile("ud2"); } while(0)
+#define RELEASE_ASSERT(x) do { if (!(x)) CRASH(); } while(0)
+//#define ASSERT RELEASE_ASSERT
+#define ASSERT_NOT_REACHED() ASSERT(false)
+#define ASSERT_INTERRUPTS_DISABLED() ASSERT(!(cpu_flags() & 0x200))
+#define ASSERT_INTERRUPTS_ENABLED() ASSERT(cpu_flags() & 0x200)

+ 0 - 14
Kernel/kassert.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "kprintf.h"
-#include "i386.h"
-
-[[noreturn]] void __assertion_failed(const char* msg, const char* file, unsigned line, const char* func);
-
-#define ASSERT(expr) (static_cast<bool>(expr) ? (void)0 : __assertion_failed(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__))
-#define CRASH() do { asm volatile("ud2"); } while(0)
-#define RELEASE_ASSERT(x) do { if (!(x)) CRASH(); } while(0)
-//#define ASSERT RELEASE_ASSERT
-#define ASSERT_NOT_REACHED() ASSERT(false)
-#define ASSERT_INTERRUPTS_DISABLED() ASSERT(!(cpu_flags() & 0x200))
-#define ASSERT_INTERRUPTS_ENABLED() ASSERT(cpu_flags() & 0x200)