summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiesh1oo <siesh1oo@siesh1oo.no>2014-03-11 19:44:34 +0100
committerSiesh1oo <siesh1oo@siesh1oo.no>2014-03-11 21:59:20 +0100
commit31eee5c62e631a1156978c0bab657e948e6bd22f (patch)
tree9e1289bca4868794fdd3feb44af9bb719b7a335e
parentc17ee0f6dd5bb6e53ff0bf6da4650972323fc82d (diff)
parent707b46956e7de08ae44ec1d8812fe0393e60457b (diff)
Rebase to cliffordwolf repo HEAD finished.
-rw-r--r--.gitignore1
-rw-r--r--Makefile21
-rw-r--r--kernel/posix_compatibility.cc134
-rw-r--r--kernel/posix_compatibility.h40
4 files changed, 190 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index f251d2b6..77d6e29e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
/qtcreator.creator
/qtcreator.creator.user
/Makefile.conf
+/minisat
/abc
/yosys
/yosys-abc
diff --git a/Makefile b/Makefile
index 9f888c86..ce9a99bc 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ INSTALL_SUDO :=
OBJS =
GENFILES =
EXTRA_TARGETS =
-TARGETS = yosys yosys-config
+TARGETS =
all: top-all
@@ -57,16 +57,18 @@ OBJS = kernel/version_$(GIT_REV).o
ABCREV = 2058c8ccea68
ABCPULL = 1
+MINISATREV = HEAD
+
-include Makefile.conf
ifeq ($(CONFIG),clang-debug)
CXX = clang
-CXXFLAGS += -std=c++11 -Os
+CXXFLAGS += -std=c++11 -g -O0 -Wall
endif
ifeq ($(CONFIG),gcc-debug)
CXX = gcc
-CXXFLAGS += -std=gnu++0x -Os
+CXXFLAGS += -std=gnu++0x -g -O0 -Wall
endif
ifeq ($(CONFIG),release)
@@ -86,8 +88,8 @@ CXXFLAGS += -pg -fno-inline
LDFLAGS += -pg
endif
-ifeq ($(ENABLE_QT4),1)
-TARGETS += yosys-svgviewer
+ifeq ($(ENABLE_MINISAT),1)
+TARGETS += yosys-minisat
endif
ifeq ($(ENABLE_ABC),1)
@@ -101,7 +103,14 @@ CXXFLAGS += $(patsubst %,-I$(VERIFIC_DIR)/%,$(VERIFIC_COMPONENTS)) -D'VERIFIC_DI
LDLIBS += $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VERIFIC_COMPONENTS))
endif
-OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o
+# Build yosys after minisat and abc (we need to access the local copies of the downloaded/installed header files).
+TARGETS += yosys yosys-config
+
+ifeq ($(ENABLE_QT4),1)
+TARGETS += yosys-svgviewer
+endif
+
+OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/posix_compatibility.o
OBJS += libs/bigint/BigIntegerAlgorithms.o libs/bigint/BigInteger.o libs/bigint/BigIntegerUtils.o
OBJS += libs/bigint/BigUnsigned.o libs/bigint/BigUnsignedInABase.o
diff --git a/kernel/posix_compatibility.cc b/kernel/posix_compatibility.cc
new file mode 100644
index 00000000..d3fb0087
--- /dev/null
+++ b/kernel/posix_compatibility.cc
@@ -0,0 +1,134 @@
+/*
+ * yosys -- Yosys Open SYnthesis Suite
+ *
+ * Copyright (C) 2012 Clifford Wolf <clifford@clifford.at>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+/**
+ * POSIX.2008 fake implementation for pre-POSIX.2008 systems. (OSX, BSD, MINGW, CYGWIN, older Linux &c.)
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L)
+typedef struct memstream {
+ off_t pos;
+ off_t size;
+ char * buffer;
+ char ** bufp;
+ size_t * sizep;
+ bool realloc;
+} memstream_t;
+
+static int memstream_read (void * cookie, char * buf, int size)
+{
+ memstream_t * mem = (memstream_t *) cookie;
+ off_t available = mem->size - mem->pos;
+ if (available < 0)
+ available = 0;
+ if (size > available)
+ size = available;
+ memcpy(buf, mem->buffer + mem->pos, size);
+ mem->pos += size;
+ return size;
+}
+
+static int memstream_write (void * cookie, const char * buf, int size)
+{
+ memstream_t * mem = (memstream_t *) cookie;
+ off_t available = mem->size - mem->pos;
+ if (size > available) {
+ if (mem->realloc) {
+ mem->buffer = (char *) realloc(mem->buffer, mem->pos + size + 1);
+ memset(mem->buffer + mem->size, 0, mem->pos + size + 1 - mem->size);
+ mem->size = mem->pos + size;
+ if (mem->bufp)
+ *(mem->bufp) = mem->buffer;
+ if (mem->sizep)
+ *(mem->sizep) = mem->size;
+ } else {
+ size = available;
+ }
+ }
+ memcpy(mem->buffer + mem->pos, buf, sizeof(char) * size);
+ mem->pos += size;
+ return size;
+}
+
+static fpos_t memstream_seek (void * cookie, fpos_t offset, int whence)
+{
+ memstream_t * mem = (memstream_t *) cookie;
+ switch (whence) {
+ case SEEK_SET:
+ if (offset < 0)
+ goto error_inval;
+ mem->pos = offset;
+ return 0;
+ case SEEK_CUR:
+ if (mem->pos + offset < 0)
+ goto error_inval;
+ mem->pos += offset;
+ return 0;
+ case SEEK_END:
+ if (mem->size + offset < 0)
+ goto error_inval;
+ mem->pos = mem->size + offset;
+ break;
+ default:
+ goto error_inval;
+ }
+ return mem->pos;
+error_inval:
+ errno = EINVAL;
+ return -1;
+}
+
+static int memstream_close (void * cookie)
+{
+ memstream_t * mem = (memstream_t *) cookie;
+ if (mem->bufp)
+ *(mem->bufp) = mem->buffer;
+ if (mem->sizep)
+ *(mem->sizep) = mem->size;
+ free(cookie);
+ return 0;
+}
+
+FILE * fmemopen (void * buf, size_t size, const char * mode)
+{
+ memstream_t * mem = (memstream_t *) malloc(sizeof(memstream_t));
+ memset(mem, 0, sizeof(memstream_t));
+ mem->size = size;
+ mem->buffer = (char *) buf;
+ (void) mode;
+ return funopen(mem, memstream_read, memstream_write, memstream_seek, memstream_close);
+}
+
+FILE * open_memstream (char ** bufp, size_t * sizep)
+{
+ memstream_t * mem = (memstream_t *) malloc(sizeof(memstream_t));
+ memset(mem, 0, sizeof(memstream_t));
+ mem->bufp = bufp;
+ mem->sizep = sizep;
+ mem->realloc = true;
+ return funopen(mem, memstream_read, memstream_write, memstream_seek, memstream_close);
+}
+
+#endif
+
diff --git a/kernel/posix_compatibility.h b/kernel/posix_compatibility.h
new file mode 100644
index 00000000..d6eaade0
--- /dev/null
+++ b/kernel/posix_compatibility.h
@@ -0,0 +1,40 @@
+/*
+ * yosys -- Yosys Open SYnthesis Suite
+ *
+ * Copyright (C) 2012 Clifford Wolf <clifford@clifford.at>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef POSIX_COMPATIBILITY_H
+#define POSIX_COMPATIBILITY_H
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if !(_XOPEN_SOURCE >= 700 || _POSIX_C_SOURCE >= 200809L)
+FILE * open_memstream (char ** bufp, size_t * sizep);
+FILE * fmemopen (void * buf, size_t size, const char * mode);
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
+