Vm-dev May 2016

vm-dev@lists.squeakfoundation.org

36 participants
150 discussions

[commit][3695] Nicolas Cellier a NULL plugin name fix
by commits＠squeakvm.org 05 May '16

05 May '16

Revision: 3695 Author: johnmci Date: 2016-05-05 09:24:39 -0700 (Thu, 05 May 2016) Log Message: ----------- Nicolas Cellier a NULL plugin name fix Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch Modified: branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2016-05-04 18:45:02 UTC (rev 3694) +++ branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m 2016-05-05 16:24:39 UTC (rev 3695) @@ -162,6 +162,7 @@ if (handle == null) { char * why = dlerror(); dprintf((stderr, "ioLoadModule(<intrinsic>): %s\n", why)); + return NULL; } else { dprintf((stderr, "loaded: <intrinsic>\n")); return handle; @@ -208,7 +209,8 @@ OSErr err = FSFindFolder(kSystemDomain, kFrameworksFolderType, false, &frameworksFolderRef); #pragma unused(err) NSURL *myURLRef = (NSURL *) CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &frameworksFolderRef)); - systemFolder = RETAINOBJ([myURLRef path]); + RETAINOBJ(myURLRef.path); + systemFolder = myURLRef.path; } pluginNameLength = strlen(pluginName); Modified: branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch =================================================================== --- branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2016-05-04 18:45:02 UTC (rev 3694) +++ branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch 2016-05-05 16:24:39 UTC (rev 3695) @@ -8,7 +8,7 @@ #if __has_feature(objc_arc) #define RELEASEOBJ(x) -#define RETAINOBJ(x) x +#define RETAINOBJ(x) #define AUTORELEASEOBJ(x) x #define SUPERDEALLOC #else

1 0

Once upon time representsSameBrowseeAs: was moved out of Morphic
by Nicolas Cellier 04 May '16

04 May '16

Hi, If you take a look at Morphic-ar.375, you'll see this: "Move a few methods between various packages to make unload easier." This commit moved representsSameBrowseeAs: out of Morphic for Lexicon and PreferenceBrowser. Of course, this message is used exclusively by Morphic so far, but if we classify it in Morphic package, then we can't easily remove Lexicon or PreferencesBrowser. Indeed, since Morphic would extend Lexicon, it would depend on Lexicon, and we could not unload Lexicon without first unloading Morphic... Recently, the same message crept in Morphic again, breaking one of the PackageDependencyTest. IMO, this is a bad thing. If we do not remove the message representsSameBrowseeAs: when we remove Morphic, then it's not a drama. And representsSameBrowseeAs: does not depend on Morphic. It's a general query that could be used by another framework. OK to move it back to respective packages? (Tools & co). Nicolas

1 0

[commit][3694] Mac OS X build changes.
by commits＠squeakvm.org 04 May '16

04 May '16

Revision: 3694 Author: eliot Date: 2016-05-04 11:45:02 -0700 (Wed, 04 May 2016) Log Message: ----------- Mac OS X build changes. Move the MIDI plugin to external, adding a Makefile. It does not work under Cocoa yetm and so is more convenient to work on externally. Move FloatArray & FloatMath plugins to internal; they're small, useful and stable. Fix dependency when plugins change from being internal to external and vice verse; they must be recompiled. Exclude sqMacV2Window.m SqViewBitmapConversion.m & SqViewClut.m; JMM says these shouldn't be included. rename the immutability build to squeak.cog.spur+immutability (for "naming consistency"). Add some ignore props. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/makeproduct branches/Cog/build.macos32x86/makeproductclean branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int branches/Cog/build.macos32x86/squeak.sista.spur/Makefile branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int branches/Cog/build.macos64x64/squeak.sista.spur/Makefile branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int Added Paths: ----------- branches/Cog/build.macos32x86/squeak.cog.spur+immutability/ branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile Removed Paths: ------------- branches/Cog/build.macos32x86/squeak+immutability.cog.spur/ branches/Cog/build.macos32x86/squeak.cog.spur.immutability/ Property Changed: ---------------- branches/Cog/build.macos32x86/glue.cog.spur/ Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-05-04 18:45:02 UTC (rev 3694) @@ -102,6 +102,9 @@ VPATH:= $(SRCDIRS) +# If plugins change from internal to external they must be recompiled. +$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext + ############################################################################# # Rules for automated builds Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-05-04 18:45:02 UTC (rev 3694) @@ -52,10 +52,13 @@ MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) -XEX:=%/sqSqueakMainApplication+screen.m -OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ +#XEX:= ... %/sqMacV2Browser.m ... +XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ + %/SqViewBitmapConversion.m %/SqViewClut.m +OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) +OSXSRC:=$(filter-out $(XEX),$(OSXSRC)) UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \ sqUnixThreads.c sqUnixVMProfile.c) VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) Property changes on: branches/Cog/build.macos32x86/glue.cog.spur ___________________________________________________________________ Modified: svn:ignore - Cocoa*.app build* deps getversion* sqNamedPrims.h + Cocoa*.app LOG* *.sources build* deps getversion* sqNamedPrims.h Modified: branches/Cog/build.macos32x86/makeproduct =================================================================== --- branches/Cog/build.macos32x86/makeproduct 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/makeproduct 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability" +PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability" for d in $PRODUCTDIRS; do if test -d "$d"; then (cd ./$d;./mvm -A) Modified: branches/Cog/build.macos32x86/makeproductclean =================================================================== --- branches/Cog/build.macos32x86/makeproductclean 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/makeproductclean 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur.immutability" +PRODUCTDIRS="newspeak.cog.spur pharo.cog.spur squeak.cog.spur squeak.cog.v3 squeak.cog.spur+immutability" for d in $PRODUCTDIRS; do if test -d "$d"; then (cd ./$d;echo $d;make cleanall) Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,13 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ BochsX64Plugin \ GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,9 +20,7 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ -MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ @@ -31,7 +31,9 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,13 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ BochsX64Plugin \ GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur.immutability/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.spur+immutability/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,9 +20,7 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ -MIDIPlugin \ MiscPrimitivePlugin \ RePlugin \ SecurityPlugin \ @@ -31,7 +31,9 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ -# JoystickTabletPlugin +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,8 +1,11 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ +BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -31,4 +33,7 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos32x86/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.sista.spur/Makefile 2016-05-04 18:45:02 UTC (rev 3694) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursistasrc/vm +COGDEFS=-DIMMUTABILITY=1 SOURCEFILE:=SqueakV50.sources APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,13 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Coca so keeping it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ BochsX64Plugin \ GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -29,5 +31,9 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,10 +1,9 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -29,5 +31,9 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,8 +1,8 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -31,4 +33,7 @@ SurfacePlugin \ UUIDPlugin \ VMProfileMacSupportPlugin \ -# JoystickTabletPlugin +# B3DAcceleratorPlugin \ +# InternetConfigPlugin \ +# JoystickTabletPlugin \ +# MacMenubarPlugin # Does not work under Cocoa Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-05-04 18:45:02 UTC (rev 3694) @@ -102,6 +102,9 @@ VPATH:= $(SRCDIRS) +# If plugins change from internal to external they must be recompiled. +$(BUILD)/$(LIBNAME)/$(LIBNAME).o: plugins.int plugins.ext + ############################################################################# # Rules for automated builds Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-05-04 18:45:02 UTC (rev 3694) @@ -52,10 +52,13 @@ MAKERSRC:=$(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) -XEX:=%/sqSqueakMainApplication+screen.m -OSXSRC:=$(wildcard $(OSXDIR)/*.c) $(filter-out $(XEX),$(wildcard $(OSXDIR)/*.m)) \ +#XEX:= ... %/sqMacV2Browser.m ... +XEX:=%/sqSqueakMainApplication+screen.m %/sqMacV2Window.m \ + %/SqViewBitmapConversion.m %/SqViewClut.m +OSXSRC=$(wildcard $(OSXDIR)/*.c) $(wildcard $(OSXDIR)/*.m) \ $(wildcard $(OSXCOMMONDIR)/*.c) $(wildcard $(OSXCOMMONDIR)/*.m) \ $(wildcard $(OSXCLASSESDIR)/*.c) $(wildcard $(OSXCLASSESDIR)/*.m) +OSXSRC:=$(filter-out $(XEX),$(OSXSRC)) UNIXSRC:=$(addprefix $(UNIXVMDIR)/,aio.c sqUnixHeartbeat.c sqUnixSpurMemory.c \ sqUnixThreads.c sqUnixVMProfile.c) VMSRC:= $(MAKERSRC) $(CROSSSRC) $(OSXSRC) $(UNIXSRC) Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -32,4 +32,4 @@ UUIDPlugin \ VMProfileMacSupportPlugin \ # JoystickTabletPlugin \ -# SerialPlugin +# SerialPlugin # Does not compile under 64-bits Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,11 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.cog.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,7 +20,6 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ MiscPrimitivePlugin \ RePlugin \ @@ -29,9 +30,10 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin \ -# SerialPlugin +# MacMenubarPlugin # Does not work under Cocoa \ +# SerialPlugin # Does not compile under 64-bits Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,11 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Coca so keeping it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.cog.spur.immutability/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,7 +20,6 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ MiscPrimitivePlugin \ RePlugin \ @@ -29,9 +30,10 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin \ -# SerialPlugin +# MacMenubarPlugin # Does not work under Cocoa \ +# SerialPlugin # Does not compile under 64-bits Modified: branches/Cog/build.macos64x64/squeak.sista.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.sista.spur/Makefile 2016-05-04 18:45:02 UTC (rev 3694) @@ -4,6 +4,7 @@ # VMSRCDIR:= ../../spursista64src/vm +COGDEFS=-DIMMUTABILITY=1 SOURCEFILE:=SqueakV50.sources APPPOST:=overwriteSqueakIcon Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,11 +1,12 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Coca so keeping it external until it can be fixed. EXTERNAL_PLUGINS = \ BochsIA32Plugin \ +BochsX64Plugin \ +GdbARMPlugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.sista.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,7 +20,6 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ MiscPrimitivePlugin \ RePlugin \ @@ -29,9 +30,10 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin \ -# SerialPlugin +# MacMenubarPlugin # Does not work under Cocoa \ +# SerialPlugin # Does not compile under 64-bits Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.ext 2016-05-04 18:45:02 UTC (rev 3694) @@ -1,11 +1,9 @@ # Copied, perhaps edited, from ../src/examplePlugins.ext +# MIDIPlugin does not work on Cocoa so keep it external until it can be fixed. EXTERNAL_PLUGINS = \ -BochsIA32Plugin \ CroquetPlugin \ -FloatArrayPlugin \ -FloatMathPlugin \ +MIDIPlugin \ Mpeg3Plugin \ SqueakFFIPrims \ SqueakSSL \ -UUIDPlugin \ UnixOSProcessPlugin Modified: branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-05-03 22:17:47 UTC (rev 3693) +++ branches/Cog/build.macos64x64/squeak.stack.spur/plugins.int 2016-05-04 18:45:02 UTC (rev 3694) @@ -11,6 +11,8 @@ DSAPrims \ FFTPlugin \ FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ HostWindowPlugin \ IA32ABI \ JPEGReaderPlugin \ @@ -18,7 +20,6 @@ Klatt \ LargeIntegers \ LocalePlugin \ -MacMenubarPlugin \ Matrix2x3Plugin \ MiscPrimitivePlugin \ RePlugin \ @@ -29,9 +30,10 @@ SoundPlugin \ StarSqueakPlugin \ SurfacePlugin \ +UUIDPlugin \ VMProfileMacSupportPlugin \ # B3DAcceleratorPlugin \ # InternetConfigPlugin \ # JoystickTabletPlugin \ -# MIDIPlugin \ -# SerialPlugin +# MacMenubarPlugin # Does not work under Cocoa \ +# SerialPlugin # Does not compile under 64-bits Added: branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile =================================================================== --- branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile (rev 0) +++ branches/Cog/platforms/iOS/plugins/MIDIPlugin/Makefile 2016-05-04 18:45:02 UTC (rev 3694) @@ -0,0 +1,7 @@ +# eem 2016/5/4 The existing code is in terms of oplder pre-carbon APIs and the +# Component Manager, which was deprecated in 10.8 and no longer seems available. +# To get the code to link we therefore have to use -undefined dynamic_lookup + +EXTRALIBS:=-undefined dynamic_lookup -framework AudioToolbox -framework CoreAudio -framework QuickTime + +include ../common/Makefile.plugin

1 0

timesTwoPower: error on windows due to incorrect version of ldexp
by Nicolas Cellier 04 May '16

04 May '16

Hi, it sounds like the Windows version of cog suffers from the infamous timesTwoPower: bug See: https://groups.google.com/forum/#!topic/comp.lang.smalltalk.dolphin/8du7NWk… http://stackoverflow.com/questions/32150888/should-ldexp-round-correctly Virtual Machine --------------- C:\Users\cellier\Documents\Smalltalk\Squeak\Spur\Squeak.exe Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1855] Win32 built on May 2 2016 10:00:42 PDT Compiler: 3.4.4 (cygming special, gdc 0.12, using dmd 0.125) platform sources revision VM: r3692 http://www.squeakvm.org/svn/squeak/branches/Cog Date: 2016-05-01 22:12:46 -0700 Plugins: r3688 http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins CoInterpreter VMMaker.oscog-eem.1855 uuid: d8e4a3c2-a3bf-4adc-b224-8012903a1ef4 May 2 2016 StackToRegisterMappingCogit VMMaker.oscog-nice.1853 uuid: 3ff63b2d-9dc9-4d6a-b3ff-fb6d37f1085e May 2 2016 What kind of configuration is it? Is it using a native windows library instead of a robust linux libm?

1 0

[commit][3693] minor revisions to point x/y rounding
by commits＠squeakvm.org 04 May '16

04 May '16

Revision: 3693 Author: johnmci Date: 2016-05-03 15:17:47 -0700 (Tue, 03 May 2016) Log Message: ----------- minor revisions to point x/y rounding Modified Paths: -------------- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-02 05:12:46 UTC (rev 3692) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.m 2016-05-03 22:17:47 UTC (rev 3693) @@ -15,10 +15,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -27,7 +27,7 @@ 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. - + The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by Corporate Smalltalk Consulting Ltd (http://www.smalltalkconsulting.com) and its contributors", in the same place and form as other third-party acknowledgments. @@ -51,7 +51,7 @@ bits. (The Mac shift and caps lock keys are both mapped to the single Squeak shift bit). This was true for squeak upto 3.0.7. Then in 3.0.8 we decided to not map the cap lock key to shift - + Mac bits: <control><option><caps lock><shift><command> ST bits: <command><option><control><shift> */ @@ -108,7 +108,7 @@ - (void) pumpRunLoopEventSendAndSignal:(BOOL)signal { NSEvent *event; - + while ((event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil @@ -133,16 +133,16 @@ using the runloop, but if you just run the runloop on the main thread, events won't get processed. You have to explicitly run this in order to get them to be processed. - + Note that using the default runloop mode with this is generally a bad idea. By running in the default mode you allow *everything* else to run, which means that some other code might decide that *it* wants an inner event loop as well. If you then want to quit before that other code has finished, tough cookies. Much better to control things more tightly by using a different runloop mode. - + */ - + } - (void ) processAsOldEventOrComplexEvent: (id) event placeIn: (sqInputEvent *) evt { @@ -166,17 +166,17 @@ NSInteger i; NSRange picker; NSUInteger totaLength; - + evt.type = EventTypeKeyboard; - evt.timeStamp = ioMSecs(); + evt.timeStamp = ioMSecs(); picker.location = 0; picker.length = 1; totaLength = [unicodeString length]; for (i=0;i < totaLength;i++) { - - + + unicode = [unicodeString characterAtIndex: i]; - + if (mainView.lastSeenKeyBoardStrokeDetails) { evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: mainView.lastSeenKeyBoardStrokeDetails.modifierFlags]; evt.charCode = mainView.lastSeenKeyBoardStrokeDetails.keyCode; @@ -184,32 +184,32 @@ evt.modifiers = 0; evt.charCode = 0; } - + if ((evt.modifiers & CommandKeyBit) && (evt.modifiers & ShiftKeyBit)) { /* command and shift */ if ((unicode >= 97) && (unicode <= 122)) { /* convert ascii code of command-shift-letter to upper case */ unicode = unicode - 32; } } - + NSString *lookupString = AUTORELEASEOBJ([[NSString alloc] initWithCharacters: &unicode length: 1]); [lookupString getBytes: &macRomanCharacter maxLength: 1 usedLength: NULL encoding: NSMacOSRomanStringEncoding options: 0 range: picker remainingRange: NULL]; - + evt.pressCode = EventKeyDown; unsigned short keyCodeRemembered = evt.charCode; evt.utf32Code = 0; evt.reserved1 = 0; - evt.windowIndex = mainView.windowLogic.windowIndex; + evt.windowIndex = mainView.windowLogic.windowIndex; [self pushEventToQueue: (sqInputEvent *)&evt]; - + evt.charCode = macRomanCharacter; evt.pressCode = EventKeyChar; evt.modifiers = evt.modifiers; evt.utf32Code = unicode; - + [self pushEventToQueue: (sqInputEvent *) &evt]; - + if (i > 1 || !mainView.lastSeenKeyBoardStrokeDetails) { evt.pressCode = EventKeyUp; evt.charCode = keyCodeRemembered; @@ -217,16 +217,16 @@ [self pushEventToQueue: (sqInputEvent *) &evt]; } } - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - (void) recordKeyDownEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView { sqKeyboardEvent evt; - + evt.type = EventTypeKeyboard; - evt.timeStamp = ioMSecs(); + evt.timeStamp = ioMSecs(); evt.charCode = [theEvent keyCode]; evt.pressCode = EventKeyDown; evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: [theEvent modifierFlags]]; @@ -240,15 +240,15 @@ - (void) recordKeyUpEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView { sqKeyboardEvent evt; - + evt.type = EventTypeKeyboard; - evt.timeStamp = ioMSecs(); + evt.timeStamp = ioMSecs(); evt.charCode = [theEvent keyCode]; evt.pressCode = EventKeyUp; evt.modifiers = [self translateCocoaModifiersToSqueakModifiers: [theEvent modifierFlags]]; evt.utf32Code = 0; evt.reserved1 = 0; - evt.windowIndex = aView.windowLogic.windowIndex; + evt.windowIndex = aView.windowLogic.windowIndex; [self pushEventToQueue: (sqInputEvent *) &evt]; interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); @@ -256,15 +256,15 @@ - (void) recordMouseEvent:(NSEvent *)theEvent fromView: (sqSqueakOSXOpenGLView *) aView{ sqMouseEvent evt; - + evt.type = EventTypeMouse; evt.timeStamp = ioMSecs(); - + NSPoint local_point = [aView convertPoint: [theEvent locationInWindow] fromView:nil]; - - evt.x = local_point.x; - evt.y = local_point.y; - + + evt.x = lrintf((float)local_point.x); + evt.y = lrintf((float)local_point.y); + int buttonAndModifiers = [self mapMouseAndModifierStateToSqueakBits: theEvent]; evt.buttons = buttonAndModifiers & 0x07; evt.modifiers = buttonAndModifiers >> 3; @@ -273,28 +273,28 @@ #else evt.reserved1 = 0; #endif - evt.windowIndex = aView.windowLogic.windowIndex; - + evt.windowIndex = aView.windowLogic.windowIndex; + [self pushEventToQueue:(sqInputEvent *) &evt]; -//NSLog(@"mouse hit x %i y %i buttons %i mods %i",evt.x,evt.y,evt.buttons,evt.modifiers); + //NSLog(@"mouse hit x %i y %i buttons %i mods %i",evt.x,evt.y,evt.buttons,evt.modifiers); interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - + - (void) recordWheelEvent:(NSEvent *) theEvent fromView: (sqSqueakOSXOpenGLView *) aView{ - + [self recordMouseEvent: theEvent fromView: aView]; CGFloat x = [theEvent deltaX]; CGFloat y = [theEvent deltaY]; if (x != 0.0f) { - [self fakeMouseWheelKeyboardEventsKeyCode: (x < 0 ? 124 : 123) ascii: (x < 0 ? 29 : 28) windowIndex: aView.windowLogic.windowIndex]; + [self fakeMouseWheelKeyboardEventsKeyCode: (x < 0 ? 124 : 123) ascii: (x < 0 ? 29 : 28) windowIndex: aView.windowLogic.windowIndex]; } if (y != 0.0f) { - [self fakeMouseWheelKeyboardEventsKeyCode: (y < 0 ? 125 : 126) ascii: (y < 0 ? 31 : 30) windowIndex: aView.windowLogic.windowIndex]; + [self fakeMouseWheelKeyboardEventsKeyCode: (y < 0 ? 125 : 126) ascii: (y < 0 ? 31 : 30) windowIndex: aView.windowLogic.windowIndex]; } } - -- (void) fakeMouseWheelKeyboardEventsKeyCode: (int) keyCode ascii: (int) ascii windowIndex: (sqInt) windowIndex { + +- (void) fakeMouseWheelKeyboardEventsKeyCode: (int) keyCode ascii: (int) ascii windowIndex: (int) windowIndex { sqKeyboardEvent evt; evt.type = EventTypeKeyboard; @@ -311,12 +311,12 @@ evt.charCode = ascii; evt.utf32Code = ascii; [self pushEventToQueue:(sqInputEvent *) &evt]; - + evt.pressCode = EventKeyUp; evt.charCode = keyCode; evt.utf32Code = 0; [self pushEventToQueue:(sqInputEvent *) &evt]; - + } - (int) translateCocoaModifiersToSqueakModifiers: (NSUInteger) modifiers { @@ -337,23 +337,23 @@ if (modifiers & NSCommandKeyMask) keyBoardModifiers |= cmdKey; return keyBoardModifiers; - + } - + - (int) mapMouseAndModifierStateToSqueakBits: (NSEvent *) event { /* On a two- or three-button mouse, the left button is normally considered primary and the right button secondary, but left-handed users can reverse these settings as a matter of preference. The middle button on a three-button mouse is always the tertiary button. ' - + But mapping assumes 1,2,3 red, yellow, blue */ - + NSInteger stButtons,modifier,mappedButton; NSInteger mouseButton=0; - + static NSInteger buttonStateBits[4] = {0,0,0,0}; - + stButtons = buttonState; NSUInteger keyBoardCarbonModifiers = [self translateCocoaModifiersToCarbonModifiers: [event modifierFlags]]; NSInteger whatHappened = [event type]; @@ -366,9 +366,9 @@ mouseButton = 2; if (!mouseButton) mouseButton = [event buttonNumber] + 1; //buttonNumber seems to count from 0. - + if (mouseButton > 0 && mouseButton < 4) { - + modifier = 0; if (keyBoardCarbonModifiers & cmdKey ) modifier = 1; @@ -376,7 +376,7 @@ modifier = 2; if (keyBoardCarbonModifiers & controlKey) modifier = 3; - + if (browserActiveAndDrawingContextOkAndNOTInFullScreenMode()) mappedButton = [(sqSqueakOSXInfoPlistInterface *) self.infoPlistInterfaceLogic getSqueakBrowserMouseMappingsAt: modifier by: mouseButton]; else @@ -390,35 +390,36 @@ stButtons |= mappedButton == 3 ? (buttonStateBits[mappedButton] ? BlueButtonBit : 0) : 0; } } - + // button state: low three bits are mouse buttons; next 8 bits are modifier bits - buttonState = (modifierMap[((keyBoardCarbonModifiers & 0xFFFF) >> 8)] << 3) | (stButtons & 0x7); + buttonState = (modifierMap[((keyBoardCarbonModifiers & 0xFFFF) >> 8)] << 3) | (stButtons & 0x7); return buttonState; } -- (void) recordDragEvent:(int)dragType numberOfFiles:(int)numFiles where:(NSPoint)point windowIndex:(sqInt)windowIndex view:(NSView *)aView{ +- (void) recordDragEvent:(int)dragType numberOfFiles:(int)numFiles where:(NSPoint)point windowIndex:(sqInt)windowIndex view:(NSView *)aView +{ sqDragDropFilesEvent evt; - + NSPoint local_point = [aView convertPoint:point fromView:nil]; - + evt.type= EventTypeDragDropFiles; evt.timeStamp= ioMSecs(); evt.dragType= dragType; - evt.x = local_point.x; - evt.y = local_point.y; + evt.x = lrintf(local_point.x); + evt.y = lrintf(local_point.y); evt.modifiers= (buttonState >> 3); evt.numFiles= numFiles; - evt.windowIndex = windowIndex; + evt.windowIndex = windowIndex; [self pushEventToQueue: (sqInputEvent *) &evt]; - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); } - (void) recordWindowEvent: (int) windowType window: (NSWIndow *) window { sqWindowEvent evt; - + evt.type= EventTypeWindow; - evt.timeStamp= ioMSecs(); + evt.timeStamp= ioMSecs(); evt.action= windowType; evt.value1 = 0; evt.value2 = 0; @@ -426,7 +427,7 @@ evt.value4 = 0; evt.windowIndex = windowIndexFromHandle((wHandleType)window); [self pushEventToQueue: (sqInputEvent *) &evt]; - + interpreterProxy->signalSemaphoreWithIndex(gDelegateApp.squeakApplication.inputSemaphoreIndex); }

1 0

New Cog VMs available
by Eliot Miranda 03 May '16

03 May '16

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3692 These include stack ARM VMs for Spur and V3. CogVM binaries as per VMMaker.oscog-eem.1855/r3692 General: Fix a bad bug in primitiveVoidVMStateForMethod. One might think that the heap scan is unnecessary if the method does not have a cog method. But it could be the case that the code zone has recently been reclaimed and so not having a cog method is no indication that it didn't have a cog method some time in the recent past, and that there are indeed still contexts with machine code pcs out there. Correct slip in primitiveMethodXray, the flags were not set in each caseOf: branch (thanks to -Wunused-value). Change overflow tests in precondition rather than postcondition for small integer multiplication. Because integer overflow is undefined behaviour, and because we can't rely on undefined behaviour, the compiler has a license to eliminate the post-condition as dead code (at least since iso c89 acception). Post-condition currently works because we use -fwrapv compiler flag, but relying on specific compiler flags is bad practice in the long term. Fix regression in signed 32bit long access (introduced beginning of April). One symptom is: (Alien newGC: 4) signedLongAt: 1 put: -16r7287E552; signedLongAt: 1 Fix positive32BitIntegerFor: for Spur64 which worked only because the constant was generated ULL. Spur: Fix primitiveIsPinned. V3: Fix missing comparison operation in genPrimitiveIdentical on V3. This should fix Character = problem encounterd in Cuis. Debugging: Add printContextReferencesTo: & printActivationsOf: and have them print the pcs of the contexts they find. Cogit: Reorder annotation constants to simplify isPCMappedAnnotation:. Sista Cogit: Added a primitive to answer all the methods present in the machine code zone. allMachineCodeMethods <primitive: 'primitiveAllMethodsCompiledToMachineCode' module:''> ^#() Fix regression in VMMaker.oscog-eem.1823 when merging the two map enumerators into one that affects Sista. The merged enumerator must extend IsSendAnnotations with the AnnotationExtension. Plugins: Regenerate plugins using the recently revised type inferrence code. Slang: Extend type inference capabilities from the AST. Unify type inference used to #inferReturnTypeFromReturnsIn: with that based on AST. Now that type inference is a bit more thorough, release type restrictions in #isFunctional in order to obtain much more aggressive inlining. With those, a gain of 10% is possible on the LargeIntegersPlugin dominated bench: Use a type inference that better fits C rules (C99 standard section 6.3): - in (float op int), int is promoted to double not float - in (unsigned short op short) both operands are promoted to #int due to int promotion rules. Use minimum generality for generated integer constants: - use int if variable fits in int - else unsigned int - else long long (long would be enough for 64bits versions, but long long works for both 32 and 64) - else unsigned long long This is to avoid spurious unsigned promotion due to improved type inference. Mac OS X: Fix argument processing, so that e.g. myvm -breaksel aSelector my.image works (but -headless still fails). _,,,^..^,,,_ best, Eliot

2 1

Spur corrupts large images when saving
by Yuriy Tymchuk 03 May '16

03 May '16

Dear vm developers, I’ve encountered multiple times an issue when my images cannot be opened after saving (only on spur). I think that this happens when image is large, and the following script results in a corrupt image almost 100%: curl get.pharo.org/50+vm | bash ./pharo Pharo.image --no-default-preferences eval --save \ "Smalltalk globals at: #ReallyBigArray put: (ByteArray new: 1024*1024*1000). 'Done'" ./pharo Pharo.image printVersion The last line is there just to make image do something and for me it fails all the times. I hope that this can help to troubleshoot the issue with the vm. Also here are my system & hardware specs: System Version: OS X 10.11.3 (15D21) Model Identifier: MacBookPro11,5 Processor Name: Intel Core i7 Processor Speed: 2.8 GHz Total Number of Cores: 4 Memory: 16 GB Cheers! Uko

15 57

IsMenuBarVisible in the MacMenubarPlugin
by Eliot Miranda 02 May '16

02 May '16

Hi All, HIToolbox on Mac OS X defines IsMenuBarVisible (/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox). There's an empty definition of IsMenuBarVisible in platforms/iOS//plugins/MacMenubarPlugin/MacMenuOS9ToOSX.m. Well, it's written as extern Boolean IsMenuBarVisible(void){}; and that form seems to create a definition, not a reference. Anyway, the damn thing screws up symbol parsing in the VMProfiler. Shouldn't the MacMenuBarPlugin be being linked against HIToolbox and have all these dummy definitions be dropped? _,,,^..^,,,_ best, Eliot

2 1

[long] Squeak and High-DPI
by Tobias Pape 02 May '16

02 May '16

Hi all, [this is a longish post, you might want to use this toc] [TOC] - [INTRO] - [TERMINOLOGY] - [DPI] - [DEFAULT DPI] - [STATUS] - [WINDOWS DPI] - [OSX CARBON DPI] - [OSX COCOA DPI] - [SUGGESTIONS] <<<< PLEASE COMMENT - [OSX COCOA PATCH] - [VM/IMAGE INTERFACE] [INTRO] For some time now, OSX and also Windows support screens of different pixel per inch (DPI, :P). The approaches are slightly different; but both support a fallback mode where the pixel content of non-aware applications is automatically scaled to look like on "default dpi"[See DEFAULT DPI]. Effectively, we end up with pixel doubling. One way or another, this means Squeak looks somewhat pixelated on new hardware. These are some thoughts of mine on how to address this. [TERMINOLOGY] [DPI] Actually "dots-per-inch" but freely used in multiple senses by different people. For displays it used to mean "how many pixels are there approximately in an inch?", but for a long time now, The [DEFAULT DPI] that OSes report usually was fixed/defaulted (Win: 96, OS X: 72), _regardless_ of the actual screen's dpi. [DEFAULT DPI] On OS X, the system reports default DPI as 72 dpi and Retina typically as 144 dpi, _although_ the "actual" dpi is different. For example, My MacBook Pro 15" is reported as 144dpi, but https://www.sven.de/dpi/ calculates that I have 220.53 pixel to the inch. That's why Apple is moving away from DPI and just talking about a "scale factor"[1],[2] and the abstract "point" principle, moving away from actual pixels for "user content"[3]. On Windows, the default dpi is 96 dpi, but Windows always made it a little easier to change that. Squeak also has a default dpi, namely 96.0 dpi. [STATUS] [WINDOWS DPI] Windows supports different levels of DPI awareness[4], available depending on OS Version[5]. Long story short, with calling a special function[6] or (As we did/do/can do) setting a key in the executables ".manifest" file to "true" or "true/PM", Windows treats our Application as DPI-Aware[7]. Currently the effect of enabling this for our VMs means: - Looks ok on non-High-DPI screens - Looks tiny on High-DPI screens - Moving the VM between High-DPI and non-High-DPI screens changes the outer frame size of the application, the pixel size reported _to_ the VM remains the same. [OSX CARBON DPI] DPI-awareness and High-DPI are not possible with the QuickDraw-API the Carbon VM used to use. [OSX COCOA DPI] OS X now has a Device-in-pixel mode and a Userspace-in-"point" mode. When opted-in via Info.plist file, on AppKit-Level, one can convert between those with +[NSScreen backingScaleFactor], -convertRectToBacking:, -convertRectFromBacking and similar. On Quartz2D/CoreGraphics-Level, CGContextGetUserSpaceToDeviceSpaceTransform(), CGContextConvertRectToDeviceSpace(), and CGContextConvertRectToUserSpace() can be used. Both approaches are slightly different. OpenGL needs an additional Opt-in. In contrast (currently) to Windows, when moving between high- and non-high-DPI, the outer frame size of the application stays the same but the pixels of the backing store change. Up until now, the Cocoa branch is not DPI-aware. [SUGGESTIONS] [OSX COCOA PATCH] Attached is a patch that makes the VM High-DPI ready. PLEASE COMMENT. Summary: - Add Info.plist entry to state whether we want High DPI (NSHighResolutionCapable) THIS IS DISABLED BY DEFAULT (as with the Windows VM's manifest) - All Views: -add -sqScreenSize for the Pixel-dimensions to report to Squeak (and use for calculation in Squeak coordinates) -add -sqMousePosition: to convert Mouse coordinates from the View's system (maybe high-dpi) to Squeak coordinates - OpenGL view: - Opt-in for High resolution (-setWantsBestResolutionOpenGLSurface:) (overridden by Info.plist's entry) - Make texture size/tracking rects based on -sqScreenSize - Quartz2D/CoreGraphics view: - Work around deprecation of [[NSGraphicsContext currentContext] graphicsPort] in OS X 10.10 - Draw image in -sqScreenSize size, and position correctly in the View's coordinate system - (remove some duplication from OpenGL view) - iPhone SqueakUIView: - use Fallbacks for -sqScreenSize/-sqMousePosition:, no High-DPI yet. Note: this patch is against the Cog/platform/ios directory, Interpreter needs similar treating. [VM/IMAGE INTERFACE] With the current Windows VM and the Cocoa VM (+patch as above), users can Opt-in for High-DPI. However, the Image does not know that its high pixel count is on a small display (hello Etoys!). I _want_ the image to know and to be able to react. I think that the image should treat DPI changes similar screen size changes. Here are my ideas: - The VM exposes screen size as prim 106, screen depth as 'primitiveScreenDepth' * We should expose 'primitivePixelPerInch' with a fallback of '^ 96.0'. * 96.0 dpi shall be the [DEFAULT DPI] of Squeak. > For OS X that would mean, on non-high-dpi it shall report 96.0 dpi (not 72 dpi), on high-dpi it shall report 192.0 dpi (not 144) > Windows already has 96.0 dpi as [DEFAULT DPI], it shall reuse that and adhere to [8] - The image regularly checks the display size (DisplayScreen class>>checkForNewScreenSize). * We should do the same for DPI (Morphic main loop etc.) - There's already a client of DPI changes, TextStyles. * The image shall store changed dpi settings to TextStyles>>pixelsPerInch: - Projects can react to display size changes via #displaySizeChanged, But only fonts can react to DPI changes via #pixelsPerInchChanged * We shall make project able to react to dpi changes, maybe via #pixelsPerInchChanged - The standard tools are currently pixel-oriented and use hard-coded pixel values * I am unsure. * We could introduce conventions to act dpi-dependent (integers: pixels with autoscaling (pixels / default dpi * actual dpi or so), floats or scaled: dpi-based, via TextStyle class>>pointsToPixels:). * We could introduce actual units and say "this tool is 3 cm wide" and calculate pixels via #pointsToPixels:. * We could eliminate hard-coded values and base tools on font sizes. I tried that with the FontImporterTool (for example: FontImporterTool>>#buttonHeight, #filenameHeight. This may be hard and not very traceable, tho. - We could move the dpi api from TextStyle to somewhere more general. I know there are some rough edges here and there; I'd like to hear your suggestions. Let's make Squeak look nice and sharp :) Best -Tobias PS: Thanks to Marcel for some valuable suggestions and help to get Quartz transformations right. [1]: https://developer.apple.com/library/mac/documentation/Cocoa/Reference/Appli… [2]: https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIVie… [3]: https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Con… [4]: https://msdn.microsoft.com/en-us/library/windows/desktop/dn280512(v=vs.85).… [5]: https://msdn.microsoft.com/en-us/library/dn469266(v=vs.85).aspx#high_dpi_fe… [6]: https://msdn.microsoft.com/en-us/library/dn302122(v=vs.85).aspx [7]: http://www.squeakvm.org/svn/squeak/branches/Cog/build.win32x86/squeak.cog.s… [8]: https://msdn.microsoft.com/en-us/library/dn469266(v=vs.85).aspx#dpi_and_the…

1 0

VM Maker: CogTools-eem.72.mcz
by commits＠source.squeak.org 02 May '16

02 May '16

Eliot Miranda uploaded a new version of CogTools to project VM Maker: http://source.squeak.org/VMMaker/CogTools-eem.72.mcz ==================== Summary ==================== Name: CogTools-eem.72 Author: eem Time: 2 May 2016, 11:44:23.50556 am UUID: 463bb727-3742-4a23-9487-3a9f6e440a2d Ancestors: CogTools-eem.71 Fix the VMProfiler for Squeak 5 and Mavericks and later Mac OS X - aSet = (Set with: #module) no lonfer works for Set and IdentitySet, use size & anyOne. - the symbol parser gets confused by IsMenuBarVisible which is in HIToolbox and the MacMenubarPlugin. CoreAUC has a huge chunk of data in its text segment. So for now simply filter-out problematic modules. - the alignment morph used to provide the window background (cuz paneColor: no longer works :-( ) must be added first, not last. - add support for 64-bits on Mac OS X. =============== Diff against CogTools-eem.71 =============== Item was changed: ----- Method: VMProfiler>>openInWindow (in category 'opening') ----- openInWindow "VMProfiler open" | window symbolListMorph labelsMorph buttons | (window := SystemWindow new) setProperty: #allowPaneSplitters toValue: false; model: self; setLabel: self class name; fillStyle: Color white; paneColor: Color white; color: Color white. (window respondsTo: #allowPaneSplitters:) ifTrue: [window allowPaneSplitters: false]. + "Cope with Squeak 4.1 SystemWindow background color changes" + window addMorph: (AlignmentMorph new color: Color white; yourself) frame: (0@0 corner: 1@1). symbolListMorph := PluggableListMorphOfManyAlt on: self list: #symbolList primarySelection: #symbolIndex changePrimarySelection: #toggleListIndex: listSelection: #symbolSelectionAt: changeListSelection: #symbolSelectionAt:put: getListElement: #listEntryForIndex: menu: #symbolListMenu:. symbolListMorph showHScrollBarOnlyWhenNeeded: false. "buggy misnamed selector :)" labelsMorph := VMProfileGraphLabelMorph model: self font: self labelFont getLabels: #positionedLabels. expressionTextMorph := PluggableTextMorph on: self text: nil accept: nil readSelection: #selectionRange menu: #expressionTextMenu:. expressionTextMorph setProperty: #alwaysAccept toValue: true; askBeforeDiscardingEdits: false; setBalloonText: 'type an expression to profile here'. buttons := OrderedCollection new. window addMorph: symbolListMorph frame: (0@0 corner: 0.15@1); addMorph: (graph := VMProfilePlotMorph model: self) frame: (0.15@0 corner: 1.0(a)0.7); addMorph: labelsMorph frame: (0.15(a)0.7 corner: 1.0(a)0.85); "address boxes" addMorph: (self addressTextMorph:'Type the low address of the histogram here' get: #lowAddressText set: #lowAddressText:) frame: (0.16(a)0.86 corner: 0.27(a)0.91); addMorph: (self addressTextMorph:'Type the high address of the histogram here' get: #highAddressText set: #highAddressText:) frame: (0.88(a)0.86 corner: 0.99(a)0.91); addMorph: (self totalTextMorph: 'Shows the total number of samples' get: #totalText) frame: (0.88(a)0.92 corner: 0.99(a)0.98); "symbol list check-box filters" addMorph: (self checkMorph: 'show module symbols' get: #showingModules set: #toggleShowModules) frame: (0.16(a)0.915 corner: 0.175(a)0.93); addMorph: (buttons addLast: (StringMorph contents: 'modules')) frame: (0.19(a)0.915 corner: 0.27(a)0.93); addMorph: (self checkMorph: 'show extern symbols' get: #showingPublicFunctions set: #toggleShowPublicFunctions) frame: (0.16(a)0.935 corner: 0.175(a)0.95); addMorph: (buttons addLast: (StringMorph contents: 'externs')) frame: (0.19(a)0.935 corner: 0.27(a)0.95); addMorph: (self checkMorph: 'show static symbols' get: #showingPrivateFunctions set: #toggleShowPrivateFunctions) frame: (0.16(a)0.955 corner: 0.175(a)0.97); addMorph: (buttons addLast: (StringMorph contents: 'statics')) frame: (0.19(a)0.955 corner: 0.27(a)0.97); addMorph: (self checkMorph: 'show static symbols' get: #showingLabels set: #toggleShowLabels) frame: (0.16(a)0.975 corner: 0.175(a)0.99); addMorph: (buttons addLast: (StringMorph contents: 'labels')) frame: (0.19(a)0.975 corner: 0.27(a)0.99); "history buttons" addMorph: (self historyButtonMorph: #backwardsButton help: 'go back to previous selection' set: #regress enable: #hasHistory color: #hasHistoryColor) frame: (0.28(a)0.86 corner: 0.315(a)0.90); addMorph: (self historyButtonMorph: #forwardsButton help: 'go forward to next selection' set: #progress enable: #hasFuture color: #hasFutureColor) frame: (0.32(a)0.86 corner: 0.355(a)0.90); "profiling buttons" addMorph: (self buttonMorph: #drawButton help: 'plot the graph' set: #plotGraph enable: #notProfilingAndData color: #clearColor) frame: (0.37(a)0.86 corner: 0.45(a)0.91); addMorph: (self buttonMorph: #clearButton help: 'clear the histogram data' set: #clearProfile enable: #notProfiling color: #clearColor) frame: (0.46(a)0.86 corner: 0.54(a)0.91); addMorph: (self buttonMorph: #startButton help: 'start the profiler' set: #startProfiling enable: #notProfiling color: #profileColor) frame: (0.28(a)0.915 corner: 0.36(a)0.96); addMorph: (self buttonMorph: #stopButton help: 'stop the profiler' set: #stopProfiling enable: #profiling color: #stopColor) frame: (0.37(a)0.915 corner: 0.45(a)0.96); addMorph: (self buttonMorph: #profileExpressionButton help: 'compile and profile the expression to the right' set: #profileExpression enable: #notProfiling color: #profileColor) frame: (0.46(a)0.915 corner: 0.54(a)0.96); addMorph: expressionTextMorph frame: (0.55(a)0.86 corner: 0.87(a)0.98); addMorph: (self checkMorph: 'Run the full garbage collector prior to profiling' get: #gcPriorToProfile set: #toggleGcPriorToProfile) frame: (0.28(a)0.97 corner: 0.295(a)0.985); addMorph: (buttons addLast: (StringMorph contents: 'gc prior')) frame: (0.30(a)0.97 corner: 0.365(a)0.995); addMorph: (self checkMorph: 'Clear the profile prior to profiling' get: #clearPriorToProfile set: #toggleClearPriorToProfile) frame: (0.37(a)0.97 corner: 0.385(a)0.985); addMorph: (buttons addLast: (StringMorph contents: 'clear prior')) frame: (0.39(a)0.97 corner: 0.455(a)0.995); addMorph: (self checkMorph: 'Run the profiled expression in its own process' get: #forkProfile set: #toggleForkProfile) frame: (0.46(a)0.97 corner: 0.475(a)0.985); addMorph: (buttons addLast: (StringMorph contents: 'fork profile')) frame: (0.48(a)0.97 corner: 0.545(a)0.995). . "A Color transparent fillStyle used to be the default. What a pain that things change so radically from release to release!!" graph fillStyle: Color transparent. - "Cope with Squeak 4.1 SystemWindow background color changes" - window addMorph: (AlignmentMorph new color: Color white; yourself) frame: (0@0 corner: 1@1). self updateButtons. "weird!!" buttons do: [:buttonMorph| buttonMorph color: Color black]. "otherwise labels don't show :(" window openInWorld. self toggleShowing: #module. ^window! Item was added: + ----- Method: VMProfilerMacSymbolsManager>>filter: (in category 'initialize-release') ----- + filter: moduleList + "Some modules are giving us parsing problems at the moment. Just ignore them for now." + ^moduleList reject: [:t| #('CoreAUC' 'FaceCore' 'HIToolbox' 'VideoToolbox') anySatisfy: [:s| t name includesSubstring: s]]! Item was changed: ----- Method: VMProfilerMacSymbolsManager>>initializeMost (in category 'initialize-release') ----- initializeMost | shortNames | initialized := false. maxAddressMask := (2 raisedToInteger: 32) - 1. modulesByName := Dictionary new. symbolsByModule := Dictionary new. shortNames := Set new. modules := self primitiveExecutableModulesAndOffsets. (tempDir := self class tempDirectory) assureExistence. modules := (1 to: modules size by: 4) collect: [:i| | shortName counter | shortName := tempDir localNameFor: (modules at: i). counter := 0. [shortNames includes: shortName] whileTrue: [counter := counter + 1. shortName := (tempDir localNameFor: (modules at: i)), counter printString]. shortNames add: shortName. (modulesByName at: (modules at: i) put: VMPExecutableModuleSymbol new) name: (modules at: i); shortName: shortName; vmshift: (modules at: i + 1); address: (maxAddressMask bitAnd: (modules at: i + 2) + (modules at: i + 1)); size: (modules at: i + 3)]. + modules := self filter: modules. "The primitive always answers the VM info in the first entry." vmModule := modules first. modules := modules asSortedCollection: [:m1 :m2| m1 address <= m2 address]! Item was changed: ----- Method: VMProfilerMacSymbolsManager>>parseSymbolsFor: (in category 'parsing') ----- parseSymbolsFor: module | arch proc symtab symStream | + arch := (Smalltalk image getSystemAttribute: 1003) caseOf: { + ['intel'] -> ['i386']. + ['x64'] -> ['x86_64']. + }. - arch := 'i386'. "for now; needs to be fetched from a systemAttribute sometime soon." (tempDir fileExists: module shortName) ifFalse: [proc := OSProcess thisOSProcess command: 'cd ', tempDir fullName, ';nm -n -arch ', arch, ' -f "', module name, '" | grep -v " [aAU] " >"', module shortName, '"']. symStream := (Array new: 1000) writeStream. symStream nextPut: module. proc ifNotNil: [[proc isComplete] whileFalse: [(Delay forMilliseconds: 25) wait]]. symtab := [StandardFileStream readOnlyFileNamed: (tempDir fullNameFor: module shortName)] on: Error do: [:ex| "Handle flaky OSProcess stuff by reporting error and failing to parse" Transcript print: ex; flush. ^nil]. + module shortName = 'HIToolbox' ifTrue: [self halt]. [| prev | prev := self parseSymbolsFrom: symtab to: symStream. + "CoreAUC has a huge chunk of data at the end of its text segment that causes the profiler to spend ages + counting zeros. Hack fix by setting the end of the last symbol in the text segment to a little less than 1Mb." + "00000000000f1922 retq" "Mavericks 13.4" + "00000000000f3b21 retq" "Yosemite 14.5" + module shortName = 'CoreAUC' ifTrue: [prev limit: 16rf8000]. symbolsByModule at: module put: (self relocateSymbols: symStream contents allButFirst inModule: module). (prev notNil and: [prev limit isNil]) ifTrue: [prev limit: module limit]] ensure: [symtab close]! Item was changed: ----- Method: VMProfilerSymbolsManager>>symbolsWithTypes: (in category 'accessing') ----- symbolsWithTypes: aSet | size stream | + (aSet size = 1 and: [aSet anyOne == #module]) ifTrue: - aSet = (Set with: #module) ifTrue: [^modules]. size := symbolsByModule inject: 0 into: [:sum :symbols| sum + symbols size]. stream := (Array new: size) writeStream. modules do: [:module| (symbolsByModule at: module) do: [:sym| (aSet includes: sym type) ifTrue: [stream nextPut: sym]]]. ^stream contents!

1 0

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 2016