Merge pull request #51 from lmntal/develop

Release v2.3.0

Author: icecocoa6

.gitignore

@@ -67,11 +67,13 @@ lib/*.il
 *.lo
 *.la
 src/arch.h
-src/il_lexer.*
-src/il_parser.*
-src/interpret_generated.c
+src/loader/il_lexer.c
+src/loader/il_lexer.h
+src/loader/il_parser.c
+src/loader/il_parser.h
+src/loader/interpret_generated.c
+src/loader/translate_generated.c
 src/slim
-src/translate_generated.c
 src/verifier/nc_lexer.*
 src/verifier/nc_parser.*
 src/verifier/nc_parser.h
@@ -81,3 +83,9 @@ src/utility/.deps
 src/verifier/.deps
 third_party/google-perftools-1.8.3/.deps
 third_party/zdelta-2.1/.deps
+third_party/**/tcmalloc.h
+doc/doxygen/*
+test/**/*.log
+test/**/*.trs
+test/**/*.il
+.dirstamp

Makefile.am

@@ -6,3 +6,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = third_party src lib ext doc test
 DIST_SUBDIRS = $(SUBDIRS)
 DISTCLEANFILES = VERSION arch.h
+
+MOSTLYCLEANFILES = -rf $(DX_CLEANFILES)
+
+@DX_RULES@

NEWS

@@ -1,3 +1,12 @@
+SLIM (2.3.0) -- 2017/03/29
+  * display commit id in version string
+  * test script with TAP
+    + enabled to run tests using `make check`
+  * add doxygen documents
+    + enabled to generate using `make doxygen-doc`
+  * delete TIME_OPT option
+  * refactoring
+
 SLIM (2.2.7) -- 2015/10/31
   * new feature
     + library function str.times

README.md

@@ -1,4 +1,4 @@
-SLIM - slim LMNtal imprementation
+SLIM - slim LMNtal imprementation {#mainpage}
 ===============================
 
 バグ報告は lmntal@ueda.info.waseda.ac.jp までお願いします。

VERSION

@@ -1 +1 @@
-2.2.7
+2.3.0

aclocal.m4

@@ -3,27 +3,31 @@
 # $Id: configure.ac,v 1.13 2008/10/05 11:22:41 riki Exp $
 
 AC_PREREQ(2.61)
-AC_INIT([SLIM], [2.2.7], [lmntal@ueda.info.waseda.ac.jp], [slim])
+AC_INIT([SLIM], [2.3.0], [lmntal@ueda.info.waseda.ac.jp], [slim])
 # AC_REVISION($Revision: 1.13 $)
 # AC_COPYRIGHT (copyright-notice)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADER([src/config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
 
 TCMALLOC_SO_VERSION=2:2:2
 PROFILER_SO_VERSION=1:1:1
 
 AC_SUBST(TCMALLOC_SO_VERSION)
 AC_SUBST(PROFILER_SO_VERSION)
 
+DX_PDF_FEATURE(OFF)
+DX_PS_FEATURE(OFF)
+DX_INIT_DOXYGEN(SLIM, doc/doxygen.cfg, doc/doxygen)
 
 # ----------------------------------------------------------------------
 # Checks for programs.
 #
 
-CFLAGS="-O3 $CFLAGS"
+CFLAGS="-O $CFLAGS"
 CXXFLAGS="-g -O2 -mmmx -msse $CXXFLAGS"
 
 AC_LANG(C)
@@ -36,6 +40,7 @@ AC_PROG_YACC
 AC_PROG_LEX
 AM_PROG_LEX
 AC_PROG_RANLIB
+AC_PROG_AWK
 
 AC_SUBST(CFLAGS)
 AM_CONDITIONAL(GCC, test "$GCC" = "yes")   # let the Makefile know if we're gcc
@@ -60,7 +65,6 @@ default_enable_devel=no
 default_enable_debug=no
 default_enable_gprof=no
 default_enable_profile=no
-default_enable_timeopt=yes
 default_enable_jni=no
 default_enable_tcmalloc=yes
 default_enable_minmax=no
@@ -100,12 +104,6 @@ AC_ARG_ENABLE([profile],
               [],
               [enable_profile="$default_enable_profile"])
 
-AC_ARG_ENABLE([time_opt],
-              [AS_HELP_STRING([--enable-time-opt],
-                              [turn on optimization for runtime performance (default yes)])],
-              [],
-              [enable_time_opt="$default_enable_timeopt"])
-
 AC_ARG_ENABLE([jni],
               [AS_HELP_STRING([--enable-jni],
                               [turn on using jni interactive mode (default no)])],
@@ -176,14 +174,6 @@ else
   AC_MSG_RESULT([enable profile: no])
 fi
 
-# optimization for runtime performance
-if test "$enable_time_opt" = "no"; then
-  AC_MSG_RESULT([enable time-opt: no])
-else
-  AC_MSG_RESULT([enable time-opt: yes])
-  AC_DEFINE([TIME_OPT], 1, [enable timeopt])
-fi
-
 # jni
 if test "$enable_jni" = "yes"; then
   AC_MSG_RESULT([enable jni: yes])
@@ -250,7 +240,7 @@ AC_C_CHAR_UNSIGNED
 #AC_TYPE_INT32_T
 #AC_TYPE_INT64_T
 #AC_TYPE_INTMAX_T
-#AC_TYPE_INTPTR_T
+AC_TYPE_INTPTR_T
 AC_TYPE_LONG_DOUBLE
 # AC_TYPE_LONG_DOUBLE_WIDER
 # AC_TYPE_LONG_LONG_INT
@@ -262,11 +252,13 @@ AC_TYPE_LONG_DOUBLE
 #AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 #AC_TYPE_UINTMAX_T
-# AC_TYPE_UINTPTR_T
+AC_TYPE_UINTPTR_T
 # AC_TYPE_UNSIGNED_LONG_LONG_INT
 
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(void*)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(uintptr_t)
 
 
 # ----------------------------------------------------------------------
@@ -890,13 +882,17 @@ echo $SLIM_VERSION > VERSION
 AC_OUTPUT(Makefile \
           src/Makefile \
           src/genconfig \
+          src/element/Makefile \
+          src/loader/Makefile \
           src/verifier/Makefile \
-          src/utility/Makefile \
           src/test/Makefile \
+          src/vm/Makefile \
+          src/ffi/Makefile \
           lib/Makefile \
           ext/Makefile \
           test/Makefile \
           test/system_check/Makefile \
+          test/statespace/Makefile \
           third_party/Makefile \
           third_party/zdelta-2.1/Makefile \
           third_party/google-perftools-1.8.3/Makefile \

configure.ac

@@ -0,0 +1,14 @@
+# Architecture of SLIM
+
+SLIM is composed of several modules.
+Modules loosely depend on each other.
+
+- *element*: contains fundamental data structures and functions.
+- *loader*: contains a parser and an il-C translator.
+- *verifier*: is an implementation of a model checker.
+- *vm*: is an implementation of LMNtal.
+- *ext*: contains extension callbacks for VM.
+- *ffi*: is an interface to access an LMNtal compiler or JNI(Java Native Interface).
+
+**Figure 1: SLIM's Architecture**
+@image html slim_arch.svg