summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-12-18 16:27:47 +0100
committerAlexis211 <alexis211@gmail.com>2009-12-18 16:27:47 +0100
commitb2e3fc19bdad4c4d5c650e9ca759883db54b2e41 (patch)
treea2003dd1d8ce2b35d22283316d370c4fb25c9995
parent437e65ecbdedd07105254b1b5e6a41d191a794a3 (diff)
downloadMelon-b2e3fc19bdad4c4d5c650e9ca759883db54b2e41.tar.gz
Melon-b2e3fc19bdad4c4d5c650e9ca759883db54b2e41.zip
Revert "Revert "Nothing, really""
This reverts commit 260347c06637f15ea93c6ad99bce4420a28bae6b.
-rw-r--r--HDD.imgbin20643840 -> 20643840 bytes
-rw-r--r--Source/Library/Userland/Start.cpp3
2 files changed, 2 insertions, 1 deletions
diff --git a/HDD.img b/HDD.img
index f795818..abdd430 100644
--- a/HDD.img
+++ b/HDD.img
Binary files differ
diff --git a/Source/Library/Userland/Start.cpp b/Source/Library/Userland/Start.cpp
index 0c25491..f1d1771 100644
--- a/Source/Library/Userland/Start.cpp
+++ b/Source/Library/Userland/Start.cpp
@@ -13,13 +13,14 @@ VirtualTerminal invt(0), outvt(0);
int main(const Vector<String>& args);
extern "C" void start() {
+ heap.create(0x40000000, 0x00040000, 0x00004000); //Initially create a 256ko heap with 16ko index
+
//Call static constructors
u32int i = 0;
for(u32int * call = &start_ctors; call < &end_ctors; call++) {
((void (*)(void))*call)();
}
- heap.create(0x40000000, 0x00040000, 0x00004000); //Initially create a 256ko heap with 16ko index
invt = VirtualTerminal::getIn(); outvt = VirtualTerminal::getOut();
if (!invt.valid()) threadFinishedSyscall(1);
if (!outvt.valid()) threadFinishedSyscall(2);