Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

[commit][3612] Fix argument access on the iOS platform.
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3612 Author: eliot Date: 2016-02-15 21:35:08 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix argument access on the iOS platform. Comment the Pharo makefiles correctly. Use -DBUILDFOR_OSX=1 for convenience. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/pharo.cog.spur/Makefile branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/pharo.cog.spur/Makefile branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-16 05:35:08 UTC (rev 3612) @@ -11,7 +11,7 @@ TARGET_ARCH:=i386 TARGET_VERSION_MIN:=10.6 -CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX \ +CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ -fvisibility=hidden -fwrapv \ Modified: branches/Cog/build.macos32x86/pharo.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/Makefile 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/build.macos32x86/pharo.cog.spur/Makefile 2016-02-16 05:35:08 UTC (rev 3612) @@ -1,5 +1,5 @@ ############################################################################## -# Makefile for Mac OS X Cog Spur Squeak Cocoa VM using clang and gnu make 3.81 +# Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81 # Do make init to allow make -n to function. # Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-16 05:35:08 UTC (rev 3612) @@ -11,7 +11,7 @@ TARGET_ARCH:=x86_64 TARGET_VERSION_MIN:=10.6 -CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX \ +CFLAGS:=$(CFLAGS) -DBUILD_FOR_OSX=1 \ -arch $(TARGET_ARCH) \ -mmacosx-version-min=$(TARGET_VERSION_MIN) -msse4.2 \ -fvisibility=hidden -fwrapv \ Modified: branches/Cog/build.macos64x64/pharo.cog.spur/Makefile =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/Makefile 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/build.macos64x64/pharo.cog.spur/Makefile 2016-02-16 05:35:08 UTC (rev 3612) @@ -1,5 +1,5 @@ ############################################################################## -# Makefile for Mac OS X Cog Spur Squeak Cocoa VM using clang and gnu make 3.81 +# Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81 # Do make init to allow make -n to function. # Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Feb 15 16:17:25 PST 2016 + Mon Feb 15 21:33:16 PST 2016 Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m 2016-02-16 05:35:08 UTC (rev 3612) @@ -85,7 +85,15 @@ return (char *) [[self.commandLineArguments objectAtIndex: -indexNumber] cStringUsingEncoding:[self currentVMEncoding]]; } #endif - } else { + } +#if BUILD_FOR_OSX + else if (indexNumber >= 2 && indexNumber <= 1000) { + if (indexNumber < [self.commandLineArguments count]) { + return (char *) [[self.commandLineArguments objectAtIndex: indexNumber] cStringUsingEncoding:[self currentVMEncoding]]; + } + } +#endif + else { switch (indexNumber) { case 0: return [[[[NSBundle mainBundle] executablePath] precomposedStringWithCanonicalMapping] UTF8String]; Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m =================================================================== --- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2016-02-16 02:24:48 UTC (rev 3611) +++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+attributes.m 2016-02-16 05:35:08 UTC (rev 3612) @@ -68,7 +68,11 @@ if (myattr == gestaltPowerPC) return "powerpc"; if (myattr == gestaltIntel) +#if defined(x86_64) || defined(__amd64) || defined(__x86_64) || defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) + return "x64"; +#else return "intel"; +#endif return "unknown"; }

1 0

Re: [Pharo-dev] Compiling the unix vm / spur
by Eliot Miranda 16 Feb '16

16 Feb '16

On Mon, Feb 15, 2016 at 7:44 PM, Ben Coman <btc(a)openinworld.com> wrote: > On Tue, Feb 16, 2016 at 3:45 AM, Eliot Miranda <eliot.miranda(a)gmail.com> > wrote: > > That's a bug in the CMake code > > (which I hope will be history in a few months). > > Are you indicating using an alternative build system? > yes. In http://www.squeakvm.org/svn/squeak/branches/Cog I have just replaced the Xcode.xcodeproj/project.pbxproj "build system", which offers no procedural abstraction at all, with a small set of Gnu Makefiles. The result is that each of the various VMs: (newspeak | squeak | pharo) x (sista | cog | stack) x (spur x v3) has a small Makefile such as build.macos32x86/pharo.cog.spur/Makefile: ############################################################################## # Makefile for Mac OS X Cog Spur Pharo Cocoa VM using clang and gnu make 3.81 # Do make init to allow make -n to function. # VMSRCDIR:= ../../spursrc/vm VM:=Pharo CFLAGS:=-DPharoVM=1 # Now include the Makefile proper, which is common to all Mac OS builds. # include ../common/Makefile.app build.macos32x86/squeak.stack.spur/Makefile ############################################################################## # Makefile for Mac OS X Stack Spur Squeak Cocoa VM using clang and gnu make 3.81 # Do make init to allow make -n to function. # VMSRCDIR:= ../../spurstacksrc/vm SOURCEFILE:=SqueakV50.sources # Now include the Makefile proper, which is common to all Mac OS builds. # include ../common/Makefile.app instead of over 700k of useless Xcode junk per build. In comparison each of the new build directories takes less than 2k of text (16k bytes on disc in 4 files) and the common makefiles (see e.g. http://www.squeakvm.org/svn/squeak/branches/Cog/build.macos32x86/common) takes less than 24k of text (44k bytes on disc in 8 files). The new build system seems no slower, and it also signs the .app bundle. his is, IMO, a huge improvement over both Xcode and CMake. The makefiles are reasonably easy to modify. They're based on Andreas' makefiles for Win32. I've been able to simplify both and am finally getting some familiarity with gnu Make's set of functions. It's very satisfying to replace of the order of 6 Mb of make junk that requires an entire IDE to edit with less than 300k of stuff. It also means I have more or less the same build system on win32 and Mac OS X. I think I may replace the Unix autoconf scheme with something similar. The only thing that's lacking in my scheme is a CMake or autoconf step to determine the platform's capabilities (to generate a config.h). If I do this right I think autoconf/CMake can be run once to initialize the build system, rather than once for every build. The intuition is that the platform doesn't change and the autoconf/CMake probe of the underlying platform can be done once and shared between all the builds. Then it needs to be redone on major OS upgrades, etc. But it /doesn't/ need to be done on every build. And gnu Make makes it easy to call-out to a common makefile that will run the autoconf/CMake step as required by the first build. $(realpath ...) is one's friend. btw, last week I came across Ninja [1], a static build system designed > to be used higher level generators, which for us could be Smalltalk. > [1] http://jpospisil.com/2014/03/16/replacing-make-with-ninja.html i don't mean to sound negative or arrogant but Ninja doesn't offer enough syntactic abstraction to be worth it. For example the rules given on that page are not much simpler than the rules in http://www.squeakvm.org/svn/squeak/branches/Cog/build.macos32x86/common/Mak…. So IMO the right approach is a per-OS set of gnu Makefiles, all of which share more or less the same architecture, plus an autoconf/CMake step to generate the config.h file that includes all the relevant information about the underlying platform. Here's the kidn of information I mean. This is a subset of the generated config.h file on e.g. linux32x86. Right now generating this for every build takes a substantial fraction of the overall build time, not an issue for a slave, but a real issue for someone doing their own VM builds, and it's unnecessary replcation. #define USE_X11 1 #define USE_X11_GLX 1 /* #undef USE_QUARTZ */ /* #undef USE_QUARTZ_CGL */ /* #undef USE_RFB */ /* libraries */ /* #undef HAVE_LIBX11 */ #define HAVE_LIBXEXT 1 #define HAVE_LIBDL 1 /* #undef HAVE_DYLD */ /* #undef HAVE_LIBFFI */ /* #undef HAVE_ICONV */ /* #undef USE_AUDIO_NONE */ /* #undef USE_AUDIO_SUN */ /* #undef USE_AUDIO_NAS */ /* #undef USE_AUDIO_OSS */ /* #undef USE_AUDIO_MACOSX */ /* #undef OSS_DEVICE */ /* header files */ #define HAVE_UNISTD_H 1 /* #undef NEED_GETHOSTNAME_P */ #define HAVE_DIRENT_H 1 /* #undef HAVE_SYS_NDIR_H */ /* #undef HAVE_SYS_DIR_H */ /* #undef HAVE_NDIR_H */ #define HAVE_DLFCN_H 1 #define HAVE_ICONV_H 1 #define HAVE_SYS_TIME_H 1 #define TIME_WITH_SYS_TIME 1 cheers -ben > _,,,^..^,,,_ best, Eliot

1 0

[commit][3611] Enlightenment arrives in tiny scintillae.
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3611 Author: eliot Date: 2016-02-15 18:24:48 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Enlightenment arrives in tiny scintillae. Nuke eitheror in favour of $(firstword $(realpath ... Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.win32x86/common/Makefile Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 02:24:48 UTC (rev 3611) @@ -42,7 +42,6 @@ BLDDIR:= $(BUILD) OBJDIR:= $(BLDDIR)/vm -# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below PLATDIR:=../../platforms CROSSDIR:=$(PLATDIR)/Cross/vm OSXDIR:=$(PLATDIR)/iOS/vm/OSX @@ -206,7 +205,8 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) +#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) +plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 02:24:48 UTC (rev 3611) @@ -42,7 +42,6 @@ BLDDIR:= $(BUILD) OBJDIR:= $(BLDDIR)/vm -# N.B. PLATDIR *must* be a relative path, see -f../../$(shell test -f ...) below PLATDIR:=../../platforms CROSSDIR:=$(PLATDIR)/Cross/vm OSXDIR:=$(PLATDIR)/iOS/vm/OSX @@ -206,7 +205,8 @@ # .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle -plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) +#plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo ../common/Makefile.plugin) +plugin-makefile = $(realpath $(OSXPLUGINSDIR)/$(1)/Makefile ../common/Makefile.plugin) # Internal plugin. Build as lib then link in lib # Check for Makefile in iOS plugins directory otherwise use default Makefile Modified: branches/Cog/build.win32x86/common/Makefile =================================================================== --- branches/Cog/build.win32x86/common/Makefile 2016-02-16 02:09:44 UTC (rev 3610) +++ branches/Cog/build.win32x86/common/Makefile 2016-02-16 02:24:48 UTC (rev 3611) @@ -44,7 +44,6 @@ PLUGINSRCDIR:= ../../src OBJDIR:= $(BUILD)/vm -# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below PLATDIR:=../../platforms CROSSDIR:=$(PLATDIR)/Cross/vm WIN32DIR:=$(PLATDIR)/win32/vm @@ -102,7 +101,7 @@ ETOBJ:= $(OBJDIR)/etext.o -.PRECIOUS: eitheror.exe mkNamedPrims.exe +.PRECIOUS: mkNamedPrims.exe ############################################################################# # DirectX definitions @@ -219,27 +218,27 @@ $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug THREADING=single $(@,debug=) default # Do make init to allow make -n to function. -init: $(OBJDIR) eitheror.exe mkNamedPrims.exe +init: $(OBJDIR) mkNamedPrims.exe cleanall: clean cleanmt cleanast cleanmtast cleandbg cleanmtdbg clean: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build + rm -rf sqNamedPrims.h mkNamedPrims.exe build cleanmt: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmt + rm -rf sqNamedPrims.h mkNamedPrims.exe buildmt cleanast: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast + rm -rf sqNamedPrims.h mkNamedPrims.exe buildast cleanmtast: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtast + rm -rf sqNamedPrims.h mkNamedPrims.exe buildmtast cleandbg: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg + rm -rf sqNamedPrims.h mkNamedPrims.exe builddbg cleanmtdbg: - rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildmtdbg + rm -rf sqNamedPrims.h mkNamedPrims.exe buildmtdbg nukelibs: rm $(LIBS) @@ -263,9 +262,6 @@ @echo VMOBJ=$(VMOBJ) @echo ----------------------------------------------------- -eitheror.exe: $(WIN32UTILDIR)/eitheror.c - $(CC) -o $@ -O1 -mconsole -mno-cygwin $< - mingw32ver.exe: $(WIN32UTILDIR)/mingw32ver.c $(CC) -o $@ -O1 -mconsole -mno-cygwin $< @@ -325,12 +321,12 @@ .PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.dll # Check for Makefile in win32 plugins directory otherwise use default Makefile -plugin-makefile = $(shell ./eitheror.exe \ +plugin-makefile = $(firstword $(realpath \ $(PLATDIR)/win32/plugins/$(*F)/Makefile.plugin \ - ../common/Makefile.plugin) + ../common/Makefile.plugin)) # Internal plugin. Build as lib then link in lib -$(OBJDIR)/%.lib: eitheror.exe $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.lib: $(call plugin-makefile,$(*F)) @-mkdir $(BUILD)/$(*F) $(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) \ @@ -339,7 +335,7 @@ $(OBJDIR)/$(*F).lib # External plugin. Build as dll and copy to vm dir ($(OBJDIR)). -$(OBJDIR)/%.dll: eitheror.exe $(call plugin-makefile,$(*F)) +$(OBJDIR)/%.dll: $(call plugin-makefile,$(*F)) @-mkdir $(BUILD)/$(*F) $(MAKE) $(MFLAGS) CONFIGURATION=$(CONFIGURATION) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) \

1 0

[commit][3610] Make the Mac makefiles look for and use the most up-to-date SDK available (until
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3610 Author: eliot Date: 2016-02-15 18:09:44 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Make the Mac makefiles look for and use the most up-to-date SDK available (until a 10.13 is introduced). Eliinate unnecessary quotes in ifeq constructs in the gnu Makefiles. Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.app branches/Cog/build.macos32x86/common/Makefile.flags branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos64x64/common/Makefile.app branches/Cog/build.macos64x64/common/Makefile.flags branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.win32x86/common/Makefile branches/Cog/build.win32x86/common/Makefile.plugin Modified: branches/Cog/build.macos32x86/common/Makefile.app =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-16 02:09:44 UTC (rev 3610) @@ -24,9 +24,9 @@ # debug. Optional. Defaults to product. The default is overridden in mvm script -ifeq ("$(CONFIGURATION)","debug") +ifeq ($(CONFIGURATION),debug) APP:=CocoaDebug.app -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) APP:=CocoaAssert.app else # default CONFIGURATION=product => CocoaFast.app APP:=CocoaFast.app Modified: branches/Cog/build.macos32x86/common/Makefile.flags =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos32x86/common/Makefile.flags 2016-02-16 02:09:44 UTC (rev 3610) @@ -5,7 +5,9 @@ XCODE:=/Applications/Xcode.app/Contents/Developer XCUB:=$(XCODE)/usr/bin -SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk +SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs +SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk +SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs)))) TARGET_ARCH:=i386 TARGET_VERSION_MIN:=10.6 Modified: branches/Cog/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-16 02:09:44 UTC (rev 3610) @@ -15,11 +15,11 @@ # SRCDIRS supplies additional directories containing files to compile. # VM config flags. -ifeq ("$(CONFIGURATION)","product") +ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -g -O1 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=0 BUILD:=buildast Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610) @@ -31,9 +31,9 @@ # Build directories # -ifeq ("$(CONFIGURATION)","assert") +ifeq ($(CONFIGURATION),assert) BUILD:=buildast -else ifeq ("$(CONFIGURATION)","debug") +else ifeq ($(CONFIGURATION),debug) BUILD:=builddbg else # default CONFIGURATION=product BUILD:=build @@ -88,11 +88,11 @@ # VM config flags. -ifeq ("$(CONFIGURATION)","debug") +ifeq ($(CONFIGURATION),debug) OFLAGS:= -g -O0 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=1 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -g -O1 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=0 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' Modified: branches/Cog/build.macos64x64/common/Makefile.app =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.app 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos64x64/common/Makefile.app 2016-02-16 02:09:44 UTC (rev 3610) @@ -24,9 +24,9 @@ # debug. Optional. Defaults to product. The default is overridden in mvm script -ifeq ("$(CONFIGURATION)","debug") +ifeq ($(CONFIGURATION),debug) APP:=CocoaDebug.app -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) APP:=CocoaAssert.app else # default CONFIGURATION=product => CocoaFast.app APP:=CocoaFast.app Modified: branches/Cog/build.macos64x64/common/Makefile.flags =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos64x64/common/Makefile.flags 2016-02-16 02:09:44 UTC (rev 3610) @@ -5,7 +5,9 @@ XCODE:=/Applications/Xcode.app/Contents/Developer XCUB:=$(XCODE)/usr/bin -SDK:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk +SDKsDIR:=$(XCODE)/Platforms/MacOSX.platform/Developer/SDKs +SDKs:=MacOSX10.12.sdk MacOSX10.11.sdk MacOSX10.10.sdk MacOSX10.9.sdk +SDK:=$(firstword $(realpath $(addprefix $(SDKsDIR)/, $(SDKs)))) TARGET_ARCH:=x86_64 TARGET_VERSION_MIN:=10.6 Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-16 02:09:44 UTC (rev 3610) @@ -15,11 +15,11 @@ # SRCDIRS supplies additional directories containing files to compile. # VM config flags. -ifeq ("$(CONFIGURATION)","product") +ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 BUILD:=build -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -g -O1 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=0 BUILD:=buildast Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-16 02:09:44 UTC (rev 3610) @@ -31,9 +31,9 @@ # Build directories # -ifeq ("$(CONFIGURATION)","assert") +ifeq ($(CONFIGURATION),assert) BUILD:=buildast -else ifeq ("$(CONFIGURATION)","debug") +else ifeq ($(CONFIGURATION),debug) BUILD:=builddbg else # default CONFIGURATION=product BUILD:=build @@ -88,11 +88,11 @@ # VM config flags. -ifeq ("$(CONFIGURATION)","debug") +ifeq ($(CONFIGURATION),debug) OFLAGS:= -g -O0 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=1 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -g -O1 -fno-omit-frame-pointer DEBUGVM=-DDEBUGVM=0 INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' Modified: branches/Cog/build.win32x86/common/Makefile =================================================================== --- branches/Cog/build.win32x86/common/Makefile 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.win32x86/common/Makefile 2016-02-16 02:09:44 UTC (rev 3610) @@ -53,7 +53,7 @@ CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) -ifeq ("$(THREADING)","multi") +ifeq ($(THREADING),multi) MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interpmt.c $(VMSRCDIR)/cogit.c) else MAKERSRC:= $(wildcard $(VMSRCDIR)/gcc3x-*interp.c $(VMSRCDIR)/cogit.c) @@ -80,7 +80,7 @@ ############################################################################# # SqueakVM definitions # -ifeq ("$(CONFIGURATION)","product") +ifeq ($(CONFIGURATION),product) VMEXE:= $(OBJDIR)/$(VM)Unstripped.exe CONSOLEVMEXE:= $(OBJDIR)/$(VM)ConsoleUnstripped.exe STRIPEXE:= $(OBJDIR)/$(VM).exe @@ -115,11 +115,11 @@ CC:=gcc # VM config flags. -ifeq ("$(CONFIGURATION)","product") +ifeq ($(CONFIGURATION),product) OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops NDEBUG:=-DNDEBUG -D'VM_LABEL(foo)=0' # Define NDEBUG for production to exclude asserts DEBUGVM=0 -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer DEBUGVM=0 NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' @@ -129,7 +129,7 @@ NDEBUG:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0' endif -ifeq ("$(THREADING)","multi") +ifeq ($(THREADING),multi) COGDEFS:=-DCOGMTVM=1 -DDEBUGVM=$(DEBUGVM) else COGDEFS:=-DCOGMTVM=0 -DDEBUGVM=$(DEBUGVM) Modified: branches/Cog/build.win32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-16 01:43:13 UTC (rev 3609) +++ branches/Cog/build.win32x86/common/Makefile.plugin 2016-02-16 02:09:44 UTC (rev 3610) @@ -55,12 +55,12 @@ -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ $(NDEBUG) -DLSB_FIRST -DVM_NAME=\"$(VM)\" -DX86 $(XDEFS) # define _MT to eliminate the inline versions of printf et al in mingw/stdio.h -ifeq ("$(CONFIGURATION)","product") +ifeq ($(CONFIGURATION),product) OFLAGS:= -D_MT -O1 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops \ -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf NDEBUG:=-DNDEBUG DEBUGVM=0 -else ifeq ("$(CONFIGURATION)","assert") +else ifeq ($(CONFIGURATION),assert) OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer \ -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf DEBUGVM=0

1 0

[commit][3609] Fix bug in the squeak start script when running a 64-bit image with a startup script on the command line .
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3609 Author: lewis Date: 2016-02-15 17:43:13 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix bug in the squeak start script when running a 64-bit image with a startup script on the command line. If a start script was specified on the command line after the image name, the squeak script picked that as the image name, and ended up selecting the wrong VM for running the image. Modified Paths: -------------- trunk/platforms/unix/cmake/squeak.in Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2016-02-16 01:40:45 UTC (rev 3608) +++ trunk/platforms/unix/cmake/squeak.in 2016-02-16 01:43:13 UTC (rev 3609) @@ -56,7 +56,7 @@ -vm) shift; case "$1" in sound*) useoss="false"; esac;; -image-info) info="true";; --) break;; - *) if test -f "$1.image" -o -f "$1"; then image="$1"; fi;; + *) if test ! "$image" -a $ -f "$1.image" -o -f "$1" $; then image="$1"; fi;; esac shift done

1 0

[commit][3608] And another one bites the dust.
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3608 Author: eliot Date: 2016-02-15 17:40:45 -0800 (Mon, 15 Feb 2016) Log Message: ----------- And another one bites the dust. (sigh) Modified Paths: -------------- branches/Cog/scripts/uploadvms Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-02-16 01:35:42 UTC (rev 3607) +++ branches/Cog/scripts/uploadvms 2016-02-16 01:40:45 UTC (rev 3608) @@ -84,7 +84,7 @@ -n) LNSSPUR=1;MNSSPUR=1;WNSSPUR=1;LNSSPUR64=1;MNSSPUR64=1; CheckDMG=1;CheckMSI=1;; -p) MPSPUR=1;MPSPUR64=1;; - -l) LCOG=1;LTCOG=1;LSPUR=1;LASPUR=1;LNSSPUR=1;; + -l) LCOG=1;LTCOG=1;LSPUR=1;LASPUR=1;LNSSPUR=1;LSPUR64=1;LNSSPUR64=1;; -m) MCOG=1;MTCOG=1;MSPUR=1;MNSSPUR=1;MSPUR64=1;MPSPUR=1;MPSPUR64=1; CheckDMG=1;; -w) WCOG=1;WTCOG=1;WSPUR=1;WNSSPUR=1;

1 0

[commit][3607] Fix snafus in the linux 64-bit archive creation and upload
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3607 Author: eliot Date: 2016-02-15 17:35:42 -0800 (Mon, 15 Feb 2016) Log Message: ----------- Fix snafus in the linux 64-bit archive creation and upload Modified Paths: -------------- branches/Cog/scripts/mkspur64vmarchives branches/Cog/scripts/uploadvms Modified: branches/Cog/scripts/mkspur64vmarchives =================================================================== --- branches/Cog/scripts/mkspur64vmarchives 2016-02-16 00:21:53 UTC (rev 3606) +++ branches/Cog/scripts/mkspur64vmarchives 2016-02-16 01:35:42 UTC (rev 3607) @@ -68,7 +68,7 @@ for d in . assert debug; do (cd $d set -- nscogspur64linux nscogspur64linuxht nscogspur64linuxhtARM - for archive in nsvmspurlinux nsvmspurlinuxht nsvmspurlinuxhtARM; do + for archive in nsvmspur64linux nsvmspur64linuxht nsvmspur64linuxhtARM; do rm -rf $archive-$TAG.tgz echo $1 '=>' $archive-$TAG.tgz COPYFILE_DISABLE=1 tar czf $archive-$TAG.tgz $1 @@ -152,7 +152,7 @@ fi if [ -n "$NW" ]; then set -- build/vm buildast/vm builddbg/vm - for dir in nsvmspurwin assert/nsvmspurwin debug/nsvmspurwin; do + for dir in nsvmspur64win assert/nsvmspur64win debug/nsvmspur64win; do test -d $dir || mkdir $dir if [ -d ../build.win64x64/$NSB/$1 ]; then rm -rf $dir/* $dir-$TAG.zip Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2016-02-16 00:21:53 UTC (rev 3606) +++ branches/Cog/scripts/uploadvms 2016-02-16 01:35:42 UTC (rev 3607) @@ -137,6 +137,8 @@ test -n "$WTSPUR" && ARCHIVES="$ARCHIVES cogspurmtwin-$TAG.zip" test -n "$LNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurlinux-$TAG.tgz nsvmspurlinuxht-$TAG.tgz nsvmspurlinuxhtARM-$TAG.tgz" +test -n "$LNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurlinux-$TAG.tgz nsvmspurlinuxht-$TAG.tgz nsvmspurlinuxhtARM-$TAG.tgz" +test -n "$LNSSPUR64" && ARCHIVES="$ARCHIVES nsvmspur64linux-$TAG.tgz nsvmspur64linuxht-$TAG.tgz nsvmspur64linuxhtARM-$TAG.tgz" test -n "$MNSSPUR" && ARCHIVES="$ARCHIVES Newspeak Spur Virtual Machine-$TAG.dmg Newspeak Spur Virtual Machine.app-$TAG.tgz" test -n "$WNSSPUR" && ARCHIVES="$ARCHIVES nsvmspurwin-$TAG.zip nsvm-spur-$TAG.msi" test -n "$MNSSPUR64" && ARCHIVES="$ARCHIVES Newspeak Spur 64-bit Virtual Machine-$TAG.dmg Newspeak Spur 64-bit Virtual Machine.app-$TAG.tgz"

1 0

[commit][3606] CogVM source as per VMMaker.oscog-eem.1680
by commits＠squeakvm.org 16 Feb '16

16 Feb '16

Revision: 3606 Author: eliot Date: 2016-02-15 16:21:53 -0800 (Mon, 15 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1680 Spur. Fix https://pharo.fogbugz.com/f/cases/17536/VM-Crash-when-adding-an-iVar-to-a-s…. When weaklings (and when ephemerons) are scan-marked forwarders must be coped with. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2442,7 +2442,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17850,7 +17850,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -51451,17 +51451,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0LL << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0LL << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -56068,6 +56064,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -56076,11 +56073,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key))) >> 55) & 1) != 0)) { @@ -60613,10 +60616,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -60656,9 +60661,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (((long)i1) << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -60743,9 +60755,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60941,11 +60953,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -61028,9 +61046,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan1); + objOop12 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -61274,9 +61292,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan2); + objOop13 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -61518,7 +61536,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66883,7 +66901,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67126,7 +67144,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67470,7 +67488,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2445,7 +2445,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17859,7 +17859,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - signed char accessorDepth; + sqInt accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -51460,17 +51460,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0LL << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0LL << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -56077,6 +56073,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -56085,11 +56082,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key))) >> 55) & 1) != 0)) { @@ -60622,10 +60625,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -60665,9 +60670,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (((long)i1) << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -60752,9 +60764,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60950,11 +60962,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -61037,9 +61055,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan1); + objOop12 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -61283,9 +61301,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan2); + objOop13 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -61527,7 +61545,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66892,7 +66910,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - usqInt clifton; + sqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67135,7 +67153,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67479,7 +67497,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - usqInt pier2; + sqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGenerator VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2411,7 +2411,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -50723,17 +50723,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -55300,6 +55296,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -55308,11 +55305,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key + 4))) >> 23) & 1) != 0)) { @@ -59724,10 +59727,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -59767,9 +59772,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (i1 << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field + 4))) >> 23) & 1) != 0))) { /* begin markAndTrace: */ @@ -59852,9 +59864,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60046,11 +60058,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -60131,9 +60149,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan1); + objOop12 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -60371,9 +60389,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan2); + objOop13 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -60611,7 +60629,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66203,7 +66221,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -66332,7 +66350,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -66547,7 +66565,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2414,7 +2414,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1680"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -50732,17 +50732,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0 << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -55309,6 +55305,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -55317,11 +55314,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key + 4))) >> 23) & 1) != 0)) { @@ -59733,10 +59736,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -59776,9 +59781,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (i1 << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (i << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field + 4))) >> 23) & 1) != 0))) { /* begin markAndTrace: */ @@ -59861,9 +59873,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -60055,11 +60067,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0 << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -60140,9 +60158,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan1); + objOop12 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -60380,9 +60398,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan2); + objOop13 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) >> 1)) & ((1 << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -60620,7 +60638,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -66212,7 +66230,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -66341,7 +66359,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt bridge; + usqInt bridge; usqInt bridgehead; usqInt bridgeSpan; sqInt bytesRead; @@ -66556,7 +66574,7 @@ usqLong firstSavedBridgeWord; sqInt nWritten; usqInt pier1; - sqInt pier2; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - StackInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2185,7 +2185,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1680"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -38177,17 +38177,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0LL << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0LL << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -42766,6 +42762,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -42774,11 +42771,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key))) >> 55) & 1) != 0)) { @@ -47163,10 +47166,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -47205,9 +47210,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (((long)i1) << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -47292,9 +47304,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -47480,11 +47492,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -47567,9 +47585,9 @@ } if (fmt1 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop11 = fetchClassOfNonImm(objToScan1); + objOop12 = fetchClassOfNonImm(objToScan1); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots1 = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots1 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l13; } } @@ -47805,9 +47823,9 @@ } if (fmt2 == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop12 = fetchClassOfNonImm(objToScan2); + objOop13 = fetchClassOfNonImm(objToScan2); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots2 = (((longAt((objOop12 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots2 = (((longAt((objOop13 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l15; } } @@ -57784,7 +57802,7 @@ sqInt referent2; sqInt referent3; char *theFP; - usqInt theIPPtr; + char *theIPPtr; StackPage *thePage; /* begin externalWriteBackHeadFramePointers */ @@ -57835,11 +57853,11 @@ theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 - : ((usqInt)((thePage->headSP)))); + : (thePage->headSP)); while (1) { assert(addressIsInPage(thePage, theFP)); assert((theIPPtr == 0) - || (addressIsInPage(thePage, ((void *)theIPPtr)))); + || (addressIsInPage(thePage, theIPPtr))); oop = longAt(theFP + FoxReceiver); if (((oop & (tagMask())) == 0) && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2016-02-15 19:28:01 UTC (rev 3605) +++ branches/Cog/nsspurstack64src/vm/interp.c 2016-02-16 00:21:53 UTC (rev 3606) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 from - StackInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 + StackInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1677 uuid: 7056bb77-6aa0-4cb6-aa6c-cd921c231d37 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1680 uuid: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2182,7 +2182,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1677"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1680"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -38168,17 +38168,13 @@ fixFollowedFieldofObjectwithInitialValue(sqInt fieldIndex, sqInt anObject, sqInt initialValue) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt objOop; - sqInt referent; assert(isOopForwarded(initialValue)); - /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(initialValue)); - referent = longAt((initialValue + BaseHeaderSize) + (0LL << (shiftForWord()))); - while (((referent & (tagMask())) == 0) - && (((longAt(referent)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { - referent = longAt((referent + BaseHeaderSize) + (0LL << (shiftForWord()))); - } - objOop = referent; + objOop = initialValue; + do { + objOop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + } while(((objOop & (tagMask())) == 0) + && (((longAt(objOop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))); /* begin storePointer:ofObject:withValue: */ assert(!(isForwarded(anObject))); if (isOldObject(anObject)) { @@ -42757,6 +42753,7 @@ sqInt objOop; sqInt objOop1; sqInt objToScan; + sqInt oop; usqInt ptr; sqInt scanLargeObject; sqInt sp; @@ -42765,11 +42762,17 @@ foundInactive = 0; ptr = (GIV(unscannedEphemerons).start); while (ptr < ((GIV(unscannedEphemerons).top))) { - /* begin keyOfEphemeron: */ + /* begin followedKeyOfEphemeron: */ objOop = (ephemeron = longAt(ptr)); assert((isNonImmediate(objOop)) && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop, oop); + } + key = oop; if (((key & (tagMask())) != 0) || (((((usqInt) (longAt(key))) >> 55) & 1) != 0)) { @@ -47154,10 +47157,12 @@ sqInt objOop1; sqInt objOop11; sqInt objOop12; + sqInt objOop13; sqInt objStackPage; sqInt objToScan; sqInt objToScan1; sqInt objToScan2; + sqInt oop; sqInt p; usqInt ptr; sqInt scanLargeObject; @@ -47196,9 +47201,16 @@ for (i1 = topIndex; i1 >= ((topIndex - numToEnumerateOnThisPage) + 1); i1 += -1) { assert(isWeak(fetchPointerofObject(i1, objStackPage))); weakling = longAt((objStackPage + BaseHeaderSize) + (((long)i1) << (shiftForWord()))); + assert(!((isForwarded(weakling)))); markAndTraceClassOf(weakling); for (i = 0, iLimiT = ((numStrongSlotsOfWeakling(weakling)) - 1); i <= iLimiT; i += 1) { - field = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + /* begin followObjField:ofObject: */ + objOop = longAt((weakling + BaseHeaderSize) + (((long)i) << (shiftForWord()))); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & ((classIndexMask()) - (isForwardedObjectClassIndexPun()))) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(i, weakling, objOop); + } + field = objOop; if (!(((field & (tagMask())) != 0) || (((((usqInt) (longAt(field))) >> 55) & 1) != 0))) { /* begin markAndTrace: */ @@ -47283,9 +47295,9 @@ } if (fmt == (weakArrayFormat())) { /* begin fixedFieldsOfClass: */ - objOop1 = fetchClassOfNonImm(objToScan); + objOop11 = fetchClassOfNonImm(objToScan); /* begin fixedFieldsOfClassFormat: */ - numStrongSlots = (((longAt((objOop1 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); + numStrongSlots = (((longAt((objOop11 + BaseHeaderSize) + (((long)InstanceSpecificationIndex) << (shiftForWord())))) >> 3)) & ((1LL << (fixedFieldsFieldWidth())) - 1); goto l20; } } @@ -47471,11 +47483,17 @@ assert(allUnscannedEphemeronsAreActive()); ptr = ((GIV(unscannedEphemerons).top)) - BytesPerWord; while (ptr >= ((GIV(unscannedEphemerons).start))) { - /* begin keyOfEphemeron: */ - objOop = (ephemeron = longAt(ptr)); - assert((isNonImmediate(objOop)) - && (isEphemeron(objOop))); - key = longAt((objOop + BaseHeaderSize) + (0LL << (shiftForWord()))); + /* begin followedKeyOfEphemeron: */ + objOop1 = (ephemeron = longAt(ptr)); + assert((isNonImmediate(objOop1)) + && (isEphemeron(objOop1))); + /* begin followOopField:ofObject: */ + oop = longAt((objOop1 + BaseHeaderSize) + (0LL << (shiftForWord()))); + if (((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == (isForwardedObjectClassIndexPun()))) { + oop = fixFollowedFieldofObjectwithInitialValue(0, objOop1, oop); + } + key = oop; /* begin markAndTrace: */ /* inline markAndShouldScan: */ @@ -47558,9 +47576,9 @@ } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1680.mcz
by commits＠source.squeak.org 16 Feb '16

16 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1680.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1680 Author: eem Time: 16 February 2016, 4:05:15.580798 pm UUID: 6fe34e1e-a5e0-4966-a2cd-3f21ccb0bde9 Ancestors: VMMaker.oscog-eem.1679 Spur. Fix https://pharo.fogbugz.com/f/cases/17536/VM-Crash-when-adding-an-iVar-to-a-s…. When weaklings (and when ephemerons) are scan-marked forwarders must be coped with. =============== Diff against VMMaker.oscog-eem.1679 =============== Item was changed: ----- Method: SpurMemoryManager>>fixFollowedField:ofObject:withInitialValue: (in category 'forwarding') ----- fixFollowedField: fieldIndex ofObject: anObject withInitialValue: initialValue "Private helper for followField:ofObject: to avoid code duplication for rare case." <inline: #never> | objOop | self assert: (self isOopForwarded: initialValue). + "inlined followForwarded: for speed (one less test)" + objOop := initialValue. + [objOop := self fetchPointer: 0 ofMaybeForwardedObject: objOop. + self isOopForwarded: objOop] whileTrue. - objOop := self followForwarded: initialValue. self storePointer: fieldIndex ofObject: anObject withValue: objOop. ^objOop! Item was added: + ----- Method: SpurMemoryManager>>followOopField:ofObject: (in category 'forwarding') ----- + followOopField: fieldIndex ofObject: anObject + "Make sure the oop at fieldIndex in anObject is not forwarded (follow the + forwarder there-in if so). Answer the (possibly followed) oop at fieldIndex." + | oop | + oop := self fetchPointer: fieldIndex ofObject: anObject. + (self isOopForwarded: oop) ifTrue: + [oop := self fixFollowedField: fieldIndex ofObject: anObject withInitialValue: oop]. + ^oop! Item was added: + ----- Method: SpurMemoryManager>>followedKeyOfEphemeron: (in category 'object access') ----- + followedKeyOfEphemeron: objOop + "Answer the object the ephemeron guards. This is its first element." + self assert: ((self isNonImmediate: objOop) and: [self isEphemeron: objOop]). + ^self followOopField: 0 ofObject: objOop! Item was changed: ----- Method: SpurMemoryManager>>markAllUnscannedEphemerons (in category 'weakness and ephemerality') ----- markAllUnscannedEphemerons "After firing the unscanned ephemerons we must scan-mark them. The wrinkle is that doing so may add more ephemerons to the set." | ptr | self assert: (self noUnscannedEphemerons) not. self assert: self allUnscannedEphemeronsAreActive. ptr := unscannedEphemerons top - self wordSize. [ptr >= unscannedEphemerons start] whileTrue: [| ephemeron key | + key := self followedKeyOfEphemeron: (ephemeron := self longAt: ptr). + self + markAndTrace: key; - key := self keyOfEphemeron: (ephemeron := self longAt: ptr). - self markAndTrace: key; markAndTrace: ephemeron. unscannedEphemerons top: unscannedEphemerons top - self wordSize. ptr < unscannedEphemerons top ifTrue: ["not the last entry; remove it by overwriting it with the last ephemeron (which must have been newly added by markAndTrace:)." self longAt: ptr put: (self longAt: unscannedEphemerons top)]. ptr := ptr - self wordSize]! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceWeaklingsFrom: (in category 'weakness and ephemerality') ----- markAndTraceWeaklingsFrom: startIndex "Mark weaklings on the weaklingStack, ignoring startIndex number of elements on the bottom of the stack. Answer the size of the stack *before* the enumeration began." ^self objStack: weaklingStack from: startIndex do: [:weakling| + self deny: (self isForwarded: weakling). self markAndTraceClassOf: weakling. "N.B. generateToByDoLimitExpression:negative:on: guards against (unsigned)0 - 1 going +ve" 0 to: (self numStrongSlotsOfWeakling: weakling) - 1 do: [:i| | field | + field := self followObjField: i ofObject: weakling. - field := self fetchPointer: i ofObject: weakling. ((self isImmediate: field) or: [self isMarked: field]) ifFalse: [self markAndTrace: field]]]! Item was changed: ----- Method: SpurMemoryManager>>markInactiveEphemerons (in category 'weakness and ephemerality') ----- markInactiveEphemerons "Go through the unscanned ephemerons, marking the inactive ones, and removing them from the unscanned ephemerons. Answer if any inactive ones were found. We cannot fire the ephemerons until all are found to be active since scan-marking an inactive ephemeron later in the set may render a previously-observed active ephemeron as inactive." | foundInactive ptr | foundInactive := false. ptr := unscannedEphemerons start. [ptr < unscannedEphemerons top] whileTrue: [| ephemeron key | + key := self followedKeyOfEphemeron: (ephemeron := self longAt: ptr). + ((self isImmediate: key) or: [self isMarked: key]) - key := self keyOfEphemeron: (ephemeron := self longAt: ptr). - ((self isImmediate: key) or: [self isMarked: key]) ifTrue: [foundInactive := true. "Now remove the inactive ephemeron from the set, and scan-mark it. Scan-marking it may add more ephemerons to the set." unscannedEphemerons top: unscannedEphemerons top - self wordSize. unscannedEphemerons top > ptr ifTrue: [self longAt: ptr put: (self longAt: unscannedEphemerons top)]. self markAndTrace: ephemeron] ifFalse: [ptr := ptr + self wordSize]]. ^foundInactive! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #theFP type: #'char *'> + <var: #theIPPtr type: #'char *'> - <var: #theIPPtr type: #usqInt> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theFP callerFP ptr oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." + theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP]. - theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. [self assert: (thePage addressIsInPage: theFP). + self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). - self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. ptr := (theFP + (self frameStackedReceiverOffset: theFP)) asInteger. oop := stackPages longAt: ptr. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asInteger. theFP := callerFP]. "And finally follow the caller context." self assert: theFP = thePage baseFP. oop := self frameCallerContext: theFP. (objectMemory isForwarded: oop) ifTrue: [self frameCallerContext: theFP put: (objectMemory followForwarded: oop)]]]!

1 0

Re: [Pharo-dev] Compiling the unix vm / spur
by Eliot Miranda 15 Feb '16

15 Feb '16

Hi Marcus, On Mon, Feb 15, 2016 at 10:37 AM, Markus Fritsche <mfritsche(a)reauktion.de> wrote: > Hi, > > I was just going to update the ubuntu ppa an wanted to supply a spur vm > image. The compilation stopped however: > > -- Configuring done > CMake Error at IA32FFIPlugin/CMakeLists.txt:11 (add_library): > Cannot find source file: > > > /home/mfritsche/src/pharo-vm-spur-2016.02.13/src/plugins/IA32FFIPlugin/IA32FFIPlugin.c > That's a bug in the CMake code (which I hope will be history in a few months). tt should be looking *only* for src/plugins/SqueakFFIPlugin/SqueakFFIPlugin.c which should include src/plugins/SqueakFFIPlugin/IA32FFIPlugin.c > Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp > .hxx .in .txx > > > Any hints? > > Kind regards, > Markus > > -- _,,,^..^,,,_ best, Eliot

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
15
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 February 2016