Vm-dev May 2015

vm-dev@lists.squeakfoundation.org

28 participants
153 discussions

VM Maker: VMMaker.oscog-eem.1324.mcz
by commits＠source.squeak.org 24 May '15

24 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1324.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1324 Author: eem Time: 24 May 2015, 1:45:10.298 pm UUID: 2a4c329d-49f0-41cd-9b2b-857fb713383c Ancestors: VMMaker.oscog-eem.1323 Move comment containing method name from after opening brace to before function prototype, because otherwise it interferes with the var struct decl. =============== Diff against VMMaker.oscog-eem.1323 =============== Item was changed: ----- Method: TMethod>>emitCCodeOn:generator: (in category 'C code generation') ----- emitCCodeOn: aStream generator: aCodeGen "Emit C code for this method onto the given stream. All calls to inlined methods should already have been expanded." aCodeGen currentMethod: self. + self emitCCommentOn: aStream. "place method comment and method name before function." + aStream crtab; nextPutAll: '/* '; nextPutAll: self definingClass name; nextPutAll: '>>#'; nextPutAll: self selector; nextPutAll: ' */'. - self emitCCommentOn: aStream. "place method comment before function" aStream cr. self emitCFunctionPrototype: aStream generator: aCodeGen isPrototype: false. aStream cr; nextPut: ${. - aStream cr; tab; - nextPutAll: '/* '; nextPutAll: self definingClass name; nextPutAll: '>>#'; nextPutAll: self selector; nextPutAll: ' */'. self emitCLocalsOn: aStream generator: aCodeGen. aCodeGen pushScope: declarations while: [parseTree emitCCodeOn: aStream level: 1 generator: aCodeGen]. aStream nextPut: $}; cr!

1 0

primitiveUtcWithOffset broken in Spur VM, works in (older?) Cog
by David T. Lewis 24 May '15

24 May '15

After loading UTCDateAndTime (*) into my Spur image, I see a recurrence of an old epoch bug. The error is in primitiveUtcWithOffset. DateAndTime now ==> 2084-05-23T12:11:16.131115-04:00 My Spur VM is: Virtual Machine --------------- /usr/local/lib/squeak/5.0-3312/squeak Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1207] Unix built on Apr 17 2015 12:45:25 Compiler: 4.4.7 20120313 (Red Hat 4.4.7-4) platform sources revision VM: r3312 http://www.squeakvm.org/svn/squeak/branches/Cog Date: 2015-04-17 12:34:25 -0700 Plugins: r3275 http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins CoInterpreter VMMaker.oscog-eem.1207 uuid: 4a338677-029f-42ac-b38d-2bc5ecc213f1 Apr 17 2015 StackToRegisterMappingCogit VMMaker.oscog-eem.1207 uuid: 4a338677-029f-42ac-b38d-2bc5ecc213f1 Apr 17 2015 I think we fixed this in Cog a few years ago, and I do not see the problem in this version of Cog: Virtual Machine --------------- /usr/local/lib/squeak/4.0-3003/squeak Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.746] Unix built on Jun 15 2014 15:31:52 Compiler: 4.1.2 20080704 (Red Hat 4.1.2-48) platform sources revision VM: r3003 http://www.squeakvm.org/svn/squeak/branches/Cog Date: 2014-06-15 15:17:31 -0700 Plugins: r2954 http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 Jun 15 2014 StackToRegisterMappingCogit VMMaker.oscog-eem.774 uuid: 665ef9a5-4139-4f97-85c0-0d0df9eea422 Jun 15 2014 Note, there is a cleaner implemention of the primitive in SVN trunk which does the time+offset inquiry as an atomic operation. The difference is academic, but it would be nice if we could use this in Cog/Spur too. Dave * http://wiki.squeak.org/squeak/6197

1 0

[commit][3356] Move definition of VM_VERSION out of various sqConfig. h files and into
by commits＠squeakvm.org 24 May '15

24 May '15

Revision: 3356 Author: eliot Date: 2015-05-23 19:03:15 -0700 (Sat, 23 May 2015) Log Message: ----------- Move definition of VM_VERSION out of various sqConfig.h files and into platforms/Cross/vm/sqVirtualMachine.h. Make unix autoconf oblivious of the VM_VERSION.VM_RELEASE version tag, allowing one to rebuild without a time-consuming configure if already configured. To support this add a main routine to platforms/Cross/vm/sqSCCSVersion.h that allows it to be compiled to answer the VM_VERSION.VM_RELEASE as defined by platforms/Cross/vm/{sqVirtualMachine.h,sqSCCSVersion.h}. Modify the linux makeproduct scripts to use makealldirty & add makeproductclean scripts. Modified Paths: -------------- branches/Cog/build.linux32ARM/makeproduct branches/Cog/build.linux32x86/makeproduct branches/Cog/build.linux64x64/makeproduct branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Cross/vm/sqVirtualMachine.h branches/Cog/platforms/Mac OS/vm/config.h branches/Cog/platforms/Mac OS/vm/sqConfig.h branches/Cog/platforms/Plan9/vm/config.h branches/Cog/platforms/iOS/vm/iPhone/config.h branches/Cog/platforms/unix/config/Makefile.in branches/Cog/platforms/unix/config/Makefile.install branches/Cog/platforms/unix/config/acinclude.m4 branches/Cog/platforms/unix/config/config.h.in branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/platforms/unix/config/make.cfg.in branches/Cog/platforms/unix/vm/Makefile.in branches/Cog/platforms/unix/vm/sqConfig.h branches/Cog/platforms/win32/vm/sqConfig.h branches/Cog/platforms/win32/vm/sqPlatformSpecific.h branches/Cog/platforms/win32/vm/sqWin32.h branches/Cog/platforms/win32/vm/sqWin32Main.c branches/Cog/platforms/win32/vm/sqWin32Prefs.c branches/Cog/platforms/win32/vm/sqWin32Prefs.h Added Paths: ----------- branches/Cog/build.linux32ARM/makeproductclean branches/Cog/build.linux32x86/makeproductclean branches/Cog/build.linux64x64/makeproductclean branches/Cog/platforms/unix/config/getversion.c Modified: branches/Cog/build.linux32ARM/makeproduct =================================================================== --- branches/Cog/build.linux32ARM/makeproduct 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/build.linux32ARM/makeproduct 2015-05-24 02:03:15 UTC (rev 3356) @@ -2,7 +2,7 @@ trap 'exit 2' HUP INT PIPE TERM for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3 squeak.stack.spur squeak.stack.v3; do if test -d "$d"; then - (cd $d;./makeallclean "$@") + (cd $d;./makealldirty "$@") else echo no $d directory found fi Copied: branches/Cog/build.linux32ARM/makeproductclean (from rev 3353, branches/Cog/build.linux32ARM/makeproduct) =================================================================== --- branches/Cog/build.linux32ARM/makeproductclean (rev 0) +++ branches/Cog/build.linux32ARM/makeproductclean 2015-05-24 02:03:15 UTC (rev 3356) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3 squeak.stack.spur squeak.stack.v3; do + if test -d "$d"; then + (cd $d;./makeallclean "$@") + else + echo no $d directory found + fi +done Modified: branches/Cog/build.linux32x86/makeproduct =================================================================== --- branches/Cog/build.linux32x86/makeproduct 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/build.linux32x86/makeproduct 2015-05-24 02:03:15 UTC (rev 3356) @@ -2,7 +2,7 @@ trap 'exit 2' HUP INT PIPE TERM for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do if test -d "$d"; then - (cd $d;./makeallclean "$@") + (cd $d;./makealldirty "$@") else echo no $d directory found fi Copied: branches/Cog/build.linux32x86/makeproductclean (from rev 3335, branches/Cog/build.linux32x86/makeproduct) =================================================================== --- branches/Cog/build.linux32x86/makeproductclean (rev 0) +++ branches/Cog/build.linux32x86/makeproductclean 2015-05-24 02:03:15 UTC (rev 3356) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do + if test -d "$d"; then + (cd $d;./makeallclean "$@") + else + echo no $d directory found + fi +done Modified: branches/Cog/build.linux64x64/makeproduct =================================================================== --- branches/Cog/build.linux64x64/makeproduct 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/build.linux64x64/makeproduct 2015-05-24 02:03:15 UTC (rev 3356) @@ -2,7 +2,7 @@ trap 'exit 2' HUP INT PIPE TERM for d in newspeak.cog.spur squeak.cog.spur; do if test -d "$d"; then - (cd $d;./makeallclean "$@") + (cd $d;./makealldirty "$@") else echo no $d directory found fi Copied: branches/Cog/build.linux64x64/makeproductclean (from rev 3335, branches/Cog/build.linux64x64/makeproduct) =================================================================== --- branches/Cog/build.linux64x64/makeproductclean (rev 0) +++ branches/Cog/build.linux64x64/makeproductclean 2015-05-24 02:03:15 UTC (rev 3356) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in newspeak.cog.spur squeak.cog.spur; do + if test -d "$d"; then + (cd $d;./makeallclean "$@") + else + echo no $d directory found + fi +done Modified: branches/Cog/platforms/Cross/vm/sq.h =================================================================== --- branches/Cog/platforms/Cross/vm/sq.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Cross/vm/sq.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -39,10 +39,13 @@ /* Note: All pluggable primitives are defined as EXPORT(int) somePrimitive(void) - If the platform requires special declaration modifiers, the EXPORT - macro can be redefined. + All non-static variables in the VM and plugins are declared as + VM_EXPORT type var + If the platform requires special declaration modifiers, the EXPORT and + VM_EXPORT macros can be redefined. */ #define EXPORT(returnType) returnType +#define VM_EXPORT /* Image save/restore macros. */ Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -97,3 +97,29 @@ } return sourceVersion; } + + +#if VERSION_PROGRAM +# include "sq.h" + +int +main(int argc, char *argv[]) +{ + char vm_version[] = VM_VERSION; + + if (argc == 2 && !strcmp(argv[1], "VM_VERSION")) + printf("%s\n", vm_version); + else if (argc == 2 && !strcmp(argv[1], "VM_MAJOR")) + printf("%.*s\n", strchr(vm_version,'.') - vm_version, vm_version); + else if (argc == 2 && !strcmp(argv[1], "VM_MINOR")) + printf("%s\n", strchr(vm_version,'.') + 1, vm_version); + else if (argc == 2 && !strcmp(argv[1], "VM_RELEASE")) + printf("%s\n", revisionAsString()); + else if (argc == 2 && !strcmp(argv[1], "VERSION_TAG")) + printf("%s.%s\n", vm_version, revisionAsString()); + else + return 1; + + return 0; +} +#endif /* VERSION_PROGRAM */ Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -1,11 +1,17 @@ #ifndef _SqueakVM_H #define _SqueakVM_H -/* We expect interp.h to define VM_PROXY_MAJOR & VM_PROXY_MINOR appropriately - * for the VM generated with it. +/* We expect interp.h to define VM_PROXY_MAJOR & VM_PROXY_MINOR, and other + * defines such as STACKVM, appropriately for the VM generated with it. */ #include "interp.h" +#if SPURVM +# define VM_VERSION "5.0" +#else +# define VM_VERSION "4.5" +#endif + #ifndef VM_PROXY_MAJOR /* Increment the following number if you change the order of functions listed or if you remove functions */ Modified: branches/Cog/platforms/Mac OS/vm/config.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/config.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Mac OS/vm/config.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -169,11 +169,6 @@ /* other configured variables */ -#if SPURVM -# define VM_VERSION "5.0" -#else -# define VM_VERSION "4.5" -#endif #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/X11R6/lib" Modified: branches/Cog/platforms/Mac OS/vm/sqConfig.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqConfig.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Mac OS/vm/sqConfig.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -20,3 +20,8 @@ #else # define VMBIGENDIAN 0 #endif + +#if defined(__GNUC__) +# define PlatformNoDbgRegParms __attribute__ ((regparm (0))) +# define NeverInline __attribute__ ((noinline)) +#endif Modified: branches/Cog/platforms/Plan9/vm/config.h =================================================================== --- branches/Cog/platforms/Plan9/vm/config.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/Plan9/vm/config.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -121,8 +121,6 @@ /* other configured variables */ -#define SQ_VERSION "4.5" -#define VM_VERSION "4.5" #define VM_LIBDIR "" #define VM_MODULE_PREFIX "" #define VM_BUILD_STRING "Plan9 built on "__DATE__" "__TIME__ Modified: branches/Cog/platforms/iOS/vm/iPhone/config.h =================================================================== --- branches/Cog/platforms/iOS/vm/iPhone/config.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/iOS/vm/iPhone/config.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -190,11 +190,6 @@ /* other configured variables */ -#if SPURVM -# define VM_VERSION "5.0" -#else -# define VM_VERSION "4.5" -#endif #define VM_MODULE_PREFIX "" /* #undef VM_DLSYM_PREFIX */ #define VM_X11DIR "/usr/X11R6/lib" Modified: branches/Cog/platforms/unix/config/Makefile.in =================================================================== --- branches/Cog/platforms/unix/config/Makefile.in 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/Makefile.in 2015-05-24 02:03:15 UTC (rev 3356) @@ -26,7 +26,7 @@ # # Author: ian.piumarta(a)inria.fr # -# Last edited: Tue Mar 2 16:59:47 PST 2010 by eliot +# Last edited: Sat May 23 18:45:43 PDT 2015 by eliot @make_cfg@ @make_prg@ @@ -58,6 +58,10 @@ version.c : $(SQLIBS) ${cfgdir}/verstamp version.c $(CC) + +getversion : ${cfgdir}/getversion.c + $(CC) -o getversion $(CFLAGS) $(INCLUDES) ${cfgdir}/getversion.c + plugins : config.sh $(PLUGINS_LA) # nuke everything but plugins.int & plugins.ext @@ -73,16 +77,17 @@ mkdir nps $(SHELL) -ec 'cd nps; ln -s $(topdir)/platforms/unix/npsqueak/* .' -nps/npsqueak.so : nps +nps/npsqueak.so : nps getversion $(SHELL) -ec 'cd nps; $(MAKE) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' # OSX app bundle osxdir=$(topdir)/platforms/unix/vm-display-Quartz -app=Squeak-$(VM_MAJOR).$(VM_MINOR)-$(VM_RELEASE).app +#app=Squeak-$(VM_MAJOR).$(VM_MINOR)-$(VM_RELEASE).app +app=Squeak-`./getversion VM_MAJOR`.`./getversion VM_MINOR`-`./getversion VM_RELEASE`.app appdir=$(app)/Contents -Squeak.app : squeak plugins Info.plist +Squeak.app : squeak plugins Info.plist getversion /bin/rm -rf $(app) mkdir -p $(appdir)/MacOS cp -p squeak $(appdir)/MacOS/. @@ -94,10 +99,8 @@ cp -pr $(osxdir)/Resources $(appdir)/. -find $(app) -name '*~' | xargs rm -f -bndl_version=${VM_VERSION} (${SQ_VERSION}) - -Info.plist : $(osxdir)/Info.plist.in $(osxdir)/mkinfo - $(osxdir)/mkinfo $(osxdir)/Info.plist.in Info.plist.tmp "${bndl_version}" +Info.plist : $(osxdir)/Info.plist.in $(osxdir)/mkinfo getversion + $(osxdir)/mkinfo $(osxdir)/Info.plist.in Info.plist.tmp "`./getversion VM_VERSION`" mv Info.plist.tmp Info.plist # OSX plugin bundle @@ -125,8 +128,8 @@ # manual page -squeak.1 : $(topdir)/platforms/unix/doc/squeak.1 - $(cfgdir)/mkman $(VM_MAJOR) $(VM_VERSION) \ +squeak.1 : $(topdir)/platforms/unix/doc/squeak.1 getversion + $(cfgdir)/mkman `./getversion VM_MAJOR` `./getversion VM_VERSION` \ $(bindir) $(imgdir) $(plgdir) $(mandir) $(docdir) \ < $(topdir)/platforms/unix/doc/squeak.1 > $@ Modified: branches/Cog/platforms/unix/config/Makefile.install =================================================================== --- branches/Cog/platforms/unix/config/Makefile.install 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/Makefile.install 2015-05-24 02:03:15 UTC (rev 3356) @@ -15,7 +15,7 @@ # squeak -install-squeak : $(squeak) +install-squeak : $(squeak) getversion $(MKINSTALLDIRS) $(ROOT)$(plgdir) $(MKINSTALLDIRS) $(ROOT)$(bindir) $(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir) @@ -25,7 +25,7 @@ $(INSTALL_DATA) $(ICONS) $(ROOT)$(VM_APP_ICONS); \ fi -uninstall-squeak : .force +uninstall-squeak : getversion .force if test -n "$(VM_APP_ICONS)"; then \ $(UNINSTALL) $(ROOT)$(VM_APP_ICONS); \ fi @@ -34,7 +34,7 @@ # plugins -install-plugins : plugins +install-plugins : plugins getversion $(MKINSTALLDIRS) $(ROOT)$(plgdir) @list='$(PLUGINS_LA)'; for p in $$list; do \ if test -f */$$p; then \ @@ -44,7 +44,7 @@ done -rm $(ROOT)$(plgdir)/*.la -uninstall-plugins : .force +uninstall-plugins : getversion .force @list='$(PLUGINS_LA)'; for p in $$list; do \ filename=$(ROOT)/$(plgdir)/`basename $$p .la`;\ if test -f $$filename; then \ @@ -92,7 +92,7 @@ rm -f inisqueak; \ $(LN_S) $$path/inisqueak .; ) -uninstall-image : +uninstall-image : getversion @$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz @$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz @$(UNINSTALL) $(ROOT)$(plgdir) inisqueak @@ -108,8 +108,8 @@ # npsqueak -install-npsqueak : npsqueak .force +install-npsqueak : npsqueak getversion .force $(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' -uninstall-npsqueak : npsqueak .force +uninstall-npsqueak : npsqueak getversion .force $(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)' Modified: branches/Cog/platforms/unix/config/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/config/acinclude.m4 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/acinclude.m4 2015-05-24 02:03:15 UTC (rev 3356) @@ -60,12 +60,12 @@ AC_DEFUN([AC_VM_VERSION],[ - VM_MAJOR=$1 - VM_MINOR=$2 - VM_RELEASE=$3 - SQ_MAJOR=$4 - SQ_MINOR=$5 - SQ_UPDATE=$6 +# VM_MAJOR=$1 +# VM_MINOR=$2 +# VM_RELEASE=$3 +# SQ_MAJOR=$4 +# SQ_MINOR=$5 +# SQ_UPDATE=$6 ]) Modified: branches/Cog/platforms/unix/config/config.h.in =================================================================== --- branches/Cog/platforms/unix/config/config.h.in 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/config.h.in 2015-05-24 02:03:15 UTC (rev 3356) @@ -161,8 +161,6 @@ /* other configured variables */ -#undef SQ_VERSION -#undef VM_VERSION #undef VM_MODULE_PREFIX #undef VM_DLSYM_PREFIX #undef VM_X11DIR Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/configure 2015-05-24 02:03:15 UTC (rev 3356) @@ -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 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 VM_DISPX11_OBJS VM_DISPX11_BITBLT_FLAGS BITBLT_OBJS BITBLT_FLAGS ARM_ARCH LIBM_CFLAGS IA32ABI_OBJS 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 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 VM_DISPX11_OBJS VM_DISPX11_BITBLT_FLAGS BITBLT_OBJS BITBLT_FLAGS ARM_ARCH LIBM_CFLAGS IA32ABI_OBJS 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. @@ -1538,12 +1538,12 @@ sqminor=`echo ${sqversion} | sed 's/^.*\.//'` - VM_MAJOR=${vmmajor} - VM_MINOR=${vmminor} - VM_RELEASE=${SVNREV} - SQ_MAJOR=${sqmajor} - SQ_MINOR=${sqminor} - SQ_UPDATE=0 +# VM_MAJOR=${vmmajor} +# VM_MINOR=${vmminor} +# VM_RELEASE=${SVNREV} +# SQ_MAJOR=${sqmajor} +# SQ_MINOR=${sqminor} +# SQ_UPDATE=0 topdir=`cd ${srcdir}/../../..; pwd` @@ -1675,24 +1675,21 @@ -VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE} +#VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE} -cat >>confdefs.h <<_ACEOF -#define VM_VERSION "${VM_VERSION}" -_ACEOF +#AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}") +#AC_SUBST(VM_MAJOR) +#AC_SUBST(VM_MINOR) +#AC_SUBST(VM_RELEASE) +#AC_SUBST(VM_VERSION) - - - - - # libdir contains ${exec_prefix}, so we have to default and expand early test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' imgdir=`eval echo ${libdir}/squeak` expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}` -plgdir='${imgdir}/'`eval echo ${VM_VERSION}` +plgdir='${imgdir}/`./getversion VERSION_TAG`' @@ -5923,7 +5920,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5926 "configure"' > conftest.$ac_ext + echo '#line 5923 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6940,7 +6937,7 @@ # Provide some information about the compiler. -echo "$as_me:6943:" \ +echo "$as_me:6940:" \ "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 @@ -8003,11 +8000,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:8006: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8010: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $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. @@ -8271,11 +8268,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:8274: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8271: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8278: \$? = $ac_status" >&5 + echo "$as_me:8275: \$? = $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. @@ -8375,11 +8372,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:8378: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8375: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8382: \$? = $ac_status" >&5 + echo "$as_me:8379: \$? = $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 @@ -9844,7 +9841,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9847 "configure"' > conftest.$ac_ext + echo '#line 9844 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10741,7 +10738,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10744 "configure" +#line 10741 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10841,7 +10838,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10844 "configure" +#line 10841 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13184,11 +13181,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:13187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13184: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13191: \$? = $ac_status" >&5 + echo "$as_me:13188: \$? = $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. @@ -13288,11 +13285,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:13291: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13288: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13295: \$? = $ac_status" >&5 + echo "$as_me:13292: \$? = $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 @@ -13824,7 +13821,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 13827 "configure"' > conftest.$ac_ext + echo '#line 13824 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14882,11 +14879,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:14885: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14882: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14889: \$? = $ac_status" >&5 + echo "$as_me:14886: \$? = $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. @@ -14986,11 +14983,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:14989: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14986: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14993: \$? = $ac_status" >&5 + echo "$as_me:14990: \$? = $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 @@ -16435,7 +16432,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16438 "configure"' > conftest.$ac_ext + echo '#line 16435 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17213,11 +17210,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:17216: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17213: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17220: \$? = $ac_status" >&5 + echo "$as_me:17217: \$? = $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. @@ -17481,11 +17478,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:17484: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17481: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17488: \$? = $ac_status" >&5 + echo "$as_me:17485: \$? = $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. @@ -17585,11 +17582,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:17588: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17585: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17592: \$? = $ac_status" >&5 + echo "$as_me:17589: \$? = $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 @@ -19054,7 +19051,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 19057 "configure"' > conftest.$ac_ext + echo '#line 19054 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -29945,10 +29942,6 @@ s,@SQ_MINOR@,$SQ_MINOR,;t t s,@SQ_UPDATE@,$SQ_UPDATE,;t t s,@SQ_VERSION@,$SQ_VERSION,;t t -s,@VM_MAJOR@,$VM_MAJOR,;t t -s,@VM_MINOR@,$VM_MINOR,;t t -s,@VM_RELEASE@,$VM_RELEASE,;t t -s,@VM_VERSION@,$VM_VERSION,;t t s,@imgdir@,$imgdir,;t t s,@expanded_relative_imgdir@,$expanded_relative_imgdir,;t t s,@plgdir@,$plgdir,;t t Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/configure.ac 2015-05-24 02:03:15 UTC (rev 3356) @@ -124,21 +124,21 @@ AC_SUBST(SQ_UPDATE) AC_SUBST(SQ_VERSION) -VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE} +#VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE} -AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}") +#AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}") -AC_SUBST(VM_MAJOR) -AC_SUBST(VM_MINOR) -AC_SUBST(VM_RELEASE) -AC_SUBST(VM_VERSION) +#AC_SUBST(VM_MAJOR) +#AC_SUBST(VM_MINOR) +#AC_SUBST(VM_RELEASE) +#AC_SUBST(VM_VERSION) # libdir contains ${exec_prefix}, so we have to default and expand early test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' imgdir=`eval echo ${libdir}/squeak` expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}` -plgdir='${imgdir}/'`eval echo ${VM_VERSION}` +plgdir='${imgdir}/`./getversion VERSION_TAG`' AC_SUBST(imgdir) AC_SUBST(expanded_relative_imgdir) Added: branches/Cog/platforms/unix/config/getversion.c =================================================================== --- branches/Cog/platforms/unix/config/getversion.c (rev 0) +++ branches/Cog/platforms/unix/config/getversion.c 2015-05-24 02:03:15 UTC (rev 3356) @@ -0,0 +1,3 @@ +#define VERSION_PROGRAM 1 + +#include "sqSCCSVersion.h" Modified: branches/Cog/platforms/unix/config/make.cfg.in =================================================================== --- branches/Cog/platforms/unix/config/make.cfg.in 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/config/make.cfg.in 2015-05-24 02:03:15 UTC (rev 3356) @@ -1,6 +1,6 @@ # make.cfg.in -- mf fragment for configured variables -*- makefile -*- # -# Copyright (C) 1996-2004 by Ian Piumarta and other authors/contributors +# Copyright (C) 1996-2015 by Ian Piumarta and other authors/contributors # listed elsewhere in this file. # All rights reserved. # @@ -20,28 +20,18 @@ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. # Author: Ian.Piumarta(a)inria.fr # -# Last edited: Tue Jan 26 11:48:03 PST 2010 by eliot +# Last edited: Fri May 22 11:16:24 PDT 2015 by eliot MAKEFLAGS= --no-print-directory @SET_MAKE@ -VM_MAJOR= @VM_MAJOR@ -VM_MINOR= @VM_MINOR@ -VM_RELEASE= @VM_RELEASE@ -VM_VERSION= @VM_VERSION@ - -SQ_MAJOR= @SQ_MAJOR@ -SQ_MINOR= @SQ_MINOR@ -SQ_UPDATE= @SQ_UPDATE@ -SQ_VERSION= @SQ_VERSION@ - DEVEL= @DEVEL@ host= @host@ Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/vm/Makefile.in 2015-05-24 02:03:15 UTC (rev 3356) @@ -71,7 +71,7 @@ sqNamedPrims$o : $(blddir)/sqNamedPrims.h -# rebuild sqExtPrims sqUnixMain (VM_VERSION) if config.h changes +# rebuild sqExtPrims sqUnixMain if config.h changes sqUnixExternalPrims$o sqUnixMain$o : ../config.h $(topdir)/platforms/unix/vm/dlfcn-dyld.c Modified: branches/Cog/platforms/unix/vm/sqConfig.h =================================================================== --- branches/Cog/platforms/unix/vm/sqConfig.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/unix/vm/sqConfig.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -18,3 +18,8 @@ #else # define VMBIGENDIAN 1 #endif + +#if defined(__GNUC__) +# define PlatformNoDbgRegParms __attribute__ ((regparm (0))) +# define NeverInline __attribute__ ((noinline)) +#endif Modified: branches/Cog/platforms/win32/vm/sqConfig.h =================================================================== --- branches/Cog/platforms/win32/vm/sqConfig.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqConfig.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -31,3 +31,8 @@ #endif #define VMBIGENDIAN 0 + +#if defined(__GNUC__) && (__GNUC__ == 3 || (!defined(__MINGW32__) && !defined(__MINGW64__))) +# define PlatformNoDbgRegParms __attribute__ ((regparm (0))) +# define NeverInline __attribute__ ((noinline)) +#endif Modified: branches/Cog/platforms/win32/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqPlatformSpecific.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -45,7 +45,10 @@ #if defined(_MSC_VER) || defined(__MINGW32__) # undef EXPORT # define EXPORT(returnType) __declspec( dllexport ) returnType +# undef VM_EXPORT +# define VM_EXPORT __declspec( dllexport ) #endif + #if defined(_MSC_VER) || defined(__MINGW32__) # define fabsf(x) ((float)fabs((double)(x))) #endif Modified: branches/Cog/platforms/win32/vm/sqWin32.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqWin32.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -25,17 +25,6 @@ #define FINALLY #endif -#ifndef SQ_IMAGE_VERSION_MAJOR -#define SQ_IMAGE_VERSION_MAJOR 3 -#endif -#ifndef SQ_IMAGE_VERSION_MINOR -#define SQ_IMAGE_VERSION_MINOR 0 -#endif - -#if (SQ_IMAGE_VERSION_MAJOR < 2) -#error "These files are only for Squeak >= 2.0" -#endif - #define NO_TABLET @@ -235,9 +224,6 @@ #define VERSION "" #endif -#define VM_VERSION TEXT("Cog VM 4.0.0 (release) from ") TEXT(__DATE__) \ - TEXT("\n") TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION) - /********************************************************/ /* image reversal functions */ /********************************************************/ Modified: branches/Cog/platforms/win32/vm/sqWin32Main.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Main.c 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqWin32Main.c 2015-05-24 02:03:15 UTC (rev 3356) @@ -18,6 +18,7 @@ #include <float.h> #include <ole2.h> #include "sq.h" +#include "sqWin32Prefs.h" #include "sqAssert.h" #include "sqWin32Backtrace.h" #include "sqSCCSVersion.h" @@ -925,7 +926,7 @@ fprintf(f,"\n%s", gdInfoString); /* print VM version information */ - fprintf(f,"\nVM Version: %s\n", VM_VERSION); + fprintf(f,"\nVM Version: %s\n", VM_VERSION_TEXT); #if STACKVM fprintf(f,"Interpreter Build: %s\n", __interpBuildInfo); # if COGVM Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2015-05-24 02:03:15 UTC (rev 3356) @@ -397,7 +397,7 @@ void HandlePrefsMenu(int cmd) { switch(cmd) { case ID_ABOUT: - MessageBox(stWindow,VM_VERSION, + MessageBox(stWindow,VM_VERSION_TEXT, TEXT("About " VM_NAME " on Win32"), MB_OK); break; case ID_DEFERUPDATES: Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Prefs.h 2015-05-21 22:26:17 UTC (rev 3355) +++ branches/Cog/platforms/win32/vm/sqWin32Prefs.h 2015-05-24 02:03:15 UTC (rev 3356) @@ -34,4 +34,20 @@ void CreatePrefsMenu(void); void HandlePrefsMenu(int); +#if COGVM +# define NICKNAME "Cog" +#elif STACKVM +# define NICKNAME "Stack" +#else +# define NICKNAME "Interpreter" #endif +#if SPURVM +# define NICKNAME_EXTRA " Spur VM " +#else +# define NICKNAME_EXTRA " VM " +#endif + +#define VM_VERSION_TEXT TEXT(NICKNAME NICKNAME_EXTRA VM_VERSION) \ + TEXT(" (release) from ") TEXT(__DATE__) TEXT("\n") \ + TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION) +#endif

2 1

VM Maker: VMMaker.oscog-eem.1323.mcz
by commits＠source.squeak.org 24 May '15

24 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1323.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1323 Author: eem Time: 23 May 2015, 7:07:35.921 pm UUID: 95fb28f1-4ac9-434c-adb9-b0a3111e70ad Ancestors: VMMaker.oscog-EstebanLorenzano.1322 Merge with Pharo (with VMMaker.oscog-EstebanLorenzano.1322). Fix PIC creation on ARM to jive with new pc-relative addressing support (addressIsInCurrentCompilation:). Move the specifics of NoDbgRegParms out of VMMaker. Assume it is defined in the various sqPlatformSpecific.h (see r3356). =============== Diff against VMMaker.oscog-EstebanLorenzano.1322 =============== Item was changed: + SystemOrganization addCategory: #'VMMaker-Building'! + SystemOrganization addCategory: #'VMMaker-Interpreter'! + SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! + SystemOrganization addCategory: #'VMMaker-InterpreterSimulation-Morphic'! + SystemOrganization addCategory: #'VMMaker-JIT'! + SystemOrganization addCategory: #'VMMaker-JITSimulation'! + SystemOrganization addCategory: #'VMMaker-Multithreading'! + SystemOrganization addCategory: #'VMMaker-Plugins'! + SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! + SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! + SystemOrganization addCategory: #'VMMaker-PostProcessing'! + SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! + SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! + SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! + SystemOrganization addCategory: #'VMMaker-Support'! + SystemOrganization addCategory: #'VMMaker-Tests'! + SystemOrganization addCategory: #'VMMaker-Translation to C'! - SystemOrganization addCategory: #VMMaker! - SystemOrganization addCategory: 'VMMaker-Building'! - SystemOrganization addCategory: 'VMMaker-Interpreter'! - SystemOrganization addCategory: 'VMMaker-InterpreterSimulation'! - SystemOrganization addCategory: 'VMMaker-InterpreterSimulation-Morphic'! - SystemOrganization addCategory: 'VMMaker-JIT'! - SystemOrganization addCategory: 'VMMaker-JITSimulation'! - SystemOrganization addCategory: 'VMMaker-Multithreading'! - SystemOrganization addCategory: 'VMMaker-Plugins'! - SystemOrganization addCategory: 'VMMaker-Plugins-Alien'! - SystemOrganization addCategory: 'VMMaker-Plugins-IOS'! - SystemOrganization addCategory: 'VMMaker-PostProcessing'! - SystemOrganization addCategory: 'VMMaker-SmartSyntaxPlugins'! - SystemOrganization addCategory: 'VMMaker-SpurMemoryManager'! - SystemOrganization addCategory: 'VMMaker-SpurMemoryManagerSimulation'! - SystemOrganization addCategory: 'VMMaker-Support'! - SystemOrganization addCategory: 'VMMaker-Tests'! - SystemOrganization addCategory: 'VMMaker-Translation to C'! Item was changed: ----- Method: CCodeGenerator>>emitCFunctionPrototypes:on: (in category 'C code generator') ----- emitCFunctionPrototypes: methodList on: aStream "Store prototype declarations for all non-inlined methods on the given stream." | exporting | aStream cr; nextPutAll: '/*** Function Prototypes ***/'; cr. + "Add a define for a NoDbgRegParms attribute for static functions used for debugging. + gcc and other compilers will use non-standard calling conventions for static functions + when optimizing. This can render the functions unusable in gdb. The sqConfig.h file + for the platform should define PlatformNoDbgRegParms suitably for the platform's + compiler, if the compiler can be persuaded not to generate such functions." + "Add a define for a NeverInline attribute that tells the compiler never to inline functions + with the attribute. We mark functions we want to observe in a profiler as NeverInline. + The sqConfig.h file for the platform should define NeverInline suitably for the platform's + compiler, if the compiler can be persuaded not to inline certain functions." - "Hmm, this should be in the sqConfig.h files. For now put it here..." - "Feel free to add equivalents for other compilers" vmClass notNil ifTrue: [NoRegParmsInAssertVMs ifTrue: + [aStream nextPutAll: '\\#if !!PRODUCTION && defined(PlatformNoDbgRegParms)\# define NoDbgRegParms PlatformNoDbgRegParms\#endif' withCRs. - [aStream nextPutAll: '\\#if !!PRODUCTION && defined(__GNUC__) && !!(defined(__MINGW32__) || defined(__MINGW64__)) && !!defined(NoDbgRegParms)\# define NoDbgRegParms __attribute__ ((regparm (0)))\#endif' withCRs. aStream nextPutAll: '\\#if !!defined(NoDbgRegParms)\# define NoDbgRegParms /*empty*/\#endif\\' withCRs]. - aStream nextPutAll: '\\#if defined(__GNUC__) && !!defined(NeverInline)\# define NeverInline __attribute__ ((noinline))\#endif' withCRs. aStream nextPutAll: '\\#if !!defined(NeverInline)\# define NeverInline /*empty*/\#endif\\' withCRs]. exporting := false. (methodList select: [:m| m isRealMethod and: [self shouldGenerateMethod: m]]) do: [:m | self emitExportPragma ifTrue: [m export ifTrue: [exporting ifFalse: [aStream nextPutAll: '#pragma export on'; cr. exporting := true]] ifFalse: [exporting ifTrue: [aStream nextPutAll: '#pragma export off'; cr. exporting := false]]]. m emitCFunctionPrototype: aStream generator: self. (NoRegParmsInAssertVMs and: [vmClass notNil and: [m export not and: [m isStatic and: [m args notEmpty]]]]) ifTrue: [aStream nextPutAll: ' NoDbgRegParms']. (vmClass notNil and: [m inline == #never]) ifTrue: [aStream nextPutAll: ' NeverInline']. aStream nextPut: $; ; cr]. exporting ifTrue: [aStream nextPutAll: '#pragma export off'; cr]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>emitGlobalCVariablesOn: (in category 'C code generator') ----- emitGlobalCVariablesOn: aStream "Store the global variable declarations on the given stream." aStream cr; nextPutAll: '/*** Global Variables ***/'; cr. (self sortStrings: (variables select: [:v| vmClass mustBeGlobal: v])) do: [:var | | varString decl | varString := var asString. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" ifTrue: [aStream nextPutAll: decl; cr] ifFalse: + [(decl includesSubString: ' private ') ifFalse: "work-around hack to prevent localization of variables only referenced once." + [(decl beginsWith: 'static') ifFalse: [aStream nextPutAll: 'VM_EXPORT ']. - [ - ((decl includesSubString: ' private ') - "or: [decl beginsWith: 'static']") ifFalse: "work-around hack to prevent localization of variables only referenced once." - [ - PharoVM ifTrue: - [(decl beginsWith: 'static') ifFalse: [aStream nextPutAll: 'VM_EXPORT ']]. (decl includes: $=) ifTrue: [decl := decl copyFrom: 1 to: (decl indexOf: $=) - 1]. aStream nextPutAll: decl; nextPut: $;; cr]]]. aStream cr! Item was changed: ----- Method: CCodeGenerator>>interpreterVersion (in category 'accessing') ----- interpreterVersion + ^self vmClass interpreterVersion, '[', self vmClass objectMemoryClass memoryManagerVersion, ']'! - | memoryManagerVersion | - memoryManagerVersion := (self options at: #ObjectMemory ifAbsent: [ #ObjectMemory ]) asClass memoryManagerVersion. - ^ self vmClass interpreterVersion, '[', memoryManagerVersion,']'! Item was removed: - ----- Method: CCodeGenerator>>isThreadedVM (in category 'testing') ----- - isThreadedVM - ^ self vmClass isThreadedVM! Item was changed: ----- Method: CCodeGenerator>>storeAPIExportHeader:OnFile: (in category 'public') ----- storeAPIExportHeader: headerName OnFile: fullHeaderPath "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | header | header := String streamContents: [:s| s nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr. self emitCAPIExportHeaderOn: s]. (self needToGenerateHeader: headerName file: fullHeaderPath contents: header) ifTrue: [self storeHeaderOnFile: fullHeaderPath contents: header]! Item was changed: ----- Method: CCodeGenerator>>storeHeaderOnFile:contents: (in category 'public') ----- storeHeaderOnFile: fileName contents: contents "Store C header code on the given file. Evaluate aBlock with the stream to generate its contents." | aStream | aStream := VMMaker forceNewFileNamed: fileName. aStream ifNil: [Error signal: 'Could not open C header file: ', fileName]. [(contents beginsWith: '/* Automatic') ifFalse: [aStream nextPutAll: (self fileHeaderVersionStampForSourceClass: nil); cr]. aStream nextPutAll: contents] ensure: [aStream close]! Item was changed: ----- Method: CCodeGenerator>>structClassesForTranslationClasses: (in category 'utilities') ----- structClassesForTranslationClasses: classes "Answer in superclass order (any superclass precedes any subclass) the ancilliaryClasses that are struct classes for all the given classes." | theStructClasses | theStructClasses := OrderedCollection new. classes do: [:aTranslationClass| ([aTranslationClass ancilliaryClasses: self options] on: MessageNotUnderstood do: [:ex| ex message selector == #ancilliaryClasses: ifTrue: [#()] ifFalse: [ex pass]]) do: [:class| (class isStructClass and: [(vmClass isNil or: [vmClass isAcceptableAncilliaryClass: class]) and: [(theStructClasses includes: class) not]]) ifTrue: [theStructClasses addLast: class]]]. ^ChangeSet superclassOrder: theStructClasses! Item was changed: ----- Method: CoInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator "Override to avoid repeating StackInterpreter's declarations and add our own extensions" self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" aCCodeGenerator addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator + addHeaderFile: (aCCodeGenerator vmClass isThreadedVM - addHeaderFile: (aCCodeGenerator isThreadedVM ifTrue: ['"cointerpmt.h"'] ifFalse: ['"cointerp.h"']); addHeaderFile:'"cogit.h"'. aCCodeGenerator vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: aCCodeGenerator interpreterVersion. aCCodeGenerator var: #heapBase type: #usqInt; var: #statCodeCompactionUsecs type: #usqLong; var: #maxLiteralCountForCompile declareC: 'sqInt maxLiteralCountForCompile = MaxLiteralCountForCompile /* ', MaxLiteralCountForCompile printString, ' */'; var: #minBackwardJumpCountForCompile declareC: 'sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* ', MinBackwardJumpCountForCompile printString, ' */'. aCCodeGenerator var: #reenterInterpreter declareC: 'jmp_buf reenterInterpreter; /* private export */'. aCCodeGenerator var: #primTraceLogIndex type: #'unsigned char'; var: #primTraceLog declareC: 'sqInt primTraceLog[256]'; var: #traceLog declareC: 'sqInt traceLog[TraceBufferSize /* ', TraceBufferSize printString, ' */]'; var: #traceSources type: #'char *' array: TraceSources! Item was changed: ----- Method: CogARMCompiler>>sub:rn:imm:ror: (in category 'ARM convenience instructions') ----- sub: destReg rn: srcReg imm: immediate ror: rot " Remember the ROR is doubled by the cpu so use 30>>1 etc SUB destReg, srcReg, #immediate ROR rot" ^self type: 1 op: SubOpcode set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogMethodSurrogate32 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^20 + self baseHeaderSize! Item was changed: ----- Method: CogMethodSurrogate64 class>>alignedByteSize (in category 'accessing') ----- alignedByteSize ^32 + self baseHeaderSize! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genGetInlineCacheClassTagFrom:into:forEntry: (in category 'compile abstract instructions') ----- genGetInlineCacheClassTagFrom: sourceReg into: destReg forEntry: forEntry "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, (with 1 & 3 collapsed to 1 for SmallIntegers, and 2 collapsed to 0 for Characters), or the receiver's classIndex. If forEntry is true answer the entry label at which control is to enter (cmEntryOffset). If forEntry is false, control enters at the start. + If forEntry is true, generate something like this: - If forEntry is false, generate something like this: Limm: andl $0x1, rDest j Lcmp Lentry: movl rSource, rDest andl $0x3, rDest jnz Limm movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: + If forEntry is false, generate something like the following. - If forEntry is true, generate something like the following. At least on a 2.2GHz Intel Core i7 the following is slightly faster than the above, 136m sends/sec vs 130m sends/sec for nfib in tinyBenchmarks Lentry: movl rSource, rDest andl $0x3, rDest jz LnotImm andl $1, rDest j Lcmp LnotImm: movl 0(%edx), rDest andl $0x3fffff, rDest Lcmp: But we expect most SmallInteger arithmetic to be performed in-line and so prefer the version that is faster for non-immediates (because it branches for immediates only)." | immLabel jumpNotImm entryLabel jumpCompare | <var: #immLabel type: #'AbstractInstruction *'> <var: #jumpNotImm type: #'AbstractInstruction *'> <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpCompare type: #'AbstractInstruction *'> forEntry ifFalse: [entryLabel := cogit Label. cogit AndCq: objectMemory tagMask R: sourceReg R: destReg. jumpNotImm := cogit JumpZero: 0. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. "Get least significant half of header word in destReg" self flag: #endianness. jumpNotImm jmpTarget: (cogit MoveMw: 0 r: sourceReg R: destReg). jumpCompare jmpTarget: (cogit AndCq: objectMemory classIndexMask R: destReg)] ifTrue: [cogit AlignmentNops: objectMemory wordSize. immLabel := cogit Label. cogit AndCq: 1 R: destReg. jumpCompare := cogit Jump: 0. cogit AlignmentNops: objectMemory wordSize. entryLabel := cogit Label. cogit AndCq: objectMemory tagMask R: sourceReg R: destReg. cogit JumpNonZero: immLabel. self flag: #endianness. "Get least significant half of header word in destReg" cogit MoveMw: 0 r: sourceReg R: destReg. cogit AndCq: objectMemory classIndexMask R: destReg. jumpCompare jmpTarget: cogit Label]. ^entryLabel! Item was changed: ----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') ----- cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase "Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as having the MNU case for cache flushing." <var: #cPIC type: #'CogMethod *'> | operand target address size end | "stack allocate the various collections so that they are effectively garbage collected on return." coInterpreter compilationBreak: cPIC selector point: (objectMemory numBytesOf: cPIC selector) isMNUCase: isMNUCase. self allocateOpcodes: 5 bytecodes: 0. + methodLabel address: cPIC asUnsignedInteger; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not. "Caller patches to open pic if caseNMethod is young." self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]). (isMNUCase not and: [coInterpreter methodHasCogMethod: caseNMethod]) ifTrue: [operand := 0. target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset] ifFalse: [isMNUCase ifTrue: [cPIC cpicHasMNUCase: true]. operand := caseNMethod. target := cPIC asInteger + (isMNUCase ifTrue: [self sizeof: CogMethod] ifFalse: [self interpretOffset - backEnd callInstructionByteSize])]. self CmpCw: caseNTag R: TempReg. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: target. + self MoveCw: cPIC asUnsignedInteger R: ClassReg. - self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs). - self computeMaximumSizes. address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC. size := self generateInstructionsAt: address. end := self outputInstructionsAt: address. processor flushICacheFrom: cPIC asInteger to: cPIC asInteger + closedPICSize. cPIC cPICNumCases: cPIC cPICNumCases + 1. ^0! Item was changed: ----- Method: Cogit>>cogMNUPICSelector:receiver:methodOperand:numArgs: (in category 'in-line cacheing') ----- cogMNUPICSelector: selector receiver: rcvr methodOperand: methodOperand numArgs: numArgs <api> "Attempt to create a one-case PIC for an MNU. The tag for the case is at the send site and so doesn't need to be generated." <returnTypeC: #'CogMethod *'> | startAddress size end | ((objectMemory isYoung: selector) or: [(objectRepresentation inlineCacheTagForInstance: rcvr) = self picAbortDiscriminatorValue]) ifTrue: [^0]. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: true. self assert: endCPICCase0 notNil. startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [coInterpreter callForCogCompiledCodeCompaction. ^0]. - methodLabel - address: startAddress; - dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. + methodLabel address: startAddress; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileMNUCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') methodOperand: methodOperand numArgs: numArgs. self computeMaximumSizes. - methodLabel concretizeAt: startAddress. size := self generateInstructionsAt: startAddress + (self sizeof: CogMethod). end := self outputInstructionsAt: startAddress + (self sizeof: CogMethod). "The missOffset is the same as the interpretOffset. On RISCs it includes an additional instruction." self assert: missOffset = ((backEnd hasLinkRegister ifTrue: [backEnd callInstructionByteSize] ifFalse: [0]) + picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') numArgs: numArgs numCases: 1 hasMNUCase: true selector: selector ! Item was changed: ----- Method: Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in category 'in-line cacheing') ----- cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase "Attempt to create a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; link to its unchecked entry-point - a CompiledMethod; link to ceInterpretMethodFromPIC: - a CompiledMethod; link to ceMNUFromPICMNUMethod:receiver:" <var: #case0CogMethod type: #'CogMethod *'> <returnTypeC: #'CogMethod *'> | startAddress size end | (objectMemory isYoung: selector) ifTrue: [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod *']. coInterpreter compilationBreak: selector point: (objectMemory numBytesOf: selector) isMNUCase: isMNUCase. startAddress := methodZone allocate: closedPICSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. - methodLabel - address: startAddress; - dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. + methodLabel address: startAddress; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileCPIC: (self cCoerceSimple: startAddress to: #'CogMethod *') Case0: case0CogMethod Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs. self computeMaximumSizes. - methodLabel concretizeAt: startAddress. size := self generateInstructionsAt: startAddress + (self sizeof: CogMethod). end := self outputInstructionsAt: startAddress + (self sizeof: CogMethod). "The missOffset is the same as the interpretOffset. On RISCs it includes an additional instruction." self assert: missOffset = ((backEnd hasLinkRegister ifTrue: [backEnd callInstructionByteSize] ifFalse: [0]) + picInterpretAbort address + picInterpretAbort machineCodeSize - startAddress). self assert: startAddress + cmEntryOffset = entry address. self assert: endCPICCase0 address = (startAddress + firstCPICCaseOffset). self assert: endCPICCase1 address = (startAddress + firstCPICCaseOffset + cPICCaseSize). ^self fillInCPICHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') numArgs: numArgs numCases: 2 hasMNUCase: isMNUCase selector: selector ! Item was changed: ----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') ----- compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs "Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; jump to its unchecked entry-point - a CompiledMethod; jump to the ceInterpretFromPIC trampoline - nil; call ceMNUFromPIC" <var: #cPIC type: #'CogMethod *'> | operand targetEntry jumpNext | <var: #case0CogMethod type: #'CogMethod *'> <var: #targetEntry type: #'void *'> <var: #jumpNext type: #'AbstractInstruction *'> self assert: case1Method notNil. self compilePICAbort: numArgs. self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. (isMNUCase not and: [coInterpreter methodHasCogMethod: case1Method]) ifTrue: [operand := 0. targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] ifFalse: "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." [operand := (case1Method isNil or: [objectMemory isYoungObject: case1Method]) ifTrue: [0] ifFalse: [case1Method]. targetEntry := case1Method isNil ifTrue: [picMNUAbort] ifFalse: [picInterpretAbort]]. jumpNext := self compileCPICEntry. self MoveCw: 0 R: SendNumArgsReg. self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset. endCPICCase0 := self CmpCw: case1Tag R: TempReg. jumpNext jmpTarget: endCPICCase0. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: (isMNUCase ifTrue: [picMNUAbort] ifFalse: [targetEntry]) asInteger. + endCPICCase1 := self MoveCw: cPIC asUnsignedInteger R: ClassReg. - endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0 ! Item was changed: ----- Method: Cogit>>compileClosedPICPrototype (in category 'in-line cacheing') ----- compileClosedPICPrototype "Compile the abstract instructions for a full closed PIC used to initialize closedPICSize. The loads into SendNumArgsReg are those for optional method objects which may be used in MNU cases." + <inline: true> | numArgs jumpNext | <var: #jumpNext type: #'AbstractInstruction *'> numArgs := 0. self compilePICAbort: numArgs. jumpNext := self compileCPICEntry. self MoveCw: 16r5EAF00D R: SendNumArgsReg. self JumpLong: methodZoneBase + 16rCA5E10. jumpNext jmpTarget: (endCPICCase0 := self Label). 1 to: numPICCases - 1 do: [:h| self CmpCw: 16rBABE1F15+h R: TempReg. self MoveCw: 16rBADA550 + h R: SendNumArgsReg. self JumpLongZero: 16rCA5E10 + (h * 16). h = 1 ifTrue: [endCPICCase1 := self Label]]. + self MoveCw: methodLabel address R: ClassReg. - self MoveCw: methodZoneBase R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0! Item was changed: ----- Method: Cogit>>compileMNUCPIC:methodOperand:numArgs: (in category 'in-line cacheing') ----- compileMNUCPIC: cPIC methodOperand: methodOperand numArgs: numArgs "Compile the code for a one-case MNU PIC that calls ceMNUFromPIC for case0Tag The tag for case0 is at the send site and so doesn't need to be generated." <var: #cPIC type: #'CogMethod *'> | jumpNext operand | <var: #jumpNext type: #'AbstractInstruction *'> self compilePICAbort: numArgs. jumpNext := self compileCPICEntry. "We do not scavenge PICs, hence we cannot cache the MNU method if it is in new space." operand := (methodOperand isNil or: [objectMemory isYoungObject: methodOperand]) ifTrue: [0] ifFalse: [methodOperand]. self MoveCw: operand R: SendNumArgsReg. self JumpLong: picMNUAbort asInteger. + jumpNext jmpTarget: (self MoveCw: cPIC asUnsignedInteger R: ClassReg). - jumpNext jmpTarget: (self MoveCw: cPIC asInteger R: ClassReg). self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0 ! Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." numPICCases := 6. - methodLabel - address: methodZoneBase; - dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. + methodLabel address: methodZoneBase; dependent: nil. "for pc-relative MoveCw: cPIC R: ClassReg" self compileClosedPICPrototype. self computeMaximumSizes. - methodLabel concretizeAt: methodZoneBase. closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). closedPICSize := methodZone roundUpLength: closedPICSize "self cCode: '' inSmalltalk: [| end | end := self outputInstructionsAt: methodZoneBase + headerSize. self disassembleFrom: methodZoneBase + headerSize to: end - 1. self halt]"! Item was changed: ----- Method: FilePlugin>>makeDirEntryName:size:createDate:modDate:isDir:fileSize:posixPermissions:isSymlink: (in category 'directory primitives') ----- makeDirEntryName: entryName size: entryNameSize createDate: createDate modDate: modifiedDate isDir: dirFlag fileSize: fileSize posixPermissions: posixPermissions isSymlink: symlinkFlag + <var: 'entryName' type: 'char *'> + <var: 'fileSize' type: 'squeakFileOffsetType '> + <option: #PharoVM> | modDateOop createDateOop nameString results stringPtr posixPermissionsOop fileSizeOop | - - <var: 'entryName' type: 'char *'> <var: 'stringPtr' type: 'char *'> - <var: 'fileSize' type: 'squeakFileOffsetType '> "allocate storage for results, remapping newly allocated oops in case GC happens during allocation" interpreterProxy pushRemappableOop: (interpreterProxy instantiateClass: (interpreterProxy classArray) indexableSize: 7). interpreterProxy pushRemappableOop: (interpreterProxy instantiateClass: (interpreterProxy classString) indexableSize: entryNameSize). interpreterProxy pushRemappableOop: (interpreterProxy positive32BitIntegerFor: createDate). interpreterProxy pushRemappableOop: (interpreterProxy positive32BitIntegerFor: modifiedDate). interpreterProxy pushRemappableOop: (interpreterProxy positive64BitIntegerFor: fileSize). interpreterProxy pushRemappableOop: (interpreterProxy positive32BitIntegerFor: posixPermissions). posixPermissionsOop := interpreterProxy popRemappableOop. fileSizeOop := interpreterProxy popRemappableOop. modDateOop := interpreterProxy popRemappableOop. createDateOop := interpreterProxy popRemappableOop. nameString := interpreterProxy popRemappableOop. results := interpreterProxy popRemappableOop. "copy name into Smalltalk string" stringPtr := interpreterProxy firstIndexableField: nameString. 0 to: entryNameSize - 1 do: [ :i | stringPtr at: i put: (entryName at: i). ]. interpreterProxy storePointer: 0 ofObject: results withValue: nameString. interpreterProxy storePointer: 1 ofObject: results withValue: createDateOop. interpreterProxy storePointer: 2 ofObject: results withValue: modDateOop. dirFlag ifTrue: [ interpreterProxy storePointer: 3 ofObject: results withValue: interpreterProxy trueObject ] ifFalse: [ interpreterProxy storePointer: 3 ofObject: results withValue: interpreterProxy falseObject ]. interpreterProxy storePointer: 4 ofObject: results withValue: fileSizeOop. interpreterProxy storePointer: 5 ofObject: results withValue: posixPermissionsOop. symlinkFlag ifTrue: [ interpreterProxy storePointer: 6 ofObject: results withValue: interpreterProxy trueObject ] ifFalse: [ interpreterProxy storePointer: 6 ofObject: results withValue: interpreterProxy falseObject ]. ^ results! Item was changed: ----- Method: Integer>>asUnsignedInteger (in category '*VMMaker-interpreter simulator') ----- asUnsignedInteger self assert: self >= 0. ^self! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslated (in category 'translation') ----- shouldBeTranslated "is this class intended to be translated as a plugin? Most subclasses should answer true, but some such as:- TestInterpreterPlugin FlippArrayPlugin2 InflatePlugin should answer false for various reasons." ^true! Item was changed: ----- Method: InterpreterPlugin class>>shouldBeTranslatedFor: (in category 'translation') ----- shouldBeTranslatedFor: platformName "Is this class intended to be translated as a plugin, perhaps specific to a platform? Most subclasses should answer true, but some such as simulation-only versions should answer false for various reasons." ^self shouldBeTranslated! Item was changed: ----- Method: InterpreterProxy>>isImmediate: (in category 'testing') ----- isImmediate: anObject <option: #(atLeastVMProxyMajor:minor: 1 13)> ^StackInterpreter objectMemoryClass isImmediate: anObject! Item was changed: ----- Method: SpurGenerationScavenger>>copyAndForward: (in category 'scavenger') ----- copyAndForward: survivor "copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak then corpse is threaded onto the weakList for later treatment." <inline: false> | bytesInObj format tenure newLocation | self assert: ((manager isInEden: survivor) "cog methods should be excluded." or: [manager isInPastSpace: survivor]). bytesInObj := manager bytesInObject: survivor. format := manager formatOf: survivor. tenure := self shouldBeTenured: survivor. "Allow Slang to inline." newLocation := (tenure or: [futureSurvivorStart + bytesInObj > futureSpace limit]) ifTrue: [self copyToOldSpace: survivor bytes: bytesInObj format: format] ifFalse: [self copyToFutureSpace: survivor bytes: bytesInObj]. manager forwardSurvivor: survivor to: newLocation. "if weak or ephemeron add to the relevant list for subsequent scanning." (manager isWeakFormat: format) ifTrue: [self addToWeakList: survivor]. ((manager isEphemeronFormat: format) and: [(self isScavengeSurvivor: (manager keyOfEphemeron: newLocation)) not]) ifTrue: [self addToEphemeronList: survivor]. ^newLocation! Item was changed: ----- Method: SpurMemoryManager>>isForwarded: (in category 'object testing') ----- isForwarded: objOop "Answer if objOop is that if a forwarder. Take advantage of isForwardedObjectClassIndexPun being a power of two to generate a more efficient test than the straight-forward (self classIndexOf: objOop) = self isForwardedObjectClassIndexPun at the cost of this being ambiguous with free chunks. So either never apply this to free chunks or guard with (self isFreeObject: foo) not. So far the idiom has been to guard with isFreeObject:" <api> <inline: true> "self assert: (self isFreeObject: objOop) not." ^(self longAt: objOop) noMask: self classIndexMask - self isForwardedObjectClassIndexPun! Item was changed: ----- Method: StackInterpreter>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') ----- codeGeneratorToComputeAccessorDepth ^VMMaker new buildCodeGeneratorForInterpreter: self class primitivesClass includeAPIMethods: false initializeClasses: false! Item was changed: ----- Method: StackInterpreter>>primitiveIndexOfMethod:header: (in category 'compiled methods') ----- primitiveIndexOfMethod: theMethod header: methodHeader "Note: With the Squeak V0 format we now have 10 bits of primitive index, but they are in two places for temporary backward compatibility. The time to unpack is negligible, since the derived primitive function pointer is stored in the method cache. With the new format we assume a 3-byte CallPrimitive with a little-endian 16-bit primitive index." <api> <inline: true> | firstBytecode | ^objectMemory hasSpurMemoryManagerAPI ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [MULTIPLEBYTECODESETS ifTrue: [(self headerIndicatesAlternateBytecodeSet: methodHeader) ifTrue: [(self alternateHeaderHasPrimitiveFlag: methodHeader) ifTrue: [firstBytecode := self firstBytecodeOfAlternateHeader: methodHeader method: theMethod. (objectMemory byteAt: firstBytecode + 1) + ((objectMemory byteAt: firstBytecode + 2) << 8)] ifFalse: [0]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]] ifFalse: [| primBits | primBits := objectMemory integerValueOf: methodHeader. (primBits bitAnd: 16r1FF) + (primBits >> 19 bitAnd: 16r200)]]! Item was changed: ----- Method: StackInterpreterSimulator>>runAtEachStep: (in category 'testing') ----- runAtEachStep: aBlock self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: [self assertValidExecutionPointers. aBlock value: currentBytecode. self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: TAssignmentNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen aStream nextPut: $(. self emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $)! Item was changed: ----- Method: TParseNode>>emitCCodeAsArgumentOn:level:generator: (in category 'C code generation') ----- emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TParseNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: TSendNode>>emitCCodeAsExpressionOn:level:generator: (in category 'C code generation') ----- emitCCodeAsExpressionOn: aStream level: level generator: aCodeGen ^self emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen! Item was changed: ----- Method: VMClass class>>initializePrimitiveErrorCodes (in category 'initialization') ----- initializePrimitiveErrorCodes "Define the VM's primitive error codes. N.B. these are replicated in platforms/Cross/vm/sqVirtualMachine.h." "VMClass initializePrimitiveErrorCodes" | pet | PrimErrTableIndex := 51. "Zero-relative" "See SmalltalkImage>>recreateSpecialObjectsArray for the table definition. If the table exists and is large enough the corresponding entry is returned as the primitive error, otherwise the error is answered numerically." pet := Smalltalk specialObjectsArray at: PrimErrTableIndex + 1 ifAbsent: [#()]. pet isArray ifFalse: [pet := #()]. PrimNoErr := 0. "for helper methods that need to answer success or an error code." PrimErrGenericFailure := pet indexOf: nil ifAbsent: 1. PrimErrBadReceiver := pet indexOf: #'bad receiver' ifAbsent: 2. PrimErrBadArgument := pet indexOf: #'bad argument' ifAbsent: 3. PrimErrBadIndex := pet indexOf: #'bad index' ifAbsent: 4. PrimErrBadNumArgs := pet indexOf: #'bad number of arguments' ifAbsent: 5. PrimErrInappropriate := pet indexOf: #'inappropriate operation' ifAbsent: 6. PrimErrUnsupported := pet indexOf: #'unsupported operation' ifAbsent: 7. PrimErrNoModification := pet indexOf: #'no modification' ifAbsent: 8. PrimErrNoMemory := pet indexOf: #'insufficient object memory' ifAbsent: 9. PrimErrNoCMemory := pet indexOf: #'insufficient C memory' ifAbsent: 10. PrimErrNotFound := pet indexOf: #'not found' ifAbsent: 11. PrimErrBadMethod := pet indexOf: #'bad method' ifAbsent: 12. PrimErrNamedInternal := pet indexOf: #'internal error in named primitive machinery' ifAbsent: 13. PrimErrObjectMayMove := pet indexOf: #'object may move' ifAbsent: 14. PrimErrLimitExceeded := pet indexOf: #'resource limit exceeded' ifAbsent: 15. PrimErrObjectIsPinned := pet indexOf: #'object is pinned' ifAbsent: 16. PrimErrWritePastObject := pet indexOf: #'primitive write beyond end of object' ifAbsent: 17!

1 0

VM Maker: VMMaker.oscog-EstebanLorenzano.1322.mcz
by commits＠source.squeak.org 22 May '15

22 May '15

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1322.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1322 Author: EstebanLorenzano Time: 22 May 2015, 8:38:54.928627 pm UUID: f973b39f-b9fb-425b-90d2-eda1a2c2406e Ancestors: VMMaker.oscog-EstebanLorenzano.1321 added a PharoVM flag I forgot =============== Diff against VMMaker.oscog-EstebanLorenzano.1321 =============== Item was changed: ----- Method: CCodeGenerator>>emitGlobalCVariablesOn: (in category 'C code generator') ----- emitGlobalCVariablesOn: aStream "Store the global variable declarations on the given stream." aStream cr; nextPutAll: '/*** Global Variables ***/'; cr. (self sortStrings: (variables select: [:v| vmClass mustBeGlobal: v])) do: [:var | | varString decl | varString := var asString. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" ifTrue: [aStream nextPutAll: decl; cr] ifFalse: [ ((decl includesSubString: ' private ') "or: [decl beginsWith: 'static']") ifFalse: "work-around hack to prevent localization of variables only referenced once." [ + PharoVM ifTrue: + [(decl beginsWith: 'static') ifFalse: [aStream nextPutAll: 'VM_EXPORT ']]. - (decl beginsWith: 'static') ifFalse: [aStream nextPutAll: 'VM_EXPORT ']. (decl includes: $=) ifTrue: [decl := decl copyFrom: 1 to: (decl indexOf: $=) - 1]. aStream nextPutAll: decl; nextPut: $;; cr]]]. aStream cr!

1 0

New Cog VMs available
by Eliot Miranda 22 May '15

22 May '15

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3354 CogVM binaries as per VMMaker.oscog-eem.1318/r3354 Cogit: Fix the performance regression on x86 in r3308 VMMaker.oscog-eem.1178 through the use of XCHG instruction in CogIA32Compiler>>genPushRegisterArgsForNumArgs:. Since SendNumArgsReg is not live with small arity sends it can replace TempReg. Spur: Fix bad C bug in nextInSortedFreeListLink:given:. The result type must be usqInt, otherwise the list can be wrongly terminated and the second compaction pass can segfault. Change printFreeChunk:isNextChunk: to printFreeChunk:printAsTreeNode:, and use it to implement printSortedFreeList. Firm up the checkTraversableSortedFreeList assert routine to check that the list is traversable from lastFreeChunk, not just firstFreeChunk. Make checkTraversableSortedFreeList robust in presence of empty sorted free list. Slang: Make promoteArithmeticTypes:and: obey C99's promotion rules more closely in an effort to generate more stable sources. Types were flipping between sqInt & usqInt for variables that were assigned both types, so that one generation would produce one type and a subsequent one another (Set/Dictionary hashing?). -- best, Eliot

3 2

VM Maker: VMMaker.oscog-EstebanLorenzano.1321.mcz
by commits＠source.squeak.org 22 May '15

22 May '15

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-EstebanLorenzano.1321.mcz ==================== Summary ==================== Name: VMMaker.oscog-EstebanLorenzano.1321 Author: EstebanLorenzano Time: 22 May 2015, 1:10:57.157449 pm UUID: 1d5fdcdd-b2cb-4f67-b92d-c3b4e1ac710a Ancestors: VMMaker.oscog-EstebanLorenzano.1320, VMMaker.oscog-eem.1319 - merged - nuked unused/incorrect methods - removed executable memory flags... this is just necesary for NativeBoost and we are not including at the moment. I took notes in case we want to put it back in the future. - removed inclusion of <setjmp.h>, it was needed for windows in the case of nativeboost. =============== Diff against VMMaker.oscog-EstebanLorenzano.1320 =============== Item was changed: ----- Method: CoInterpreter>>initStackPagesAndInterpret (in category 'initialization') ----- initStackPagesAndInterpret "Initialize the stack pages and enter interpret. Use alloca'ed memory so that when we have a JIT its stack pointer will be on the native stack since alloca allocates memory on the stack. Certain thread systems use the native stack pointer as the frame ID so putting the stack anywhere else can confuse the thread system." "Override to establish the setjmp/longjmp handler for reentering the interpreter from machine code, and disable executablity on the heap and stack pages." "This should be in its own initStackPages method but Slang can't inline C code strings." | stackPageBytes stackPagesBytes theStackMemory | <var: #theStackMemory type: #'char *'> stackPageBytes := self stackPageByteSize. stackPagesBytes := self computeStackZoneSize. theStackMemory := self cCode: [self alloca: stackPagesBytes] inSmalltalk: [stackPages initializeWithByteSize: stackPagesBytes for: self]. self cCode: [self me: theStackMemory ms: 0 et: stackPagesBytes]. + self sqMakeMemoryNotExecutableFrom: objectMemory startOfMemory asUnsignedInteger + To: objectMemory memoryLimit asUnsignedInteger. + self sqMakeMemoryNotExecutableFrom: theStackMemory asUnsignedInteger - self cppIf: #PHAROVM_USE_EXECUTABLE_MEMORY - ifTrue: [ - self - sqMakeMemoryExecutableFrom: objectMemory startOfMemory asUnsignedInteger - To: objectMemory memoryLimit asUnsignedInteger ] - ifFalse: [ - self - sqMakeMemoryNotExecutableFrom: objectMemory startOfMemory asUnsignedInteger - To: objectMemory memoryLimit asUnsignedInteger ]. - self - sqMakeMemoryNotExecutableFrom: theStackMemory asUnsignedInteger To: theStackMemory asUnsignedInteger + stackPagesBytes. - stackPages initializeStack: theStackMemory numSlots: stackPagesBytes / objectMemory wordSize pageSize: stackPageBytes / objectMemory wordSize. self assert: self minimumUnusedHeadroom = stackPageBytes. "Once the stack pages are initialized we can continue to bootstrap the system." self loadInitialContext. "We're ready for the heartbeat (poll interrupt)" self ioInitHeartbeat. self initialEnterSmalltalkExecutive. ^nil! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'printRegisters' 'printInstructions' 'clickConfirm' 'singleStep') do: [:simulationVariableNotNeededForRealVM| aCCodeGenerator removeVariable: simulationVariableNotNeededForRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" aCCodeGenerator addHeaderFile:'<stddef.h>'; "for e.g. offsetof" - addHeaderFile:'<setjmp.h>'; addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"dispdbg.h"'; "must preceed cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetSP declareC: 'unsigned long (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #ceFlushICache declareC: 'static void (*ceFlushICache)(unsigned long from, unsigned long to)'; var: #ceCheckFeaturesFunction declareC: 'static unsigned long (*ceCheckFeaturesFunction)(void)'; var: #ceTryLockVMOwner declareC: 'unsigned long (*ceTryLockVMOwner)(void)'; var: #ceUnlockVMOwner declareC: 'void (*ceUnlockVMOwner)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *, void *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'; var: #primInvokeLabel type: #'AbstractInstruction *'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss entry noCheckEntry selfSendEntry dynSuperEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #annotations type: #'InstructionAnnotation *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'; var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]'; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static sqInt objectReferencesInRuntime[NumObjRefsInRuntime]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #CFramePointer type: #'void *'; declareVar: #CStackPointer type: #'void *'; declareVar: #minValidCallAddress type: #'unsigned long'; declareVar: #debugPrimCallStackOffset type: #'unsigned long'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator); var: #primitiveGeneratorTable declareC: 'static PrimitiveDescriptor primitiveGeneratorTable[MaxCompiledPrimitiveIndex+1]', (self tableInitializerFor: aCCodeGenerator vmClass primitiveTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltak generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'! Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." numPICCases := 6. + methodLabel + address: methodZoneBase; + dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileClosedPICPrototype. self computeMaximumSizes. methodLabel concretizeAt: methodZoneBase. closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). closedPICSize := methodZone roundUpLength: closedPICSize "self cCode: '' inSmalltalk: [| end | end := self outputInstructionsAt: methodZoneBase + headerSize. self disassembleFrom: methodZoneBase + headerSize to: end - 1. self halt]"! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>compactClassIndexOfClass: (in category 'accessing') ----- - compactClassIndexOfClass: classOop - "Ugh, can't reply on the host. Spur doesn't have compact classes" - | aClass contextClass | - aClass := self objectForOop: classOop. - "Pharo requires Context while Squeak uses MethodContext" - contextClass := (Smalltalk at: #MethodContext - ifAbsent: [ Smalltalk at: #Context ]). - ^false - ifTrue: [aClass indexIfCompact] - ifFalse: - [aClass caseOf: { - [CompiledMethod] -> [1]. - [Array] -> [3]. - [LargeNegativeInteger] -> [4]. - [LargePositiveInteger] -> [5]. - [Float] -> [6]. - [Association] -> [8]. - [Point] -> [9]. - [Rectangle] -> [10]. - [ByteString] -> [11]. - [contextClass ] -> [14]. - [Bitmap] -> [16] - } - otherwise: [0]]! 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 *'> super assimilateNewSegment: segInfo. + coInterpreter sqMakeMemoryNotExecutableFrom: segInfo segStart To: segInfo segLimit! - self - cppIf: #PHAROVM_USE_EXECUTABLE_MEMORY - ifTrue: [ coInterpreter sqMakeMemoryExecutableFrom: segInfo segStart To: segInfo segLimit ] - ifFalse: [ coInterpreter sqMakeMemoryNotExecutableFrom: segInfo segStart To: segInfo segLimit ] - ! Item was removed: - ----- Method: Spur32BitMemoryManager class>>objectRepresentationClass (in category 'accessing class hierarchy') ----- - objectRepresentationClass - ^CogObjectRepresentationFor32BitSpur!

1 0

VM Maker: VMMaker.oscog-eem.1319.mcz
by commits＠source.squeak.org 22 May '15

22 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1319.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1319 Author: eem Time: 21 May 2015, 6:00:53.388 pm UUID: 797f904f-0e7c-42b8-bf53-aa40ee592b13 Ancestors: VMMaker.oscog-eem.1318 Fix generation of the closed PIC prototype when using pc-relative addressing (on ARMv5). =============== Diff against VMMaker.oscog-eem.1318 =============== Item was changed: ----- Method: Cogit>>generateClosedPICPrototype (in category 'initialization') ----- generateClosedPICPrototype "Generate the prototype ClosedPIC to determine how much space as full PIC takes. When we first allocate a closed PIC it only has one or two cases and we want to grow it. So we have to determine how big a full one is before hand." numPICCases := 6. + methodLabel + address: methodZoneBase; + dependent: nil. "stack allocate the various collections so that they are effectively garbage collected on return." self allocateOpcodes: numPICCases * 7 bytecodes: 0. self compileClosedPICPrototype. self computeMaximumSizes. methodLabel concretizeAt: methodZoneBase. closedPICSize := (self sizeof: CogMethod) + (self generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. cPICCaseSize := endCPICCase1 address - endCPICCase0 address. cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + firstCPICCaseOffset). closedPICSize := methodZone roundUpLength: closedPICSize "self cCode: '' inSmalltalk: [| end | end := self outputInstructionsAt: methodZoneBase + headerSize. self disassembleFrom: methodZoneBase + headerSize to: end - 1. self halt]"!

1 0

[commit][3355] Make the upload script help better produce the announcement email.
by commits＠squeakvm.org 22 May '15

22 May '15

Revision: 3355 Author: eliot Date: 2015-05-21 15:26:17 -0700 (Thu, 21 May 2015) Log Message: ----------- Make the upload script help better produce the announcement email. Modified Paths: -------------- branches/Cog/scripts/uploadvms Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2015-05-21 19:54:19 UTC (rev 3354) +++ branches/Cog/scripts/uploadvms 2015-05-21 22:26:17 UTC (rev 3355) @@ -256,10 +256,9 @@ echo scp -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV $SCP -p $ARCHIVES "$@" $RemoteUser:$RemoteRoot/VM.r$REV echo ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \\\; ls -al $RemoteRoot/VM.r$REV -ssh $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \; ls -al $RemoteRoot/VM.r$REV +$SSH $RemoteUser chmod a-w $RemoteRoot/VM.r$REV/* \; ls -al $RemoteRoot/VM.r$REV if [ "$T" != 1 ]; then test -x image/makegetvmscripts.sh && (image/makegetvmscripts.sh) - -test -x /usr/bin/pbcopy && pbcopy <../history/README.$REV fi +test -x /usr/bin/pbcopy && (echo "... at http://www.mirandabanda.org/files/Cog/VM/VM.r$REV"; echo; tail -n +39 ../history/README.$REV) | pbcopy

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.1317.mcz
by Nicolas Cellier 21 May '15

21 May '15

2015-05-21 6:56 GMT+02:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1317.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.1317 > Author: eem > Time: 20 May 2015, 9:56:04.05 pm > UUID: a7e082b5-1ad8-42ef-84cc-0079605c8440 > Ancestors: VMMaker.oscog-eem.1316 > > Cogit: > Fix the performance regression on x86 in r3308 > VMMaker.oscog-eem.1178 through the use of the XCHG > instruction in CogIA32Compiler>>genPushRegisterArgsForNumArgs:. > Since SendNumArgsReg is not live with small arity sends > it can be used instead of TempReg. > > Replace uses of the magic constant 2 with > NumSendTrampolines - 2 (actually <= 2 => > < (NumSendTrampolines - 1)) where appropriate. Hence > NumSendTrampolines moved to CogCompilationConstants. > > Fix bug on ARM with pc-relative addressing. pc-relative > addressing can only be used within a method because of relocation. > The old code would use pc-relative addressing to access > trampolines for methods close to the trampolines and then > not for methods further away, causing changes in the code > generated by compileInterpreterPrimitive:. > > To support this, rationalize the PIC compilation code, being sure > to initialize and concretize methodLabel at the start of each PIC. > Don't bother to pass PIC size as a parameter given we have > PIC-specific header-filling routines now. > > Spur: > Firm up the checkTraversableSortedFreeList assert routine to > check that the list is traversable from lastFreeChunk, not just > firstFreeChunk. > > Slang: > Make promoteArithmeticTypes:and: obey C99's promotion rules > more closely in an effort to generate more stable sources. > Types were flipping between sqInt & usqInt for variables that > were assigned both types, so that one generation would produce > one type and a subsequent one another (Set/Dictionary hashing?). > > Simulation/In-image Compilation: > Fix varBaseAddress calculations for in-image compilation so that > it jives with real compilation. > > Allow setting of recordPrimTrace through initializationOptions. > > =============== Diff against VMMaker.oscog-eem.1316 =============== > > Item was changed: > ----- Method: CCodeGenerator>>promoteArithmeticTypes:and: (in category > 'type inference') ----- > promoteArithmeticTypes: firstType and: secondType > + "Answer the return type for an arithmetic send. This is so that > the inliner can still inline > + simple expressions. Deal with pointer arithmetic, floating point > arithmetic and promotion." > + | firstSize secondSize | > - "Answer the return type for an arithmetic sendThis is so that the > inliner can still > - inline simple expressions. Deal with pointer arithmetic, > floating point arithmetic > - and promotion." > ((#(#double float) includes: firstType) > or: [#(#double float) includes: secondType]) ifTrue: > [^(firstType = #float and: [secondType = #float]) > ifTrue: [#float] > ifFalse: [#double]]. > "deal with unknowns, answering nil." > (firstType isNil or: [secondType isNil]) ifTrue: > [^nil]. > + "Deal with promotion; answer the longest type, defaulting to the > recever if they're the same. > + See e.g. section 6.3.1.8 Usual arithmetic conversions, from the > C99 standard: > + Otherwise, the integer promotions are performed on both > operands > + Then the following rules are applied to the promoted > operands: > + > + If both operands have the same type, then no > further conversion is needed. > + > + Otherwise, if both operands have signed integer > types or both have unsigned integer > + types, the operand with the type of lesser integer > conversion rank is converted to the > + type of the operand with greater rank. > + > + Otherwise, if the operand that has unsigned > integer type has rank greater or equal to > + the rank of the type of the other operand, then > the operand with signed integer type > + is converted to the type of the operand with > unsigned integer type. > + > + Otherwise, if the type of the operand with signed > integer type can represent all of the > + values of the type of the operand with unsigned > integer type, then the operand with > + unsigned integer type is converted to the type of > the operand with signed integer type. > + > + Otherwise, both operands are converted to the > unsigned integer type corresponding to > + the type of the operand with signed integer type. > + > + It is important to choose deterministically to get stable source > generation. So if the types have > + the same size but differ in signedness we choose the unsigned > type, which is in partial agreement > + with the above" > + ^(firstSize := self sizeOfIntegralCType: firstType) = (secondSize > := self sizeOfIntegralCType: secondType) > + ifTrue: > + [(firstType first = $u) > + ifTrue: [firstType] > + ifFalse: [(secondType first = $u) ifTrue: > [secondType] ifFalse: [firstType]]] > + ifFalse: > + [firstSize > secondSize ifTrue: [firstType] > ifFalse: [secondType]]! > - "deal with promotion; answer the longest type, defaulting to the > recever if they're the same" > - ^(self sizeOfIntegralCType: firstType) >= (self > sizeOfIntegralCType: secondType) > - ifTrue: [firstType] > - ifFalse: [secondType]! > > +1 That's how I wrote it a few weeks ago in my experimental branch: http://smalltalkhub.com/mc/nice/NiceVMExperiments/main promoteIntegerArithmeticTypes: firstType and: secondType "Answer the return type for an arithmetic send. This is so that the inliner can still inline simple expressions. Deal with integer arithmetic and promotion." | length1 length2 | length1 := self sizeOfIntegralCType: firstType. length2 := self sizeOfIntegralCType: secondType. length1 > length2 ifTrue: [^firstType]. length2 > length1 ifTrue: [^secondType]. firstType first = $u ifTrue: [^firstType]. secondType first = $u ifTrue: [^secondType]. ^firstType > Item was changed: > ----- Method: CoInterpreter>>varBaseAddress (in category 'cog jit > support') ----- > varBaseAddress > <api> > <returnTypeC: #usqInt> > + ^self cCode: [(self addressOf: stackPointer) asUnsignedInteger - > 16r42] > + inSmalltalk: [cogit fakeVarBaseAddress]! > - ^(self addressOf: stackPointer) asUnsignedInteger - 16r42! > > Item was changed: > ----- Method: CogARMCompiler>>loadCwInto: (in category 'generate machine > code - support') ----- > loadCwInto: destReg > "Load the operand into the destination register, answering > the size of the instructions generated to do so." > | operand distance | > operand := operands at: 0. > "First try and encode as a pc-relative reference..." > + (cogit addressIsInCurrentCompilation: operand) ifTrue: > + [distance := operand - (address + 8). > - (cogit addressIsInCodeZone: operand) ifTrue: > - [distance := operand - (address + 8). > self rotateable8bitImmediate: distance > ifTrue: [ :rot :immediate | > self machineCodeAt: 0 put: (self add: > destReg rn: PC imm: immediate ror: rot). > ^4] > ifFalse: > [self rotateable8bitImmediate: distance > negated > ifTrue: [ :rot :immediate | > self machineCodeAt: 0 put: > (self sub: destReg rn: PC imm: immediate ror: rot). > ^4] > ifFalse: []]]. > "If this fails, use the conventional and painfully long 4 > instruction sequence." > ^self at: 0 moveCw: operand intoR: destReg! > > Item was changed: > VMStructType subclass: #CogAbstractInstruction > instanceVariableNames: 'opcode machineCodeSize maxSize machineCode > operands address dependent cogit objectMemory bcpc' > classVariableNames: 'NumOperands' > + poolDictionaries: 'CogCompilationConstants CogRTLOpcodes' > - poolDictionaries: 'CogRTLOpcodes' > category: 'VMMaker-JIT'! > > !CogAbstractInstruction commentStamp: 'eem 4/21/2015 09:12' prior: 0! > I am an abstract instruction generated by the Cogit. I am subsequently > concretized to machine code for the current processor. A sequence of > concretized CogAbstractInstructions are concatenated to form the code for a > CogMethod. I am an abstract class. My concrete subclasses concretize to > the machine code of a specific processor. > > Instance Variables > address: <Integer> > bcpc: <Integer> > cogit: <Cogit> > dependent: <AbstractInstruction|nil> > machineCode: <CArray on: (ByteArray|Array)> > machineCodeSize: <Integer> > maxSize: <Integer> > objectMemory: <NewCoObjectMemory|SpurCoMemoryManager etc> > opcode: <Integer> > operands: <CArray on: Array> > > address > - the address at which the instruction will be generated > > bcpc > - the bytecode pc for which the instruction was generated; > simulation only > > cogit > - the Cogit assembling the receiver; simulation only > > dependent > - a reference to another instruction which depends on the > receiver, if any; in C this is a pointer > > machineCode > - the array of machine code the receiver generates when concretized > > machineCodeSize > - the size of machineCode in bytes > > maxSize > - the maximum size of machine code that the current instruction > will generate, in bytes > > objectMemory > - the memory manager for the system; simulation only > > opcode > - the opcode for the receiver which defines which abstract opcode > it represents; see CogRTLOpcodes class>>initialize and > CogAbstractInstruction subclass initialize methods > > operands > - the array containing any operands the instruction may have; the > opcode defines implicitly how many operands are consdered! > > Item was changed: > SharedPool subclass: #CogCompilationConstants > instanceVariableNames: '' > + classVariableNames: 'BadRegisterSet NumSendTrampolines > SSBaseOffset SSConstant SSIllegal SSRegister SSSpill' > - classVariableNames: 'BadRegisterSet SSBaseOffset SSConstant > SSIllegal SSRegister SSSpill' > poolDictionaries: '' > category: 'VMMaker-JIT'! > > Item was changed: > ----- Method: CogIA32Compiler>>genPushRegisterArgsForNumArgs: (in > category 'smalltalk calling convention') ----- > genPushRegisterArgsForNumArgs: numArgs > + "Ensure that the register args are pushed before the retpc for > arity <= self numRegArgs. This > + won't be as clumsy on a RISC. But putting the receiver and args > above the return address > + means the CoInterpreter has a single machine-code frame format > which saves us a lot of work. > + N.B. Take great care to /not/ smash TempReg, which is used in > directed send marshalling. > + We could use XCHG to swap the ReceiverResultReg and top-of-stack > return address, pushing the > + the ret pc (now in ReceiverResultReg) later, but XCHG is very > slow. We can use SendNumArgsReg > + because it is only live in sends of arity >= (NumSendTrampolines > - 1)." > + self assert: cogit numRegArgs < (NumSendTrampolines - 1). > - "Ensure that the register args are pushed before the retpc for > arity <= self numRegArgs." > - "This won't be as clumsy on a RISC. But putting the receiver and > - args above the return address means the CoInterpreter has a > - single machine-code frame format which saves us a lot of work." > numArgs <= cogit numRegArgs ifTrue: > [self assert: cogit numRegArgs <= 2. > + false "these two variants show the same performance on > Intel Core i7, but the second one may be shorter." > + ifTrue: > + [cogit MoveMw: 0 r: SPReg R: > SendNumArgsReg. "Save return pc" > + numArgs > 0 ifTrue: > + [cogit PushR: Arg0Reg. > + numArgs > 1 ifTrue: > + [cogit PushR: Arg1Reg]]. > + cogit PushR: SendNumArgsReg. > + cogit MoveR: ReceiverResultReg Mw: > objectMemory wordSize * (1 + numArgs) r: SPReg] > + ifFalse: > + ["a.k.a. > + cogit gen: XCHGMwrR operand: 0 > operand: SPReg operand: ReceiverResultReg. > + but XCHG is slow." > + cogit MoveMw: 0 r: SPReg R: > SendNumArgsReg. "Save return pc" > + cogit MoveR: ReceiverResultReg Mw: 0 r: > SPReg. > + numArgs > 0 ifTrue: > + [cogit PushR: Arg0Reg. > + numArgs > 1 ifTrue: > + [cogit PushR: Arg1Reg]]. > + cogit PushR: SendNumArgsReg]] "Restore > return address"! > - "N.B. Take great care to /not/ smash TempReg, which is > used in directed send marshalling." > - "Swap the return address with ReceiverResultReg" > - cogit gen: XCHGMwrR operand: 0 operand: SPReg operand: > ReceiverResultReg. "Save return address; replace with receiver" > - numArgs > 0 ifTrue: > - [cogit PushR: Arg0Reg. > - numArgs > 1 ifTrue: > - [cogit PushR: Arg1Reg]]. > - cogit PushR: ReceiverResultReg. > - "Reload ReceiverResultReg" > - cogit MoveMw: numArgs + 1 * objectMemory wordSize r: SPReg > R: ReceiverResultReg]! > > Item was changed: > CogClass subclass: #Cogit > instanceVariableNames: 'coInterpreter objectMemory > objectRepresentation processor threadManager methodZone methodZoneBase > codeBase minValidCallAddress lastNInstructions simulatedAddresses > simulatedTrampolines simulatedVariableGetters simulatedVariableSetters > printRegisters printInstructions compilationTrace clickConfirm breakPC > breakBlock singleStep guardPageSize traceFlags traceStores breakMethod > methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame > hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook > primInvokeLabel methodLabel stackCheckLabel blockEntryLabel > blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall > sendMiss missOffset entryPointMask checkedEntryAlignment > uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset > noCheckEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 > numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize > openPICSize fixups abstractOpcodes annotations generatorTable > primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC > bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex > blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment > expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline > cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline > ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline > ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline > ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg > ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs > cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling > ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline > ceStoreContextInstVarTrampoline ceEnclosingObjectTrampoline > ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction > ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline > ceTraceStoreTrampoline ceGetSP ordinarySendTrampolines superSendTrampolines > directedSuperSendTrampolines dynamicSuperSendTrampolines > outerSendTrampolines selfSendTrampolines firstSend lastSend > realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg > realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex > trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex > cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner > ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA > extB numIRCs indexOfIRC theIRCs implicitReceiverSendTrampolines > nsSendCacheSurrogateClass tempOop' > + classVariableNames: 'AltBlockCreationBytecodeSize > AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames > AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug > DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation > FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension > IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend > IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference > IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex > MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex > NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex > NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumTrampolines > ProcessorClass' > - classVariableNames: 'AltBlockCreationBytecodeSize > AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames > AnnotationShift AnnotationsWithBytecodePCs BlockCreationBytecodeSize Debug > DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation > FirstSpecialSelector HasBytecodePC IsAbsPCReference IsAnnotationExtension > IsDirectedSuperSend IsDisplacementX2N IsNSDynamicSuperSend > IsNSImplicitReceiverSend IsNSSelfSend IsNSSendCall IsObjectReference > IsRelativeCall IsSendCall IsSuperSend MapEnd MaxCompiledPrimitiveIndex > MaxStackAllocSize MaxX2NDisplacement NSCClassTagIndex > NSCEnclosingObjectIndex NSCNumArgsIndex NSCSelectorIndex NSCTargetIndex > NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerNSC NumSendTrampolines > NumTrampolines ProcessorClass' > poolDictionaries: 'CogCompilationConstants CogMethodConstants > CogRTLOpcodes VMBasicConstants VMBytecodeConstants VMObjectIndices > VMStackFrameOffsets' > category: 'VMMaker-JIT'! > Cogit class > instanceVariableNames: 'generatorTable primitiveTable'! > > !Cogit commentStamp: 'eem 4/6/2015 15:56' prior: 0! > I am the code generator for the Cog VM. My job is to produce machine > code versions of methods for faster execution and to manage inline caches > for faster send performance. I can be tested in the current image using my > class-side in-image compilation facilities. e.g. try > > StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) > > I have concrete subclasses that implement different levels of > optimization: > SimpleStackBasedCogit is the simplest code generator. > > StackToRegisterMappingCogit is the current production code > generator It defers pushing operands > to the stack until necessary and implements a register-based > calling convention for low-arity sends. > > StackToRegisterMappingCogit is an experimental code generator with > support for counting > conditional branches, intended to support adaptive optimization. > > coInterpreter <CoInterpreterSimulator> > the VM's interpreter with which I cooperate > methodZoneManager <CogMethodZoneManager> > the manager of the machine code zone > objectRepresentation <CogObjectRepresentation> > the object used to generate object accesses > processor <BochsIA32Alien|?> > the simulator that executes the IA32/x86 machine code I generate > when simulating execution in Smalltalk > simulatedTrampolines <Dictionary of Integer -> MessageSend> > the dictionary mapping trap jump addresses to run-time routines > used to warp from simulated machine code in to the Smalltalk run-time. > simulatedVariableGetters <Dictionary of Integer -> MessageSend> > the dictionary mapping trap read addresses to variables in > run-time objects used to allow simulated machine code to read variables in > the Smalltalk run-time. > simulatedVariableSetters <Dictionary of Integer -> MessageSend> > the dictionary mapping trap write addresses to variables in > run-time objects used to allow simulated machine code to write variables in > the Smalltalk run-time. > printRegisters printInstructions clickConfirm <Boolean> > flags controlling debug printing and code simulation > breakPC <Integer> > machine code pc breakpoint > cFramePointer cStackPointer <Integer> > the variables representing the C stack & frame pointers, which > must change on FFI callback and return > selectorOop <sqInt> > the oop of the methodObj being compiled > methodObj <sqInt> > the bytecode method being compiled > initialPC endPC <Integer> > the start and end pcs of the methodObj being compiled > methodOrBlockNumArgs <Integer> > argument count of current method or block being compiled > needsFrame <Boolean> > whether methodObj or block needs a frame to execute > primitiveIndex <Integer> > primitive index of current method being compiled > methodLabel <CogAbstractOpcode> > label for the method header > blockEntryLabel <CogAbstractOpcode> > label for the start of the block dispatch code > stackOverflowCall <CogAbstractOpcode> > label for the call of ceStackOverflow in the method prolog > sendMissCall <CogAbstractOpcode> > label for the call of ceSICMiss in the method prolog > entryOffset <Integer> > offset of method entry code from start (header) of method > entry <CogAbstractOpcode> > label for the first instruction of the method entry code > noCheckEntryOffset <Integer> > offset of the start of a method proper (after the method entry > code) from start (header) of method > noCheckEntry <CogAbstractOpcode> > label for the first instruction of start of a method proper > fixups <Array of <AbstractOpcode Label | nil>> > the labels for forward jumps that will be fixed up when reaching > the relevant bytecode. fixup shas one element per byte in methodObj's > bytecode > abstractOpcodes <Array of <AbstractOpcode>> > the code generated when compiling methodObj > byte0 byte1 byte2 byte3 <Integer> > individual bytes of current bytecode being compiled in methodObj > bytecodePointer <Integer> > bytecode pc (same as Smalltalk) of the current bytecode being > compiled > opcodeIndex <Integer> > the index of the next free entry in abstractOpcodes (this code is > translated into C where OrderedCollection et al do not exist) > numAbstractOpcodes <Integer> > the number of elements in abstractOpcocdes > blockStarts <Array of <BlockStart>> > the starts of blocks in the current method > blockCount > the index into blockStarts as they are being noted, and hence > eventually the total number of blocks in the current method > labelCounter <Integer> > a nicety for numbering labels not needed in the production system > but probably not expensive enough to worry about > ceStackOverflowTrampoline <Integer> > ceSend0ArgsTrampoline <Integer> > ceSend1ArgsTrampoline <Integer> > ceSend2ArgsTrampoline <Integer> > ceSendNArgsTrampoline <Integer> > ceSendSuper0ArgsTrampoline <Integer> > ceSendSuper1ArgsTrampoline <Integer> > ceSendSuper2ArgsTrampoline <Integer> > ceSendSuperNArgsTrampoline <Integer> > ceSICMissTrampoline <Integer> > ceCPICMissTrampoline <Integer> > ceStoreCheckTrampoline <Integer> > ceReturnToInterpreterTrampoline <Integer> > ceBaseFrameReturnTrampoline <Integer> > ceSendMustBeBooleanTrampoline <Integer> > ceClosureCopyTrampoline <Integer> > the various trampolines (system-call-like jumps from machine code > to the run-time). > See Cogit>>generateTrampolines for the mapping from trampoline to > run-time > routine and then read the run-time routine for a funcitonal > description. > ceEnterCogCodePopReceiverReg <Integer> > the enilopmart (jump from run-time to machine-code) > methodZoneBase <Integer> > ! > Cogit class > instanceVariableNames: 'generatorTable primitiveTable'! > > Item was added: > + ----- Method: Cogit>>addressIsInCurrentCompilation: (in category > 'testing') ----- > + addressIsInCurrentCompilation: address > + ^address asUnsignedInteger >= methodLabel address > + and: [address < (methodLabel address + (1 << 16))]! > > Item was changed: > ----- Method: Cogit>>codeRangesFor: (in category 'disassembly') ----- > codeRangesFor: cogMethod > "Answer a sequence of ranges of code for the main method and all > of the blocks in a CogMethod. > N.B. These are in order of block dispatch, _not_ necessarily > address order in the method." > <doNotGenerate> > | pc end blockEntry starts | > cogMethod cmType = CMClosedPIC ifTrue: > [end := (self addressOfEndOfCase: cogMethod cPICNumCases - > 1 inCPIC: cogMethod) + cPICEndSize. > ^{ CogCodeRange > from: cogMethod asInteger + (self sizeof: > CogMethod) > to: end > cogMethod: cogMethod > startpc: nil }]. > end := (self mapEndFor: cogMethod) - 1. > cogMethod blockEntryOffset = 0 ifTrue: > [^{ CogCodeRange > from: cogMethod asInteger + (self sizeof: > CogMethod) > to: end > cogMethod: cogMethod > + startpc: (cogMethod cmType ~= CMOpenPIC > ifTrue: > + [coInterpreter > startPCOfMethodHeader: cogMethod methodHeader]) }]. > - startpc: (coInterpreter > startPCOfMethodHeader: cogMethod methodHeader) }]. > pc := blockEntry := cogMethod blockEntryOffset + cogMethod > asInteger. > starts := OrderedCollection with: cogMethod. > [pc < end] whileTrue: > [| targetpc | > targetpc := blockEntry. > (backEnd isJumpAt: pc) ifTrue: > [targetpc := backEnd jumpTargetPCAt: pc. > targetpc < blockEntry ifTrue: > [starts add: (self cCoerceSimple: targetpc > - (self sizeof: CogBlockMethod) to: #'CogBlockMethod *')]]. > pc := pc + (backEnd instructionSizeAt: pc)]. > starts := starts asSortedCollection. > ^(1 to: starts size + 1) collect: > [:i| | cogSubMethod nextpc | > i <= starts size > ifTrue: > [cogSubMethod := starts at: i. > nextpc := i < starts size ifTrue: > [(starts at: i + 1) address] ifFalse: [blockEntry]. > CogCodeRange > from: cogSubMethod address + (self > sizeof: cogSubMethod) > to: nextpc - 1 > cogMethod: cogSubMethod > startpc: (i = 1 > ifTrue: > [coInterpreter startPCOfMethodHeader: cogMethod methodHeader] > ifFalse: > [cogSubMethod startpc])] > ifFalse: > [CogCodeRange > from: blockEntry > to: end]]! > > Item was changed: > ----- Method: Cogit>>cogMNUPICSelector:receiver:methodOperand:numArgs: > (in category 'in-line cacheing') ----- > cogMNUPICSelector: selector receiver: rcvr methodOperand: methodOperand > numArgs: numArgs > <api> > "Attempt to create a one-case PIC for an MNU. > The tag for the case is at the send site and so doesn't need to > be generated." > <returnTypeC: #'CogMethod *'> > + | startAddress size end | > - | startAddress headerSize size end | > ((objectMemory isYoung: selector) > or: [(objectRepresentation inlineCacheTagForInstance: rcvr) = > self picAbortDiscriminatorValue]) ifTrue: > [^0]. > coInterpreter > compilationBreak: selector > point: (objectMemory numBytesOf: selector) > isMNUCase: true. > self assert: endCPICCase0 notNil. > startAddress := methodZone allocate: closedPICSize. > startAddress = 0 ifTrue: > [coInterpreter callForCogCompiledCodeCompaction. > ^0]. > methodLabel > address: startAddress; > dependent: nil. > "stack allocate the various collections so that they > are effectively garbage collected on return." > self allocateOpcodes: numPICCases * 7 bytecodes: 0. > self compileMNUCPIC: (self cCoerceSimple: startAddress to: > #'CogMethod *') > methodOperand: methodOperand > numArgs: numArgs. > self computeMaximumSizes. > + methodLabel concretizeAt: startAddress. > + size := self generateInstructionsAt: startAddress + (self sizeof: > CogMethod). > + end := self outputInstructionsAt: startAddress + (self sizeof: > CogMethod). > - headerSize := self sizeof: CogMethod. > - size := self generateInstructionsAt: startAddress + headerSize. > - end := self outputInstructionsAt: startAddress + headerSize. > "The missOffset is the same as the interpretOffset. On RISCs it > includes an additional instruction." > self assert: missOffset = ((backEnd hasLinkRegister ifTrue: > [backEnd callInstructionByteSize] ifFalse: [0]) > + > picInterpretAbort address + picInterpretAbort machineCodeSize - > startAddress). > self assert: startAddress + cmEntryOffset = entry address. > ^self > fillInCPICHeader: (self cCoerceSimple: startAddress to: > #'CogMethod *') > - size: closedPICSize > numArgs: numArgs > numCases: 1 > hasMNUCase: true > selector: selector ! > > Item was changed: > ----- Method: Cogit>>cogOpenPICSelector:numArgs: (in category 'in-line > cacheing') ----- > cogOpenPICSelector: selector numArgs: numArgs > "Create an Open PIC. Temporarily create a direct call of > ceSendFromOpenPIC:. > Should become a probe of the first-level method lookup cache > followed by a > call of ceSendFromOpenPIC: if the probe fails." > <returnTypeC: #'CogMethod *'> > + | startAddress codeSize mapSize end | > - | startAddress headerSize codeSize mapSize end | > coInterpreter > compilationBreak: selector > point: (objectMemory numBytesOf: selector) > isMNUCase: false. > startAddress := methodZone allocate: openPICSize. > startAddress = 0 ifTrue: > [^self cCoerceSimple: InsufficientCodeSpace to: > #'CogMethod *']. > methodLabel > address: startAddress; > dependent: nil. > "stack allocate the various collections so that they > are effectively garbage collected on return." > self allocateOpcodes: 100 bytecodes: 0. > self compileOpenPIC: selector numArgs: numArgs. > self computeMaximumSizes. > methodLabel concretizeAt: startAddress. > + codeSize := self generateInstructionsAt: startAddress + (self > sizeof: CogMethod). > - headerSize := self sizeof: CogMethod. > - codeSize := self generateInstructionsAt: startAddress + headerSize. > mapSize := self generateMapAt: startAddress + openPICSize - 1 > start: startAddress + cmNoCheckEntryOffset. > self assert: entry address - startAddress = cmEntryOffset. > + self assert: (methodZone roundUpLength: (self sizeof: CogMethod) + > codeSize) + (methodZone roundUpLength: mapSize) <= openPICSize. > + end := self outputInstructionsAt: startAddress + (self sizeof: > CogMethod). > - self assert: headerSize + codeSize + mapSize <= openPICSize. > - end := self outputInstructionsAt: startAddress + headerSize. > ^self > fillInOPICHeader: (self cCoerceSimple: startAddress to: > #'CogMethod *') > - size: openPICSize > numArgs: numArgs > selector: selector ! > > Item was changed: > ----- Method: > Cogit>>cogPICSelector:numArgs:Case0Method:Case1Method:tag:isMNUCase: (in > category 'in-line cacheing') ----- > cogPICSelector: selector numArgs: numArgs Case0Method: case0CogMethod > Case1Method: case1MethodOrNil tag: case1Tag isMNUCase: isMNUCase > "Attempt to create a two-case PIC for case0CogMethod and > case1Method,case1Tag. > The tag for case0CogMethod is at the send site and so doesn't > need to be generated. > case1Method may be any of > - a Cog method; link to its unchecked entry-point > - a CompiledMethod; link to ceInterpretMethodFromPIC: > - a CompiledMethod; link to > ceMNUFromPICMNUMethod:receiver:" > <var: #case0CogMethod type: #'CogMethod *'> > <returnTypeC: #'CogMethod *'> > + | startAddress size end | > - | startAddress headerSize size end | > (objectMemory isYoung: selector) ifTrue: > [^self cCoerceSimple: YoungSelectorInPIC to: #'CogMethod > *']. > coInterpreter > compilationBreak: selector > point: (objectMemory numBytesOf: selector) > isMNUCase: isMNUCase. > startAddress := methodZone allocate: closedPICSize. > startAddress = 0 ifTrue: > [^self cCoerceSimple: InsufficientCodeSpace to: > #'CogMethod *']. > methodLabel > address: startAddress; > dependent: nil. > "stack allocate the various collections so that they > are effectively garbage collected on return." > self allocateOpcodes: numPICCases * 7 bytecodes: 0. > self compileCPIC: (self cCoerceSimple: startAddress to: > #'CogMethod *') > Case0: case0CogMethod > Case1Method: case1MethodOrNil > tag: case1Tag > isMNUCase: isMNUCase > numArgs: numArgs. > self computeMaximumSizes. > + methodLabel concretizeAt: startAddress. > + size := self generateInstructionsAt: startAddress + (self sizeof: > CogMethod). > + end := self outputInstructionsAt: startAddress + (self sizeof: > CogMethod). > - headerSize := self sizeof: CogMethod. > - size := self generateInstructionsAt: startAddress + headerSize. > - end := self outputInstructionsAt: startAddress + headerSize. > "The missOffset is the same as the interpretOffset. On RISCs it > includes an additional instruction." > self assert: missOffset = ((backEnd hasLinkRegister ifTrue: > [backEnd callInstructionByteSize] ifFalse: [0]) > + > picInterpretAbort address + picInterpretAbort machineCodeSize - > startAddress). > self assert: startAddress + cmEntryOffset = entry address. > self assert: endCPICCase0 address = (startAddress + > firstCPICCaseOffset). > self assert: endCPICCase1 address = (startAddress + > firstCPICCaseOffset + cPICCaseSize). > ^self > fillInCPICHeader: (self cCoerceSimple: startAddress to: > #'CogMethod *') > - size: closedPICSize > numArgs: numArgs > numCases: 2 > hasMNUCase: isMNUCase > selector: selector ! > > Item was added: > + ----- Method: Cogit>>fakeVarBaseAddress (in category 'accessing') ----- > + fakeVarBaseAddress > + "We expect simulatedAddresses to have around 40 entries. 48 is > hopefully a good maximum." > + <doNotGenerate> > + ^self fakeAddressFor: nil index: 48! > > Item was added: > + ----- Method: > Cogit>>fillInCPICHeader:numArgs:numCases:hasMNUCase:selector: (in category > 'generate machine code') ----- > + fillInCPICHeader: pic numArgs: numArgs numCases: numCases hasMNUCase: > hasMNUCase selector: selector > + <returnTypeC: #'CogMethod *'> > + <var: #pic type: #'CogMethod *'> > + <inline: true> > + self assert: (objectMemory isYoung: selector) not. > + pic cmType: CMClosedPIC. > + pic objectHeader: 0. > + pic blockSize: closedPICSize. > + pic methodObject: 0. > + pic methodHeader: 0. > + pic selector: selector. > + pic cmNumArgs: numArgs. > + pic cmRefersToYoung: false. > + pic cmUsageCount: self initialClosedPICUsageCount. > + pic cpicHasMNUCase: hasMNUCase. > + pic cPICNumCases: numCases. > + pic blockEntryOffset: 0. > + self assert: pic cmType = CMClosedPIC. > + self assert: pic selector = selector. > + self assert: pic cmNumArgs = numArgs. > + self assert: pic cPICNumCases = numCases. > + self assert: (backEnd callTargetFromReturnAddress: pic asInteger + > missOffset) = (self picAbortTrampolineFor: numArgs). > + self assert: closedPICSize = (methodZone roundUpLength: > closedPICSize). > + processor flushICacheFrom: pic asUnsignedInteger to: pic > asUnsignedInteger + closedPICSize. > + ^pic! > > Item was removed: > - ----- Method: > Cogit>>fillInCPICHeader:size:numArgs:numCases:hasMNUCase:selector: (in > category 'generate machine code') ----- > - fillInCPICHeader: pic size: size numArgs: numArgs numCases: numCases > hasMNUCase: hasMNUCase selector: selector > - <returnTypeC: #'CogMethod *'> > - <var: #pic type: #'CogMethod *'> > - self assert: (objectMemory isYoung: selector) not. > - pic cmType: CMClosedPIC. > - pic objectHeader: 0. > - pic blockSize: size. > - pic methodObject: 0. > - pic methodHeader: 0. > - pic selector: selector. > - pic cmNumArgs: numArgs. > - pic cmRefersToYoung: false. > - pic cmUsageCount: self initialClosedPICUsageCount. > - pic cpicHasMNUCase: hasMNUCase. > - pic cPICNumCases: numCases. > - pic blockEntryOffset: 0. > - self assert: pic cmType = CMClosedPIC. > - self assert: pic selector = selector. > - self assert: pic cmNumArgs = numArgs. > - self assert: pic cPICNumCases = numCases. > - self assert: (backEnd callTargetFromReturnAddress: pic asInteger + > missOffset) = (self picAbortTrampolineFor: numArgs). > - self assert: size = (methodZone roundUpLength: size). > - processor flushICacheFrom: pic asUnsignedInteger to: pic > asUnsignedInteger + size. > - ^pic! > > Item was added: > + ----- Method: Cogit>>fillInOPICHeader:numArgs:selector: (in category > 'generate machine code') ----- > + fillInOPICHeader: pic numArgs: numArgs selector: selector > + <returnTypeC: #'CogMethod *'> > + <var: #pic type: #'CogMethod *'> > + <inline: true> > + pic cmType: CMOpenPIC. > + pic objectHeader: 0. > + pic blockSize: openPICSize. > + "pic methodObject: 0.""This is also the nextOpenPIC link so don't > initialize it" > + methodZone addToOpenPICList: pic. > + pic methodHeader: 0. > + pic selector: selector. > + pic cmNumArgs: numArgs. > + (pic cmRefersToYoung: (objectMemory isYoung: selector)) ifTrue: > + [methodZone addToYoungReferrers: pic]. > + pic cmUsageCount: self initialOpenPICUsageCount. > + pic cpicHasMNUCase: false. > + pic cPICNumCases: 0. > + pic blockEntryOffset: 0. > + self assert: pic cmType = CMOpenPIC. > + self assert: pic selector = selector. > + self assert: pic cmNumArgs = numArgs. > + self assert: (backEnd callTargetFromReturnAddress: pic asInteger + > missOffset) = (self picAbortTrampolineFor: numArgs). > + self assert: openPICSize = (methodZone roundUpLength: openPICSize). > + processor flushICacheFrom: pic asUnsignedInteger to: pic > asUnsignedInteger + openPICSize. > + ^pic! > > Item was removed: > - ----- Method: Cogit>>fillInOPICHeader:size:numArgs:selector: (in > category 'generate machine code') ----- > - fillInOPICHeader: pic size: size numArgs: numArgs selector: selector > - <returnTypeC: #'CogMethod *'> > - <var: #pic type: #'CogMethod *'> > - pic cmType: CMOpenPIC. > - pic objectHeader: 0. > - pic blockSize: size. > - "pic methodObject: 0.""This is also the nextOpenPIC link so don't > initialize it" > - methodZone addToOpenPICList: pic. > - pic methodHeader: 0. > - pic selector: selector. > - pic cmNumArgs: numArgs. > - (pic cmRefersToYoung: (objectMemory isYoung: selector)) ifTrue: > - [methodZone addToYoungReferrers: pic]. > - pic cmUsageCount: self initialOpenPICUsageCount. > - pic cpicHasMNUCase: false. > - pic cPICNumCases: 0. > - pic blockEntryOffset: 0. > - self assert: pic cmType = CMOpenPIC. > - self assert: pic selector = selector. > - self assert: pic cmNumArgs = numArgs. > - self assert: (backEnd callTargetFromReturnAddress: pic asInteger + > missOffset) = (self picAbortTrampolineFor: numArgs). > - self assert: size = (methodZone roundUpLength: size). > - processor flushICacheFrom: pic asUnsignedInteger to: pic > asUnsignedInteger + size. > - ^pic! > > Item was changed: > ----- Method: Cogit>>generateClosedPICPrototype (in category > 'initialization') ----- > generateClosedPICPrototype > "Generate the prototype ClosedPIC to determine how much space as > full PIC takes. > When we first allocate a closed PIC it only has one or two cases > and we want to grow it. > So we have to determine how big a full one is before hand." > - | headerSize | > numPICCases := 6. > "stack allocate the various collections so that they > are effectively garbage collected on return." > self allocateOpcodes: numPICCases * 7 bytecodes: 0. > self compileClosedPICPrototype. > self computeMaximumSizes. > + methodLabel concretizeAt: methodZoneBase. > + closedPICSize := (self sizeof: CogMethod) + (self > generateInstructionsAt: methodZoneBase + (self sizeof: CogMethod)). > - headerSize := self sizeof: CogMethod. > - closedPICSize := headerSize + (self generateInstructionsAt: > methodZoneBase + headerSize). > firstCPICCaseOffset := endCPICCase0 address - methodZoneBase. > cPICCaseSize := endCPICCase1 address - endCPICCase0 address. > cPICEndSize := closedPICSize - (numPICCases - 1 * cPICCaseSize + > firstCPICCaseOffset). > closedPICSize := methodZone roundUpLength: closedPICSize > "self cCode: '' > inSmalltalk: > [| end | > end := self outputInstructionsAt: methodZoneBase > + headerSize. > self disassembleFrom: methodZoneBase + headerSize > to: end - 1. > self halt]"! > > Item was changed: > ----- Method: Cogit>>generateOpenPICPrototype (in category > 'initialization') ----- > generateOpenPICPrototype > "Generate the prototype ClosedPIC to determine how much space as > full PIC takes. > When we first allocate a closed PIC it only has one or two cases > and we want to grow it. > So we have to determine how big a full one is before hand." > + | codeSize mapSize | > - | headerSize codeSize mapSize | > "stack allocate the various collections so that they > are effectively garbage collected on return." > self allocateOpcodes: 100 bytecodes: 0. > + methodLabel > + address: methodZoneBase; > + dependent: nil. > + "Need a real selector here so that the map accomodates the > annotations for the selector. > + Use self numRegArgs to generate the longest possible code > sequence due to > + genPushRegisterArgsForNumArgs:" > - "Ned a real selector here so that the map accomodates the > annotations for the selector." > self compileOpenPIC: (coInterpreter specialSelector: 0) numArgs: > self numRegArgs. > self computeMaximumSizes. > - headerSize := self sizeof: CogMethod. > methodLabel concretizeAt: methodZoneBase. > + codeSize := self generateInstructionsAt: methodZoneBase + (self > sizeof: CogMethod). > - codeSize := self generateInstructionsAt: methodZoneBase + > headerSize. > mapSize := self generateMapAt: nil start: methodZoneBase + > cmNoCheckEntryOffset. > + openPICSize := (methodZone roundUpLength: (self sizeof: CogMethod) > + codeSize) + (methodZone roundUpLength: mapSize). > - openPICSize := (methodZone roundUpLength: headerSize + codeSize) + > (methodZone roundUpLength: mapSize). > "self cCode: '' > inSmalltalk: > [| end | > end := self outputInstructionsAt: methodZoneBase > + headerSize. > + self disassembleFrom: methodZoneBase + (self > sizeof: CogMethod) to: end - 1. > - self disassembleFrom: methodZoneBase + headerSize > to: end - 1. > self halt]"! > > Item was changed: > ----- Method: Cogit>>generateTrampolines (in category 'initialization') > ----- > generateTrampolines > "Generate the run-time entries and exits at the base of the native > code zone and update the base. > Read the class-side method trampolines for documentation on the > various trampolines" > | methodZoneStart | > methodZoneStart := methodZoneBase. > + methodLabel address: methodZoneStart. > self allocateOpcodes: 80 bytecodes: 0. > initialPC := 0. > endPC := numAbstractOpcodes - 1. > hasYoungReferent := false. > self generateSendTrampolines. > self generateMissAbortTrampolines. > objectRepresentation generateObjectRepresentationTrampolines. > self generateRunTimeTrampolines. > self cppIf: NewspeakVM ifTrue: [self generateNewspeakRuntime]. > self cppIf: SistaVM ifTrue: [self generateSistaRuntime]. > self generateEnilopmarts. > self generateTracingTrampolines. > > "finish up" > self recordGeneratedRunTime: 'methodZoneBase' address: > methodZoneBase. > processor flushICacheFrom: methodZoneStart to: methodZoneBase! > > Item was added: > + ----- Method: Cogit>>methodLabel (in category 'accessing') ----- > + methodLabel > + <cmacro: '() methodLabel'> > + ^methodLabel! > > Item was changed: > ----- Method: Cogit>>setInterpreter: (in category 'initialization') ----- > setInterpreter: aCoInterpreter > "Initialization of the code generator in the simulator. > These objects already exist in the generated C VM > or are used only in the simulation." > <doNotGenerate> > coInterpreter := aCoInterpreter. > objectMemory := aCoInterpreter objectMemory. > threadManager := aCoInterpreter threadManager. "N.B. may be nil" > methodZone := CogMethodZone new. > objectRepresentation := objectMemory objectRepresentationClass > forCogit: > self methodZone: methodZone. > methodZone setInterpreter: aCoInterpreter > objectRepresentation: objectRepresentation > cogit: self. > generatorTable := self class generatorTable. > primitiveGeneratorTable := self class primitiveTable. > processor := ProcessorClass new. > simulatedAddresses := Dictionary new. > simulatedTrampolines := Dictionary new. > simulatedVariableGetters := Dictionary new. > simulatedVariableSetters := Dictionary new. > traceStores := 0. > + traceFlags := (self class initializationOptions at: > #recordPrimTrace ifAbsent: [true]) > + ifTrue: [8] "record prim trace on > by default (see Cogit class>>decareCVarsIn:)" > + ifFalse: [0]. > - traceFlags := 8. "record prim trace on by default (see Cogit > class>>decareCVarsIn:)" > debugPrimCallStackOffset := 0. > singleStep := printRegisters := printInstructions := clickConfirm > := false. > breakBlock ifNil: [self breakPC: breakPC]. > (backEnd := processor abstractInstructionCompilerClass new) cogit: > self. > (methodLabel := processor abstractInstructionCompilerClass new) > cogit: self. > ordinarySendTrampolines := CArrayAccessor on: (Array new: > NumSendTrampolines). > superSendTrampolines := CArrayAccessor on: (Array new: > NumSendTrampolines). > BytecodeSetHasDirectedSuperSend ifTrue: > [directedSuperSendTrampolines := CArrayAccessor on: (Array > new: NumSendTrampolines)]. > NewspeakVM ifTrue: > [selfSendTrampolines := CArrayAccessor on: (Array new: > NumSendTrampolines). > dynamicSuperSendTrampolines := CArrayAccessor on: (Array > new: NumSendTrampolines). > implicitReceiverSendTrampolines := CArrayAccessor on: > (Array new: NumSendTrampolines). > outerSendTrampolines := CArrayAccessor on: (Array new: > NumSendTrampolines)]. > "debug metadata" > objectReferencesInRuntime := CArrayAccessor on: (Array new: > NumObjRefsInRuntime). > runtimeObjectRefIndex := 0. > "debug metadata" > trampolineAddresses := CArrayAccessor on: (Array new: > NumTrampolines * 2). > trampolineTableIndex := 0. > > compilationTrace ifNil: [compilationTrace := self class > initializationOptions at: #compilationTrace ifAbsent: [0]]. > extA := extB := 0! > > Item was changed: > ----- Method: Cogit>>varBaseAddress (in category 'accessing') ----- > varBaseAddress > "We expect simulatedAddresses to have around 40 entries. 48 is > hopefully a good maximum." > <doNotGenerate> > + ^coInterpreter varBaseAddress! > - ^self cCode: [coInterpreter varBaseAddress] > - inSmalltalk: [self fakeAddressFor: nil index: 48]! > > Item was changed: > ----- Method: CurrentImageCoInterpreterFacade>>addressForLabel: (in > category 'labels') ----- > addressForLabel: l > + ^variables at: l ifAbsentPut: [variables size * 4 + self > variablesBase]! > - ^variables > - at: l > - ifAbsentPut: > - [(self isLabelRelativeToCogitVarBaseReg: l) > - ifTrue: [cogit fakeAddressFor: l index: > variables size + 48] > - ifFalse: [variables size * 4 + self > variablesBase]]! > > Item was added: > + ----- Method: CurrentImageCoInterpreterFacade>>varBaseAddress (in > category 'accessing') ----- > + varBaseAddress > + "This value is chosen for ARM, which has the ability to do 12-bit > relative addresses from the var base register." > + ^(variables at: 'stackLimit') - (1 << 11)! > > Item was changed: > ----- Method: SimpleStackBasedCogit>>genSend:numArgs:sendTable: (in > category 'bytecode generator support') ----- > genSend: selector numArgs: numArgs sendTable: sendTable > <inline: false> > <var: #sendTable type: #'sqInt *'> > | annotation | > (objectMemory isYoung: selector) ifTrue: > [hasYoungReferent := true]. > self assert: needsFrame. > annotation := self annotationForSendTable: sendTable. > self assert: (numArgs between: 0 and: 255). "say" > self assert: (objectMemory addressCouldBeOop: selector). > self MoveMw: numArgs * objectMemory wordSize r: SPReg R: > ReceiverResultReg. > "Deal with stale super sends; see SpurMemoryManager's class > comment." > (self annotationIsForUncheckedEntryPoint: annotation) ifTrue: > [objectRepresentation genEnsureOopInRegNotForwarded: > ReceiverResultReg scratchReg: TempReg]. > + "0 through (NumSendTrampolines - 2) numArgs sends have the arg > count implciti in the trampoline. > + The last send trampoline (NumSendTrampolines - 1) passes numArgs > in SendNumArgsReg." > + numArgs >= (NumSendTrampolines - 1) ifTrue: > - numArgs > 2 ifTrue: > [self MoveCq: numArgs R: SendNumArgsReg]. > (BytecodeSetHasDirectedSuperSend > and: [annotation = IsDirectedSuperSend]) ifTrue: > [self genMoveConstant: tempOop R: TempReg]. > self MoveCw: selector R: ClassReg. > self annotate: (self Call: (sendTable at: (numArgs min: > NumSendTrampolines - 1))) > with: annotation. > self PushR: ReceiverResultReg. > ^0! > > Item was added: > + ----- Method: > SistaStackToRegisterMappingCogit>>fillInCPICHeader:numArgs:numCases:hasMNUCase:selector: > (in category 'generate machine code') ----- > + fillInCPICHeader: pic numArgs: numArgs numCases: numCases hasMNUCase: > hasMNUCase selector: selector > + pic counters: 0. > + ^super fillInCPICHeader: pic numArgs: numArgs numCases: numCases > hasMNUCase: hasMNUCase selector: selector! > > Item was removed: > - ----- Method: > SistaStackToRegisterMappingCogit>>fillInCPICHeader:size:numArgs:numCases:hasMNUCase:selector: > (in category 'generate machine code') ----- > - fillInCPICHeader: pic size: size numArgs: numArgs numCases: numCases > hasMNUCase: hasMNUCase selector: selector > - pic counters: 0. > - ^super fillInCPICHeader: pic size: size numArgs: numArgs numCases: > numCases hasMNUCase: hasMNUCase selector: selector! > > Item was added: > + ----- Method: > SistaStackToRegisterMappingCogit>>fillInOPICHeader:numArgs:selector: (in > category 'generate machine code') ----- > + fillInOPICHeader: pic numArgs: numArgs selector: selector > + pic counters: 0. > + ^super fillInOPICHeader: pic numArgs: numArgs selector: selector! > > Item was removed: > - ----- Method: > SistaStackToRegisterMappingCogit>>fillInOPICHeader:size:numArgs:selector: > (in category 'generate machine code') ----- > - fillInOPICHeader: pic size: size numArgs: numArgs selector: selector > - pic counters: 0. > - ^super fillInOPICHeader: pic size: size numArgs: numArgs selector: > selector! > > Item was changed: > ----- Method: SpurMemoryManager>>checkTraversableSortedFreeList (in > category 'simulation only') ----- > checkTraversableSortedFreeList > + | prevFree prevPrevFree freeChunk | > - | prevFree freeChunk | > <api> > <inline: false> > + prevFree := prevPrevFree := 0. > - prevFree := 0. > freeChunk := firstFreeChunk. > self allOldSpaceEntitiesDo: > [:o| | objOop next limit | > (self isFreeObject: o) ifTrue: > [self assert: o = freeChunk. > next := self nextInSortedFreeListLink: freeChunk > given: prevFree. > limit := next = 0 ifTrue: [endOfMemory] ifFalse: > [next]. > "coInterpreter transcript cr; print: freeChunk; > tab; print: o; tab; print: prevFree; nextPutAll: '<->'; print: next; flush." > objOop := freeChunk. > [self oop: (objOop := self objectAfter: objOop) > isLessThan: limit] whileTrue: > [self assert: (self isFreeObject: objOop) > not]. > + prevPrevFree := prevFree. > prevFree := freeChunk. > freeChunk := next]]. > self assert: prevFree = lastFreeChunk. > + self assert: (self nextInSortedFreeListLink: lastFreeChunk given: > 0) = prevPrevFree. > self assert: freeChunk = 0. > ^true! > > Item was changed: > ----- Method: > StackToRegisterMappingCogit>>genMarshalledSend:numArgs:sendTable: (in > category 'bytecode generator support') ----- > genMarshalledSend: selector numArgs: numArgs sendTable: sendTable > <inline: false> > <var: #sendTable type: #'sqInt *'> > | annotation | > (objectMemory isYoung: selector) ifTrue: > [hasYoungReferent := true]. > self assert: needsFrame. > annotation := self annotationForSendTable: sendTable. > "Deal with stale super sends; see SpurMemoryManager's class > comment." > (self annotationIsForUncheckedEntryPoint: annotation) ifTrue: > [objectRepresentation genEnsureOopInRegNotForwarded: > ReceiverResultReg scratchReg: TempReg]. > + "0 through (NumSendTrampolines - 2) numArgs sends have the arg > count implciti in the trampoline. > + The last send trampoline (NumSendTrampolines - 1) passes numArgs > in SendNumArgsReg." > + numArgs >= (NumSendTrampolines - 1) ifTrue: > - numArgs > 2 ifTrue: > [self MoveCq: numArgs R: SendNumArgsReg]. > (BytecodeSetHasDirectedSuperSend > and: [annotation = IsDirectedSuperSend]) ifTrue: > [self genMoveConstant: tempOop R: TempReg]. > self MoveCw: selector R: ClassReg. > self annotate: (self Call: (sendTable at: (numArgs min: > NumSendTrampolines - 1))) > with: annotation. > optStatus isReceiverResultRegLive: false. > ^self ssPushRegister: ReceiverResultReg! > >

1 0

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2015