system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Kernel: Remove unneeded kassert.h.

Browse source
This commit is contained in:
Andreas Kling 2019-04-03 12:51:10 +02:00
parent 429bb091e7
commit ac46e45f6e
3 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AK/Assertions.h
View file

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

14
Kernel/Assertions.h
View file

@ -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)

14
Kernel/kassert.h
View file

@ -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)