Merge pull request #10 from YosysHQ/yosys-experimental

Integrate write_cex and cexinfo and some fixes in write_cex output code

3 files changed, 16 insertions, 0 deletions

diff --git a/src/sat/bsat2/Alloc.h b/src/sat/bsat2/Alloc.h
index 7f506cb5..9a65cf0c 100644
--- a/src/sat/bsat2/Alloc.h
+++ b/src/sat/bsat2/Alloc.h
@@ -97,7 +97,11 @@ void RegionAllocator<T>::capacity(uint32_t min_cap)
         cap += delta;
 
         if (cap <= prev_cap)
+#ifdef __wasm
+            abort();
+#else
             throw OutOfMemoryException();
+#endif
     }
     // printf(" .. (%p) cap = %u\n", this, cap);
 
@@ -119,7 +123,11 @@ RegionAllocator<T>::alloc(int size)
     
     // Handle overflow:
     if (sz < prev_sz)
+#ifdef __wasm
+        abort();
+#else
         throw OutOfMemoryException();
+#endif
 
     return prev_sz;
 }
diff --git a/src/sat/bsat2/Vec.h b/src/sat/bsat2/Vec.h
index f0e07d01..5eea6174 100644
--- a/src/sat/bsat2/Vec.h
+++ b/src/sat/bsat2/Vec.h
@@ -97,7 +97,11 @@ void vec<T>::capacity(int min_cap) {
     if (cap >= min_cap) return;
     int add = imax((min_cap - cap + 1) & ~1, ((cap >> 1) + 2) & ~1);   // NOTE: grow by approximately 3/2
     if (add > INT_MAX - cap || (((data = (T*)::realloc(data, (cap += add) * sizeof(T))) == NULL) && errno == ENOMEM))
+#ifdef __wasm
+        abort();
+#else
         throw OutOfMemoryException();
+#endif
  }
 
 
diff --git a/src/sat/bsat2/XAlloc.h b/src/sat/bsat2/XAlloc.h
index 1da17602..33741e33 100644
--- a/src/sat/bsat2/XAlloc.h
+++ b/src/sat/bsat2/XAlloc.h
@@ -34,7 +34,11 @@ static inline void* xrealloc(void *ptr, size_t size)
 {
     void* mem = realloc(ptr, size);
     if (mem == NULL && errno == ENOMEM){
+#ifdef __wasm
+        abort();
+#else
         throw OutOfMemoryException();
+#endif
     }else
         return mem;
 }