More work on syscalls

7 files changed, 44 insertions, 1 deletions

diff --git a/Source/Kernel/MemoryManager/Mem.ns.cpp b/Source/Kernel/MemoryManager/Mem.ns.cpp
index c7f07f0..144b9f3 100644
--- a/Source/Kernel/MemoryManager/Mem.ns.cpp
+++ b/Source/Kernel/MemoryManager/Mem.ns.cpp
@@ -1,5 +1,6 @@
 #include <common.h>
 #include <MemoryManager/PhysMem.ns.h>
+#include <TaskManager/Task.ns.h>
 #include <Heap.class.h>
 
 namespace Mem {
@@ -50,6 +51,10 @@ void free(void *ptr) {
 	kheap.free(ptr);
 }
 
+void* mkXchgSpace(u32int sz) {
+	return Task::currThread()->mkXchgSpace(sz);
+}
+
 u32int kheapSize() {
 	return kheap.size();
 }
diff --git a/Source/Kernel/MemoryManager/Mem.ns.h b/Source/Kernel/MemoryManager/Mem.ns.h
index 0d2b1da..b06ab79 100644
--- a/Source/Kernel/MemoryManager/Mem.ns.h
+++ b/Source/Kernel/MemoryManager/Mem.ns.h
@@ -11,6 +11,8 @@ namespace Mem {
 	void *alloc(u32int sz, bool align = false);
 	void free(void *ptr);
 
+	void* mkXchgSpace(u32int sz);	//This creates a space between userland and kernel land where data can be exchanged
+
 	u32int kheapSize(), kheapFree();
 }
 
diff --git a/Source/Kernel/TaskManager/Thread.class.cpp b/Source/Kernel/TaskManager/Thread.class.cpp
index 315eae2..98fa32d 100644
--- a/Source/Kernel/TaskManager/Thread.class.cpp
+++ b/Source/Kernel/TaskManager/Thread.class.cpp
@@ -52,6 +52,7 @@ void runThread(Thread* thread, void* data, thread_entry_t entry_point) {
 }
 
 Thread::Thread() : Ressource(TH_IFACE_OBJTYPE) {	//Private constructor, does nothing
+	m_xchgspace = 0;
 }
 
 Thread::Thread(thread_entry_t entry_point, void* data, bool iskernel) : Ressource(TH_IFACE_OBJTYPE) {
@@ -69,10 +70,13 @@ Thread::Thread(Process* process, thread_entry_t entry_point, void* data) : Resso
 Thread::~Thread() {
 	Task::unregisterThread(this);
 	Mem::free(m_kernelStack.addr);
+	m_process->getPagedir()->switchTo();
 	if (m_userStack.addr != 0) {
-		m_process->getPagedir()->switchTo();
 		m_process->heap().free(m_userStack.addr);
 	}
+	if (m_xchgspace != 0) {
+		m_process->heap().free(m_xchgspace);
+	}
 	//Don't unregister thread in process, it has probably already been done
 }
 
@@ -80,6 +84,7 @@ void Thread::setup(Process* process, thread_entry_t entry_point, void* data, boo
 	addCall1(TH_IFACE_SLEEP, (call1)&Thread::sleepSC);
 	addCall1(TH_IFACE_FINISH, (call1)&Thread::finishSC);
 
+	m_xchgspace = 0;
 	m_isKernel = isKernel;
 	m_process = process;
 	m_kernelStack.addr = Mem::alloc(STACKSIZE);
@@ -181,6 +186,12 @@ u32int Thread::getEip() { return m_eip; }
 
 Process* Thread::getProcess() { return m_process; }
 
+void* Thread::mkXchgSpace(u32int sz) {
+	if (m_xchgspace != 0) m_process->heap().free(m_xchgspace);
+	m_xchgspace = m_process->heap().alloc(sz);
+	return m_xchgspace;
+}
+
 void Thread::sleep(u32int msecs) {
 	m_state = T_SLEEPING;
 	waitfor.m_time = Time::time() + msecs;
diff --git a/Source/Kernel/TaskManager/Thread.class.h b/Source/Kernel/TaskManager/Thread.class.h
index 8a7d45e..42baa86 100644
--- a/Source/Kernel/TaskManager/Thread.class.h
+++ b/Source/Kernel/TaskManager/Thread.class.h
@@ -22,6 +22,8 @@ class Thread : public Ressource {
 	u32int m_esp, m_ebp, m_eip;
 	u8int m_state;	//Is one of T_* defined above
 
+	void* m_xchgspace;
+
 	union {		//What the thread might be waiting for
 		u32int m_time;
 		u8int m_irq;		//An IRQ number
@@ -49,6 +51,8 @@ class Thread : public Ressource {
 	u32int getEip();
 	Process* getProcess();
 
+	void* mkXchgSpace(u32int sz);
+
 	void sleep(u32int msecs);
 	void waitIRQ(u8int irq);
 	bool runnable();	//Called by scheduler
diff --git a/Source/Kernel/VTManager/VirtualTerminal-sc.proto.cpp b/Source/Kernel/VTManager/VirtualTerminal-sc.proto.cpp
index 8948657..e0c6e8d 100644
--- a/Source/Kernel/VTManager/VirtualTerminal-sc.proto.cpp
+++ b/Source/Kernel/VTManager/VirtualTerminal-sc.proto.cpp
@@ -5,7 +5,22 @@ u32int VirtualTerminal::writeHexSC(u32int number) {
 	return 0;
 }
 
+u32int VirtualTerminal::writeSC(u32int wat) {
+	write(String::unserialize(wat));
+	return 0;
+}
+
+u32int VirtualTerminal::writeDecSC(u32int n_hi, u32int n_lo) {
+	s64int n = ((u64int)n_hi << 32) | n_lo;
+	writeDec(n);
+	return 0;
+}
+
 u32int VirtualTerminal::putSC(u32int code) {
 	put(WChar(code));
 	return 0;
 }
+
+u32int VirtualTerminal::readLineSC() {
+	return readLine().serialize();
+}
diff --git a/Source/Kernel/VTManager/VirtualTerminal.proto.cpp b/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
index b7c7340..dfd8f84 100644
--- a/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
+++ b/Source/Kernel/VTManager/VirtualTerminal.proto.cpp
@@ -7,7 +7,10 @@
 VirtualTerminal::VirtualTerminal() : 
 	Ressource(VT_IFACE_OBJTYPE), m_kbdMutex(false), m_kbdbuffMutex(false), m_kbdbuff() {
 	addCall1(VT_IFACE_WRITEHEX, (call1)&VirtualTerminal::writeHexSC);
+	addCall2(VT_IFACE_WRITEDEC, (call2)&VirtualTerminal::writeDecSC);
+	addCall1(VT_IFACE_WRITE, (call1)&VirtualTerminal::writeSC);
 	addCall1(VT_IFACE_PUT, (call1)&VirtualTerminal::putSC);
+	addCall0(VT_IFACE_READLINE, (call0)&VirtualTerminal::readLineSC);
 }
 
 VirtualTerminal::~VirtualTerminal() {
diff --git a/Source/Kernel/VTManager/VirtualTerminal.proto.h b/Source/Kernel/VTManager/VirtualTerminal.proto.h
index b9d0eb8..b0cd224 100644
--- a/Source/Kernel/VTManager/VirtualTerminal.proto.h
+++ b/Source/Kernel/VTManager/VirtualTerminal.proto.h
@@ -21,7 +21,10 @@ class VirtualTerminal : public Ressource {
 
 	//SYSCALLS :
 	u32int writeHexSC(u32int);
+	u32int writeDecSC(u32int, u32int);
+	u32int writeSC(u32int);
 	u32int putSC(u32int);
+	u32int readLineSC();
 
 	public:
 	VirtualTerminal();