Vm-dev November 2013

vm-dev@lists.squeakfoundation.org

30 participants
103 discussions

[commit][2810] use ckformat.c from generated sources
by commits＠squeakvm.org 14 Nov '13

14 Nov '13

Revision: 2810 Author: piumarta Date: 2013-11-13 19:54:12 -0800 (Wed, 13 Nov 2013) Log Message: ----------- use ckformat.c from generated sources Modified Paths: -------------- trunk/platforms/unix/vm/build.cmake Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2013-11-14 03:52:52 UTC (rev 2809) +++ trunk/platforms/unix/vm/build.cmake 2013-11-14 03:54:12 UTC (rev 2810) @@ -76,7 +76,7 @@ INSTALL (PROGRAMS ${bld}/squeak.sh DESTINATION bin) ADD_EXECUTABLE (ckformat - ${config}/ckformat.c + ${src}/ckformat.c ) INSTALL (PROGRAMS ${bld}/ckformat DESTINATION ${plgdir})

1 0

[commit][2809] disable debugging message; run default VM with given args if image check fails
by commits＠squeakvm.org 14 Nov '13

14 Nov '13

Revision: 2809 Author: piumarta Date: 2013-11-13 19:52:52 -0800 (Wed, 13 Nov 2013) Log Message: ----------- disable debugging message; run default VM with given args if image check fails Modified Paths: -------------- trunk/platforms/unix/cmake/squeak.in Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2013-11-14 03:47:40 UTC (rev 2808) +++ trunk/platforms/unix/cmake/squeak.in 2013-11-14 03:52:52 UTC (rev 2809) @@ -3,7 +3,7 @@ # Launch squeakvm from the command line or a menu script, with a good # plugin path, text encodings and pulseaudio kludge # -# Last edited: 2012-09-17 09:06:59 by piumarta on linux64 +# Last edited: 2013-11-13 19:51:35 by piumarta on emilia PATH=/usr/bin:/bin @@ -105,6 +105,8 @@ 68003) vms="${squeakvm64}"; plgdir="${plgd64}";; *) vms="${squeakvm}";; esac +else + vms="${squeakvm}" # no image found, run default VM with args fi # find the vm and set the plugin path @@ -115,7 +117,7 @@ fi for avm in ${vms}; do - echo CHECKING ${avm} + #echo CHECKING ${avm} if test -x "${plgdir}/${avm}"; then # bin/squeak -> lib/squeak/x.y-z/squeakvm vm="${plgdir}/${avm}" plugins="${plgdir}"

1 0

[commit][2808] fix handling of --src option
by commits＠squeakvm.org 14 Nov '13

14 Nov '13

Revision: 2808 Author: piumarta Date: 2013-11-13 19:47:40 -0800 (Wed, 13 Nov 2013) Log Message: ----------- fix handling of --src option Modified Paths: -------------- trunk/platforms/unix/cmake/configure Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2013-11-14 03:44:42 UTC (rev 2807) +++ trunk/platforms/unix/cmake/configure 2013-11-14 03:47:40 UTC (rev 2808) @@ -1,6 +1,6 @@ #!/bin/sh -# Last edited: 2013-11-11 18:50:33 by piumarta on emilia +# Last edited: 2013-11-13 19:46:57 by piumarta on emilia RELEASE_TAG="" @@ -69,7 +69,7 @@ case "$1" in --help) help; exit 0;; --debug-configure) dump;; - --src=*) src="`echo \"$1\" | sed 's/\-\-src=//'`" + --src=*) rel="`echo \"$1\" | sed 's/\-\-src=//'`" src="`(cd \"${rel}\"; pwd)`" args="${args} -DOPT--src=${src}";; --CFLAGS=*) cflags="`echo \"$1\" | sed 's/\-\-CFLAGS=//'`";; @@ -86,7 +86,7 @@ if test ! -f "${interp_h}"; then echo "problem locating generated source file: ${interp_h}" - echo "use --src=<directory> to locate sources relative to ${unix}" + echo "use --src=<directory> to locate sources relative to ${PWD}" echo "current value is: --src=\"${src}\"" exit 1 fi

1 0

[commit][2806] Fix sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto given that VirtualAlloc
by commits＠squeakvm.org 14 Nov '13

14 Nov '13

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,@topdir@,$topdir,;t t s,@cfgdir@,$cfgdir,;t t s,@vmmdir@,$vmmdir,;t t +s,@vmpdir@,$vmpdir,;t t s,@vmmcfg@,$vmmcfg,;t t s,@blddir@,$blddir,;t t s,@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(a)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" \

1 0

[commit][2805] Spur Stack VM src and OSPlugin src as per VMMaker.oscog-eem. 510.
by commits＠squeakvm.org 13 Nov '13

13 Nov '13

Revision: 2805 Author: eliot Date: 2013-11-13 14:27:21 -0800 (Wed, 13 Nov 2013) Log Message: ----------- Spur Stack VM src and OSPlugin src as per VMMaker.oscog-eem.510. See VMMaker.oscog-eem.510 history for Spur VM changes (this is not ready for any kind of use). Add spur stack unix build. Add win32 alloc for Spur memory segments. Fix the Spur cygwinbuild. Modified Paths: -------------- branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/win32/vm/sqWin32Alloc.c branches/Cog/platforms/win32/vm/sqWin32Alloc.h branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/spurstackbuild/cygwinbuild/Makefile branches/Cog/spurstackbuild/cygwinbuild/mvm branches/Cog/spurstackbuild/macbuild/mvm branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c Added Paths: ----------- branches/Cog/spurstackbuild/unixbuild/ branches/Cog/spurstackbuild/unixbuild/HowToBuild branches/Cog/spurstackbuild/unixbuild/astbld/ branches/Cog/spurstackbuild/unixbuild/astbld/mvm branches/Cog/spurstackbuild/unixbuild/astbld/plugins.ext branches/Cog/spurstackbuild/unixbuild/astbld/plugins.int branches/Cog/spurstackbuild/unixbuild/astbldt/ branches/Cog/spurstackbuild/unixbuild/astbldt/mvm branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.ext branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.int branches/Cog/spurstackbuild/unixbuild/bld/ branches/Cog/spurstackbuild/unixbuild/bld/mvm branches/Cog/spurstackbuild/unixbuild/bld/plugins.ext branches/Cog/spurstackbuild/unixbuild/bld/plugins.int branches/Cog/spurstackbuild/unixbuild/bldt/ branches/Cog/spurstackbuild/unixbuild/bldt/mvm branches/Cog/spurstackbuild/unixbuild/bldt/plugins.ext branches/Cog/spurstackbuild/unixbuild/bldt/plugins.int branches/Cog/spurstackbuild/unixbuild/dbgbld/ branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.ext branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.int branches/Cog/spurstackbuild/unixbuild/dbgbldt/ branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.ext branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.int branches/Cog/spurstackbuild/unixbuild/mkNamedPrims.sh Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Nov 2 14:13:36 PDT 2013 + Wed Nov 13 14:25:08 PST 2013 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2013-11-13 22:27:21 UTC (rev 2805) @@ -1046,12 +1046,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 if (verbose) Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2013-11-13 22:27:21 UTC (rev 2805) @@ -29,7 +29,7 @@ #endif static LPSTR pageBase; /* base address of allocated memory */ -static DWORD pageBits; /* bit mask for the start of a memory page */ +static DWORD pageMask; /* bit mask for the start of a memory page */ static DWORD pageSize; /* size of a memory page */ static DWORD nowReserved; /* 'publicly' reserved virtual memory */ static LPSTR pageLimit; /* upper limit of commited pages */ @@ -60,13 +60,13 @@ /* determine page boundaries */ GetSystemInfo(&sysInfo); pageSize = sysInfo.dwPageSize; - pageBits = ~(pageSize - 1); + pageMask = ~(pageSize - 1); /* round the requested size up to the next page boundary */ - nowReserved = (desiredHeapSize + pageSize) & pageBits; + nowReserved = (desiredHeapSize + pageSize) & pageMask; /* round the initial commited size up to the next page boundary */ - initialCommit = (minHeapSize + pageSize) & pageBits; + initialCommit = (minHeapSize + pageSize) & pageMask; /* Here, we only reserve the maximum memory to be used It will later be committed during actual access */ @@ -107,7 +107,7 @@ if(fShowAllocations) { warnPrintf("Growing memory by %d...", delta); } - delta = (delta + pageSize) & pageBits; + delta = (delta + pageSize) & pageMask; if(!VirtualAlloc(pageLimit, delta, MEM_COMMIT, PAGE_READWRITE)) { if(fShowAllocations) { warnPrintf("failed\n"); @@ -139,7 +139,7 @@ return oldLimit; } #endif - delta &= pageBits; + delta &= pageMask; if(!VirtualFree(pageLimit-delta, delta, MEM_DECOMMIT)) { if(fShowAllocations) { warnPrintf("failed\n"); @@ -176,17 +176,11 @@ } return bytesLeft; } +#endif /* NO_VIRTUAL_MEMORY */ -/************************************************************************/ -/* sqMemReleaseMemory: Release virtual memory */ -/************************************************************************/ -void sqReleaseMemory(void) -{ - /* Win32 will do that for us */ -} +#define roundDownToPage(v) ((v)&pageMask) +#define roundUpToPage(v) (((v)+pageSize-1)&pageMask) -#endif /* NO_VIRTUAL_MEMORY */ - #if COGVM void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) @@ -212,3 +206,42 @@ perror("VirtualProtect(x,y,PAGE_EXECUTE_READWRITE)"); } #endif /* COGVM */ + +#if SPURVM +/* Allocate a region of memory of al least size bytes, at or above minAddress. + * If the attempt fails, answer null. If the attempt succeeds, answer the + * start of the region and assign its size through allocatedSizePointer. + */ +void * +sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer) +{ + void *alloc; + long bytes = roundUpToPage(size); + + *allocatedSizePointer = bytes; + alloc = VirtualAlloc(0, bytes, MEM_COMMIT, PAGE_READWRITE); + if (!alloc) { + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "Unable to VirtualAlloc committed memory (%d bytes requested)", + bytes); + return NULL; + } + if ((unsigned long)alloc >= (unsigned long)minAddress) + return alloc; + if (!VirtualFree(alloc, bytes, MEM_RELEASE)) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), + "Unable to VirtualFree committed memory (%d bytes requested)", + bytes); + alloc = VirtualAlloc(0, bytes, MEM_COMMIT+MEM_TOP_DOWN, PAGE_READWRITE); + if ((unsigned long)alloc >= (unsigned long)minAddress) + return alloc; + if (!VirtualFree(alloc, bytes, MEM_RELEASE)) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), + "Unable to VirtualFree committed memory (%d bytes requested)", + bytes); + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "Unable to VirtualAlloc committed memory at desired address (%d bytes requested at or above %p)", + bytes, minAddress); + return NULL; +} +#endif /* SPURVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.h 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.h 2013-11-13 22:27:21 UTC (rev 2805) @@ -28,7 +28,5 @@ int sqShrinkMemoryBy(int oldLimit, int delta); int sqMemoryExtraBytesLeft(int includingSwap); -void sqReleaseMemory(void); - #endif /* NO_VIRTUAL_MEMORY */ #endif /* __SQ_WIN32_ALLOC_H */ Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2013-11-13 22:27:21 UTC (rev 2805) @@ -1188,9 +1188,6 @@ fclose(stdout); remove(stdoutName); } -#ifndef NO_VIRTUAL_MEMORY - sqReleaseMemory(); -#endif OleUninitialize(); } Modified: branches/Cog/spurstackbuild/cygwinbuild/Makefile =================================================================== --- branches/Cog/spurstackbuild/cygwinbuild/Makefile 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/spurstackbuild/cygwinbuild/Makefile 2013-11-13 22:27:21 UTC (rev 2805) @@ -9,7 +9,7 @@ CONFIGURATION=product # The name of the VM to build -VM:=Croquet +VM:=Squeak VM_NAME?=$(VM) # Is this a Croquet VM (defaults to OGL instead of D3D)? @@ -35,7 +35,7 @@ OBJDIR:= $(BLDDIR)/vm # N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below -PLATDIR:=../platforms +PLATDIR:=../../platforms CROSSDIR:=$(PLATDIR)/Cross/vm WIN32DIR:=$(PLATDIR)/win32/vm MAKERDIR:=$(VMSRCDIR)/vm Modified: branches/Cog/spurstackbuild/cygwinbuild/mvm =================================================================== --- branches/Cog/spurstackbuild/cygwinbuild/mvm 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/spurstackbuild/cygwinbuild/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -1,5 +1,5 @@ #!/bin/sh -rm -rf build*/vm/Croquet*.exe +rm -rf build*/vm/Squeak*.exe make debug;make assert;make make THREADING=multi CONFIGURATION=debug;make THREADING=multi CONFIGURATION=assert;make THREADING=multi -ls -rlt build*/vm/Croquet*.exe +ls -rlt build*/vm/Squeak*.exe Modified: branches/Cog/spurstackbuild/macbuild/mvm =================================================================== --- branches/Cog/spurstackbuild/macbuild/mvm 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/spurstackbuild/macbuild/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -7,7 +7,7 @@ while [ -n "$1" ]; do case $1 in -c) C=-c;; #-c == Core VM only - -A) D=LOGD;A=LOGA;F=LOGS;; + -A) D=LOGD;A=LOGA;F=LOGF;; -d) D=LOGD;; -a) A=LOGA;; -f) F=LOGF;; Added: branches/Cog/spurstackbuild/unixbuild/HowToBuild =================================================================== --- branches/Cog/spurstackbuild/unixbuild/HowToBuild (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/HowToBuild 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,104 @@ +How To Build On Linux +--------------------- + +Contents: + - How to build the Spur Stack VM on Unix + - Testing an external plugin has completely linked + - Compiling in 32-bit mode on a 64-bit linux + - Testing an external plugin has completely linked + - N.B. Please read: Optimization level and gcc version + +How to build the Newspeak VM on Unix +------------------------------- +1. Install the tools (gcc, X11-devel, etc (e.g. libpng, libX11 & libxt source)) +2. Check out the following sources from svn (if you haven't already - if you're + reading this in unixbuild its likely you've already got the sources) + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/platforms + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/spurstacksrc + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/spurstackbuild +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 + 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 + +4. At the end of it you'll get a new VM in sslinux, or in the path provided + via -prefix + +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + + +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 + +3b. For a full debug VM use the dbgbld's mvm and find a vm in sslinuxdbg, + or do + CFLAGS="-g -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNO_VM_PROFILE=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid" LDFLAGS=-Wl,-z,now + +3c. If you're building the VM on a 64-bit OS, you'll need a compiler which can +compile and link to 32-bit binaries. On most Linuxes the gcc-multilib package +provides the 32-bit compiler and the ia32-libs provides the 32-bit libraries. +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" +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. + + +3c. (see Compiling in 32-bit mode on a 64-bit linux below) +If you're building the VM on a 64-bit OS, you'll need a compiler which can +compile and link to 32-bit binaries. On most Linuxes the gcc-multilib package +provides the 32-bit compiler and the ia32-libs provides the 32-bit libraries. +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 +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. + +Compiling in 32-bit mode on a 64-bit linux +------------------------------- +Follow 3c. above. Also note that according to Paul DeBruicker the following +packages need to be installed to compile in 32-bt mode on 64-bit ubuntu. YMMV. + +build-essential +ia32-libs +gcc-multilib +g++multilib + +In addition phil(a)highoctane.be installed libc6dev-i386. + +This in itself may not be enough, but persistence will pay off. See for example +http://permalink.gmane.org/gmane.comp.lang.smalltalk.pharo.devel/75198. + +Testing an external plugin has completely linked +------------------------------- +You may find that an external plugin compiles and links but does not load. +This is usually because it contans undefined symbols. To find undefined +symbols, remake the plugin, capturing the link step and then supply + -Wl,--warn-unresolved-symbols -Wl,--no-allow-shlib-undefined +when manually repeating the link command + + +Optimization level and gcc version +---------------------------------- +There are issues with gcc version > 4.2.1. Any of the following flags may break the build at -O2: +-ftree-pre +-fpartial-inlining +-fcaller-saves + +So turn them off. e.g. + ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -fno-caller-saves -fno-partial-inlining -fno-tree-pre -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread +See http://smallissimo.blogspot.fr/2013/02/compiling-squeak-cog-virtual-machine… + +There appear to be issues with 3.4.x gcc version on RedHat. In particular +compiling the Newspeak VM with either of + gcc version 3.4.6 20060404 (Red Hat 3.4.6-3) + gcc version 3.4.6 20060404 (Red Hat 3.4.6-10) +using -O2 results in a VM that segfaults early in startup. For these compilers +it is probably wise to use -O1, even though -O3 seems to work. Added: branches/Cog/spurstackbuild/unixbuild/astbld/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbld/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbld/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,27 @@ +#!/bin/bash +INSTALLDIR=sslinuxast +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +OPT=-O1 + +echo -n "clean? " +read a +case $a in +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 \ + --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" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/astbld/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/astbld/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbld/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbld/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/astbld/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbld/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbld/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/astbldt/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbldt/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbldt/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,28 @@ +#!/bin/bash +# VM with VM profiler and threaded heartbeat assuming multiple thread priorities +INSTALLDIR=sslinuxastht +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +OPT=-O1 + +echo -n "clean? " +read a +case $a in +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 \ + --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" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/astbldt/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/astbldt/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bld/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bld/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,31 @@ +#!/bin/bash +INSTALLDIR=sslinux +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +# Some gcc versions create a broken VM using -O2 +case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in +3.4.*) OPT=-O1;; +*) OPT=-O2;; +esac + +echo -n "clean? " +read a +case $a in +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 \ + --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" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/bld/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/bld/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bld/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bld/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/bld/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bld/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bld/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/bldt/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bldt/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bldt/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,32 @@ +#!/bin/bash +# VM with VM profiler and threaded heartbeat assuming multiple thread priorities +INSTALLDIR=sslinuxht +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +# Some gcc versions create a broken VM using -O2 +case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in +3.4.*) OPT=-O1;; +*) OPT=-O2;; +esac + +echo -n "clean? " +read a +case $a in +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 \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DDEBUGVM=0" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/bldt/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/bldt/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bldt/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bldt/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/bldt/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/bldt/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/bldt/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,27 @@ +#!/bin/bash +INSTALLDIR=sslinuxdbg +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +OPT=-O0 + +echo -n "clean? " +read a +case $a in +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 \ + --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" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/dbgbld/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbld/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,28 @@ +#!/bin/bash +# VM with VM profiler and threaded heartbeat assuming multiple thread priorities +INSTALLDIR=sslinuxdbght +if [ $# -ge 1 ]; then + case "$1" in + -*) ;; + *) INSTALLDIR="$1"; shift + esac +fi +OPT=-O0 + +echo -n "clean? " +read a +case $a in +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 \ + --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" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +../../../scripts/nukeversion +rm -rf ../../../$INSTALLDIR +# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/$INSTALLDIR Property changes on: branches/Cog/spurstackbuild/unixbuild/dbgbldt/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.ext =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.ext (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.ext 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,3 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.ext +EXTERNAL_PLUGINS = \ +SqueakSSL Added: branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.int =================================================================== --- branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.int (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/dbgbldt/plugins.int 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,26 @@ +# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int +INTERNAL_PLUGINS = \ +AsynchFilePlugin \ +BMPReadWriterPlugin \ +B2DPlugin \ +BitBltPlugin \ +DSAPrims \ +DropPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +ZipPlugin \ +JPEGReadWriter2Plugin \ +JPEGReaderPlugin \ +LargeIntegers \ +Matrix2x3Plugin \ +MiscPrimitivePlugin \ +IA32ABI \ +RePlugin \ +SecurityPlugin \ +SocketPlugin \ +SurfacePlugin \ +UUIDPlugin \ +UnixOSProcessPlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/spurstackbuild/unixbuild/mkNamedPrims.sh =================================================================== --- branches/Cog/spurstackbuild/unixbuild/mkNamedPrims.sh (rev 0) +++ branches/Cog/spurstackbuild/unixbuild/mkNamedPrims.sh 2013-11-13 22:27:21 UTC (rev 2805) @@ -0,0 +1,24 @@ +#!/bin/sh +# Generate a sqNamedPrims.h file from plugins.int. The plugins.int used should +# be the one and only argument. +if [ $# != 1 -o ! -f "$1" ]; then + echo usage $0 plugins.int ">sqNamedPrims.h" 1>&2 + exit 1 +fi +echo "/* Automatically generated on "`date`" */" +echo "extern sqExport vm_exports[];"; +echo "extern sqExport os_exports[];"; +for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'` +do + echo "extern sqExport "$p"_exports[];" +done +echo +echo "sqExport *pluginExports[] = {" +echo " vm_exports," +echo " os_exports," +for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'` +do + echo " "$p"_exports," +done +echo " NULL" +echo "};" Property changes on: branches/Cog/spurstackbuild/unixbuild/mkNamedPrims.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-11-12 03:28:11 UTC (rev 2804) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2013-11-13 22:27:21 UTC (rev 2805) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.510 uuid: 70117c0d-28a7-4703-a044-cab26cfffe83 from - StackInterpreter VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 + StackInterpreter VMMaker.oscog-eem.510 uuid: 70117c0d-28a7-4703-a044-cab26cfffe83 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.497 uuid: e1a38963-1741-4d75-99ae-af7006087d85 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.510 uuid: 70117c0d-28a7-4703-a044-cab26cfffe83 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -267,8 +267,8 @@ #define ProcessSignalingLowSpace 22 #define ReceiverIndex 5 #define RemapBufferSize 25 -#define RememberedSetLimit 0x4000 -#define RememberedSetRedZone 0x2000 +#define RememberedSetLimit 0x10000 +#define RememberedSetRedZone 0x8000 #define SchedulerAssociation 3 #define SelectorAboutToReturn 48 #define SelectorCannotInterpret 34 @@ -284,6 +284,10 @@ #define SmallContextSlots 22 #define SmallIntegerShift 1 #define SpecialSelectors 23 +#define StackPageReachedButUntraced 1 +#define StackPageTraced 2 +#define StackPageTraceInvalid -1 +#define StackPageUnreached 0 #define StackPointerIndex 2 #define SuperclassIndex 0 #define SuspendedContextIndex 1 @@ -330,7 +334,6 @@ static sqInt allocateNewSpaceSlotsformatclassIndex(sqInt numSlots, sqInt formatField, sqInt classIndex); static void allocateOrExtendSegmentInfos(void); static sqInt allocateSlotsInOldSpacebytesformatclassIndex(sqInt numSlots, sqInt totalBytes, sqInt formatField, sqInt classIndex); -static sqInt allocateSlotsformatclassIndex(sqInt numSlots, sqInt formatField, sqInt classIndex); static sqInt allocationUnit(void); static sqInt allUnscannedEphemeronsAreActive(void); sqInt argumentCountOfClosure(sqInt closurePointer); @@ -345,7 +348,6 @@ static sqInt becomeEffectFlagsFor(sqInt objOop); sqInt becomewith(sqInt array1, sqInt array2); static sqInt becomewithtwoWaycopyHash(sqInt array1, sqInt array2, sqInt twoWayFlag, sqInt copyHashFlag); -static void bestFitCompact(void); static sqInt bitsSetInFreeSpaceMaskForAllFreeLists(void); sqInt booleanValueOf(sqInt obj); static void bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil); @@ -370,7 +372,7 @@ sqInt checkedIntegerValueOf(sqInt intOop); sqInt checkedLongAt(sqInt byteAddress); static sqInt checkForEventsMayContextSwitch(sqInt mayContextSwitch); -static sqInt checkHeapIntegrity(void); +static sqInt checkHeapIntegrity(sqInt excludeUnmarkedNewSpaceObjs); static sqInt checkImageVersionFromstartingAt(sqImageFile f, squeakFileOffsetType imageOffset); static sqInt checkInterpreterIntegrity(void); static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP); @@ -423,6 +425,7 @@ static sqInt copyAndForward(sqInt survivor); sqInt copyBits(void); sqInt copyBitsFromtoat(sqInt x0, sqInt x1, sqInt y); +void countMarkedAndUnmarkdObjects(sqInt printFlags); static void cr(void); static void createActualMessageTo(sqInt lookupClass); char * cStringOrNullFor(sqInt oop); @@ -439,6 +442,7 @@ EXPORT(sqInt) dumpImage(sqInt fileName); void dumpPrimTraceLog(void); sqInt eeInstantiateClassIndexformatnumSlots(sqInt knownClassIndex, sqInt objFormat, sqInt numSlots); +static void eliminateAndFreeForwarders(void); static void ensureAdequateClassTableBitmap(void); static sqInt ensureBehaviorHash(sqInt aBehavior); static sqInt ensureCallerContext(char *theFP); @@ -446,8 +450,8 @@ static sqInt ensureRoomOnObjStackAt(sqInt objStackRootIndex); static sqInt enterIntoClassTable(sqInt aBehavior); static sqInt ephemeronFormat(void); -static void exactFitCompact(void); static sqInt existInstancesInNewSpaceOf(sqInt classObj); +static void expungeDuplicateClasses(void); static void externalDivorceFrameandContext(char *theFP, sqInt ctxt); static char * externalEnsureIsBaseFrame(char *aFramePtr); static sqInt externalInstVarofContext(sqInt offset, sqInt aContext); @@ -465,6 +469,7 @@ sqInt fetchLong32ofObject(sqInt fieldIndex, sqInt oop); sqInt fetchPointerofObject(sqInt fieldIndex, sqInt objOop); static sqInt fetchStackPointerOf(sqInt aContext); +static void fillHighestObjectsWithMovableObjectsFromupTo(sqInt startObj, sqInt limitObj); static sqInt findClassContainingMethodstartingAt(sqInt meth, sqInt classObj); sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr); static char * findFrameAboveinPage(char *theFP, StackPage *thePage); @@ -479,6 +484,7 @@ sqInt firstByteFormat(void); sqInt firstCompiledMethodFormat(void); static sqInt firstCorpse(sqInt headOfCorpseList); +static void firstFitCompact(void); static void * firstFixedFieldOfMaybeImmediate(sqInt oop); void * firstFixedField(sqInt objOop); void * firstIndexableField(sqInt objOop); @@ -516,6 +522,7 @@ static sqInt freeChunkNextIndex(void); static sqInt freeChunkParentIndex(void); static sqInt freeChunkWithBytesat(sqInt bytes, sqInt address); +static sqInt freeListsObj(void); static sqInt freeStackPageNoAssert(StackPage *aPage); static void freeUntracedStackPages(void); sqInt fullDisplayUpdate(void); @@ -575,6 +582,7 @@ static sqInt isContextHeader(sqInt aHeader); static sqInt isContextNonImm(sqInt oop); static sqInt isContext(sqInt oop); +static sqInt isEnumerableObject(sqInt objOop); static sqInt isEphemeron(sqInt objOop); sqInt isFloatObject(sqInt oop); static sqInt isForwardedClassTag(sqInt classIndex); @@ -587,6 +595,7 @@ static sqInt isInFutureSpace(sqInt address); sqInt isInMemory(sqInt address); static sqInt isInNewSpace(sqInt objOop); +static sqInt isInOldSpace(sqInt address); static sqInt isInRememberedSet(sqInt objOop); static sqInt isInSegments(usqInt address); sqInt isIntegerObject(sqInt oop); @@ -646,6 +655,7 @@ sqInt loadBitBltFrom(sqInt bb); void loadInitialContext(void); void longPrintOop(sqInt oop); +void longPrintReferencesTo(sqInt anOop); sqInt longStoreBytecodeForHeader(sqInt methodHeader); static sqInt lookupInMethodCacheSelclassTag(sqInt selector, sqInt classTag); static sqInt lookupMethodInClass(sqInt class); @@ -657,6 +667,8 @@ sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue); static void mapInterpreterOops(void); static void mapStackPages(void); +static sqInt markAndShouldScan(sqInt objOop); +static void markAndTraceClassOf(sqInt objOop); static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents); static sqInt markAndTraceStackPages(sqInt fullGCFlag); static void markAndTraceStackPage(StackPage *thePage); @@ -695,6 +707,7 @@ static sqInt noUnscannedEphemerons(void); static sqInt numFreeLists(void); sqInt numPointerSlotsOf(sqInt objOop); +static sqInt numSlotsMask(void); static usqInt numSlotsOfAny(sqInt objOop); usqInt numSlotsOf(sqInt objOop); sqInt numStrongSlotsOfephemeronInactiveIf(sqInt objOop, int (*criterion)(sqInt key)); @@ -702,12 +715,16 @@ sqInt objectAfter(sqInt objOop); static sqInt objectAfterlimit(sqInt objOop, sqInt limit); sqInt objectArg(sqInt index); +sqInt objectBefore(sqInt objOop); static sqInt objectStartingAt(sqInt address); sqInt obsoleteDontUseThisFetchWordofObject(sqInt fieldIndex, sqInt oop); static sqInt okayOop(sqInt signedOop); static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThanOrEqualToandLessThanOrEqualTo(sqInt anOop, sqInt baseOop, sqInt limitOop); static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop); +static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop); +static sqInt oopisLessThanOrEqualTo(sqInt anOop, sqInt otherOop); +static sqInt oopisLessThan(sqInt anOop, sqInt otherOop); static sqInt pageIndexFor(void *pointer); static sqInt pageListIsWellFormed(void); void pinObject(sqInt objOop); @@ -977,6 +994,7 @@ void printProcessStack(sqInt aProcess); sqInt printProcsOnList(sqInt procList); void printReferencesTo(sqInt anOop); +sqInt printStackCallStackOf(char *aFramePointer); void printStackPageList(void); void printStackPageListInUse(void); void printStackPages(void); @@ -1003,7 +1021,7 @@ static usqInt rawNumSlotsOf(sqInt objOop); static usqInt rawOverflowSlotsOf(sqInt objOop); sqInt readableFormat(sqInt imageVersion); -static sqInt readHeapFromImageFiledataBytes(sqInt f, sqInt numBytes); +static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes); size_t readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squeakFileOffsetType imageOffset); static sqInt rebuildFreeTreeFrom(sqInt sortedFreeChunks); EXPORT(sqInt) reestablishContextPriorToCallback(sqInt callbackContext); @@ -1016,7 +1034,7 @@ static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex); static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); -static void runLeakCheckerForFullGC(sqInt fullGCFlag); +static void runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjs(sqInt fullGCFlag, sqInt excludeUnmarkedNewSpaceObjs); static void scanClassPostBecomeeffects(sqInt startClassObj, sqInt becomeEffects); static void scavengeFutureSurvivorSpaceStartingAt(sqInt initialAddress); static void scavengeLoop(void); @@ -1025,6 +1043,7 @@ static float scavengerTenuringThreshold(void); static sqInt scavengeUnfiredEphemeronsOnEphemeronList(void); static void scavengingGCTenuringIf(sqInt tenuringCriterion); +static usqInt segLimit(SpurSegmentInfo * self_in_segLimit); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); EXPORT(sqInt) sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtr, sqInt stackPtr, sqInt regsPtr, sqInt jmpBufPtr); void setBreakSelector(char *aString); @@ -1058,7 +1077,7 @@ static sqInt sixtyFourBitIndexableFormat(void); usqInt sizeOfAlienData(sqInt oop); sqInt sizeOfCallPrimitiveBytecode(sqInt methodHeader); -static sqInt sizeOfFree(sqInt objOop); +static usqLong sizeOfFree(sqInt objOop); sqInt sizeOfLongStoreTempBytecode(sqInt methodHeader); sqInt sizeOfSTArrayFromCPrimitive(void *cPtr); sqInt slotSizeOf(sqInt oop); @@ -1109,6 +1128,7 @@ sqInt trueObject(void); static void unlinkSolitaryFreeTreeNode(sqInt freeTreeNode); static void updateStateOfSpouseContextForFrameWithSP(char *theFP, char *theSP); +static sqInt usedSize(SpurCircularBuffer * self_in_usedSize); static sqInt validClassTableRootPages(void); static sqInt validInstructionPointerinFrame(usqInt anInstrPointer, char *fp); sqInt validInstructionPointerinMethodframePointer(usqInt theInstrPointer, usqInt aMethod, char *fp); @@ -1136,32 +1156,32 @@ _iss sqInt specialObjectsOop; _iss StackPage * stackPage; _iss sqInt nilObj; -_iss char * framePointer; -_iss usqInt newSpaceLimit; _iss usqInt method; +_iss usqInt newSpaceLimit; +_iss char * framePointer; _iss sqInt argumentCount; _iss usqInt newMethod; _iss sqInt messageSelector; _iss sqInt hiddenRootsObj; _iss usqInt instructionPointer; -_iss usqInt freeOldSpaceStart; _iss usqInt freeStart; _iss sqInt remapBufferCount; -_iss SpurCircularBuffer highestObjects; +_iss usqInt freeOldSpaceStart; _iss sqInt trueObj; _iss sqInt falseObj; -_iss sqInt totalFreeOldSpace; _iss StackPage * pages; +_iss sqInt totalFreeOldSpace; +_iss SpurCircularBuffer highestObjects; _iss sqInt * freeLists; -_iss sqInt freeListsMask; _iss usqInt pastSpaceStart; _iss SpurSegmentInfo * segments; _iss char * stackLimit; _iss char * stackMemory; +_iss usqInt freeListsMask; _iss sqInt rememberedSetSize; -_iss sqInt weaklingStack; _iss sqInt bytesPerPage; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt weaklingStack; _iss SpurContiguousObjStack unscannedEphemerons; _iss SpurNewSpaceSpace futureSpace; _iss StackPage * mostRecentlyUsedPage; @@ -1171,40 +1191,41 @@ _iss sqInt jmpDepth; _iss sqInt numRememberedEphemerons; _iss sqInt classNameIndex; -_iss usqInt endOfMemory; _iss sqInt markStack; -_iss sqInt numStackPages; +_iss usqInt endOfMemory; _iss sqInt numClassTablePages; +_iss sqInt numStackPages; _iss sqLong nextProfileTick; _iss SpurNewSpaceSpace eden; _iss sqInt profileProcess; _iss sqInt tenureThreshold; _iss sqInt ephemeronList; +_iss sqInt needGCFlag; _iss sqInt numPages; _iss sqInt tempOop; _iss sqInt previousRememberedSetSize; +_iss unsigned char * classTableBitmap; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; -_iss sqInt objStackInvalidBecause; +_iss char * objStackInvalidBecause; _iss sqInt ephemeronQueue; _iss sqInt extraRootCount; +_iss sqInt firstFreeChunk; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt profileMethod; -_iss sqInt startOfMemory; -_iss unsigned char * classTableBitmap; +_iss usqInt startOfMemory; +_iss sqInt growHeadroom; _iss sqInt invalidObjStackPage; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; _iss sqInt highestRunnableProcessPriority; +_iss sqInt lastSubdividedFreeChunk; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss sqInt statCheckForEvents; -_iss sqInt firstFreeChunk; -_iss sqInt growHeadroom; _iss usqInt lowSpaceThreshold; -_iss sqInt needGCFlag; _iss usqLong statGCEndUsecs; _iss sqInt classTableIndex; _iss sqInt lkupClass; @@ -1217,7 +1238,7 @@ _iss sqInt firstSegmentSize; _iss usqLong gcStartUsecs; _iss usqInt memory; -_iss sqInt statCompactPassCount; +_iss usqInt scavengeThreshold; _iss sqInt thisClassIndex; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt fullScreenFlag; @@ -1234,6 +1255,7 @@ _iss sqInt globalSessionID; _iss sqInt interruptKeycode; _iss sqInt maxExtSemTabSizeSet; +_iss sqInt statCompactPassCount; _iss usqLong statFullGCUsecs; _iss sqInt statFullGCs; _iss sqInt statGrowMemory; @@ -1248,7 +1270,6 @@ _iss sqInt methodDictLinearSearchLimit; _iss StackPage * overflowedPage; _iss sqInt savedWindowSize; -_iss usqInt scavengeThreshold; _iss sqInt signalLowSpace; _iss sqInt statMarkCount; _iss sqInt statPendingFinalizationSignals; @@ -1264,7 +1285,7 @@ _iss long methodCache[MethodCacheSize + 1 /* 4097 */]; _iss sqInt remapBuffer[RemapBufferSize + 1 /* 26 */]; _iss sqInt atCache[AtCacheTotalSize + 1 /* 65 */]; -_iss sqInt rememberedSet[RememberedSetLimit + 1 /* 16385 */]; +_iss sqInt rememberedSet[RememberedSetLimit + 1 /* 65537 */]; _iss sqInt *extraRoots[ExtraRootsSize + 1 /* 2049 */]; _iss usqInt suspendedCallbacks[MaxJumpBuf + 1 /* 33 */]; _iss usqInt suspendedMethods[MaxJumpBuf + 1 /* 33 */]; @@ -1889,7 +1910,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.497]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.510]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -3475,8 +3496,10 @@ CASE(64) /* pushLiteralVariableBytecode */ { + sqInt litVar; sqInt object; sqInt objOop; + sqInt referent; VM_LABEL(0pushLiteralVariableBytecode); /* begin fetchNextBytecode */ @@ -3490,20 +3513,38 @@ # endif /* MULTIPLEBYTECODESETS */ /* begin pushLiteralVariable: */ - /* begin internalPush: */ - /* begin fetchPointer:ofObject: */ + VM_LABEL(0pushLiteralVariable); + + /* push/store/popLiteralVariable all fetch a literal, and either read or write the literal's value field. + The fetch of the literal needs an explicit check (otherwise we would have to scan all literals in + all methods in the stack zone, and the entire method on return, and global variables are relatively + rare; in my work image 8.7% of literals are globals). */ + /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); - objOop = longAt((GIV(method) + (BaseHeaderSize)) + 4 /* ((currentBytecode bitAnd: 31) + LiteralStart) << 2 */); - object = longAt((objOop + (BaseHeaderSize)) + (ValueIndex << 2)); - longAtPointerput((localSP -= BytesPerOop), object); + litVar = longAt((GIV(method) + (BaseHeaderSize)) + 4 /* ((currentBytecode bitAnd: 31) + LiteralStart) << 2 */); + if (((longAt(litVar)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(litVar)); + referent = longAt((litVar + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + litVar = referent; + } + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), longAt((litVar + (BaseHeaderSize)) + (ValueIndex << 2))); + } BREAK; CASE(65) /* pushLiteralVariableBytecode */ { + sqInt litVar; sqInt object; sqInt objOop; + sqInt referent; VM_LABEL(1pushLiteralVariableBytecode); /* begin fetchNextBytecode */ @@ -3517,20 +3558,38 @@ # endif /* MULTIPLEBYTECODESETS */ /* begin pushLiteralVariable: */ - /* begin internalPush: */ - /* begin fetchPointer:ofObject: */ + VM_LABEL(1pushLiteralVariable); + + /* push/store/popLiteralVariable all fetch a literal, and either read or write the literal's value field. + The fetch of the literal needs an explicit check (otherwise we would have to scan all literals in + all methods in the stack zone, and the entire method on return, and global variables are relatively + rare; in my work image 8.7% of literals are globals). */ + /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); - objOop = longAt((GIV(method) + (BaseHeaderSize)) + 8 /* ((currentBytecode bitAnd: 31) + LiteralStart) << 2 */); - object = longAt((objOop + (BaseHeaderSize)) + (ValueIndex << 2)); - longAtPointerput((localSP -= BytesPerOop), object); + litVar = longAt((GIV(method) + (BaseHeaderSize)) + 8 /* ((currentBytecode bitAnd: 31) + LiteralStart) << 2 */); + if (((longAt(litVar)) & 0x3FFFFF) == 8) { + /* begin followForwarded: */ + assert(isForwarded(litVar)); + referent = longAt((litVar + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + litVar = referent; + } + /* begin internalPush: */ + longAtPointerput((localSP -= BytesPerOop), longAt((litVar + (BaseHeaderSize)) + (ValueIndex << 2))); + } BREAK; CASE(66) /* pushLiteralVariableBytecode */ { + sqInt litVar; sqInt object; sqInt objOop; + sqInt referent; VM_LABEL(2pushLiteralVariableBytecode); /* begin fetchNextBytecode */ @@ -3544,20 +3603,38 @@ # endif /* MULTIPLEBYTECODESETS */ /* begin pushLiteralVariable: */ - /* begin internalPush: */ - /* begin fetchPointer:ofObject: */ + VM_LABEL(2pushLiteralVariable); + + /* push/store/popLiteralVariable all fetch a literal, and either read or write the literal's value field. + The fetch of the literal needs an explicit check (otherwise we would have to scan all literals in + all methods in the stack zone, and the entire method on return, and global variables are relatively + rare; in my work image 8.7% of literals are globals). */ + /* begin literal: */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.510.mcz
by commits＠source.squeak.org 13 Nov '13

13 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.510.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.510 Author: eem Time: 13 November 2013, 1:55:19.338 pm UUID: 70117c0d-28a7-4703-a044-cab26cfffe83 Ancestors: VMMaker.oscog-eem.509 Reduce C compilation warnings for the Spur Stack VM. Fix bug in SpurMemMgr>>countMarkedAndUnmarkdObjects:. =============== Diff against VMMaker.oscog-eem.509 =============== Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them (the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> + <var: #theIPPtr type: #usqInt> - <var: #theIPPtr type: #'char *'> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: + [theIPPtr := theSP asUnsignedInteger. - [theIPPtr := theSP. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). + self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). - self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). offset := theFP + (self frameStackedReceiverOffset: theFP). oop := stackPages longAt: offset. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: offset put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxIFReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| delta | delta := (objectMemory followForwarded: oop) - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > (self frameMethod: theFP)]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (objectMemory followForwarded: oop)]]. self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. - [theIPPtr := theFP + FoxCallerSavedIP. theFP := callerFP]]]! Item was changed: ----- Method: ObjectMemory>>readHeapFromImageFile:dataBytes: (in category 'image save/restore') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written." + <var: #f type: #sqImageFile> ^self cCode: [self sq: (self pointerForOop: self memoryBaseForImageRead) Image: (self sizeof: #char) File: numBytes Read: f] inSmalltalk: [(f readInto: memory startingAt: self memoryBaseForImageRead // 4 + 1 count: numBytes // 4) * 4]! Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceLimit pastSpaceStart lowSpaceThreshold freeOldSpaceStart startOfMemory endOfMemory sortedFreeChunks) in: aCCodeGenerator. self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #classTableBitmap type: #'unsigned char *'; + var: #objStackInvalidBecause type: #'char *'; var: #highestObjects type: #SpurCircularBuffer; var: #unscannedEphemerons type: #SpurContiguousObjStack. aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots + declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'! - declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'.! Item was changed: ----- Method: SpurMemoryManager>>countMarkedAndUnmarkdObjects: (in category 'debug support') ----- countMarkedAndUnmarkdObjects: printFlags "print the count of marked and unmarked objects. In addition if 1 is set in printFlags, short-print marked objects, and/or if 2 is set, short-print unmarked obejcts." <api> | nm nu | nm := nu := 0. self allObjectsDo: [:o| (self isMarked: o) ifTrue: [nm := nm + 1. (printFlags anyMask: 1) ifTrue: [coInterpreter shortPrintOop: o]] ifFalse: [nu := nu + 1. (printFlags anyMask: 2) ifTrue: [coInterpreter shortPrintOop: o]]]. + self print: 'n marked: '; printNum: nm; cr. + self print: 'n unmarked: '; printNum: nu; cr! - self print: 'n marked: '; print: nm; cr. - self print: 'n unmarked: '; print: nu; cr! Item was changed: ----- Method: SpurMemoryManager>>isValidObjStackPage:myIndex: (in category 'obj stacks') ----- isValidObjStackPage: objStackPage myIndex: myx "Just check the page itself." <inline: false> (self classIndexOf: objStackPage) = self wordSizeClassIndexPun ifFalse: + [objStackInvalidBecause := 'wrong class index'. - [objStackInvalidBecause := 'wong class index'. invalidObjStackPage := objStackPage. ^false]. (self formatOf: objStackPage) = self wordIndexableFormat ifFalse: + [objStackInvalidBecause := 'wrong format'. - [objStackInvalidBecause := 'wong format'. invalidObjStackPage := objStackPage. ^false]. (self numSlotsOfAny: objStackPage) = ObjStackPageSlots ifFalse: + [objStackInvalidBecause := 'wrong num slots'. - [objStackInvalidBecause := 'wong num slots'. invalidObjStackPage := objStackPage. ^false]. myx = (self fetchPointer: ObjStackMyx ofObject: objStackPage) ifFalse: + [objStackInvalidBecause := 'wrong myx'. - [objStackInvalidBecause := 'wong myx'. invalidObjStackPage := objStackPage. ^false]. (marking and: [(self isMarked: objStackPage) not]) ifTrue: [objStackInvalidBecause := 'marking but page is unmarked'. invalidObjStackPage := objStackPage. ^false]. ^true! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> <var: #segAddress type: #'void *'> self cCode: [] inSmalltalk: [segments ifNil: [^nil]]. "bootstrap" (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount Above: (segments at: 0) segLimit asVoidPointer AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | newSegIndex := self insertSegmentFor: segAddress asUnsignedLong. newSeg := self addressOf: (segments at: newSegIndex). newSeg + segStart: segAddress asUnsignedLong; - segStart: segAddress; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). "and add the new free chunk to the free list; done here instead of in assimilateNewSegment: for the assert" manager addFreeChunkWithBytes: allocatedSize - manager bridgeSize at: newSeg segStart. self assert: (manager addressAfter: (manager objectStartingAt: newSeg segStart)) = (newSeg segLimit - manager bridgeSize). + "test isInMemory:" + 0 to: numSegments - 1 do: + [:i| + self assert: (manager isInMemory: (segments at: i) segStart). + self assert: (manager isInMemory: (segments at: i) segLimit - manager wordSize). + self assert: (manager isInMemory: (segments at: i) segLimit) not. + (i between: 1 and: numSegments - 2) ifTrue: + [self assert: (manager isInMemory: (segments at: i) segStart - manager wordSize) not]]. ^newSeg]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>readHeapFromImageFile:dataBytes: (in category 'snapshot') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the segment info, while eliminating the bridge objects that end each segment and give the size of the subsequent segment." + <var: #f type: #sqImageFile> <inline: false> | bytesRead totalBytesRead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | <var: 'segInfo' type: 'SpurSegmentInfo *'> self allocateOrExtendSegmentInfos. "segment sizes include the two-header-word bridge at the end of each segment." numSegments := totalBytesRead := 0. oldBase := 0. "N.B. still must be adjusted by oldBaseAddr." newBase := manager newSpaceLimit. nextSegmentSize := firstSegmentSize. bridge := firstSegmentSize + manager newSpaceLimit - manager baseHeaderSize. [segInfo := self addressOf: (segments at: numSegments). segInfo segStart: oldBase; "N.B. still must be adjusted by oldBaseAddr." segSize: nextSegmentSize; swizzle: newBase - oldBase. "N.B. still must be adjusted by oldBaseAddr." bytesRead := self readHeapFrom: f at: newBase dataBytes: nextSegmentSize. bytesRead > 0 ifTrue: [totalBytesRead := totalBytesRead + bytesRead]. bytesRead ~= nextSegmentSize ifTrue: [^totalBytesRead]. numSegments := numSegments + 1. bridgeSpan := manager bytesPerSlot * (manager rawOverflowSlotsOf: bridge). oldBase := oldBase + nextSegmentSize + bridgeSpan. newBase := newBase + nextSegmentSize - manager bridgeSize. nextSegmentSize := manager longLongAt: bridge. nextSegmentSize ~= 0] whileTrue: [bridge := bridge - manager bridgeSize + nextSegmentSize]. "newBase should point just past the last bridge. all others should have been eliminated." self assert: newBase - manager newSpaceLimit = (totalBytesRead - (numSegments * manager bridgeSize)). "set freeOldSpaceStart now for adjustAllOopsBy:" manager setFreeOldSpaceStart: newBase. ^totalBytesRead! Item was changed: ----- Method: SpurSegmentManager>>writeSegment:nextSegmentSize:toFile: (in category 'snapshot') ----- writeSegment: aSpurSegmentInfo nextSegmentSize: nextSegSize toFile: aBinaryStream <var: 'aSpurSegmentInfo' type: #'SpurSegmentInfo *'> <var: 'aBinaryStream' type: #'FILE *'> | bridge savedHeader nWritten | <var: 'savedHeader' type: #usqLong> bridge := aSpurSegmentInfo segLimit - manager baseHeaderSize. "last seg may be beyond endOfMemory/freeOldSpaceStart" self assert: ((manager isValidSegmentBridge: bridge) or: [nextSegSize = 0]). savedHeader := manager longLongAt: bridge. manager longLongAt: bridge put: nextSegSize. nWritten := self cCode: [self + sq: aSpurSegmentInfo segStart asVoidPointer - sq: aSpurSegmentInfo segStart Image: 1 File: aSpurSegmentInfo segSize Write: aBinaryStream] inSmalltalk: [aBinaryStream next: aSpurSegmentInfo segSize / 4 putAll: manager memory startingAt: aSpurSegmentInfo segStart / 4 + 1. aSpurSegmentInfo segSize]. manager longLongAt: bridge put: savedHeader. ^nWritten! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them (the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> + <var: #theIPPtr type: #usqInt> - <var: #theIPPtr type: #'char *'> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: + [theIPPtr := theSP asUnsignedInteger. - [theIPPtr := theSP. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). + self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). - self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). oop := stackPages longAt: theFP + FoxReceiver. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. + theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asUnsignedInteger. "reuse theIP; its just an offset here" - theIP := theFP + (self frameStackedReceiverOffset: theFP). "reuse theIP; its just an offset here" oop := stackPages longAt: theIP. ((objectMemory isNonImmediate: oop) and: [(objectMemory isForwarded: oop)]) ifTrue: [stackPages longAt: theIP put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| delta | theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := (objectMemory followForwarded: oop) - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (objectMemory followForwarded: oop)]. self followNecessaryForwardingInMethod: (self frameMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: + [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. - [theIPPtr := theFP + FoxCallerSavedIP. theFP := callerFP]]]! Item was changed: ----- Method: StackInterpreter>>printFrameThing:andFrame:at: (in category 'debug printing') ----- printFrameThing: name andFrame: theFP at: address <var: #theFP type: #'char *'> | it len | <inline: false> <var: #name type: #'char *'> <var: #address type: #'char *'> it := stackPages longAt: address. self printHexPtr: address; printChar: $:. len := self strlen: name. 1 to: 12 - len do: [:i| self space]. self print: name; print: ': '; printHex: it. it ~= 0 ifTrue: [self printChar: $=. it = objectMemory nilObject ifTrue: [self print: 'nil'] ifFalse: [self printNum: it]]. + self print: ' frame: '; printHexPtr: theFP; cr! - self print: ' frame: '; printHex: theFP; cr! Item was changed: ----- Method: StackInterpreter>>printStackCallStack (in category 'debug printing') ----- printStackCallStack <doNotGenerate> + self printStackCallStackOf: localFP! - | theFP context | - theFP := localFP. - [context := self shortReversePrintFrameAndCallers: theFP. - ((self isMarriedOrWidowedContext: context) - and: [self checkIsStillMarriedContext: context currentFP: localFP]) ifFalse: - [^nil]. - theFP := self frameOfMarriedContext: context] repeat! Item was added: + ----- Method: StackInterpreter>>printStackCallStackOf: (in category 'debug printing') ----- + printStackCallStackOf: aFramePointer + <var: #aFramePointer type: #'char *'> + <api> + | theFP context | + <var: #theFP type: #'char *'> + theFP := aFramePointer. + [context := self shortReversePrintFrameAndCallers: theFP. + ((self isMarriedOrWidowedContext: context) + and: + [theFP := self frameOfMarriedContext: context. + self checkIsStillMarriedContext: context currentFP: theFP]) ifFalse: + [^nil]] repeat! Item was changed: ----- Method: StackInterpreter>>shortPrintOop: (in category 'debug printing') ----- shortPrintOop: oop <inline: false> self printHexnp: oop. (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^self + cCode: 'printf("=$%ld ($%lc)\n", (long)characterValueOf(oop), (wint_t)characterValueOf(oop))' - cCode: 'printf("=$%ld ($%c)\n", (long)characterValueOf(oop), (long)characterValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. ^self cCode: 'printf("=%ld\n", (long)integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. (objectMemory addressCouldBeObj: oop) ifFalse: [self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [' is not on the heap']); cr. ^nil]. ((objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]) ifTrue: [^self printOop: oop]. self print: ': a(n) '. self printNameOfClass: (objectMemory fetchClassOfNonImm: oop) count: 5. self cr!

1 0

VM Maker: VMMaker.oscog-eem.509.mcz
by commits＠source.squeak.org 13 Nov '13

13 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.509.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.509 Author: eem Time: 12 November 2013, 4:47:46.161 pm UUID: 1f030e9c-8603-4588-8ad9-b3a935699fae Ancestors: VMMaker.oscog-eem.508 Fix the bootstrap now that sufficientSPaceAfterGC: will grow. Change (we hope) all oop comparisons into self oop: o isFoo: l forms. Comment typo. =============== Diff against VMMaker.oscog-eem.508 =============== Item was changed: ----- Method: Spur32BitMemoryManager>>fillObj:numSlots:with: (in category 'instantiation') ----- fillObj: objOop numSlots: numSlots with: fillValue <inline: true> + self assert: (self oop: objOop + self baseHeaderSize + (numSlots * self bytesPerOop) - 1 + isLessThan: (self addressAfter: objOop)). - self assert: (objOop + self baseHeaderSize + (numSlots * self bytesPerOop) - 1) - < (self addressAfter: objOop). objOop + self baseHeaderSize to: objOop + self baseHeaderSize + (numSlots * self wordSize) - 1 by: self allocationUnit do: [:p| self longAt: p put: fillValue; longAt: p + 4 put: fillValue]! Item was changed: ----- Method: Spur32BitMemoryManager>>objectAfter:limit: (in category 'object enumeration') ----- objectAfter: objOop limit: limit "Object parsing. 1. all objects have at least a word following the header, for a forwarding pointer. 2. objects with an overflow size have a preceeing word with a saturated numSlots. If the word following an object doesn't have a saturated numSlots field it must be a single-header object. If the word following does have a saturated numSlots it must be the overflow size word." | followingWordAddress followingWord | followingWordAddress := self addressAfter: objOop. + (self oop: followingWordAddress isGreaterThanOrEqualTo: limit) ifTrue: - followingWordAddress >= limit ifTrue: [^limit]. self flag: #endianness. followingWord := self longAt: followingWordAddress + 4. ^followingWord >> self numSlotsHalfShift = self numSlotsMask ifTrue: [followingWordAddress + self baseHeaderSize] ifFalse: [followingWordAddress]! Item was changed: ----- Method: Spur64BitMemoryManager>>fillObj:numSlots:with: (in category 'instantiation') ----- fillObj: objOop numSlots: numSlots with: fillValue <inline: true> + self assert: (self oop: objOop + self baseHeaderSize + (numSlots * self bytesPerOop) - 1 + isLessThan: (self addressAfter: objOop)). - self assert: (objOop + self baseHeaderSize + (numSlots * self bytesPerOop) - 1) - < (self addressAfter: objOop). objOop + self baseHeaderSize to: objOop + self baseHeaderSize + (numSlots * self bytesPerOop) - 1 by: self allocationUnit do: [:p| self longAt: p put: fillValue]! Item was changed: ----- Method: Spur64BitMemoryManager>>objectAfter:limit: (in category 'object enumeration') ----- objectAfter: objOop limit: limit "Object parsing. 1. all objects have at least a word following the header, for a forwarding pointer. 2. objects with an overflow size have a preceeing word with a saturated numSlots. If the word following an object doesn't have a saturated numSlots field it must be a single-header object. If the word following does have a saturated numSlots it must be the overflow size word." | followingWordAddress followingWord | followingWordAddress := self addressAfter: objOop. + (self oop: followingWordAddress isGreaterThanOrEqualTo: limit) ifTrue: - followingWordAddress >= limit ifTrue: [^limit]. self flag: #endianness. followingWord := self longAt: followingWordAddress. ^followingWord >> self numSlotsFullShift = self numSlotsMask ifTrue: [followingWordAddress + self baseHeaderSize] ifFalse: [followingWordAddress]! Item was changed: ----- Method: SpurMemoryManager class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator self declareCAsOop: #( memory freeStart scavengeThreshold newSpaceLimit pastSpaceStart + lowSpaceThreshold freeOldSpaceStart startOfMemory endOfMemory sortedFreeChunks) - lowSpaceThreshold freeOldSpaceStart endOfMemory sortedFreeChunks) in: aCCodeGenerator. self declareCAsUSqLong: (self allInstVarNames select: [:ivn| ivn endsWith: 'Usecs']) in: aCCodeGenerator. aCCodeGenerator var: #freeListsMask type: #usqInt; var: #freeLists type: #'sqInt *'; var: #classTableBitmap type: #'unsigned char *'; var: #highestObjects type: #SpurCircularBuffer; var: #unscannedEphemerons type: #SpurContiguousObjStack. aCCodeGenerator var: #remapBuffer declareC: 'sqInt remapBuffer[RemapBufferSize + 1 /* ', (RemapBufferSize + 1) printString, ' */]'. aCCodeGenerator var: #extraRoots declareC: 'sqInt *extraRoots[ExtraRootsSize + 1 /* ', (ExtraRootsSize + 1) printString, ' */]'.! Item was changed: ----- Method: SpurMemoryManager>>allExistingNewSpaceObjectsDo: (in category 'object enumeration') ----- allExistingNewSpaceObjectsDo: aBlock <inline: true> | prevObj prevPrevObj objOop limit | prevPrevObj := prevObj := nil. "After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are in pastSpace. Objects are allocated in eden. So enumerate only eden and pastSpace." objOop := self objectStartingAt: scavenger eden start. limit := freeStart. + [self oop: objOop isLessThan: limit] whileTrue: - [objOop < limit] whileTrue: [(self isEnumerableObject: objOop) ifTrue: [aBlock value: objOop]. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeStart]. objOop := self objectStartingAt: scavenger pastSpace start. limit := pastSpaceStart. + [self oop: objOop isLessThan: limit] whileTrue: - [objOop < limit] whileTrue: [(self isFreeObject: objOop) ifFalse: [aBlock value: objOop]. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: limit]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>allExistingOldSpaceObjectsDo: (in category 'object enumeration') ----- allExistingOldSpaceObjectsDo: aBlock "Enumerate all old space objects, excluding any objects created during the execution of allExistingOldSpaceObjectsDo:." <inline: true> | oldSpaceLimit prevObj prevPrevObj objOop | prevPrevObj := prevObj := nil. objOop := self firstObject. oldSpaceLimit := freeOldSpaceStart. [self assert: objOop \\ self allocationUnit = 0. + self oop: objOop isLessThan: oldSpaceLimit] whileTrue: - objOop < oldSpaceLimit] whileTrue: [self assert: (self longLongAt: objOop) ~= 0. (self isEnumerableObject: objOop) ifTrue: [aBlock value: objOop]. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeOldSpaceStart]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>allNewSpaceEntitiesDo: (in category 'object enumeration') ----- allNewSpaceEntitiesDo: aBlock "Enumerate all new space objects, including free objects." <inline: true> | prevObj prevPrevObj objOop limit | prevPrevObj := prevObj := nil. "After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are in pastSpace. Objects are allocated in eden. So enumerate only eden and pastSpace." objOop := self objectStartingAt: scavenger eden start. + [self oop: objOop isLessThan: freeStart] whileTrue: - [objOop < freeStart] whileTrue: [aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeStart]. objOop := self objectStartingAt: scavenger pastSpace start. limit := pastSpaceStart. + [self oop: objOop isLessThan: limit] whileTrue: - [objOop < limit] whileTrue: [aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: limit]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>allOldSpaceEntitiesForCoalescingDo: (in category 'object enumeration') ----- allOldSpaceEntitiesForCoalescingDo: aBlock <inline: true> | prevObj prevPrevObj objOop rawNumSlots rawNumSlotsAfter | prevPrevObj := prevObj := nil. objOop := self firstObject. [self assert: objOop \\ self allocationUnit = 0. + self oop: objOop isLessThan: freeOldSpaceStart] whileTrue: - objOop < freeOldSpaceStart] whileTrue: [self assert: (self longLongAt: objOop) ~= 0. rawNumSlots := self rawNumSlotsOf: objOop. aBlock value: objOop. "If the number of slot changes coalescing changed an object from a single to a double header." rawNumSlotsAfter := self rawNumSlotsOf: objOop. (rawNumSlotsAfter ~= rawNumSlots and: [rawNumSlotsAfter = self numSlotsMask]) ifTrue: [objOop := objOop + self baseHeaderSize. self assert: (self objectAfter: prevObj limit: freeOldSpaceStart) = objOop]. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeOldSpaceStart]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>allOldSpaceEntitiesFrom:do: (in category 'object enumeration') ----- allOldSpaceEntitiesFrom: initialObject do: aBlock <inline: true> | prevObj prevPrevObj objOop | prevPrevObj := prevObj := nil. objOop := initialObject. [self assert: objOop \\ self allocationUnit = 0. + self oop: objOop isLessThan: freeOldSpaceStart] whileTrue: - objOop < freeOldSpaceStart] whileTrue: [self assert: (self longLongAt: objOop) ~= 0. aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeOldSpaceStart]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rootTable, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rootTable entries have their rootBit set. Answer if all checks pass." | ok numRememberedRootsInHeap | <inline: false> ok := true. numRememberedRootsInHeap := 0. self allHeapEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | ((self isFreeObject: obj) or: [(self isYoung: obj) and: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]]) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedRootsInHeap := numRememberedRootsInHeap + 1. (scavenger isInRememberedSet: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classAtIndex: (classIndex := self classIndexOf: obj). ((classOop isNil or: [classOop = nilObj]) and: [(self isHiddenObj: obj) not]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. self baseHeaderSize to: (self lastPointerOf: obj) by: BytesPerOop do: [:ptr| fieldOop := self longAt: obj + ptr. (self isNonImmediate: fieldOop) ifTrue: [| fi | fi := ptr - self baseHeaderSize / self wordSize. (fieldOop bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. "don't be misled by CogMethods; they appear to be young, but they're not" + ((self isYoung: fieldOop) + and: [self oop: fieldOop isGreaterThanOrEqualTo: startOfMemory]) ifTrue: - ((self isYoung: fieldOop) and: [fieldOop >= startOfMemory]) ifTrue: [containsYoung := true]]]]]. (containsYoung and: [(self isYoung: obj) not]) ifTrue: [(self isRemembered: obj) ifFalse: [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. self eek. ok := false]]]]. numRememberedRootsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedRootsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]. 1 to: extraRootCount do: [:ri| | obj | obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]. ^ok! Item was changed: ----- Method: SpurMemoryManager>>checkOkayOop: (in category 'debug support') ----- checkOkayOop: oop "Verify that the given oop is legitimate. Check address, header, and size but not class. Answer true if OK. Otherwise print reason and answer false." <api> <var: #oop type: #usqInt> | classIndex fmt unusedBits unusedBitsInYoungObjects | <var: #unusedBits type: #usqLong> "address and size checks" (self isImmediate: oop) ifTrue: [^true]. (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self print: 'oop '; printHex: oop; print: ' is not a valid address'. ^false]. + (self oop: (self addressAfter: oop) isLessThanOrEqualTo: freeOldSpaceStart) ifFalse: - (self addressAfter: oop) <= freeOldSpaceStart ifFalse: [self print: 'oop '; printHex: oop; print: ' size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self print: 'oop '; printHex: oop; print: ' is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop - self baseHeaderSize) ~= self numSlotsMask]) ifTrue: [self print: 'oop '; printHex: oop; print: ' header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self print: 'oop '; printHex: oop; print: ' has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self print: 'oop '; printHex: oop; print: ' has mis-matched format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some unused header bits set; should be zero'. ^false]. unusedBitsInYoungObjects := self newSpaceRefCountMask. ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self print: 'oop '; printHex: oop; print: ' has some header bits unused in young objects set; should be zero'. ^false]. ^true! Item was changed: ----- Method: SpurMemoryManager>>exactFitCompact (in category 'compaction') ----- exactFitCompact "Compact all of memory above firstFreeChunk using exact-fit, assuming free space is sorted and that as many of the the highest objects as will fit are recorded in highestObjects. Don't move pinned objects. Note that we don't actually move; we merely copy and forward. Eliminating forwarders will be done in a final pass. Leave the objects that don't fit exactly (the misfits), and hence aren't moved, in highestObjects." <inline: false> | misfits first nfits nmiss nHighest nMisses savedLimit | <var: #misfits type: #usqInt> self checkFreeSpace. totalFreeOldSpace = 0 ifTrue: [^self]. highestObjects isEmpty ifTrue: [^self]. nfits := nmiss := 0. misfits := highestObjects last + self wordSize. [statCompactPassCount := statCompactPassCount + 1. highestObjects from: misfits - self wordSize reverseDo: [:o| | b | + self assert: (self oop: o isGreaterThan: firstFreeChunk). - self assert: o > firstFreeChunk. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfExactlyBytes: b suchThat: [:f| f < o]) ifNil: [nmiss := nmiss + 1. misfits := misfits - self wordSize. misfits < highestObjects start ifTrue: [misfits := highestObjects limit - self wordSize]. self longAt: misfits put: o] ifNotNil: [:f| nfits := nfits + 1. self copyAndForward: o withBytes: b toFreeChunk: f]]]. self checkFreeSpace. "now highestObjects contains only misfits, if any, from misfits to last. set first to first failure and refill buffer. next cycle will add more misfits. give up on exact-fit when half of the highest objects fail to fit." first := self longAt: highestObjects first. + self assert: (self oop: first isGreaterThan: firstFreeChunk). - self assert: first > firstFreeChunk. nHighest := highestObjects usedSize. highestObjects first: misfits. nMisses := highestObjects usedSize. nMisses > (nHighest // 2) ifTrue: [coInterpreter print: 'exactFitCompact fits: '; printNum: nfits; print: ' misfits: '; printNum: nmiss; cr. ^self]. self findFirstFreeChunkPostCompactionPass. savedLimit := self moveMisfitsToTopOfHighestObjects: misfits. self fillHighestObjectsWithMovableObjectsFrom: firstFreeChunk upTo: first. misfits := self moveMisfitsInHighestObjectsBack: savedLimit. highestObjects usedSize > 0] whileTrue! Item was changed: ----- Method: SpurMemoryManager>>fillHighestObjectsWithMovableObjectsFrom:upTo: (in category 'compaction') ----- fillHighestObjectsWithMovableObjectsFrom: startObj upTo: limitObj "Refill highestObjects with movable objects up to, but not including limitObj. c.f. the loop in freeUnmarkedObjectsNilUnmarkedWeaklingSlotsAndSortAndCoalesceFreeSpace." | lastHighest highestObjectsWraps | highestObjects resetAsEmpty. lastHighest := highestObjects last. highestObjectsWraps := 0. self allOldSpaceObjectsFrom: startObj do: [:o| + (self oop: o isGreaterThanOrEqualTo: limitObj) ifTrue: - o >= limitObj ifTrue: [highestObjects last: lastHighest. ^self]. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: [highestObjectsWraps := highestObjectsWraps + 1]. self longAt: lastHighest put: o]]]. highestObjects last: lastHighest! Item was changed: ----- Method: SpurMemoryManager>>firstFitCompact (in category 'compaction') ----- firstFitCompact "Compact all of memory above firstFreeChunk using first-fit, assuming free space is sorted and that as many of the the highest objects as will fit are recorded in highestObjects. Don't move pinned objects. Note that we don't actually move; we merely copy and forward. Eliminating forwarders will be done in a final pass." <inline: false> | first nhits nmisses | self checkFreeSpace. totalFreeOldSpace = 0 ifTrue: [^self]. highestObjects isEmpty ifTrue: [^self]. nhits := nmisses := 0. [statCompactPassCount := statCompactPassCount + 1. highestObjects reverseDo: [:o| | b | + (self oop: o isLessThanOrEqualTo: firstFreeChunk) ifTrue: - o <= firstFreeChunk ifTrue: [coInterpreter print: 'firstFitCompact fits: '; printNum: nhits; print: ' misfits: '; printNum: nmisses; cr. ^self]. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfBytes: b suchThat: [:f| f < o]) ifNil: [nmisses := nmisses + 1] ifNotNil: [:f| nhits := nhits + 1. self copyAndForward: o withBytes: b toFreeChunk: f. self assert: (lastSubdividedFreeChunk = 0 or: [(self addressAfter: (self objectStartingAt: f)) = lastSubdividedFreeChunk])]]]. self checkFreeSpace. first := self longAt: highestObjects first. + self assert: (self oop: first isGreaterThan: firstFreeChunk). - self assert: first > firstFreeChunk. self findFirstFreeChunkPostCompactionPass. self fillHighestObjectsWithMovableObjectsFrom: firstFreeChunk upTo: first. highestObjects usedSize > 0] whileTrue. coInterpreter print: 'firstFitCompact fits: '; printNum: nhits; print: ' misfits: '; printNum: nmisses; cr! Item was changed: ----- Method: SpurMemoryManager>>instanceAfter: (in category 'object enumeration') ----- instanceAfter: objOop | actualObj classIndex | actualObj := objOop. classIndex := self classIndexOf: objOop. (self isInEden: objOop) ifTrue: [[actualObj := self objectAfter: actualObj limit: freeStart. + self oop: actualObj isLessThan: freeStart] whileTrue: - actualObj < freeStart] whileTrue: [classIndex = (self classIndexOf: actualObj) ifTrue: [^actualObj]]. + actualObj := (self oop: pastSpaceStart isGreaterThan: scavenger pastSpace start) - actualObj := pastSpaceStart > scavenger pastSpace start ifTrue: [self objectStartingAt: scavenger pastSpace start] ifFalse: [nilObj]]. (self isInSurvivorSpace: actualObj) ifTrue: [[actualObj := self objectAfter: actualObj limit: pastSpaceStart. + self oop: actualObj isLessThan: pastSpaceStart] whileTrue: - actualObj < pastSpaceStart] whileTrue: [classIndex = (self classIndexOf: actualObj) ifTrue: [^actualObj]]. actualObj := nilObj]. [actualObj := self objectAfter: actualObj limit: freeOldSpaceStart. + self oop:actualObj isLessThan: freeOldSpaceStart] whileTrue: - actualObj < freeOldSpaceStart] whileTrue: [classIndex = (self classIndexOf: actualObj) ifTrue: [^actualObj]]. ^nil! Item was changed: ----- Method: SpurMemoryManager>>isInNewSpace: (in category 'object testing') ----- isInNewSpace: objOop + ^(self oop: objOop isLessThan: newSpaceLimit) + and: [self oop: objOop isGreaterThanOrEqualTo: startOfMemory]! - ^objOop >= startOfMemory - and: [objOop < newSpaceLimit]! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceHiddenRoots (in category 'gc - global') ----- markAndTraceHiddenRoots "The hidden roots hold both the class table pages and the obj stacks, and hence need special treatment. The obj stacks must be marked specially; their pages must be marked, but only the contents of the ephemeronQueue should be marked. If a class table page is weak we can mark and trace the hiddenRoots, + which will not trace through class table opages because they are weak. - which will not trace throguh class table opages because they are weak. But if class table pages are strong, we must mark the pages and *not* trace them so that only classes reachable from the true roots will be marked, and unreachable classes will be left unmarked." self markAndTraceObjStack: markStack andContents: false. self markAndTraceObjStack: weaklingStack andContents: false. self markAndTraceObjStack: ephemeronQueue andContents: true. self setIsMarkedOf: self freeListsObj to: true. (self isWeakNonImm: classTableFirstPage) ifTrue: [^self markAndTrace: hiddenRootsObj]. self setIsMarkedOf: hiddenRootsObj to: true. self markAndTrace: classTableFirstPage. 1 to: numClassTablePages - 1 do: [:i| self setIsMarkedOf: (self fetchPointer: i ofObject: hiddenRootsObj) to: true]! Item was changed: ----- Method: SpurMemoryManager>>moveMisfitsToTopOfHighestObjects: (in category 'compaction') ----- moveMisfitsToTopOfHighestObjects: misfits "After a cycle of exact-fit compaction highestObjects may contain some number of mobile objects that fail to fit, and more objects may exist to move. Move existing misfits to top of highestObjects and temporarily shrink highestObjects to refill it without overwriting misfits. Answer the old limit. moveMisfitsInHighestObjectsBack: will undo the change." | oldLimit bytesToMove | oldLimit := highestObjects limit. misfits = (highestObjects last + self wordSize) ifTrue: [^oldLimit]. + (self oop: misfits isLessThanOrEqualTo: highestObjects last) ifTrue: - misfits <= highestObjects last ifTrue: [bytesToMove := highestObjects last + self wordSize - misfits. self mem: (highestObjects limit - bytesToMove) asVoidPointer mo: misfits asVoidPointer ve: bytesToMove. highestObjects limit: misfits - self wordSize. ^oldLimit]. "misfits wrapped; move in two stages to preserve ordering" bytesToMove := highestObjects last - highestObjects start. self mem: (misfits - bytesToMove) asVoidPointer mo: misfits asVoidPointer ve: oldLimit - misfits. highestObjects limit: misfits - bytesToMove. self mem: (oldLimit - bytesToMove) asVoidPointer mo: highestObjects start asVoidPointer ve: bytesToMove. ^oldLimit! Item was changed: ----- Method: SpurMemoryManager>>objectAfter: (in category 'object enumeration') ----- objectAfter: objOop <api> "Object parsing. 1. all objects have at least a word following the header, for a forwarding pointer. 2. objects with an overflow size have a preceeing word with a saturated slotSize. If the word following an object doesn't have a saturated size field it must be a single-header object. If the word following does have a saturated slotSize it must be the overflow size word." <inline: false> + (self oop: objOop isLessThan: newSpaceLimit) ifTrue: - objOop < newSpaceLimit ifTrue: [(self isInEden: objOop) ifTrue: [^self objectAfter: objOop limit: freeStart]. (self isInSurvivorSpace: objOop) ifTrue: [^self objectAfter: objOop limit: pastSpaceStart]. ^self objectAfter: objOop limit: scavenger futureSurvivorStart]. ^self objectAfter: objOop limit: freeOldSpaceStart! Item was changed: ----- Method: SpurMemoryManager>>objectBefore: (in category 'object enumeration') ----- objectBefore: objOop <api> | prev | prev := nil. + (self oop: objOop isLessThan: newSpaceLimit) ifTrue: - objOop < newSpaceLimit ifTrue: [self allNewSpaceObjectsDo: [:o| + (self oop: o isGreaterThanOrEqualTo: objOop) ifTrue: - o >= objOop ifTrue: [^prev]. prev := o]. ^prev]. self allOldSpaceObjectsDo: [:o| + (self oop: o isGreaterThanOrEqualTo: objOop) ifTrue: - o >= objOop ifTrue: [^prev]. prev := o]. ^prev! Item was changed: ----- Method: SpurMemoryManager>>okayOop: (in category 'debug support') ----- okayOop: signedOop "Verify that the given oop is legitimate. Check address, header, and size but not class." | oop classIndex fmt unusedBits unusedBitsInYoungObjects | <var: #oop type: #usqInt> <var: #unusedBits type: #usqLong> oop := self cCoerce: signedOop to: #usqInt. "address and size checks" (self isImmediate: oop) ifTrue: [^true]. (self addressCouldBeObjWhileScavenging: oop) ifFalse: [self error: 'oop is not a valid address'. ^false]. + (self oop: (self addressAfter: oop) isLessThanOrEqualTo: freeOldSpaceStart) ifFalse: - (self addressAfter: oop) <= freeOldSpaceStart ifFalse: [self error: 'oop size would make it extend beyond the end of memory'. ^false]. "header type checks" (classIndex := self classIndexOf: oop) >= self firstClassIndexPun ifFalse: [self error: 'oop is a free chunk, or bridge, not an object'. ^false]. ((self rawNumSlotsOf: oop) = self numSlotsMask and: [(self rawNumSlotsOf: oop - self baseHeaderSize) ~= self numSlotsMask]) ifTrue: [self error: 'oop header has overflow header word, but overflow word does not have a saturated numSlots field'. ^false]. "format check" fmt := self formatOf: oop. (fmt = 6) | (fmt = 8) ifTrue: [self error: 'oop has an unknown format type'. ^false]. (fmt = self forwardedFormat) ~= (classIndex = self isForwardedObjectClassIndexPun) ifTrue: [self error: 'oop has mis-matched format/classIndex fields; only one of them is the isForwarded value'. ^false]. "specific header bit checks" unusedBits := (1 << self classIndexFieldWidth) | (1 << (self identityHashFieldWidth + 32)). ((self longLongAt: oop) bitAnd: unusedBits) ~= 0 ifTrue: [self error: 'some unused header bits are set; should be zero'. ^false]. unusedBitsInYoungObjects := (1 << self greyBitShift) | (1 << self pinnedBitShift) | (1 << self rememberedBitShift). ((self longAt: oop) bitAnd: unusedBitsInYoungObjects) ~= 0 ifTrue: [self error: 'some header bits unused in young objects are set; should be zero'. ^false]. ^true ! Item was changed: ----- Method: SpurMemoryManager>>sortFreeListAt: (in category 'free space') ----- sortFreeListAt: i "Sort the individual free list i so that the lowest address is at the head of the list. Use an insertion sort with a scan for initially sorted elements." | list next head | list := freeLists at: i. "list of objects to be inserted" list = 0 ifTrue: "empty list; we're done" [^self]. head := list. "scan list to find find first out-of-order element" [(next := self fetchPointer: self freeChunkNextIndex ofObject: list) > list] whileTrue: [list := next]. "no out-of-order elements; list was already sorted; we're done" next = 0 ifTrue: [^self]. "detatch already sorted list" self storePointer: self freeChunkNextIndex ofFreeChunk: list withValue: 0. list := next. [list ~= 0] whileTrue: [| node prev | "grab next node to be inserted" next := self fetchPointer: self freeChunkNextIndex ofObject: list. "search sorted list for insertion point" prev := 0. "prev node for insertion sort" node := head. "current node for insertion sort" [node ~= 0 + and: [self oop: node isLessThan: list]] whileTrue: - and: [node < list]] whileTrue: [prev := node. node := self fetchPointer: self freeChunkNextIndex ofObject: node]. "insert the node into the sorted list" self assert: (node = 0 or: [node > list]). prev = 0 ifTrue: [head := list] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: list]. self storePointer: self freeChunkNextIndex ofFreeChunk: list withValue: node. list := next]. "replace the list with the sorted list" freeLists at: i put: head! Item was changed: ----- Method: SpurMemoryManager>>startOfMemory: (in category 'simulation') ----- startOfMemory: value startOfMemory := value. + (freeStart isNil or: [self oop: freeStart isLessThan: value]) ifTrue: - (freeStart isNil or: [freeStart < value]) ifTrue: [freeStart := value]! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> <var: #segAddress type: #'void *'> + self cCode: [] inSmalltalk: [segments ifNil: [^nil]]. "bootstrap" (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount Above: (segments at: 0) segLimit asVoidPointer AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | newSegIndex := self insertSegmentFor: segAddress asUnsignedLong. newSeg := self addressOf: (segments at: newSegIndex). newSeg segStart: segAddress; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). "and add the new free chunk to the free list; done here instead of in assimilateNewSegment: for the assert" manager addFreeChunkWithBytes: allocatedSize - manager bridgeSize at: newSeg segStart. self assert: (manager addressAfter: (manager objectStartingAt: newSeg segStart)) = (newSeg segLimit - manager bridgeSize). ^newSeg]. ^nil!

1 0

VM Maker: Cog-eem.118.mcz
by commits＠source.squeak.org 13 Nov '13

13 Nov '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.118.mcz ==================== Summary ==================== Name: Cog-eem.118 Author: eem Time: 12 November 2013, 3:59:17.082 pm UUID: 4b955d55-bab9-4826-a8a7-fc08f34ac52a Ancestors: Cog-eem.117 Fix bootstraop after isEnumerableObject: change; classIndex assert requires correct numClassTablePages. =============== Diff against Cog-eem.117 =============== Item was changed: ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap image') ----- allocateClassTable "Allocate the root of the classTable plus enough pages to accomodate all classes in the classToIndex map. Don't fill in the entries yet; the classes have yet to be cloned." | tableRoot page maxSize numPages | tableRoot := newHeap allocateSlots: newHeap classTableRootSlots + newHeap hiddenRootSlots format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: tableRoot) = (newHeap classTableRootSlots + newHeap hiddenRootSlots). self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. newHeap nilFieldsOf: tableRoot. "first page is strong" page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. self assert: (newHeap objectAfter: tableRoot limit: newHeap freeStart) = page. lastClassTablePage := page. newHeap nilFieldsOf: page. newHeap storePointer: 0 ofObject: tableRoot withValue: page. newHeap hiddenRootsObj: tableRoot. maxSize := classToIndex inject: 0 into: [:a :b| a max: b]. numPages := (maxSize + newHeap classTableMinorIndexMask / newHeap classTablePageSize) truncated. 2 to: numPages do: [:i| page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: page) = newHeap arrayFormat. self assert: (newHeap classIndexOf: page) = newHeap arrayClassIndexPun. newHeap fillObj: page numSlots: newHeap classTablePageSize with: newHeap nilObject. newHeap storePointer: i - 1 ofObject: tableRoot withValue: page. self assert: (newHeap objectAfter: (newHeap fetchPointer: i - 2 ofObject: tableRoot) limit: newHeap freeStart) = page. + lastClassTablePage := page]. + "and once again to recompute numClassTablePages post building the class table." + newHeap instVarNamed: 'numClassTablePages' put: nil. + newHeap hiddenRootsObj: tableRoot! - lastClassTablePage := page]!

1 0

VM Maker: VMMaker.oscog-eem.508.mcz
by commits＠source.squeak.org 12 Nov '13

12 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.508.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.508 Author: eem Time: 12 November 2013, 2:39:57.354 pm UUID: 55fa33b3-25f2-4d01-b2c2-02a5a5228bf7 Ancestors: VMMaker.oscog-eem.507 Add an assert to check that free chunk subdivision works correctly. Fix the issue of integer variables assigned unsigned values but compared against zero, but forcing these to be unsigned. Affects e.g. longPrintReferencesTo:. =============== Diff against VMMaker.oscog-eem.507 =============== Item was changed: ----- Method: Spur32BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents." <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes. self checkFreeSpace. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self flag: #endianness. self longAt: chunk put: numSlots. self longAt: chunk + 4 put: self numSlotsMask << self numSlotsHalfShift. self longLongAt: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). + self assert: (lastSubdividedFreeChunk = 0 or: [(self addressAfter: chunk + self baseHeaderSize) = lastSubdividedFreeChunk]). ^chunk + self baseHeaderSize]. self longLongAt: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). + self assert: (lastSubdividedFreeChunk = 0 or: [(self addressAfter: chunk) = lastSubdividedFreeChunk]). ^chunk! Item was changed: ----- Method: Spur64BitMemoryManager>>allocateSlotsInOldSpace:bytes:format:classIndex: (in category 'allocation') ----- allocateSlotsInOldSpace: numSlots bytes: totalBytes format: formatField classIndex: classIndex "Answer the oop of a chunk of space in oldSpace with numSlots slots. The header will have been filled-in but not the contents." <inline: false> | chunk | chunk := self allocateOldSpaceChunkOfBytes: totalBytes. chunk ifNil: [^nil]. numSlots >= self numSlotsMask ifTrue: "for header parsing we put a saturated slot count in the prepended overflow size word" [self longAt: chunk put: numSlots + (self numSlotsMask << self numSlotsFullShift). self longAt: chunk + self baseHeaderSize put: (self headerForSlots: self numSlotsMask format: formatField classIndex: classIndex). + self assert: (lastSubdividedFreeChunk = 0 or: [(self addressAfter: chunk + self baseHeaderSize) = lastSubdividedFreeChunk]). ^chunk + self baseHeaderSize]. self longAt: chunk put: (self headerForSlots: numSlots format: formatField classIndex: classIndex). + self assert: (lastSubdividedFreeChunk = 0 or: [(self addressAfter: chunk) = lastSubdividedFreeChunk]). ^chunk! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfBytes: (in category 'free space') ----- allocateOldSpaceChunkOfBytes: chunkBytes "Answer a chunk of oldSpace from the free lists, if available, otherwise answer nil. Break up a larger chunk if one of the exact size does not exist. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." | initialIndex chunk index nodeBytes parent child | + self assert: (lastSubdividedFreeChunk := 0) = 0. "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" totalFreeOldSpace := totalFreeOldSpace - chunkBytes. "be optimistic (& don't wait for the write)" initialIndex := chunkBytes / self allocationUnit. (initialIndex < self numFreeLists and: [1 << initialIndex <= freeListsMask]) ifTrue: [(freeListsMask anyMask: 1 << initialIndex) ifTrue: [(chunk := freeLists at: initialIndex) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). ^self unlinkFreeChunk: chunk atIndex: initialIndex]. freeListsMask := freeListsMask - (1 << initialIndex)]. "first search for free chunks of a multiple of chunkBytes in size" index := initialIndex. [(index := index + index) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(chunk := freeLists at: index) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). self unlinkFreeChunk: chunk atIndex: index. self assert: (self bytesInObject: chunk) = (index * self allocationUnit). self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: chunk) + chunkBytes. ^chunk]. freeListsMask := freeListsMask - (1 << index)]]. "now get desperate and use the first that'll fit. Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence start at initialIndex + 2." index := initialIndex + 1. [(index := index + 1) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(chunk := freeLists at: index) ~= 0 ifTrue: [self assert: chunk = (self startOfObject: chunk). self assert: (self isValidFreeObject: chunk). self unlinkFreeChunk: chunk atIndex: index. self assert: (self bytesInObject: chunk) = (index * self allocationUnit). self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: chunk) + chunkBytes. ^chunk]. freeListsMask := freeListsMask - (1 << index)]]]. "Large chunk, or no space on small free lists. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the smallest chunk at least as large as chunkBytes, or 0 if none." parent := 0. child := freeLists at: 0. [child ~= 0] whileTrue: [| childBytes | self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." [chunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. chunk ~= 0 ifTrue: [self assert: (self isValidFreeObject: chunk). self storePointer: self freeChunkNextIndex ofFreeChunk: child withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: chunk). ^self startOfObject: chunk]. child := 0] "break out of loop to remove interior node" ifFalse: ["Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence reject chunks < 2 * allocationUnit larger." childBytes <= (chunkBytes + self allocationUnit) ifTrue: "node too small; walk down the larger size of the tree" [child := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: child] ifFalse: [parent := child. "parent will be smallest node >= chunkBytes + allocationUnit" nodeBytes := childBytes. child := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: child]]]. parent = 0 ifTrue: [totalFreeOldSpace := totalFreeOldSpace + chunkBytes. "optimism was unfounded" ^nil]. "self printFreeChunk: parent" self assert: (nodeBytes = chunkBytes or: [nodeBytes >= (chunkBytes + (2 * self allocationUnit))]). self assert: (self bytesInObject: parent) = nodeBytes. "attempt to remove from list" chunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: parent. chunk ~= 0 ifTrue: [self assert: (chunkBytes = nodeBytes or: [chunkBytes + self allocationUnit < nodeBytes]). self storePointer: self freeChunkNextIndex ofFreeChunk: parent withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: chunk). chunkBytes ~= nodeBytes ifTrue: [self freeChunkWithBytes: nodeBytes - chunkBytes at: (self startOfObject: chunk) + chunkBytes]. ^self startOfObject: chunk]. "no list; remove the interior node" chunk := parent. self unlinkSolitaryFreeTreeNode: chunk. "if there's space left over, add the fragment back." chunkBytes ~= nodeBytes ifTrue: [self freeChunkWithBytes: nodeBytes - chunkBytes at: (self startOfObject: chunk) + chunkBytes]. ^self startOfObject: chunk! Item was changed: ----- Method: SpurMemoryManager>>allocateOldSpaceChunkOfBytes:suchThat: (in category 'free space') ----- allocateOldSpaceChunkOfBytes: chunkBytes suchThat: acceptanceBlock "Answer a chunk of oldSpace from the free lists that satisfies acceptanceBlock, if available, otherwise answer nil. Break up a larger chunk if one of the exact size cannot be found. N.B. the chunk is simply a pointer, it has no valid header. The caller *must* fill in the header correctly." | initialIndex node next prev index child childBytes acceptedChunk acceptedNode | <inline: true> "must inline for acceptanceBlock" + self assert: (lastSubdividedFreeChunk := 0) = 0. "for debugging:" "totalFreeOldSpace := self totalFreeListBytes" totalFreeOldSpace := totalFreeOldSpace - chunkBytes. "be optimistic (& don't wait for the write)" initialIndex := chunkBytes / self allocationUnit. (initialIndex < self numFreeLists and: [1 << initialIndex <= freeListsMask]) ifTrue: [(freeListsMask anyMask: 1 << initialIndex) ifTrue: [(node := freeLists at: initialIndex) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << initialIndex)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: initialIndex put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. ^node]. prev := node. node := next]]]. "first search for free chunks of a multiple of chunkBytes in size" index := initialIndex. [(index := index + initialIndex) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: node) + chunkBytes. ^node]. prev := node. node := next]]]]. "now get desperate and use the first that'll fit. Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence start at initialIndex + 2." index := initialIndex + 1. [(index := index + 1) < self numFreeLists and: [1 << index <= freeListsMask]] whileTrue: [(freeListsMask anyMask: 1 << index) ifTrue: [(node := freeLists at: index) = 0 ifTrue: [freeListsMask := freeListsMask - (1 << index)] ifFalse: [prev := 0. [node ~= 0] whileTrue: [self assert: node = (self startOfObject: node). self assert: (self isValidFreeObject: node). next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. (acceptanceBlock value: node) ifTrue: [prev = 0 ifTrue: [freeLists at: index put: next] ifFalse: [self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: next]. self freeChunkWithBytes: index * self allocationUnit - chunkBytes at: (self startOfObject: node) + chunkBytes. ^node]. prev := node. node := next]]]]]. "Large chunk, or no space on small free lists. Search the large chunk list. Large chunk list organized as a tree, each node of which is a list of chunks of the same size. Beneath the node are smaller and larger blocks. When the search ends parent should hold the smallest chunk at least as large as chunkBytes, or 0 if none. acceptedChunk and acceptedNode save us from having to back-up when the acceptanceBlock filters-out all nodes of the right size, but there are nodes of the wrong size it does accept." child := freeLists at: 0. node := acceptedChunk := acceptedNode := 0. [child ~= 0] whileTrue: [self assert: (self isValidFreeObject: child). childBytes := self bytesInObject: child. childBytes = chunkBytes ifTrue: "size match; try to remove from list at node." [node := child. [prev := node. node := self fetchPointer: self freeChunkNextIndex ofFreeChunk: node. node ~= 0] whileTrue: [(acceptanceBlock value: node) ifTrue: [self assert: (self isValidFreeObject: node). self storePointer: self freeChunkNextIndex ofFreeChunk: prev withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: node). ^self startOfObject: node]]. (acceptanceBlock value: child) ifTrue: [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: child. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: child] ifFalse: "list; replace node with it" [self inFreeTreeReplace: child with: next]. ^self startOfObject: child]]. child ~= 0 ifTrue: ["Note that because the minimum free size is 16 bytes (2 * allocationUnit), to leave room for the forwarding pointer/next free link, we can only break chunks that are at least 16 bytes larger, hence reject chunks < 2 * allocationUnit larger." childBytes <= (chunkBytes + self allocationUnit) ifTrue: "node too small; walk down the larger size of the tree" [child := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: child] ifFalse: [self flag: 'we can do better here; preferentially choosing the lowest node. That would be a form of best-fit since we are trying to compact down'. acceptedNode = 0 ifTrue: [acceptedChunk := child. "first search the list." [acceptedChunk := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedChunk. (acceptedChunk ~= 0 and: [acceptanceBlock value: acceptedChunk]) ifTrue: [acceptedNode := child]. acceptedChunk ~= 0 and: [acceptedNode = 0]] whileTrue. "nothing on the list; will the node do? This prefers acceptable nodes higher up the tree over acceptable list elements further down, but we haven't got all day..." (acceptedNode = 0 and: [acceptanceBlock value: child]) ifTrue: [acceptedNode := child]]. child := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: child]]]. acceptedNode ~= 0 ifTrue: [acceptedChunk ~= 0 ifTrue: [self assert: (self bytesInObject: acceptedChunk) >= (chunkBytes + self allocationUnit). [next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. next ~= acceptedChunk] whileTrue: [acceptedNode := next]. self storePointer: self freeChunkNextIndex ofFreeChunk: acceptedNode withValue: (self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedChunk). self freeChunkWithBytes: (self bytesInObject: acceptedChunk) - chunkBytes at: (self startOfObject: acceptedChunk) + chunkBytes. ^self startOfObject: acceptedChunk]. next := self fetchPointer: self freeChunkNextIndex ofFreeChunk: acceptedNode. next = 0 ifTrue: "no list; remove the interior node" [self unlinkSolitaryFreeTreeNode: acceptedNode] ifFalse: "list; replace node with it" [self inFreeTreeReplace: acceptedNode with: next]. self assert: (self bytesInObject: acceptedNode) >= (chunkBytes + self allocationUnit). self freeChunkWithBytes: (self bytesInObject: acceptedNode) - chunkBytes at: (self startOfObject: acceptedNode) + chunkBytes. ^self startOfObject: acceptedNode]. totalFreeOldSpace := totalFreeOldSpace + chunkBytes. "optimism was unfounded" ^nil! Item was changed: ----- Method: SpurMemoryManager>>firstFitCompact (in category 'compaction') ----- firstFitCompact "Compact all of memory above firstFreeChunk using first-fit, assuming free space is sorted and that as many of the the highest objects as will fit are recorded in highestObjects. Don't move pinned objects. Note that we don't actually move; we merely copy and forward. Eliminating forwarders will be done in a final pass." <inline: false> | first nhits nmisses | self checkFreeSpace. totalFreeOldSpace = 0 ifTrue: [^self]. highestObjects isEmpty ifTrue: [^self]. nhits := nmisses := 0. [statCompactPassCount := statCompactPassCount + 1. highestObjects reverseDo: [:o| | b | o <= firstFreeChunk ifTrue: [coInterpreter print: 'firstFitCompact fits: '; printNum: nhits; print: ' misfits: '; printNum: nmisses; cr. ^self]. ((self isForwarded: o) or: [self isPinned: o]) ifFalse: [b := self bytesInObject: o. (self allocateOldSpaceChunkOfBytes: b suchThat: [:f| f < o]) ifNil: [nmisses := nmisses + 1] ifNotNil: [:f| nhits := nhits + 1. + self copyAndForward: o withBytes: b toFreeChunk: f. + self assert: (lastSubdividedFreeChunk = 0 + or: [(self addressAfter: (self objectStartingAt: f)) = lastSubdividedFreeChunk])]]]. - self copyAndForward: o withBytes: b toFreeChunk: f]]]. self checkFreeSpace. first := self longAt: highestObjects first. self assert: first > firstFreeChunk. self findFirstFreeChunkPostCompactionPass. self fillHighestObjectsWithMovableObjectsFrom: firstFreeChunk upTo: first. highestObjects usedSize > 0] whileTrue. coInterpreter print: 'firstFitCompact fits: '; printNum: nhits; print: ' misfits: '; printNum: nmisses; cr! Item was changed: ----- Method: SpurMemoryManager>>freeChunkWithBytes:at: (in category 'free space') ----- freeChunkWithBytes: bytes at: address <inline: false> | freeChunk | + self assert: (lastSubdividedFreeChunk := address) ~= 0. freeChunk := self initFreeChunkWithBytes: bytes at: address. self addToFreeList: freeChunk bytes: bytes. + self assert: freeChunk = (self objectStartingAt: address). ^freeChunk! Item was added: + ----- Method: TAssignmentNode>>variableNameOrNil (in category 'accessing') ----- + variableNameOrNil + ^variable variableNameOrNil! Item was changed: ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesIn: aCodeGen parseTree nodesDo: + [:node| | type var m | + "If there is something of the form i >= 0, then i should be signed, not unsigned." + (node isSend + and: [(locals includes: (var := node receiver variableNameOrNil)) + and: [(#(<= < >= >) includes: node selector) + and: [node args first isConstant + and: [node args first value = 0 + and: [(type := self typeFor: var in: aCodeGen) notNil + and: [type first == $u]]]]]]) ifTrue: + [declarations at: var put: (declarations at: var) allButFirst]. + "if an assignment of a known send, set the variable's type to the return type of the send." - [:node| | var m | (node isAssignment and: [(locals includes: (var := node variable name)) and: [(declarations includesKey: var) not and: [node expression isSend and: [(m := aCodeGen methodNamed: node expression selector) notNil]]]]) ifTrue: [(#(sqInt void nil) includes: m returnType) ifFalse: ["the $: is to map things like unsigned field : 3 to usqInt" declarations at: var put: ((m returnType includes: $:) ifTrue: [#usqInt] ifFalse: [m returnType]), ' ', var]]]! Item was added: + ----- Method: TParseNode>>variableNameOrNil (in category 'accessing') ----- + variableNameOrNil + "Overridden in TAssignmentNode & TVariableNode to answer their variable name." + ^nil! Item was added: + ----- Method: TVariableNode>>variableNameOrNil (in category 'accessing') ----- + variableNameOrNil + ^name!

1 0

VM Maker: VMMaker.oscog-eem.507.mcz
by commits＠source.squeak.org 12 Nov '13

12 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.507.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.507 Author: eem Time: 12 November 2013, 11:45:01.849 am UUID: 0cc40be1-4ec6-4be1-823f-4d7ed85aed05 Ancestors: VMMaker.oscog-eem.506 Keep bridges marked in notePinned:, called in fUOASACFS. Support growth in sufficientSpaceAfterGC:. Add a segLimit accessor to simplify segment code. Add Integer>>asUnsignedLong for simulation. =============== Diff against VMMaker.oscog-eem.506 =============== Item was added: + ----- Method: Integer>>asUnsignedLong (in category '*VMMaker-interpreter simulator') ----- + asUnsignedLong + self assert: self >= 0. + ^self! Item was changed: ----- Method: Spur32BitCoMemoryManager>>assimilateNewSegment: (in category 'growing/shrinking memory') ----- assimilateNewSegment: segInfo "Update after adding a segment. Here we make sure the new segment is not executable." <var: #segInfo type: #'SpurSegmentInfo *'> + coInterpreter sqMakeMemoryNotExecutableFrom: segInfo segStart To: segInfo segLimit! - coInterpreter - sqMakeMemoryNotExecutableFrom: segInfo segStart - To: segInfo segStart + segInfo segSize! Item was changed: ----- Method: SpurMemoryManager>>assimilateNewSegment: (in category 'growing/shrinking memory') ----- assimilateNewSegment: segInfo "Update after adding a segment. Here we set freeOldSpaceStart & endOfMemory if required." <var: #segInfo type: #'SpurSegmentInfo *'> segInfo segStart >= endOfMemory ifTrue: [freeOldSpaceStart := + endOfMemory := segInfo segLimit - self bridgeSize]! - endOfMemory := segInfo segStart + segInfo segSize - self bridgeSize]! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpace (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpace "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Small free chunks are sorted in address order on each small list head. Large free chunks are sorted on the sortedFreeChunks list. Record as many of the highest objects as there is room for in highestObjects, a circular buffer, for the use of exactFitCompact. Use unused eden space for highestObjects. If highestObjects does not wrap, store 0 at highestObjects last. Record the lowest free object in firstFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | lastLargeFree lastHighest highestObjectsWraps sortedFreeChunks | <var: #lastHighest type: #usqInt> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. segmentManager prepareForGlobalSweep."for notePinned:" "for sorting free space throw away the list heads, rebuilding them for small free chunks below." self resetFreeListHeads. highestObjects initializeStart: freeStart limit: scavenger eden limit. lastHighest := highestObjects last "a.k.a. freeStart - wordSize". highestObjectsWraps := 0. self assert: highestObjects limit - highestObjects start // self wordSize >= 1024. firstFreeChunk := sortedFreeChunks := lastLargeFree := 0. "Note that if we were truly striving for performance we could split the scan into two phases, one up to the first free object and one after, which would remove the need to test firstFreeChunk when filling highestObjects." self allOldSpaceEntitiesForCoalescingDo: [:o| (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. + self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" - self setIsMarkedOf: o to: false. (self isPinned: o) ifTrue: [segmentManager notePinned: o]. firstFreeChunk ~= 0 ifTrue: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: [highestObjectsWraps := highestObjectsWraps + 1]. self longAt: lastHighest put: o]]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here next | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := o. next := self objectAfter: here limit: endOfMemory. (self isMarked: next) ifFalse: "coalescing; rare case" [self assert: (self isRemembered: o) not. [statCoalesces := statCoalesces + 1. here := self coalesce: here and: next. next := self objectAfter: here limit: endOfMemory. next = endOfMemory or: [self isMarked: next]] whileFalse]. self setFree: here. firstFreeChunk = 0 ifTrue: [firstFreeChunk := here]. (self isLargeFreeObject: here) ifTrue: [lastLargeFree = 0 ifTrue: [sortedFreeChunks := here] ifFalse: [self setFree: here. self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: here]. lastLargeFree := here] ifFalse: [self freeSmallObject: here]]]. highestObjects last: lastHighest. highestObjectsWraps ~= 0 ifTrue: [highestObjects first: (lastHighest + self wordSize >= highestObjects limit ifTrue: [highestObjects start] ifFalse: [lastHighest + self wordSize])]. lastLargeFree ~= 0 ifTrue: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: 0]. totalFreeOldSpace := self reverseSmallListHeads. totalFreeOldSpace := totalFreeOldSpace + (self rebuildFreeTreeFrom: sortedFreeChunks). self checkFreeSpace. self touch: highestObjectsWraps! Item was changed: ----- Method: SpurMemoryManager>>sufficientSpaceAfterGC: (in category 'gc - scavenging') ----- sufficientSpaceAfterGC: numBytes "This is ObjectMemory's funky entry-point into its incremental GC, which is a stop-the-world a young generation reclaimer. In Spur we run the scavenger. Answer if space is not low." self assert: numBytes = 0. self scavengingGCTenuringIf: TenureByAge. + [totalFreeOldSpace < growHeadroom + and: [(self growOldSpaceByAtLeast: 0) notNil]] whileTrue: + [totalFreeOldSpace >= growHeadroom ifTrue: + [^true]]. lowSpaceThreshold > totalFreeOldSpace ifTrue: "space is low" [lowSpaceThreshold := 0. "avoid signalling low space twice" ^false]. ^true! Item was added: + ----- Method: SpurSegmentInfo>>segLimit (in category 'accessing') ----- + segLimit + ^segSize + segStart! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> <var: #segAddress type: #'void *'> (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount + Above: (segments at: 0) segLimit asVoidPointer - Above: ((segments at: 0) segStart + (segments at: 0) segSize) asVoidPointer AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | newSegIndex := self insertSegmentFor: segAddress asUnsignedLong. newSeg := self addressOf: (segments at: newSegIndex). newSeg segStart: segAddress; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). "and add the new free chunk to the free list; done here instead of in assimilateNewSegment: for the assert" manager addFreeChunkWithBytes: allocatedSize - manager bridgeSize at: newSeg segStart. self assert: (manager addressAfter: (manager objectStartingAt: newSeg segStart)) + = (newSeg segLimit - manager bridgeSize). - = (newSeg segStart + newSeg segSize - manager bridgeSize). ^newSeg]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>allBridgesMarked (in category 'debug support') ----- allBridgesMarked 0 to: numSegments - 1 do: [:i| | bridgeObj | + bridgeObj := (segments at: i) segLimit - manager baseHeaderSize. - bridgeObj := (segments at: i) segStart - + (segments at: i) segSize - - manager baseHeaderSize. self assert: (manager isSegmentBridge: bridgeObj). (manager isMarked: bridgeObj) ifFalse: [^false]]. ^true "for debugging:" "(0 to: numSegments - 1) select: [:i| | bridgeObj | bridgeObj := (segments at: i) segStart + (segments at: i) segSize - manager baseHeaderSize. self assert: (manager isSegmentBridge: bridgeObj). manager isMarked: bridgeObj]"! Item was changed: ----- Method: SpurSegmentManager>>bridgeFrom:to: (in category 'growing/shrinking memory') ----- bridgeFrom: aSegment to: nextSegmentOrNil "Create a bridge from aSegment to the next segment, or create a terminating bridge if there is no next segment." <var: #aSegment type: #'SpurSegmentInfo *'> <var: #nextSegmentOrNil type: #'SpurSegmentInfo *'> | segEnd clifton bridgeSpan | + segEnd := aSegment segLimit. - segEnd := aSegment segStart + aSegment segSize. clifton := segEnd - manager bridgeSize. "clifton is where the Avon bridge begins..." bridgeSpan := nextSegmentOrNil ifNil: [manager bridgeSize] ifNotNil: [nextSegmentOrNil segStart - segEnd + manager bridgeSize]. manager initSegmentBridgeWithBytes: bridgeSpan at: clifton. "the revised bridge should get us to the new segment" self assert: (nextSegmentOrNil isNil or: [(manager addressAfter: (manager objectStartingAt: clifton)) = nextSegmentOrNil segStart]) ! Item was changed: ----- Method: SpurSegmentManager>>collapseSegmentsPostSwizzle (in category 'snapshot') ----- collapseSegmentsPostSwizzle "The image has been loaded, old segments reconstructed, and the heap swizzled into a single contiguous segment. Collapse the segments into one." <inline: false> | bridge | canSwizzle := false. firstSegmentSize ifNil: "true when used by SpurBootstrap to transform an image" [^self]. numSegments := 1. (segments at: 0) segStart: manager newSpaceLimit; segSize: manager endOfMemory - manager newSpaceLimit. "finally plant a bridge at the end of the coalesced segment and cut back the manager's notion of the end of memory to immediately before the bridge." bridge := manager endOfMemory - manager bridgeSize. + self assert: bridge = ((segments at: 0) segLimit - manager bridgeSize). - self assert: bridge = ((segments at: 0) segStart - + (segments at: 0) segSize - - manager bridgeSize). manager initSegmentBridgeWithBytes: manager bridgeSize at: bridge; setEndOfMemory: bridge! Item was changed: ----- Method: SpurSegmentManager>>insertSegmentFor: (in category 'growing/shrinking memory') ----- insertSegmentFor: segAddress "Reserve a new segInfo for segAddress. If segAddress is in the middle of the existing segments, shuffle them up to make room. Answer the new segment's index." | segIndex lastSegIndex | + self assert: segAddress > (segments at: 0) segLimit. - self assert: segAddress > ((segments at: 0) segStart + (segments at: 0) segSize). numSegments = numSegInfos ifTrue: [self allocateOrExtendSegmentInfos]. self assert: numSegments < numSegInfos. segIndex := lastSegIndex := numSegments - 1. numSegments := numSegments + 1. + [segAddress > (segments at: segIndex) segLimit ifTrue: - [segAddress > ((segments at: segIndex) segStart - + (segments at: segIndex) segSize) ifTrue: [segIndex := segIndex + 1. lastSegIndex to: segIndex by: -1 do: [:idx| segments at: idx + 1 put: (segments at: idx)]. ^segIndex]. segIndex := segIndex - 1] repeat! Item was changed: ----- Method: SpurSegmentManager>>isInSegments: (in category 'testing') ----- isInSegments: address <var: #address type: #usqInt> 0 to: numSegments - 1 do: [:i| address < (segments at: i) segStart ifTrue: [^false]. + address < (segments at: i) segLimit ifTrue: - address < ((segments at: i) segStart + (segments at: i) segSize) ifTrue: [^true]]. ^false! Item was changed: ----- Method: SpurSegmentManager>>notePinned: (in category 'pinning') ----- notePinned: objOop "Let the segmentManager mark which segments contain pinned objects" self assert: (manager isPinned: objOop). + (manager isSegmentBridge: objOop) + ifTrue: + [manager setIsMarkedOf: objOop to: true] + ifFalse: + [[(segments at: sweepIndex) segLimit < objOop] whileTrue: + [sweepIndex := sweepIndex + 1]. + (segments at: sweepIndex) containsPinned: true]! - (manager isSegmentBridge: objOop) ifFalse: - [[(segments at: sweepIndex) segStart + (segments at: sweepIndex) segSize < objOop] whileTrue: - [sweepIndex := sweepIndex + 1]. - (segments at: sweepIndex) containsPinned: true]! Item was changed: ----- Method: SpurSegmentManager>>writeSegment:nextSegmentSize:toFile: (in category 'snapshot') ----- writeSegment: aSpurSegmentInfo nextSegmentSize: nextSegSize toFile: aBinaryStream <var: 'aSpurSegmentInfo' type: #'SpurSegmentInfo *'> <var: 'aBinaryStream' type: #'FILE *'> | bridge savedHeader nWritten | <var: 'savedHeader' type: #usqLong> + bridge := aSpurSegmentInfo segLimit - manager baseHeaderSize. - bridge := aSpurSegmentInfo segStart + aSpurSegmentInfo segSize - manager baseHeaderSize. "last seg may be beyond endOfMemory/freeOldSpaceStart" self assert: ((manager isValidSegmentBridge: bridge) or: [nextSegSize = 0]). savedHeader := manager longLongAt: bridge. manager longLongAt: bridge put: nextSegSize. nWritten := self cCode: [self sq: aSpurSegmentInfo segStart Image: 1 File: aSpurSegmentInfo segSize Write: aBinaryStream] inSmalltalk: [aBinaryStream next: aSpurSegmentInfo segSize / 4 putAll: manager memory startingAt: aSpurSegmentInfo segStart / 4 + 1. aSpurSegmentInfo segSize]. manager longLongAt: bridge put: savedHeader. ^nWritten!

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2013