Convert the C++ support to use exceptions for "proper" language support.

apps/hello_cpp/hello_cpp.cpp

@@ -34,10 +34,11 @@ class HelloBuf : public AbstractHello {
     }
 };
 
-extern "C" void c_main() {
+void cpp_main() {
     AbstractHello *hellos[] = {
 	new HelloSDP(), new HelloSDRAM(), new HelloBuf()
     };
+
     for (AbstractHello *hello : hellos) {
         hello->hello("Hello world from C++!");
     }

include/sark_cpp.h

@@ -7,38 +7,46 @@ extern "C"
 #include <cstdlib>
 #include <new>
 
-inline void* operator new (size_t size) noexcept {
-    void *p = sark_alloc(1, size);
-    while (p == nullptr) {
-	rt_error(RTE_SWERR);
+inline void* operator new (size_t size) {
+    void *ptr = sark_alloc(1, size);
+    if (ptr == nullptr) {
+	throw std::bad_alloc();
     }
-    return p;
+    return ptr;
 }
 
-inline void operator delete (void *p) noexcept {
-    sark_free(p);
+inline void operator delete (void *ptr) noexcept {
+    if (ptr != nullptr) {
+	sark_free(ptr);
+    }
 }
 
-inline void* operator new [](size_t size) noexcept {
-    return operator new (size); // Same as regular new
+inline void* operator new [](size_t size) {
+    void *ptr = sark_alloc(1, size);
+    if (ptr == nullptr) {
+	throw std::bad_alloc();
+    }
+    return ptr;
 }
 
-inline void operator delete [](void *p) noexcept {
-    operator delete (p); // Same as regular delete
+inline void operator delete [](void *ptr) noexcept {
+    operator delete (ptr); // Same as regular delete
 }
 
 inline void* operator new (size_t size, std::nothrow_t) noexcept {
     return sark_alloc(1, size);
 }
 
-inline void operator delete (void *p,  std::nothrow_t) noexcept {
-    operator delete (p); // Same as regular delete
+inline void operator delete (void *ptr, std::nothrow_t) noexcept {
+    operator delete (ptr); // Same as regular delete
 }
 
-inline void* operator new [](size_t size, std::nothrow_t) noexcept {
+inline void* operator new [](size_t size, std::nothrow_t nothrow) noexcept {
     return sark_alloc(1, size);
 }
 
-inline void operator delete [](void *p,  std::nothrow_t) noexcept {
-    operator delete (p); // Same as regular delete
+inline void operator delete [](void *ptr, std::nothrow_t nothrow) noexcept {
+    operator delete (ptr); // Same as regular delete
 }
+
+extern void cpp_main(void);

make/Makefile.common

@@ -52,7 +52,7 @@ ifeq ($(GNU),1)
     # GNU Compiler (gcc) settings
     AS := $(GP)-as --defsym GNU=1 -mthumb-interwork -march=armv5te
     CC_NO_THUMB  := $(GP)-gcc -c -mthumb-interwork -march=armv5te -std=gnu99 -ffreestanding -I $(SPINN_INC_DIR)
-    CXX_NO_THUMB := $(GP)-gcc -c -mthumb-interwork -march=armv5te -std=c++11 -ffreestanding -I $(SPINN_INC_DIR) -fno-rtti -fno-exceptions
+    CXX_NO_THUMB := $(GP)-gcc -c -mthumb-interwork -march=armv5te -std=c++11 -ffreestanding -I $(SPINN_INC_DIR) -fno-rtti
     CC_THUMB  := $(CC_NO_THUMB) -mthumb -DTHUMB
     CXX_THUMB := $(CXX_NO_THUMB) -mthumb -DTHUMB
 
@@ -78,7 +78,7 @@ else
     # ARM Compiler settings
     AS := armasm --keep --cpu=5te --apcs interwork
     CC_NO_THUMB := armcc -c --c99 --cpu=5te --apcs interwork --min_array_alignment=4 -I $(SPINN_INC_DIR)
-    CXX_NO_THUMB := armcc -c --cpp11 --cpu=5te --apcs interwork --min_array_alignment=4 -I $(SPINN_INC_DIR) --no_rtti --no_exceptions
+    CXX_NO_THUMB := armcc -c --cpp11 --cpu=5te --apcs interwork --min_array_alignment=4 -I $(SPINN_INC_DIR) --no_rtti
     CC_THUMB := $(CC_NO_THUMB) --thumb -DTHUMB
     CXX_THUMB := $(CXX_NO_THUMB) --thumb -DTHUMB
 

sark/Makefile

@@ -81,11 +81,14 @@ endif
 
 #-------------------------------------------------------------------------------
 
-# SARK C sources
+# SARK C and C++ sources
 
 $(BUILD_DIR)/%.o: %.c $(SPINN_INC_DIR)/spinnaker.h $(SPINN_INC_DIR)/sark.h $(SPINN_INC_DIR)/spin1_api.h
 	$(CC_THUMB) $(CFLAGS) -o $@ $<
 
+$(BUILD_DIR)/%.o: %.cpp $(SPINN_INC_DIR)/spinnaker.h $(SPINN_INC_DIR)/sark.h $(SPINN_INC_DIR)/spin1_api.h
+	$(CXX_THUMB) $(CFLAGS) -o $@ $<
+
 $(BUILD_DIR)/sark_isr.o: sark_isr.c $(SPINN_INC_DIR)/spinnaker.h $(SPINN_INC_DIR)/sark.h $(SPINN_INC_DIR)/spin1_api.h
 	$(CC) $(CFLAGS) -o $@ $<
 

sark/sark_cpp.cpp

@@ -0,0 +1,18 @@
+#include <sark_cpp.h>
+
+extern "C" void __cxa_pure_virtual() {
+    io_printf(IO_BUF, "Pure Virtual Function called");
+    rt_error(RTE_SWERR);
+}
+
+extern "C" void c_main(void) {
+    try {
+	cpp_main();
+    } catch (const std::exception &e) {
+	io_printf(IO_BUF, "uncaught exception: %s", e.what());
+	rt_error(RTE_SWERR);
+    } catch (...) {
+	io_printf(IO_BUF, "unexpected non-standard exception");
+	rt_error(RTE_SWERR);
+    }
+}