Migration to C++!

6 files changed, 62 insertions, 39 deletions

diff --git a/src/kernel/lib/bitset.c b/src/kernel/lib/bitset.c
deleted file mode 100644
index a6d334b..0000000
--- a/src/kernel/lib/bitset.c
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "bitset.h"
-
-void bitset_set(struct bitset* t, uint32_t num) {
-	uint32_t idx = INDEX_FROM_BIT(num);
-	uint32_t off = OFFSET_FROM_BIT(num);
-	t->bits[idx] |= (0x1 << off);
-}
-
-void bitset_clear(struct bitset* t, uint32_t num) {
-	uint32_t idx = INDEX_FROM_BIT(num);
-	uint32_t off = OFFSET_FROM_BIT(num);
-	t->bits[idx] &= ~(0x1 << off);
-}
-
-uint32_t bitset_test(struct bitset* t, uint32_t num) {
-	uint32_t idx = INDEX_FROM_BIT(num);
-	uint32_t off = OFFSET_FROM_BIT(num);
-	return (t->bits[idx] & (0x1 << off));
-}
-
-uint32_t bitset_firstFree(struct bitset* t) {
-	uint32_t i, j;
-	for (i = 0; i < INDEX_FROM_BIT(t->size); i++) {
-		if (t->bits[i] != 0xFFFFFFFF) {
-			for (j = 0; j < 32; j++) {
-				uint32_t toTest = 0x1 << j;
-				if (!(t->bits[i] & toTest)) {
-					return i*4*8+j;
-				}
-			}
-		}
-	}
-	return (uint32_t) - 1;
-}
-
diff --git a/src/kernel/lib/bitset.cpp b/src/kernel/lib/bitset.cpp
new file mode 100644
index 0000000..2b3d2e9
--- /dev/null
+++ b/src/kernel/lib/bitset.cpp
@@ -0,0 +1,35 @@
+#include "bitset.h"
+
+void bitset::set(uint32_t num) {
+	uint32_t idx = INDEX_FROM_BIT(num);
+	uint32_t off = OFFSET_FROM_BIT(num);
+	bits[idx] |= (0x1 << off);
+}
+
+void bitset::clear(uint32_t num) {
+	uint32_t idx = INDEX_FROM_BIT(num);
+	uint32_t off = OFFSET_FROM_BIT(num);
+	bits[idx] &= ~(0x1 << off);
+}
+
+uint32_t bitset::test(uint32_t num) {
+	uint32_t idx = INDEX_FROM_BIT(num);
+	uint32_t off = OFFSET_FROM_BIT(num);
+	return (bits[idx] & (0x1 << off));
+}
+
+uint32_t bitset::firstFree() {
+	uint32_t i, j;
+	for (i = 0; i < INDEX_FROM_BIT(size); i++) {
+		if (bits[i] != 0xFFFFFFFF) {
+			for (j = 0; j < 32; j++) {
+				uint32_t toTest = 0x1 << j;
+				if (!(bits[i] & toTest)) {
+					return i*4*8+j;
+				}
+			}
+		}
+	}
+	return (uint32_t) - 1;
+}
+
diff --git a/src/kernel/lib/bitset.h b/src/kernel/lib/bitset.h
index fe9e8c2..f2441ce 100644
--- a/src/kernel/lib/bitset.h
+++ b/src/kernel/lib/bitset.h
@@ -9,11 +9,12 @@
 struct bitset {
 	uint32_t *bits;
 	uint32_t size;
+
+	void set(uint32_t num);
+	void clear(uint32_t num);
+	uint32_t test(uint32_t num);
+	uint32_t firstFree();
 };
 
-void bitset_set(struct bitset* t, uint32_t num);
-void bitset_clear(struct bitset* t, uint32_t num);
-uint32_t bitset_test(struct bitset* t, uint32_t num);
-uint32_t bitset_firstFree(struct bitset* t);
 
 #endif
diff --git a/src/kernel/lib/cpp.h b/src/kernel/lib/cpp.h
new file mode 100644
index 0000000..cf08ede
--- /dev/null
+++ b/src/kernel/lib/cpp.h
@@ -0,0 +1,16 @@
+#ifndef DEF_CPPSUPPORT_H
+#define DEF_CPPSUPPORT_H
+
+#include <mem/mem.h>
+
+inline void* operator new(size_t, void* p)   throw() { return p; }
+inline void* operator new[](size_t, void* p) throw() { return p; }
+inline void  operator delete  (void*, void*) throw() { };
+inline void  operator delete[](void*, void*) throw() { };
+
+inline void* operator new (size_t size) { return kmalloc(size); }
+inline void* operator new[] (size_t size) { return kmalloc(size); }
+inline void operator delete (void* ptr) { return kfree(ptr); }
+inline void operator delete[] (void* ptr) { return kfree(ptr); }
+
+#endif
diff --git a/src/kernel/lib/std.c b/src/kernel/lib/std.cpp
index 316dfa3..7ab4f64 100644
--- a/src/kernel/lib/std.c
+++ b/src/kernel/lib/std.cpp
@@ -1,5 +1,6 @@
 #include "std.h"
 #include "core/sys.h"
+#include "core/monitor.h"
 
 int errno = 0;
 
diff --git a/src/kernel/lib/std.h b/src/kernel/lib/std.h
index 51e0435..ced49b5 100644
--- a/src/kernel/lib/std.h
+++ b/src/kernel/lib/std.h
@@ -5,7 +5,12 @@
 
 #include <types.h>  /* For size_t */
 
+#ifdef __cplusplus
+extern "C" void abort();
+#else
 void abort();
+#endif
+
 #define sbrk ksbrk
 #define brk kbrk