Windows XP build

[Vort]

I decided to try building Windows XP compatible Bochs binary with Windows XP.
In short, result was successful: Bochs-win32-2.8.devel-xp.zip.

To make such build, I used Windows XP compatible MSYS2 environment, msys2-i686-20160205.exe.
Proper installation of MSYS2 may require hunting for old .pkg.tar.xz files, but I had them already installed in my system.

There were several problems with this build.
Some of them worth fixing in master branch for sure.

1. Static link for niclist.exe. Newer compliers make binary without extra dependencies, but not this one. (worth fixing in master)
2. Building of libsoftfloat.a did not quoted CXX variable, which can contain two parts separated by spaces. (worth fixing in master)
3. bochs.nsi build resulted in Error: Can't change target charset after data already got compressed or header already changed! error with nsis-3.04-setup.exe.
4. cpu/call_far.cc have mismatched BX_CPP_AttrRegparmN attribute. (worth fixing in master)
5. #include <iphlpapi.h> for some reason requires #include <wincrypt.h> (otherwise msys32/mingw32/i686-w64-mingw32/include/mprapi.h:865:3: error: 'CERT_NAME_BLOB' does not name a type error appear).
6. Windows XP have no inet_ntop and inet_pton functions. I took them from PlibC.
7. lexer.l produces incorrect lexer.c file. I wasn't able to figure out how to fix this problem so I just skipped this step (used already available lexer.c).

Patch

diff --git a/bochs/Makefile.in b/bochs/Makefile.in
index 23bd13c73..244e67833 100644
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@@ -248,7 +248,7 @@ bximage@EXE@: misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/v
 	@LINK_CONSOLE@ $(BXIMAGE_LINK_OPTS) misc/bximage.o misc/hdimage.o misc/vmware3.o misc/vmware4.o misc/vpc.o misc/vbox.o
 
 niclist@EXE@: misc/niclist.o
-	@LINK_CONSOLE@ misc/niclist.o
+	@LINK_CONSOLE@ misc/niclist.o @NICLIST_LINK_OPTS@
 
 bxhub@EXE@: misc/bxhub.o misc/netutil.o
 	@LINK_CONSOLE@ misc/bxhub.o misc/netutil.o @BXHUB_LINK_OPTS@
@@ -350,7 +350,7 @@ cpu/fpu/libfpu.a::
 
 cpu/softfloat3e/libsoftfloat.a::
 	cd cpu/softfloat3e @COMMAND_SEPARATOR@
-	$(MAKE) $(MDEFINES) CXX=$(CXX) libsoftfloat.a
+	$(MAKE) $(MDEFINES) CXX="$(CXX)" libsoftfloat.a
 	@CD_UP_TWO@
 
 memory/libmemory.a::
diff --git a/bochs/build/win32/nsis/bochs.nsi.in b/bochs/build/win32/nsis/bochs.nsi.in
index 45c646d3e..d57c2affb 100644
--- a/bochs/build/win32/nsis/bochs.nsi.in
+++ b/bochs/build/win32/nsis/bochs.nsi.in
@@ -61,7 +61,7 @@ Var IndependentSectionState
   Name "${NAME}"
   OutFile Bochs-win${BITS}-${VERSION}.exe
   SetOverwrite on
-  Unicode True
+;  Unicode True
   XPStyle On
 
   ; Installation Types
diff --git a/bochs/configure b/bochs/configure
index 5cd8868dc..b1eeda0d4 100755
Binary files a/bochs/configure and b/bochs/configure differ
diff --git a/bochs/configure.ac b/bochs/configure.ac
index 5fefe5ba0..03f57798f 100644
--- a/bochs/configure.ac
+++ b/bochs/configure.ac
@@ -2962,6 +2962,7 @@ case "$target" in
     BXIMAGE_LINK_OPTS="-luser32"
     if test "$enable_static_link" = yes; then
       BXIMAGE_LINK_OPTS="${BXIMAGE_LINK_OPTS} -static"
+	  NICLIST_LINK_OPTS="-static"
     fi
     if test "$networking" = yes; then
       OPTIONAL_TARGET="$OPTIONAL_TARGET bxhub niclist"
@@ -2996,6 +2997,7 @@ AC_SUBST(BXIMAGE_FLAG)
 AC_SUBST(BXIMAGE_LINK_OPTS)
 AC_SUBST(BXHUB_FLAG)
 AC_SUBST(BXHUB_LINK_OPTS)
+AC_SUBST(NICLIST_LINK_OPTS)
 AC_SUBST(CXXFLAGS_CONSOLE)
 
 ENH_DBG_OBJS=""
diff --git a/bochs/cpu/call_far.cc b/bochs/cpu/call_far.cc
index a9bbe6502..828038516 100644
--- a/bochs/cpu/call_far.cc
+++ b/bochs/cpu/call_far.cc
@@ -647,7 +647,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::shadow_stack_switch(bx_address new_SSP)
   }
 }
 
-void BX_CPP_AttrRegparmN(1) BX_CPU_C::call_far_shadow_stack_push(Bit16u cs, bx_address lip, bx_address old_ssp)
+void BX_CPP_AttrRegparmN(3) BX_CPU_C::call_far_shadow_stack_push(Bit16u cs, bx_address lip, bx_address old_ssp)
 {
 #if BX_SUPPORT_VMX
   if (BX_CPU_THIS_PTR in_vmx_guest)
diff --git a/bochs/iodev/network/eth_slirp.cc b/bochs/iodev/network/eth_slirp.cc
index 735f1b281..da778e6c4 100644
--- a/bochs/iodev/network/eth_slirp.cc
+++ b/bochs/iodev/network/eth_slirp.cc
@@ -35,15 +35,11 @@
 #if BX_NETWORKING && BX_NETMOD_SLIRP
 
 #ifdef _WIN32
-/* as defined in sdkddkver.h */
 #ifdef _WIN32_WINNT
 #if _WIN32_WINNT < 0x0601
-#undef _WIN32_WINNT
+#include "slirp/slirp.h"
 #endif
 #endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601 /* Windows 7 */
-#endif
 /* reduces the number of implicitly included headers */
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
diff --git a/bochs/iodev/network/slirp/slirp.h b/bochs/iodev/network/slirp/slirp.h
index f3fe70bb1..b4b4d085d 100644
--- a/bochs/iodev/network/slirp/slirp.h
+++ b/bochs/iodev/network/slirp/slirp.h
@@ -17,15 +17,6 @@
 
 #ifdef _WIN32
 
-/* as defined in sdkddkver.h */
-#ifdef _WIN32_WINNT
-#if _WIN32_WINNT < 0x0601
-#undef _WIN32_WINNT
-#endif
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0601 /* Windows 7 */
-#endif
 /* reduces the number of implicitly included headers */
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -35,8 +26,445 @@
 #include <windows.h>
 #include <ws2tcpip.h>
 #include <sys/timeb.h>
+#include <wincrypt.h>
 #include <iphlpapi.h>
 
+#ifdef _WIN32_WINNT
+#if _WIN32_WINNT < 0x0601
+/*
+ * Copyright (C) 1996-2001  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and 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 INTERNET SOFTWARE CONSORTIUM
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ * INTERNET SOFTWARE CONSORTIUM 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.
+ */
+#include <errno.h>
+#include <stdio.h>
+
+#define NS_INT16SZ   2
+#define NS_IN6ADDRSZ  16
+
+static const char *inet_ntop4(const unsigned char *src, char *dst,
+            size_t size);
+
+#ifdef AF_INET6
+static const char *inet_ntop6(const unsigned char *src, char *dst,
+            size_t size);
+#endif
+
+/* char *
+ * isc_net_ntop(af, src, dst, size)
+ *  convert a network format address to presentation format.
+ * return:
+ *  pointer to presentation format address (`dst'), or NULL (see errno).
+ * author:
+ *  Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop(int af, const void *src, char *dst, size_t size)
+{
+  switch (af) {
+  case AF_INET:
+    return (inet_ntop4((const unsigned char *)src, dst, size));
+#ifdef AF_INET6
+  case AF_INET6:
+    return (inet_ntop6((const unsigned char *)src, dst, size));
+#endif
+  default:
+    errno = EAFNOSUPPORT;
+    return (NULL);
+  }
+  /* NOTREACHED */
+}
+
+/* const char *
+ * inet_ntop4(src, dst, size)
+ *  format an IPv4 address
+ * return:
+ *  `dst' (as a const)
+ * notes:
+ *  (1) uses no statics
+ *  (2) takes a unsigned char* not an in_addr as input
+ * author:
+ *  Paul Vixie, 1996.
+ */
+static const char *
+inet_ntop4(const unsigned char *src, char *dst, size_t size)
+{
+  static const char *fmt = "%u.%u.%u.%u";
+  char tmp[sizeof "255.255.255.255"];
+  size_t len;
+
+  len = snprintf(tmp, sizeof tmp, fmt, src[0], src[1], src[2], src[3]);
+  if (len >= size) {
+    errno = ENOSPC;
+    return (NULL);
+  }
+  memcpy(dst, tmp, len + 1);
+
+  return (dst);
+}
+
+/* const char *
+ * isc_inet_ntop6(src, dst, size)
+ *  convert IPv6 binary address into presentation (printable) format
+ * author:
+ *  Paul Vixie, 1996.
+ */
+#ifdef AF_INET6
+static const char *
+inet_ntop6(const unsigned char *src, char *dst, size_t size)
+{
+  /*
+   * Note that int32_t and int16_t need only be "at least" large enough
+   * to contain a value of the specified size.  On some systems, like
+   * Crays, there is no such thing as an integer variable with 16 bits.
+   * Keep this in mind if you think this function should have been coded
+   * to use pointer overlays.  All the world's not a VAX.
+   */
+  char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+  struct { int base, len; } best, cur;
+  unsigned int words[NS_IN6ADDRSZ / NS_INT16SZ];
+  int i, inc;
+
+  /*
+   * Preprocess:
+   *  Copy the input (bytewise) array into a wordwise array.
+   *  Find the longest run of 0x00's in src[] for :: shorthanding.
+   */
+  memset(words, '\0', sizeof words);
+  for (i = 0; i < NS_IN6ADDRSZ; i++)
+    words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+  best.base = -1;
+  best.len = 0;
+  cur.base = -1;
+  cur.len = 0;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+    if (words[i] == 0) {
+      if (cur.base == -1)
+        cur.base = i, cur.len = 1;
+      else
+        cur.len++;
+    } else {
+      if (cur.base != -1) {
+        if (best.base == -1 || cur.len > best.len)
+          best = cur;
+        cur.base = -1;
+      }
+    }
+  }
+  if (cur.base != -1) {
+    if (best.base == -1 || cur.len > best.len)
+      best = cur;
+  }
+  if (best.base != -1 && best.len < 2)
+    best.base = -1;
+
+  /*
+   * Format the result.
+   */
+  tp = tmp;
+  for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+    /* Are we inside the best run of 0x00's? */
+    if (best.base != -1 && i >= best.base &&
+        i < (best.base + best.len)) {
+      if (i == best.base)
+        *tp++ = ':';
+      continue;
+    }
+    /* Are we following an initial run of 0x00s or any real hex? */
+    if (i != 0)
+      *tp++ = ':';
+    /* Is this address an encapsulated IPv4? */
+    if (i == 6 && best.base == 0 &&
+        (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
+      if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+        return (NULL);
+      tp += strlen(tp);
+      break;
+    }
+    inc = snprintf(tp, 5, "%x", words[i]);
+    tp += inc;
+  }
+  /* Was it a trailing run of 0x00's? */
+  if (best.base != -1 && (best.base + best.len) ==
+      (NS_IN6ADDRSZ / NS_INT16SZ))
+    *tp++ = ':';
+  *tp++ = '\0';
+
+  /*
+   * Check for overflow, copy, and we're done.
+   */
+  if ((size_t)(tp - tmp) > size) {
+    errno = ENOSPC;
+    return (NULL);
+  }
+  memcpy(dst, tmp, tp - tmp);
+  return (dst);
+}
+#endif /* AF_INET6 */
+
+#ifndef INADDRSZ
+#define	INADDRSZ	4
+#endif
+
+/* int
+ * inet_pton4(src, dst, pton)
+ *	when last arg is 0: inet_aton(). with hexadecimal, octal and shorthand.
+ *	when last arg is 1: inet_pton(). decimal dotted-quad only.
+ * return:
+ *	1 if `src' is a valid input, else 0.
+ * notice:
+ *	does not touch `dst' unless it's returning 1.
+ * author:
+ *	Paul Vixie, 1996.
+ */
+static int	inet_pton4(const char *src, u_char *dst, int pton)
+{
+	u_int val;
+	u_int digit;
+	int base, n;
+	unsigned char c;
+	u_int parts[4];
+	register u_int *pp = parts;
+
+	c = *src;
+	for (;;) {
+		/*
+		 * Collect number up to ``.''.
+		 * Values are specified as for C:
+		 * 0x=hex, 0=octal, isdigit=decimal.
+		 */
+		if (!isdigit(c))
+			return (0);
+		val = 0; base = 10;
+		if (c == '0') {
+			c = *++src;
+			if (c == 'x' || c == 'X')
+				base = 16, c = *++src;
+			else if (isdigit(c) && c != '9')
+				base = 8;
+		}
+		/* inet_pton() takes decimal only */
+		if (pton && base != 10)
+			return (0);
+		for (;;) {
+			if (isdigit(c)) {
+				digit = c - '0';
+				if (digit >= base)
+					break;
+				val = (val * base) + digit;
+				c = *++src;
+			} else if (base == 16 && isxdigit(c)) {
+				digit = c + 10 - (islower(c) ? 'a' : 'A');
+				if (digit >= 16)
+					break;
+				val = (val << 4) | digit;
+				c = *++src;
+			} else
+				break;
+		}
+		if (c == '.') {
+			/*
+			 * Internet format:
+			 *	a.b.c.d
+			 *	a.b.c	(with c treated as 16 bits)
+			 *	a.b	(with b treated as 24 bits)
+			 *	a	(with a treated as 32 bits)
+			 */
+			if (pp >= parts + 3)
+				return (0);
+			*pp++ = val;
+			c = *++src;
+		} else
+			break;
+	}
+	/*
+	 * Check for trailing characters.
+	 */
+	if (c != '\0' && !isspace(c))
+		return (0);
+	/*
+	 * Concoct the address according to
+	 * the number of parts specified.
+	 */
+	n = pp - parts + 1;
+	/* inet_pton() takes dotted-quad only.  it does not take shorthand. */
+	if (pton && n != 4)
+		return (0);
+	switch (n) {
+
+	case 0:
+		return (0);		/* initial nondigit */
+
+	case 1:				/* a -- 32 bits */
+		break;
+
+	case 2:				/* a.b -- 8.24 bits */
+		if (parts[0] > 0xff || val > 0xffffff)
+			return (0);
+		val |= parts[0] << 24;
+		break;
+
+	case 3:				/* a.b.c -- 8.8.16 bits */
+		if ((parts[0] | parts[1]) > 0xff || val > 0xffff)
+			return (0);
+		val |= (parts[0] << 24) | (parts[1] << 16);
+		break;
+
+	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
+		if ((parts[0] | parts[1] | parts[2] | val) > 0xff)
+			return (0);
+		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+		break;
+	}
+	if (dst) {
+		val = htonl(val);
+		memcpy(dst, &val, INADDRSZ);
+	}
+	return (1);
+}
+
+#if USE_IPV6
+/* int
+ * inet_pton6(src, dst)
+ *	convert presentation level address to network order binary form.
+ * return:
+ *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ * notice:
+ *	(1) does not touch `dst' unless it's returning 1.
+ *	(2) :: in a full address is silently ignored.
+ * credit:
+ *	inspired by Mark Andrews.
+ * author:
+ *	Paul Vixie, 1996.
+ */
+static int inet_pton6(const char *src, u_char *dst)
+{
+	static const char xdigits_l[] = "0123456789abcdef",
+			  xdigits_u[] = "0123456789ABCDEF";
+	u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
+	const char *xdigits, *curtok;
+	int ch, saw_xdigit;
+	u_int val;
+
+	memset((tp = tmp), '\0', IN6ADDRSZ);
+	endp = tp + IN6ADDRSZ;
+	colonp = NULL;
+	/* Leading :: requires some special handling. */
+	if (*src == ':')
+		if (*++src != ':')
+			return (0);
+	curtok = src;
+	saw_xdigit = 0;
+	val = 0;
+	while ((ch = *src++) != '\0') {
+		const char *pch;
+
+		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
+			pch = strchr((xdigits = xdigits_u), ch);
+		if (pch != NULL) {
+			val <<= 4;
+			val |= (pch - xdigits);
+			if (val > 0xffff)
+				return (0);
+			saw_xdigit = 1;
+			continue;
+		}
+		if (ch == ':') {
+			curtok = src;
+			if (!saw_xdigit) {
+				if (colonp)
+					return (0);
+				colonp = tp;
+				continue;
+			} else if (*src == '\0')
+				return (0);
+			if (tp + INT16SZ > endp)
+				return (0);
+			*tp++ = (u_char) (val >> 8) & 0xff;
+			*tp++ = (u_char) val & 0xff;
+			saw_xdigit = 0;
+			val = 0;
+			continue;
+		}
+		if (ch == '.' && ((tp + INADDRSZ) <= endp) &&
+		    inet_pton4(curtok, tp, 1) > 0) {
+			tp += INADDRSZ;
+			saw_xdigit = 0;
+			break;	/* '\0' was seen by inet_pton4(). */
+		}
+		return (0);
+	}
+	if (saw_xdigit) {
+		if (tp + INT16SZ > endp)
+			return (0);
+		*tp++ = (u_char) (val >> 8) & 0xff;
+		*tp++ = (u_char) val & 0xff;
+	}
+	if (colonp != NULL) {
+		/*
+		 * Since some memmove()'s erroneously fail to handle
+		 * overlapping regions, we'll do the shift by hand.
+		 */
+		const int n = tp - colonp;
+		int i;
+
+		if (tp == endp)
+			return (0);
+		for (i = 1; i <= n; i++) {
+			endp[- i] = colonp[n - i];
+			colonp[n - i] = 0;
+		}
+		tp = endp;
+	}
+	if (tp != endp)
+		return (0);
+	memcpy(dst, tmp, IN6ADDRSZ);
+	return (1);
+}
+#endif
+
+/* int
+ * inet_pton(af, src, dst)
+ *	convert from presentation format (which usually means ASCII printable)
+ *	to network format (which is usually some kind of binary format).
+ * return:
+ *	1 if the address was valid for the specified address family
+ *	0 if the address wasn't valid (`dst' is untouched in this case)
+ *	-1 if some other error occurred (`dst' is untouched in this case, too)
+ * author:
+ *	Paul Vixie, 1996.
+ */
+static int inet_pton(int af, const char *src, void *dst)
+{
+
+	switch (af) {
+	case AF_INET:
+		return (inet_pton4(src, (u_char*)dst, 1));
+#if USE_IPV6
+	case AF_INET6:
+		return (inet_pton6(src, (u_char*)dst));
+#endif
+	default:
+		errno = EAFNOSUPPORT;
+		return (-1);
+	}
+	/* NOTREACHED */
+}
+
+#endif
+#endif
+
 #else
 #define O_BINARY 0
 #endif 

Improving compatibility in such way may be interesting for two reasons:

1. For "Bochs inside of Bochs" scenarios, useful for debugging purposes.
2. For teaching people about Turing-completeness. It may be fun to run Windows 11 on 30 year old PC for example.

[stlintel]

Merge all but slirp and bochs.nsi.in changes

[Vort]

Here are my results and notes regarding creation of Windows 95 compatible binary.
In short, I was able to get it working except for slirp: Bochs-win32-2.8.devel-9x.zip.

I did not tried yet to make 9x build using 9x-compatible tools.
I was using the same Windows XP and the same msys2-i686-20160205.exe for it.

1. However, this version of MSYS2 is not able to make 9x-compatible binaries right away. It needs different version of -lpthread, this one. And pthread9x requires fixing as well! #if __GNUC__ > 4 in crtfix.c should be adjusted to 5.
2. bochs\iodev\hdimage\cdrom_win32.cc have function Is_WinXP_SP2_or_Later which is not compatible with Windows 9x. I just replaced its contents with return false, but better fix is of course possible.
3. Slirp have lots of ipv6-related code, which won't work with win9x. Theoretically, it is possible to make runtime checks for ipv6 support, but I just disabled slirp for now.
4. For binary to run, additional dependencies are needed: Winsock 2, W95ws2setup.exe, which requires working network, should be installed and MSVCRT.DLL should be found somewhere.
5. msys2-i686 makes binary, compatible with i686. For binary to work with really old hardware, either MSYS2 should be rebuilt with i386 flags or different compiler should be found.