Heap included as well in userland library

5 files changed, 11 insertions, 57 deletions

diff --git a/Source/Kernel/TaskManager/Mutex.class.cpp b/Source/Kernel/TaskManager/Mutex.class.cpp
deleted file mode 100644
index 8ba274f..0000000
--- a/Source/Kernel/TaskManager/Mutex.class.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "Mutex.class.h"
-#include <TaskManager/Task.ns.h>
-
-extern "C" u32int atomic_exchange(u32int* ptr, u32int newval);
-
-Mutex::Mutex(u32int locked) {
-	m_locked = locked;
-}
-
-bool Mutex::lock() {
-	if (atomic_exchange(&m_locked, MUTEX_TRUE) == MUTEX_TRUE) return false;	//The lock was already locked
-	return true;
-}
-
-void Mutex::waitLock() {
-	while (atomic_exchange(&m_locked, MUTEX_TRUE) == MUTEX_TRUE) {
-		if (Task::currThread() != 0) Task::currThread()->sleep(10);	//Wait 10ms
-		else return;
-	}
-}
-
-void Mutex::unlock() {
-	m_locked = MUTEX_FALSE;
-}
-
-bool Mutex::locked() {
-	return m_locked;
-}
diff --git a/Source/Kernel/TaskManager/Mutex.class.h b/Source/Kernel/TaskManager/Mutex.class.h
deleted file mode 100644
index 1e3f63d..0000000
--- a/Source/Kernel/TaskManager/Mutex.class.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef DEF_MUTEX_CLASS_H
-#define DEF_MUTEX_CLASS_H
-
-#include <common.h>
-
-#define MUTEX_FALSE 0
-#define MUTEX_TRUE 1
-
-class Mutex {
-	private:
-	u32int m_locked;
-
-	public:
-	Mutex(u32int locked = MUTEX_FALSE);
-	bool lock();		//Locks the mutex if it is not locked. Returns true if mutex could be locked, false if already locked
-	void waitLock();	//Locks the mutex, waiting for it to be unlocked before if necessary
-	void unlock();
-	bool locked();
-};
-
-#endif
diff --git a/Source/Kernel/TaskManager/Process.class.cpp b/Source/Kernel/TaskManager/Process.class.cpp
index 39428b4..aae8fce 100644
--- a/Source/Kernel/TaskManager/Process.class.cpp
+++ b/Source/Kernel/TaskManager/Process.class.cpp
@@ -57,6 +57,7 @@ Process* Process::run(String filename, FSNode* cwd, u32int uid) {
 Process::Process(String cmdline, u32int uid) : Ressource(PR_IFACE_OBJTYPE) {
 	addCall0(PR_IFACE_EXIT, (call0)&Process::exitSC);
 	addCall1(PR_IFACE_ALLOCPAGE, (call1)&Process::allocPageSC);
+	addCall1(PR_IFACE_FREEPAGE, (call1)&Process::freePageSC);
 	m_pid = Task::nextPid();
 	m_cmdline = cmdline;
 	m_retval = 0;
@@ -150,3 +151,11 @@ u32int Process::allocPageSC(u32int pos) {
 	m_pagedir->allocFrame(pos, true, true);
 	return 0;
 }
+
+u32int Process::freePageSC(u32int pos) {
+	if (Task::currProcess() != this) return 1;
+	if ((pos & 0x00000FFF) != 0) pos = (pos & 0xFFFFF000) + 0x1000;
+	if (pos >= 0xC0000000) return 1;
+	m_pagedir->freeFrame(pos);
+	return 0;
+}
diff --git a/Source/Kernel/TaskManager/Process.class.h b/Source/Kernel/TaskManager/Process.class.h
index 1b614b7..afdfe20 100644
--- a/Source/Kernel/TaskManager/Process.class.h
+++ b/Source/Kernel/TaskManager/Process.class.h
@@ -5,7 +5,7 @@
 #include <Vector.class.h>
 #include <SimpleList.class.h>
 #include <MemoryManager/PageDirectory.class.h>
-#include <MemoryManager/Heap.class.h>
+#include <Heap.class.h>
 #include <VTManager/VirtualTerminal.proto.h>
 #include <VFS/File.class.h>
 
@@ -72,6 +72,7 @@ class Process : public Ressource {
 	//System calls
 	u32int exitSC();
 	u32int allocPageSC(u32int);
+	u32int freePageSC(u32int);
 };
 
 #endif
diff --git a/Source/Kernel/TaskManager/Task.wtf.asm b/Source/Kernel/TaskManager/Task.wtf.asm
index 36c1ade..9f27bec 100644
--- a/Source/Kernel/TaskManager/Task.wtf.asm
+++ b/Source/Kernel/TaskManager/Task.wtf.asm
@@ -9,13 +9,6 @@ idle_task:
 	hlt
 	jmp idle_task
 
-[GLOBAL atomic_exchange]
-atomic_exchange:
-   mov ecx, [esp+4]		; Get lock address
-   mov eax, [esp+8]		; Get new value
-   xchg eax, [ecx]		; Old value goes in eax
-   ret
-
 [GLOBAL copy_page_physical]
 copy_page_physical:
    push ebx              ; According to __cdecl, we must preserve the contents of EBX.