From fe7ee4224bbad362ec33342a584b3130461ab394 Mon Sep 17 00:00:00 2001 From: Faisal K Date: Mon, 18 Sep 2017 00:06:01 -0400 Subject: [PATCH 1/2] Updated command qemu to qemu-system-i386 --- src/sdk/qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdk/qemu.sh b/src/sdk/qemu.sh index 753cf7b..268c789 100755 --- a/src/sdk/qemu.sh +++ b/src/sdk/qemu.sh @@ -1,2 +1,2 @@ #!/bin/bash -qemu -m 1024 -s -hda ./c.img -curses -serial /dev/tty -redir tcp:2323::23 +qemu-system-i386 -m 1024 -s -hda ./c.img -curses -serial /dev/tty -redir tcp:2323::23 From 1900591e2634e8fdf8899b921b267cdf261df3ff Mon Sep 17 00:00:00 2001 From: Faisal K Date: Mon, 18 Sep 2017 00:16:53 -0400 Subject: [PATCH 2/2] Fixes a compilation error for missing delete Fixes missing delete(void*, unsigned int) with no added functionality --- src/kernel/runtime/cxx.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kernel/runtime/cxx.cc b/src/kernel/runtime/cxx.cc index 19c9d01..87cc526 100644 --- a/src/kernel/runtime/cxx.cc +++ b/src/kernel/runtime/cxx.cc @@ -69,7 +69,11 @@ void operator delete(void *ptr) { kfree(ptr); } - +//This function needs to be looked into but for now it allows compilation +void operator delete(void *ptr, unsigned int k) +{ + kfree(ptr); +} #ifndef __arm__ void* operator new(size_t len) {