Merge pull request #1711 from YosysHQ/cat/wasm-exception-cleanup

Remove Wasm exception handling workarounds

CMakeLists.txt

@@ -108,13 +108,6 @@ endif()
 
 if (WASI)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lwasi-emulated-mman")
-    add_definitions(
-        -DBOOST_EXCEPTION_DISABLE
-        -DBOOST_NO_EXCEPTIONS
-    )
-    if (NOT Threads_FOUND)
-        add_definitions(-DBOOST_NO_CXX11_HDR_MUTEX)
-    endif()
 endif()
 
 if (STATIC_BUILD)

common/kernel/command.cc

@@ -736,7 +736,7 @@ int CommandHandler::exec()
 {
     try {
         if (!parseOptions())
-            return -1;
+            return 125;
 
         if (executeBeforeContext())
             return 0;
@@ -752,7 +752,7 @@ int CommandHandler::exec()
         return rc;
     } catch (log_execution_error_exception) {
         printFooter();
-        return -1;
+        return 125;
     }
 }
 

common/kernel/nextpnr.cc

@@ -16,20 +16,3 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-
-#if defined(__wasm)
-#include <exception>
-#include <typeinfo>
-#include "log.h"
-
-extern "C" {
-// FIXME: WASI does not currently support exceptions.
-void *__cxa_allocate_exception(size_t thrown_size) throw() { return malloc(thrown_size); }
-bool __cxa_uncaught_exception() throw();
-void __cxa_throw(void *thrown_exception, struct std::type_info *tinfo, void (*dest)(void *)) { std::terminate(); }
-}
-
-namespace boost {
-void throw_exception(std::exception const &e) { NEXTPNR_NAMESPACE::log_error("boost::exception(): %s\n", e.what()); }
-} // namespace boost
-#endif