aa64: finalise context switch, page fault handler and syscall

[lunaix-os.git] / lunaix-os / includes / lunaix / bits.h

diff --git a/lunaix-os/includes/lunaix/bits.h b/lunaix-os/includes/lunaix/bits.h
index 1029bb08bfd314e97cf74678efb748499fe2ef9b..fca3f6753bf680fe742ed6ee1746b42c77a4f860 100644 (file)
--- a/lunaix-os/includes/lunaix/bits.h
+++ b/lunaix-os/includes/lunaix/bits.h
@@ -1,14 +1,24 @@
 #ifndef __LUNAIX_BITS_H
 #define __LUNAIX_BITS_H
 
+#include <asm/bits.h>
+
+#define BITS_AT(val, bitfield)       _BITS_STATIC(val, bitfield)
+
+#ifndef __ASM__
 #include <lunaix/compiler.h>
 
-#define BITS(h, l)               (((1UL << ((h) + 1)) - 1) ^ ((1UL << (l)) - 1))
-#define BIT(p)                   BITS(p, p)
+#define BITFIELD(h, l)               (h), (l)
+
+#define BIT(p)                       BITFIELD(p, p)
+#define BITFLAG(p)                   (1UL << (p))
+
+#define BITS_GENMASK(bitfield)       _BITS_GENMASK(bitfield)
+
+#define BITS_GET(from, bitfield)     _BITS_EXTRACT(from, bitfield)
 
-#define BITS_GET(from, bits)     (((from) & (bits)) >> ctzl(bits))
+#define BITS_SET(to, bitfield, val)  _BITS_INSERT(to, val, bitfield)
 
-#define BITS_SET(to, bits, val)  \
-            (((to) & ~(bits)) | (((val) << ctzl(bits)) & (bits)))
+#endif
 
 #endif /* __LUNAIX_BITS_H */