Merge master into release/2

--HG--
branch : release

.gitignore

@@ -1,6 +1,6 @@
-test/test-reports/
-test/*.test
-test/runtest
+TEST-*.xml
+test_*.exec
+runtest
 libvm68k.la
 libvm68kapi.la
 remove-potcdate.sed
@@ -14,19 +14,19 @@ config.h.in
 configure
 aclocal.m4
 stamp-*
-**/Debug/
-**/Release/
-**/LibrarySupport/
-**/.libs/
-**/.deps/
-**/nbproject/private/
-**/_build/
+Debug
+Release
+.libs
+.deps
+LibrarySupport
+_build
 *@quot.po
 *@boldquot.po
 *.insert-header
 *.gmo
 *.trs
 *.log
+*.pc
 *.lo
 *.o
 *.tvsconfig

.hgignore

@@ -1,7 +1,7 @@
 syntax: regexp
-^test/test-reports/
-^test/[^/]*\.test$
-^test/runtest$
+(^|/)TEST-[^/]*\.xml$
+(^|/)test_[^/]*\.exec$
+(^|/)runtest$
 (^|/)libvm68k\.la$
 (^|/)libvm68kapi\.la$
 (^|/)remove-potcdate\.sed$
@@ -15,19 +15,19 @@ syntax: regexp
 (^|/)configure$
 (^|/)aclocal\.m4$
 (^|/)stamp-[^/]*$
-(^|/)Debug/
-(^|/)Release/
-(^|/)LibrarySupport/
-(^|/)\.libs/
-(^|/)\.deps/
-(^|/)nbproject/private/
-(^|/)_build/
+(^|/)Debug$
+(^|/)Release$
+(^|/)\.libs$
+(^|/)\.deps$
+(^|/)LibrarySupport$
+(^|/)_build$
 @quot\.po$
 @boldquot\.po$
 \.insert-header$
 \.gmo$
 \.trs$
 \.log$
+\.pc$
 \.lo$
 \.o$
 \.tvsconfig$

.hgtags

@@ -0,0 +1 @@
+0b9aff908790e0dc941587209eb3a9ce1057004e release/2-alpha.1

.vscode/c_cpp_properties.json

@@ -1,11 +1,12 @@
 {
     "configurations": [
         {
-            "name": "POSIX",
+            "name": "POSIX (GCC)",
+            "compilerPath": "/usr/bin/gcc",
             "includePath": [
                 "${workspaceFolder}",
                 "${workspaceFolder}/libvm68kapi",
-                "${workspaceFolder}/src"
+                "${workspaceFolder}/libvm68k"
             ],
             "defines": [
                 "HAVE_CONFIG_H"

.vscode/tasks.json

@@ -8,10 +8,7 @@
             "args": [
                 "check"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": [
                 "$gcc"
             ]
@@ -24,7 +21,7 @@
                 "clean",
                 "check"
             ],
-            "group": "build",
+            "group": "none",
             "problemMatcher": [
                 "$gcc"
             ]

Makefile.am

@@ -1,14 +1,11 @@
 ## Process this file with automake to produce Makefile.in.
 
-# Uses foreign for now.
-AUTOMAKE_OPTIONS = foreign
-
 ACLOCAL_AMFLAGS = -Im4
 
-SUBDIRS = config libvm68kapi src test
-
 EXTRA_DIST = libvm68k.groupproj
 
+SUBDIRS = libvm68kapi libvm68k test
+
 dist-hook: $(distdir)/SHA256SUMS
 	if test -n "$$GPG_USERNAME"; then \
 	    gpg -ba -u "$$GPG_USERNAME" $(distdir)/SHA256SUMS; \

azure-pipelines.yml

@@ -6,7 +6,7 @@
 # this notice are preserved.  This file is offered as-is, without any warranty.
 ---
 variables:
-  package.distName: libvm68k-2-alpha.1
+  package.distName: libvm68k-2-alpha.2
 trigger:
   - master
   - release/*
@@ -34,7 +34,7 @@ stages:
                   libcppunit-dev
             displayName: Install build dependencies
           - bash: |
-              autoreconf --install
+              autoreconf
             displayName: Bootstrap
           - bash: |
               ./configure --disable-static

configure.ac

@@ -1,29 +1,25 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.69])
-AC_INIT([libvm68k], [2-alpha.1],
-[https://bitbucket.org/vx68k/libvm68k/issues/new],,
+AC_INIT([libvm68k], [2-alpha.2],
+[https://bitbucket.org/kazssym/libvm68k/issues/new],,
 [https://www.vx68k.org/vx68k/libvm68k])
-AC_CONFIG_SRCDIR([src/context.cpp])
+AC_CONFIG_SRCDIR([libvm68k/context.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([no-define])
-LT_INIT
-
+LT_PREREQ([2.4.6])
+LT_INIT()
+AM_INIT_AUTOMAKE([foreign no-define tar-ustar])
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
-
 # Checks for libraries.
-
 # Checks for header files.
-
 # Checks for typedefs, structures, and compiler characteristics.
-
 # Checks for library functions.
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit=yes])
 AM_CONDITIONAL([CPPUNIT], [test "$no_cppunit" != yes])
-
-AC_CONFIG_FILES([Makefile config/Makefile libvm68kapi/Makefile
-src/Makefile test/Makefile])
+# Configuration actions.
+AC_CONFIG_FILES([Makefile libvm68kapi/Makefile libvm68k/Makefile
+test/Makefile])
 AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

libvm68k/Makefile.am

@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in.
+
+AM_CPPFLAGS = -I$(top_srcdir)/config \
+-I$(top_srcdir)/libvm68kapi -I$(top_builddir)/libvm68kapi
+
+pkgconfigdir = $(libdir)/pkgconfig
+
+lib_LTLIBRARIES = libvm68k.la
+
+EXTRA_DIST = vm68k.pc.in vm68k.cbproj ModelSupport_vm68k
+
+pkgconfig_DATA = vm68k.pc
+
+libvm68k_la_LDFLAGS = -version-info 1:0:0
+libvm68k_la_SOURCES = context.cpp
+EXTRA_libvm68k_la_SOURCES = win32dll.cpp
+
+nobase_include_HEADERS = \
+bits/vm68kcore.h bits/vm68k/register.h bits/vm68k/context.h
+noinst_HEADERS = vm68kPCH1.h
+
+CLEANFILES = $(pkgconfig_DATA)
+
+vm68k.pc: $(srcdir)/vm68k.pc.in $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
+
+installcheck-local:
+	if test -n '$(PKG_CONFIG)'; then \
+	    export PKG_CONFIG_PATH=$(pkgconfigdir); \
+	    $(PKG_CONFIG) --exists --exact-version=$(VERSION) vm68k; \
+	fi

libvm68k/vm68k.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: vm68k
+Description: libvm68k
+Version: @VERSION@
+Requires.private: vm68kapi
+Cflags: -I${includedir}
+Libs: -L${libdir} -lvm68k

libvm68kapi/Makefile.am

@@ -1,12 +1,29 @@
 ## Process this file with automake to produce Makefile.in.
 
-AM_CPPFLAGS =
+AM_CPPFLAGS = -D_VM68K_API_LIBRARY
+
+pkgconfigdir = $(libdir)/pkgconfig
 
 lib_LTLIBRARIES = libvm68kapi.la
 
+EXTRA_DIST = vm68kapi.pc.in
+
+pkgconfig_DATA = vm68kapi.pc
+
 nobase_include_HEADERS = vm68k/data vm68k/memory \
 bits/vm68kapi.h bits/vm68k/data.h bits/vm68k/memory.h \
 bits/vm68k/virtual_machine.h
 
 libvm68kapi_la_LDFLAGS = -version-info 1:0:0
 libvm68kapi_la_SOURCES = data.cpp memory.cpp virtual_machine.cpp
+
+CLEANFILES = $(pkgconfig_DATA)
+
+vm68kapi.pc: $(srcdir)/vm68kapi.pc.in $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status --file=$(subdir)/$@
+
+installcheck-local:
+	if test -n '$(PKG_CONFIG)'; then \
+	    export PKG_CONFIG_PATH=$(pkgconfigdir); \
+	    $(PKG_CONFIG) --exists --exact-version=$(VERSION) vm68kapi; \
+	fi

libvm68kapi/bits/vm68k/data.h

@@ -28,7 +28,7 @@ namespace vm68k
     /// Byte (8-bit-wide) data.
     ///
     /// This type is trivial and standard-layout.
-    class _VM68KAPI_PUBLIC byte
+    class _VM68K_API_PUBLIC byte
     {
     public:
         using int_type = std::int8_t;
@@ -89,7 +89,7 @@ namespace vm68k
     /// Word (16-bit-wide) data.
     ///
     /// This type is trivial and standard-layout.
-    class _VM68KAPI_PUBLIC word
+    class _VM68K_API_PUBLIC word
     {
     public:
         using int_type = std::int16_t;
@@ -152,7 +152,7 @@ namespace vm68k
     /// Long word (32-bit-wide) data.
     ///
     /// This type is trivial and standard-layout.
-    class _VM68KAPI_PUBLIC long_word
+    class _VM68K_API_PUBLIC long_word
     {
     public:
         using int_type = std::int32_t;

libvm68kapi/bits/vm68k/memory.h

@@ -30,7 +30,7 @@ namespace vm68k
      * <author>Kaz Nishimura</author>
      * <since>2.0</since>
      */
-    class _VM68KAPI_PUBLIC memory
+    class _VM68K_API_PUBLIC memory
     {
     public:
         enum mode
@@ -76,7 +76,7 @@ namespace vm68k
     };
 
     /// Read-write memory.
-    class _VM68KAPI_PUBLIC read_write_memory : public memory
+    class _VM68K_API_PUBLIC read_write_memory : public memory
     {
         using inherited = memory;
 
@@ -123,7 +123,7 @@ namespace vm68k
      * <author>Kaz Nishimura</author>
      * <since>2.0</since>
      */
-    class _VM68KAPI_PUBLIC memory_map
+    class _VM68K_API_PUBLIC memory_map
     {
     public:
         using mode = memory::mode;
@@ -152,7 +152,7 @@ namespace vm68k
             const void *bytes) = 0;
     };
 
-    class _VM68KAPI_PUBLIC memory_exception : public std::exception {
+    class _VM68K_API_PUBLIC memory_exception : public std::exception {
         typedef std::exception inherited;
 
     public:
@@ -167,7 +167,7 @@ namespace vm68k
         memory_map::address_type _error_address;
     };
 
-    class _VM68KAPI_PUBLIC bus_error : public memory_exception {
+    class _VM68K_API_PUBLIC bus_error : public memory_exception {
         typedef memory_exception inherited;
 
     public:
@@ -177,7 +177,7 @@ namespace vm68k
         const char *what() const noexcept override;
     };
 
-    class _VM68KAPI_PUBLIC address_error : public memory_exception {
+    class _VM68K_API_PUBLIC address_error : public memory_exception {
         typedef memory_exception inherited;
 
     public:

libvm68kapi/bits/vm68k/virtual_machine.h

@@ -26,7 +26,7 @@
 namespace vm68k
 {
     /// Abstract device.
-    class _VM68KAPI_PUBLIC device
+    class _VM68K_API_PUBLIC device
     {
     protected:
         device();
@@ -43,7 +43,7 @@ namespace vm68k
     };
 
     /// Virtual machine.
-    class _VM68KAPI_PUBLIC virtual_machine
+    class _VM68K_API_PUBLIC virtual_machine
     {
     private:
         std::shared_ptr<memory_map> _memory_map;

libvm68kapi/bits/vm68kapi.h

@@ -19,24 +19,24 @@
 #ifndef _VM68KAPI_H
 #define _VM68KAPI_H 1
 
-#ifndef _VM68KAPI_PUBLIC
+#ifndef _VM68K_API_PUBLIC
 #if _WIN32
 #if VM68KAPI_DLL
-#define _VM68KAPI_PUBLIC __declspec(dllexport)
+#define _VM68K_API_PUBLIC __declspec(dllexport)
 #else
-#define _VM68KAPI_PUBLIC __declspec(dllimport)
+#define _VM68K_API_PUBLIC __declspec(dllimport)
 #endif
 #else /* !_WIN32 */
 #if defined __has_attribute
 #if __has_attribute(visibility)
-#define _VM68KAPI_PUBLIC __attribute__((visibility("default")))
+#define _VM68K_API_PUBLIC __attribute__((visibility("default")))
 #endif
 #endif /* defined __has_attribute */
 #endif /* !_WIN32 */
 #endif
 
-#ifndef _VM68KAPI_PUBLIC
-#define _VM68KAPI_PUBLIC
+#ifndef _VM68K_API_PUBLIC
+#define _VM68K_API_PUBLIC
 #endif
 
 #endif