[Vm-dev] [commit][2806]
Fix sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto given that
VirtualAlloc
commits at squeakvm.org
commits at squeakvm.org
Thu Nov 14 02:20:09 UTC 2013
Revision: 2806
Author: eliot
Date: 2013-11-13 18:20:08 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
Fix sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto given that VirtualAlloc
answers low memory, at keast on Windows XP.
Add Spur to the -version VM description on win32.
Munge unix/config's automake to build a stack vm. Add spurstackbuild/unixbuild.
Add cleanall to spurstackbuild/cygwinbuild/Makefile
Modified Paths:
--------------
branches/Cog/platforms/unix/config/acinclude.m4
branches/Cog/platforms/unix/config/configure
branches/Cog/platforms/unix/config/configure.ac
branches/Cog/platforms/unix/config/mkconfig.in
branches/Cog/platforms/win32/vm/sqWin32Alloc.c
branches/Cog/platforms/win32/vm/sqWin32Intel.c
branches/Cog/spurstackbuild/cygwinbuild/Makefile
branches/Cog/spurstackbuild/unixbuild/HowToBuild
branches/Cog/spurstackbuild/unixbuild/astbld/mvm
branches/Cog/spurstackbuild/unixbuild/astbldt/mvm
branches/Cog/spurstackbuild/unixbuild/bld/mvm
branches/Cog/spurstackbuild/unixbuild/bldt/mvm
branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm
branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Nov 13 14:25:08 PST 2013
+ Wed Nov 13 18:17:37 PST 2013
Modified: branches/Cog/platforms/unix/config/acinclude.m4
===================================================================
--- branches/Cog/platforms/unix/config/acinclude.m4 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/unix/config/acinclude.m4 2013-11-14 02:20:08 UTC (rev 2806)
@@ -41,7 +41,7 @@
vmmcheck file -f ${vmmcfg}/plugins.int
vmmcheck file -f ${vmmcfg}/plugins.ext
vmmcheck dir -d ${vmmdir}
- vmmcheck dir -d ${vmmdir}/plugins
+ vmmcheck dir -d ${vmpdir}
vmmcheck dir -d ${vmmdir}/vm
vmmcheck file -f ${vmmdir}/vm/interp.h
vmmcheck file -f ${vmmdir}/vm/vmCallback.h
Modified: branches/Cog/platforms/unix/config/configure
===================================================================
--- branches/Cog/platforms/unix/config/configure 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/unix/config/configure 2013-11-14 02:20:08 UTC (rev 2806)
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='NM LD SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS cogit topdir cfgdir vmmdir vmmcfg blddir SQ_MAJOR SQ_MINOR SQ_UPDATE SQ_VERSION VM_MAJOR VM_MINOR VM_RELEASE VM_VERSION imgdir expanded_relative_imgdir plgdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT WFLAGS AS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN CPP EGREP SED LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES HAVE_INTERP_H ALLOCA INTERP AWK VM_APP_ICONS npsqueak install_nps uninstall_nps SQ_LIBDIR int_modules ext_modules HAVE_LANGINFO_CODESET HAVE_NANOSLEEP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_CPPFLAGS X_INCLUDES LIBM_CFLAGS LIB_UUID int_plugins ext_plugins LIBOBJS LTLIBOBJS'
+ac_subst_vars='NM LD SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS cogit topdir cfgdir vmmdir vmpdir vmmcfg blddir SQ_MAJOR SQ_MINOR SQ_UPDATE SQ_VERSION VM_MAJOR VM_MINOR VM_RELEASE VM_VERSION imgdir expanded_relative_imgdir plgdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT WFLAGS AS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN CPP EGREP SED LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES HAVE_INTERP_H ALLOCA INTERP AWK VM_APP_ICONS npsqueak install_nps uninstall_nps SQ_LIBDIR int_modules ext_modules HAVE_LANGINFO_CODESET HAVE_NANOSLEEP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_CPPFLAGS X_INCLUDES LIBM_CFLAGS LIB_UUID int_plugins ext_plugins LIBOBJS LTLIBOBJS'
ac_subst_files='make_cfg make_int make_ext make_prg Makefile_install Makefile_dist Makefile_rpm Makefile_deb'
# Initialize some variables set by options.
@@ -1038,6 +1038,7 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-src=dir generated src directory default=src
+ --with-plugins=dir generated plugins directory default=src/plugins
--with-vmmcfg=dir vm configuration directory containing plugins.int and plugins.ext default=.
--with-gnu-awk assume that awk is GNU gawk default=no
--with-gnu-as assume that as is the GNU assembler default=no
@@ -1535,16 +1536,37 @@
vmmdir="${topdir}/${vmmsrc}"
+
+# Check whether --with-plugins or --without-plugins was given.
+if test "${with_plugins+set}" = set; then
+ withval="$with_plugins"
+ vmpsrc="${with_plugins}"
+else
+ vmpsrc="src/plugins"
+fi;
+
+vmpdir="${topdir}/${vmpsrc}"
+
if test ! -d "${topdir}/${vmmsrc}"; then
- if test -d "${topdir}/platforms/unix/${vmmsrc}"; then
- vmmdir="${topdir}/platforms/unix/${vmmsrc}"
+ if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then
+ vmmdir="${topdir}/platforms/unix/${vmmsrc}/vm"
echo "$as_me:$LINENO: result: using built-in src directory" >&5
echo "${ECHO_T}using built-in src directory" >&6
fi
fi
+if test ! -d "${topdir}/${vmpsrc}"; then
+ if test -d "${topdir}/platforms/unix/${vmpsrc}"; then
+ vmpdir="${topdir}/platforms/unix/${vmpsrc}"
+ echo "$as_me:$LINENO: result: using built-in pligins directory" >&5
+echo "${ECHO_T}using built-in pligins directory" >&6
+ fi
+fi
+
echo "$as_me:$LINENO: result: ${vmmdir}" >&5
echo "${ECHO_T}${vmmdir}" >&6
+echo "$as_me:$LINENO: result: ${vmpdir}" >&5
+echo "${ECHO_T}${vmpdir}" >&6
blddir=`pwd`
@@ -1592,7 +1614,7 @@
vmmcheck file -f ${vmmcfg}/plugins.int
vmmcheck file -f ${vmmcfg}/plugins.ext
vmmcheck dir -d ${vmmdir}
- vmmcheck dir -d ${vmmdir}/plugins
+ vmmcheck dir -d ${vmpdir}
vmmcheck dir -d ${vmmdir}/vm
vmmcheck file -f ${vmmdir}/vm/interp.h
vmmcheck file -f ${vmmdir}/vm/vmCallback.h
@@ -1616,6 +1638,7 @@
+
SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
cat >>confdefs.h <<_ACEOF
@@ -5876,7 +5899,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5879 "configure"' > conftest.$ac_ext
+ echo '#line 5902 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6893,7 +6916,7 @@
# Provide some information about the compiler.
-echo "$as_me:6896:" \
+echo "$as_me:6919:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7956,11 +7979,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7959: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7963: \$? = $ac_status" >&5
+ echo "$as_me:7986: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8224,11 +8247,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8227: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8250: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8231: \$? = $ac_status" >&5
+ echo "$as_me:8254: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8328,11 +8351,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8331: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8335: \$? = $ac_status" >&5
+ echo "$as_me:8358: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9797,7 +9820,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 9800 "configure"' > conftest.$ac_ext
+ echo '#line 9823 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10694,7 +10717,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10697 "configure"
+#line 10720 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10794,7 +10817,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10797 "configure"
+#line 10820 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13137,11 +13160,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13140: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13163: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13144: \$? = $ac_status" >&5
+ echo "$as_me:13167: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13241,11 +13264,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13244: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13267: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13248: \$? = $ac_status" >&5
+ echo "$as_me:13271: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13777,7 +13800,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 13780 "configure"' > conftest.$ac_ext
+ echo '#line 13803 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14835,11 +14858,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14838: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14861: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14842: \$? = $ac_status" >&5
+ echo "$as_me:14865: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14939,11 +14962,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14942: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14946: \$? = $ac_status" >&5
+ echo "$as_me:14969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16388,7 +16411,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 16391 "configure"' > conftest.$ac_ext
+ echo '#line 16414 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17166,11 +17189,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17169: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17192: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17173: \$? = $ac_status" >&5
+ echo "$as_me:17196: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17434,11 +17457,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17437: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17441: \$? = $ac_status" >&5
+ echo "$as_me:17464: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17538,11 +17561,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17541: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17564: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17545: \$? = $ac_status" >&5
+ echo "$as_me:17568: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19007,7 +19030,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 19010 "configure"' > conftest.$ac_ext
+ echo '#line 19033 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -23833,9 +23856,10 @@
echo "$as_me:$LINENO: result: $CFLAGS_32" >&5
echo "${ECHO_T}$CFLAGS_32" >&6
-# CFLAGS="$CFLAGS_32 $CFLAGS -msse"
+# tpr - try to keep msse out of it for Pi CFLAGS="$CFLAGS_32 $CFLAGS -msse"
CFLAGS="$CFLAGS_32 $CFLAGS"
+
echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
if test "${ac_cv_c_bigendian+set}" = set; then
@@ -29100,6 +29124,7 @@
s, at topdir@,$topdir,;t t
s, at cfgdir@,$cfgdir,;t t
s, at vmmdir@,$vmmdir,;t t
+s, at vmpdir@,$vmpdir,;t t
s, at vmmcfg@,$vmmcfg,;t t
s, at blddir@,$blddir,;t t
s, at SQ_MAJOR@,$SQ_MAJOR,;t t
Modified: branches/Cog/platforms/unix/config/configure.ac
===================================================================
--- branches/Cog/platforms/unix/config/configure.ac 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/unix/config/configure.ac 2013-11-14 02:20:08 UTC (rev 2806)
@@ -28,7 +28,7 @@
#
# Author: Ian.Piumarta at SqueakLand.org
#
-# Last edited: Tue Jan 26 11:51:29 PST 2010 by eliot
+# Last edited: Wed Nov 13 17:15:30 PST 2013 by eliot
AC_INIT([config.h.in])
@@ -46,14 +46,29 @@
vmmdir="${topdir}/${vmmsrc}"
+AC_ARG_WITH(plugins,
+[ --with-plugins=dir generated plugins directory [default=src/plugins]],
+[ vmpsrc="${with_plugins}"],
+[ vmpsrc="src/plugins"])
+
+vmpdir="${topdir}/${vmpsrc}"
+
if test ! -d "${topdir}/${vmmsrc}"; then
- if test -d "${topdir}/platforms/unix/${vmmsrc}"; then
- vmmdir="${topdir}/platforms/unix/${vmmsrc}"
+ if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then
+ vmmdir="${topdir}/platforms/unix/${vmmsrc}/vm"
AC_MSG_RESULT([using built-in src directory])
fi
fi
+if test ! -d "${topdir}/${vmpsrc}"; then
+ if test -d "${topdir}/platforms/unix/${vmpsrc}"; then
+ vmpdir="${topdir}/platforms/unix/${vmpsrc}"
+ AC_MSG_RESULT([using built-in pligins directory])
+ fi
+fi
+
AC_MSG_RESULT(${vmmdir})
+AC_MSG_RESULT(${vmpdir})
blddir=`pwd`
@@ -83,6 +98,7 @@
AC_SUBST(topdir)
AC_SUBST(cfgdir)
AC_SUBST(vmmdir)
+AC_SUBST(vmpdir)
AC_SUBST(vmmcfg)
AC_SUBST(blddir)
Modified: branches/Cog/platforms/unix/config/mkconfig.in
===================================================================
--- branches/Cog/platforms/unix/config/mkconfig.in 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/unix/config/mkconfig.in 2013-11-14 02:20:08 UTC (rev 2806)
@@ -22,9 +22,9 @@
vmi_conf="${platforms}/unix"
plg_conf="${vmi_conf}/plugins"
-vmi_dirs="@vmmdir@ ${platforms}/Cross ${vmi_conf}"
-int_dirs="@vmmdir@/plugins ${platforms}/Cross/plugins ${plg_conf}"
-ext_dirs="@vmmdir@/plugins ${platforms}/Cross/plugins ${plg_conf}"
+vmi_dirs="@vmmdir@ ${platforms}/Cross ${vmi_conf}"
+int_dirs="@vmpdir@ ${platforms}/Cross/plugins ${plg_conf}"
+ext_dirs="@vmpdir@ ${platforms}/Cross/plugins ${plg_conf}"
cat > config.sh <<EOF
cogit="@cogit@"
Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c
===================================================================
--- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2013-11-14 02:20:08 UTC (rev 2806)
@@ -219,6 +219,7 @@
long bytes = roundUpToPage(size);
*allocatedSizePointer = bytes;
+#if 0 /* It appears VirtualAlloc answers low memory by default. */
alloc = VirtualAlloc(0, bytes, MEM_COMMIT, PAGE_READWRITE);
if (!alloc) {
sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"),
@@ -232,6 +233,7 @@
sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"),
"Unable to VirtualFree committed memory (%d bytes requested)",
bytes);
+#endif /* 0 */
alloc = VirtualAlloc(0, bytes, MEM_COMMIT+MEM_TOP_DOWN, PAGE_READWRITE);
if ((unsigned long)alloc >= (unsigned long)minAddress)
return alloc;
Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c
===================================================================
--- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-11-14 02:20:08 UTC (rev 2806)
@@ -773,12 +773,17 @@
char *info= (char *)malloc(4096);
info[0]= '\0';
+#if SPURVM
+# define ObjectMemory " Spur"
+#else
+# define ObjectMemory
+#endif
#if defined(NDEBUG)
-# define BuildVariant "Production"
+# define BuildVariant "Production" ObjectMemory
#elif DEBUGVM
-# define BuildVariant "Debug"
+# define BuildVariant "Debug" ObjectMemory
# else
-# define BuildVariant "Assert"
+# define BuildVariant "Assert" ObjectMemory
#endif
sprintf(info+strlen(info), "%s [" BuildVariant " VM]\n", vmBuildString);
Modified: branches/Cog/spurstackbuild/cygwinbuild/Makefile
===================================================================
--- branches/Cog/spurstackbuild/cygwinbuild/Makefile 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/cygwinbuild/Makefile 2013-11-14 02:20:08 UTC (rev 2806)
@@ -201,6 +201,8 @@
# Do make init to allow make -n to function.
init: $(OBJDIR) eitheror.exe mkNamedPrims.exe
+cleanall: clean cleanmt cleanast cleanmtast cleandbg cleanmtdbg
+
clean:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build
@@ -213,6 +215,9 @@
cleanmtast:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast
+cleandbg:
+ rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg
+
cleanmtdbg:
rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg
Modified: branches/Cog/spurstackbuild/unixbuild/HowToBuild
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/HowToBuild 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/HowToBuild 2013-11-14 02:20:08 UTC (rev 2806)
@@ -19,11 +19,11 @@
3. Open a shell, cd into the spurstackbuild/unixbuild/bld directory and execute
the mvm script. This installs a VM in the sslinux directory alongside
spurstacksrc et al. Alternatively you can configure your own VM, e.g. with
- ../../../platforms/unix/config/configure --with-src=spurstacksrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid" LDFLAGS=-Wl,-z,now
+ ../../../platforms/unix/config/configure --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid" LDFLAGS=-Wl,-z,now
make install prefix=WhereYouWantTheVmToGo
N.B. On Ubuntu *do not* supply "LIBS="-lpthread -luuid"", i.e. use
- ../../../platforms/unix/config/configure --with-src=spurstacksrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0" LDFLAGS=-Wl,-z,now
+ ../../../platforms/unix/config/configure --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0" LDFLAGS=-Wl,-z,now
4. At the end of it you'll get a new VM in sslinux, or in the path provided
via -prefix
@@ -33,7 +33,7 @@
3a. For an assert-enabled VM use the astbld directory's mvm and find a vm in
sslinuxast, or do
- ../../../platforms/unix/config/configure --with-src=spurstacksrc CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNO_VM_PROFILE=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid" LDFLAGS=-Wl,-z,now
+ ../../../platforms/unix/config/configure --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNO_VM_PROFILE=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid" LDFLAGS=-Wl,-z,now
3b. For a full debug VM use the dbgbld's mvm and find a vm in sslinuxdbg,
or do
@@ -45,7 +45,7 @@
You'll also have to add the -m32 switch to all gcc & g++ invocations. The
easiest way to do this is to add CC="gcc -m32" & CXX="g++ -m32" to the configure
script:
- ../../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --with-src=spurstacksrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1" LIBS="-lpthread -luuid"
+ ../../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1" LIBS="-lpthread -luuid"
To run a 32-bit VM on a 64-bit OS, you'll also need the 32-bit libraries
provided by the ia32-libs package.
@@ -57,7 +57,7 @@
You'll also have to add the -m32 switch to all gcc & g++ invocations. The
easiest way to do this is to add CC="gcc -m32" & CXX="g++ -m32" to the configure
script:
- ../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
+ ../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --without-npsqueak --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread
To run a 32-bit VM on a 64-bit OS, you'll also need the 32-bit libraries
provided by the ia32-libs package.
Modified: branches/Cog/spurstackbuild/unixbuild/astbld/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/astbld/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/astbld/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -14,7 +14,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DTIIMER_HEARTBEAT=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
Modified: branches/Cog/spurstackbuild/unixbuild/astbldt/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/astbldt/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/astbldt/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -15,7 +15,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
Modified: branches/Cog/spurstackbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/bld/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/bld/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -18,7 +18,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DDEBUGVM=0" \
Modified: branches/Cog/spurstackbuild/unixbuild/bldt/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/bldt/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/bldt/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -19,7 +19,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DDEBUGVM=0" \
Modified: branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -14,7 +14,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
Modified: branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm
===================================================================
--- branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm 2013-11-13 22:27:21 UTC (rev 2805)
+++ branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm 2013-11-14 02:20:08 UTC (rev 2806)
@@ -15,7 +15,8 @@
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=spurstacksrc \
+test -f config.h || ../../../platforms/unix/config/configure \
+ --with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
More information about the Vm-dev
mailing list