Revision: 3631 Author: eliot Date: 2016-02-24 11:25:16 -0800 (Wed, 24 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1699
First, it was Stephane Rollandin who found the perform: bug. Apologies for the misattribution.
Allow a plugin to override moduleName in generating its export table, via moduleExportsName. Hence fix compilation of the SqueakFFIPrims plugin as an internal plugin.
Also use a single variable to hold moduleExportsName in the generated source.
Make the SqueakFFIPrims plugin internal in the Mac pharo builds. Add a target to the Mac makefiles to allow printing a plugins prerequisites. This to try and debug why plugins are not remade unless FooPlugin.lib and/or FooPlugin.bundle are deleted.
Modified Paths: -------------- branches/Cog/build.macos32x86/common/Makefile.plugin branches/Cog/build.macos32x86/common/Makefile.vm branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int branches/Cog/build.macos64x64/common/Makefile.plugin branches/Cog/build.macos64x64/common/Makefile.vm branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c 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/scripts/mkspur64vmarchives branches/Cog/scripts/revertIfEssentiallyUnchanged branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c 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/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/BochsX64Plugin/BochsX64Plugin.c branches/Cog/src/plugins/CameraPlugin/CameraPlugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FileCopyPlugin/FileCopyPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/GdbARMPlugin/GdbARMPlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/HostWindowPlugin/HostWindowPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/ImmX11Plugin/ImmX11Plugin.c branches/Cog/src/plugins/InternetConfigPlugin/InternetConfigPlugin.c branches/Cog/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/LocalePlugin/LocalePlugin.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MacMenubarPlugin/MacMenubarPlugin.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SerialPlugin/SerialPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SoundPlugin/SoundPlugin.c branches/Cog/src/plugins/Squeak3D/Squeak3D.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UUIDPlugin/UUIDPlugin.c branches/Cog/src/plugins/UnicodePlugin/UnicodePlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/src/plugins/WeDoPlugin/WeDoPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c 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/build.macos32x86/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-24 19:25:16 UTC (rev 3631) @@ -15,6 +15,8 @@ # SRCDIRS supplies additional directories containing files to compile. # PREREQUISITES supplies names of files that must exist to make lib or bundle
+$(info $$(LIBNAME): $(LIBNAME)) + # VM config flags. ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os @@ -31,6 +33,7 @@ endif
CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) + # The following are the four key locations (set via invocation): # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree?
Modified: branches/Cog/build.macos32x86/common/Makefile.vm =================================================================== --- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-24 19:25:16 UTC (rev 3631) @@ -215,7 +215,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ @@ -225,6 +225,12 @@ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib
+prereqs/%.lib: + @-ls -rlt $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) + # It would be nice to have this abbreviation but it creates havoc eem 2/2016 #%.lib: $(OBJDIR)/%.lib # make $(MAKEFLAGS) $< @@ -236,7 +242,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.ext 2016-02-24 19:25:16 UTC (rev 3631) @@ -4,6 +4,5 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ UnixOSProcessPlugin
Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-24 19:25:16 UTC (rev 3631) @@ -26,6 +26,7 @@ SoundCodecPrims \ SoundGenerationPlugin \ SoundPlugin \ +SqueakFFIPrims \ StarSqueakPlugin \ SurfacePlugin \ UUIDPlugin \
Modified: branches/Cog/build.macos64x64/common/Makefile.plugin =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/common/Makefile.plugin 2016-02-24 19:25:16 UTC (rev 3631) @@ -15,6 +15,8 @@ # SRCDIRS supplies additional directories containing files to compile. # PREREQUISITES supplies names of files that must exist to make lib or bundle
+$(info $$(LIBNAME): $(LIBNAME)) + # VM config flags. ifeq ($(CONFIGURATION),product) OFLAGS:= -g -Os @@ -31,6 +33,7 @@ endif
CFLAGS:= $(CFLAGS) $(OFLAGS) $(COGDEFS) $(DEBUGVM) $(XDEFS) + # The following are the four key locations (set via invocation): # PLUGINSRCDIR: Where is the root of the src/plugins source tree? # VMSRCDIR: Where is the root of the src vm source tree?
Modified: branches/Cog/build.macos64x64/common/Makefile.vm =================================================================== --- branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/common/Makefile.vm 2016-02-24 19:25:16 UTC (rev 3631) @@ -215,7 +215,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm $(BUILD)/vm/$(*F).lib || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \ @@ -225,6 +225,12 @@ $(PLUGINHACK) \ $(OBJDIR)/$(*F).lib
+prereqs/%.lib: + @-ls -rlt $(call plugin-makefile,$(*F)) $(wildcard $(*F).ignore) \ + $(wildcard $(PLUGINSRCDIR)/$(*F)/*.c) \ + $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ + $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) + # It would be nice to have this abbreviation but it creates havoc eem 2/2016 #%.lib: $(OBJDIR)/%.lib # make $(MAKEFLAGS) $< @@ -236,7 +242,7 @@ $(wildcard $(PLATDIR)/Cross/plugins/$(*F)/*.*) \ $(wildcard $(OSXPLUGINSDIR)/$(*F)/*.*) @-mkdir -p $(BLDDIR)/$(*F) - test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).bundle || true + test $@ -ot $(call plugin-makefile,$(*F)) && rm -rf $(BUILD)/vm/$(*F).* || true rm -f $(BUILD)/vm/$(*F).ignore $(MAKE) $(MFLAGS) BUILD=$(BUILD) \ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.ext 2016-02-24 19:25:16 UTC (rev 3631) @@ -4,6 +4,5 @@ FloatArrayPlugin \ FloatMathPlugin \ Mpeg3Plugin \ -SqueakFFIPrims \ SqueakSSL \ UnixOSProcessPlugin
Modified: branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int =================================================================== --- branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/build.macos64x64/pharo.cog.spur/plugins.int 2016-02-24 19:25:16 UTC (rev 3631) @@ -26,6 +26,7 @@ SoundCodecPrims \ SoundGenerationPlugin \ SoundPlugin \ +SqueakFFIPrims \ StarSqueakPlugin \ SurfacePlugin \ UUIDPlugin \
Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -5883,12 +5883,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc;
Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __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.1693"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1699"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -17850,7 +17850,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -30067,7 +30067,7 @@ } /* begin success: */ successBoolean3 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == (extentX * extentY)); if (!successBoolean3) {
@@ -30112,7 +30112,7 @@ } /* begin success: */ successBoolean7 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean7) {
@@ -30156,7 +30156,7 @@ } /* begin success: */ successBoolean9 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean9) {
@@ -35142,7 +35142,7 @@ } rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35250,7 +35250,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35828,7 +35828,7 @@ if (!((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))))) {
/* Must be indexable words */ /* begin primitiveFail */ @@ -40522,7 +40522,7 @@ && ((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))))) {
/* Must be indexable words */ /* begin primitiveFail */ @@ -53934,7 +53934,7 @@ isWords(sqInt oop) { return ((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))); + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))); }
@@ -61538,7 +61538,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67275,7 +67275,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; @@ -77063,7 +77063,7 @@ return; } if (((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) { + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) { lastIndex = ((64 < ((numBytesOf(oop)) / BytesPerWord)) ? 64 : ((numBytesOf(oop)) / BytesPerWord)); if (lastIndex > 0) { for (index = 1; index <= lastIndex; index += 1) { @@ -84981,71 +84981,72 @@ }
+static char _m[] = ""; void* vm_exports[][3] = { - {"", "callbackEnter", (void*)callbackEnter}, - {"", "callbackLeave", (void*)callbackLeave}, - {"", "moduleUnloaded", (void*)moduleUnloaded}, - {"", "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, - {"", "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, - {"", "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, - {"", "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, - {"", "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, - {"", "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, - {"", "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, - {"", "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, - {"", "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, - {"", "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, - {"", "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, - {"", "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, - {"", "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, - {"", "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, - {"", "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, - {"", "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, - {"", "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, - {"", "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, - {"", "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, - {"", "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, - {"", "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, - {"", "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, - {"", "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, - {"", "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, - {"", "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, - {"", "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, - {"", "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, - {"", "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, - {"", "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, - {"", "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, - {"", "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, - {"", "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, - {"", "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, - {"", "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, - {"", "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, - {"", "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, - {"", "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, - {"", "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, - {"", "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, - {"", "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, - {"", "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, - {"", "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, - {"", "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, - {"", "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, - {"", "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, - {"", "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, - {"", "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, - {"", "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, - {"", "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, - {"", "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, - {"", "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, - {"", "printFramesInPage", (void*)printFramesInPage}, - {"", "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, - {"", "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, - {"", "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, - {"", "segmentContainingObj", (void*)segmentContainingObj}, - {"", "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, - {"", "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, - {"", "setInterruptCheckChain", (void*)setInterruptCheckChain}, - {"", "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, - {"", "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, + {(void*)_m, "callbackEnter", (void*)callbackEnter}, + {(void*)_m, "callbackLeave", (void*)callbackLeave}, + {(void*)_m, "moduleUnloaded", (void*)moduleUnloaded}, + {(void*)_m, "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, + {(void*)_m, "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, + {(void*)_m, "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, + {(void*)_m, "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, + {(void*)_m, "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, + {(void*)_m, "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, + {(void*)_m, "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, + {(void*)_m, "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, + {(void*)_m, "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, + {(void*)_m, "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, + {(void*)_m, "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, + {(void*)_m, "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, + {(void*)_m, "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, + {(void*)_m, "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, + {(void*)_m, "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, + {(void*)_m, "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, + {(void*)_m, "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, + {(void*)_m, "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, + {(void*)_m, "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, + {(void*)_m, "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, + {(void*)_m, "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, + {(void*)_m, "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, + {(void*)_m, "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, + {(void*)_m, "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, + {(void*)_m, "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, + {(void*)_m, "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, + {(void*)_m, "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, + {(void*)_m, "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, + {(void*)_m, "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, + {(void*)_m, "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, + {(void*)_m, "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, + {(void*)_m, "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, + {(void*)_m, "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, + {(void*)_m, "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, + {(void*)_m, "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, + {(void*)_m, "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, + {(void*)_m, "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, + {(void*)_m, "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, + {(void*)_m, "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, + {(void*)_m, "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, + {(void*)_m, "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, + {(void*)_m, "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, + {(void*)_m, "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, + {(void*)_m, "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, + {(void*)_m, "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, + {(void*)_m, "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, + {(void*)_m, "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, + {(void*)_m, "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, + {(void*)_m, "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, + {(void*)_m, "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, + {(void*)_m, "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, + {(void*)_m, "printFramesInPage", (void*)printFramesInPage}, + {(void*)_m, "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, + {(void*)_m, "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, + {(void*)_m, "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, + {(void*)_m, "segmentContainingObj", (void*)segmentContainingObj}, + {(void*)_m, "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, + {(void*)_m, "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, + {(void*)_m, "setInterruptCheckChain", (void*)setInterruptCheckChain}, + {(void*)_m, "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, + {(void*)_m, "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, {NULL, NULL, NULL} };
Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */
Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -2,11 +2,11 @@
/* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __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.1693"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1699"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace;
@@ -17859,7 +17859,7 @@ static sqInt checkForAndFollowForwardedPrimitiveState(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt accessorDepth; + signed char accessorDepth; sqInt firstBytecode; sqInt found; sqInt found1; @@ -30076,7 +30076,7 @@ } /* begin success: */ successBoolean3 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == (extentX * extentY)); if (!successBoolean3) {
@@ -30121,7 +30121,7 @@ } /* begin success: */ successBoolean7 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean7) {
@@ -30165,7 +30165,7 @@ } /* begin success: */ successBoolean9 = (((bitsObj & (tagMask())) == 0) - && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) + && (((((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) && ((lengthOfformat(bitsObj, (((usqInt) (longAt(bitsObj))) >> (formatShift())) & (formatMask()))) == 16); if (!successBoolean9) {
@@ -35151,7 +35151,7 @@ } rcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35259,7 +35259,7 @@ } rcvr = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!(((rcvr & (tagMask())) == 0) - && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))) { + && (((((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(rcvr))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))) { (GIV(primFailCode) = PrimErrInappropriate); return; } @@ -35837,7 +35837,7 @@ if (!((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))))) {
/* Must be indexable words */ /* begin primitiveFail */ @@ -40531,7 +40531,7 @@ && ((((outPointerArray & (tagMask())) == 0) && (((((usqInt) (longAt(outPointerArray))) >> (formatShift())) & (formatMask())) == 2)) && (((segmentWordArray & (tagMask())) == 0) - && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))))))) { + && (((((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(segmentWordArray))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))))))) {
/* Must be indexable words */ /* begin primitiveFail */ @@ -53943,7 +53943,7 @@ isWords(sqInt oop) { return ((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1)))); + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1)))); }
@@ -61547,7 +61547,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67284,7 +67284,7 @@ static sqInt NoDbgRegParms readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt bridge; + sqInt bridge; usqInt bridgehead; usqLong bridgeSpan; sqInt bytesRead; @@ -77072,7 +77072,7 @@ return; } if (((oop & (tagMask())) == 0) - && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstLongFormat()) + 1))))) { + && (((((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) >= (firstLongFormat())) && (((((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask())) <= ((firstShortFormat()) - 1))))) { lastIndex = ((64 < ((numBytesOf(oop)) / BytesPerWord)) ? 64 : ((numBytesOf(oop)) / BytesPerWord)); if (lastIndex > 0) { for (index = 1; index <= lastIndex; index += 1) { @@ -84990,71 +84990,72 @@ }
+static char _m[] = ""; void* vm_exports[][3] = { - {"", "callbackEnter", (void*)callbackEnter}, - {"", "callbackLeave", (void*)callbackLeave}, - {"", "moduleUnloaded", (void*)moduleUnloaded}, - {"", "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, - {"", "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, - {"", "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, - {"", "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, - {"", "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, - {"", "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, - {"", "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, - {"", "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, - {"", "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, - {"", "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, - {"", "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, - {"", "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, - {"", "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, - {"", "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, - {"", "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, - {"", "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, - {"", "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, - {"", "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, - {"", "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, - {"", "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, - {"", "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, - {"", "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, - {"", "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, - {"", "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, - {"", "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, - {"", "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, - {"", "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, - {"", "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, - {"", "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, - {"", "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, - {"", "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, - {"", "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, - {"", "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, - {"", "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, - {"", "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, - {"", "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, - {"", "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, - {"", "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, - {"", "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, - {"", "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, - {"", "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, - {"", "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, - {"", "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, - {"", "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, - {"", "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, - {"", "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, - {"", "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, - {"", "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, - {"", "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, - {"", "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, - {"", "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, - {"", "printFramesInPage", (void*)printFramesInPage}, - {"", "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, - {"", "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, - {"", "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, - {"", "segmentContainingObj", (void*)segmentContainingObj}, - {"", "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, - {"", "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, - {"", "setInterruptCheckChain", (void*)setInterruptCheckChain}, - {"", "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, - {"", "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, + {(void*)_m, "callbackEnter", (void*)callbackEnter}, + {(void*)_m, "callbackLeave", (void*)callbackLeave}, + {(void*)_m, "moduleUnloaded", (void*)moduleUnloaded}, + {(void*)_m, "primitiveAddLargeIntegers\000\377", (void*)primitiveAddLargeIntegers}, + {(void*)_m, "primitiveAllInstances\000\377", (void*)primitiveAllInstances}, + {(void*)_m, "primitiveAllObjects\000\377", (void*)primitiveAllObjects}, + {(void*)_m, "primitiveBitAndLargeIntegers\000\377", (void*)primitiveBitAndLargeIntegers}, + {(void*)_m, "primitiveBitOrLargeIntegers\000\377", (void*)primitiveBitOrLargeIntegers}, + {(void*)_m, "primitiveBitShiftLargeIntegers\000\377", (void*)primitiveBitShiftLargeIntegers}, + {(void*)_m, "primitiveBitXorLargeIntegers\000\377", (void*)primitiveBitXorLargeIntegers}, + {(void*)_m, "primitiveClockLogAddresses\000\377", (void*)primitiveClockLogAddresses}, + {(void*)_m, "primitiveCompareBytes\000\377", (void*)primitiveCompareBytes}, + {(void*)_m, "primitiveCrashVM\000\377", (void*)primitiveCrashVM}, + {(void*)_m, "primitiveDisablePowerManager\000\377", (void*)primitiveDisablePowerManager}, + {(void*)_m, "primitiveDivideLargeIntegers\000\377", (void*)primitiveDivideLargeIntegers}, + {(void*)_m, "primitiveDivLargeIntegers\000\377", (void*)primitiveDivLargeIntegers}, + {(void*)_m, "primitiveEqualLargeIntegers\000\377", (void*)primitiveEqualLargeIntegers}, + {(void*)_m, "primitiveEventProcessingControl\000\377", (void*)primitiveEventProcessingControl}, + {(void*)_m, "primitiveGetLogDirectory\000\377", (void*)primitiveGetLogDirectory}, + {(void*)_m, "primitiveGetWindowLabel\000\377", (void*)primitiveGetWindowLabel}, + {(void*)_m, "primitiveGetWindowSize\000\377", (void*)primitiveGetWindowSize}, + {(void*)_m, "primitiveGreaterOrEqualLargeIntegers\000\377", (void*)primitiveGreaterOrEqualLargeIntegers}, + {(void*)_m, "primitiveGreaterThanLargeIntegers\000\377", (void*)primitiveGreaterThanLargeIntegers}, + {(void*)_m, "primitiveHeartbeatFrequency\000\377", (void*)primitiveHeartbeatFrequency}, + {(void*)_m, "primitiveHighResClock\000\377", (void*)primitiveHighResClock}, + {(void*)_m, "primitiveImageFormatVersion\000\377", (void*)primitiveImageFormatVersion}, + {(void*)_m, "primitiveInterruptChecksPerMSec\000\377", (void*)primitiveInterruptChecksPerMSec}, + {(void*)_m, "primitiveIsBigEnder\000\377", (void*)primitiveIsBigEnder}, + {(void*)_m, "primitiveIsWindowObscured\000\377", (void*)primitiveIsWindowObscured}, + {(void*)_m, "primitiveLessOrEqualLargeIntegers\000\377", (void*)primitiveLessOrEqualLargeIntegers}, + {(void*)_m, "primitiveLessThanLargeIntegers\000\377", (void*)primitiveLessThanLargeIntegers}, + {(void*)_m, "primitiveLongRunningPrimitive\000\377", (void*)primitiveLongRunningPrimitive}, + {(void*)_m, "primitiveLongRunningPrimitiveSemaphore\000\377", (void*)primitiveLongRunningPrimitiveSemaphore}, + {(void*)_m, "primitiveMillisecondClockMask\000\377", (void*)primitiveMillisecondClockMask}, + {(void*)_m, "primitiveMinimumUnusedHeadroom\000\377", (void*)primitiveMinimumUnusedHeadroom}, + {(void*)_m, "primitiveModLargeIntegers\000\377", (void*)primitiveModLargeIntegers}, + {(void*)_m, "primitiveMultiplyLargeIntegers\000\377", (void*)primitiveMultiplyLargeIntegers}, + {(void*)_m, "primitiveNotEqualLargeIntegers\000\377", (void*)primitiveNotEqualLargeIntegers}, + {(void*)_m, "primitiveOriginalMillisecondClock\000\377", (void*)primitiveOriginalMillisecondClock}, + {(void*)_m, "primitivePathToUsing\000\377", (void*)primitivePathToUsing}, + {(void*)_m, "primitiveProfilePrimitive\000\377", (void*)primitiveProfilePrimitive}, + {(void*)_m, "primitiveProfileSample\000\377", (void*)primitiveProfileSample}, + {(void*)_m, "primitiveProfileSemaphore\000\377", (void*)primitiveProfileSemaphore}, + {(void*)_m, "primitiveProfileStart\000\377", (void*)primitiveProfileStart}, + {(void*)_m, "primitiveQuoLargeIntegers\000\377", (void*)primitiveQuoLargeIntegers}, + {(void*)_m, "primitiveRemLargeIntegers\000\377", (void*)primitiveRemLargeIntegers}, + {(void*)_m, "primitiveScreenDepth\000\377", (void*)primitiveScreenDepth}, + {(void*)_m, "primitiveSetGCSemaphore\000\377", (void*)primitiveSetGCSemaphore}, + {(void*)_m, "primitiveSetLogDirectory\000\377", (void*)primitiveSetLogDirectory}, + {(void*)_m, "primitiveSetWindowLabel\000\377", (void*)primitiveSetWindowLabel}, + {(void*)_m, "primitiveSetWindowSize\000\377", (void*)primitiveSetWindowSize}, + {(void*)_m, "primitiveSubtractLargeIntegers\000\377", (void*)primitiveSubtractLargeIntegers}, + {(void*)_m, "primitiveUtcWithOffset\000\377", (void*)primitiveUtcWithOffset}, + {(void*)_m, "primitiveVoidReceiver\000\377", (void*)primitiveVoidReceiver}, + {(void*)_m, "printFramesInPage", (void*)printFramesInPage}, + {(void*)_m, "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, + {(void*)_m, "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, + {(void*)_m, "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, + {(void*)_m, "segmentContainingObj", (void*)segmentContainingObj}, + {(void*)_m, "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, + {(void*)_m, "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, + {(void*)_m, "setInterruptCheckChain", (void*)setInterruptCheckChain}, + {(void*)_m, "shortPrintFramesInPage", (void*)shortPrintFramesInPage}, + {(void*)_m, "shortPrintFramesOnStackPageListInUse\000\377", (void*)shortPrintFramesOnStackPageListInUse}, {NULL, NULL, NULL} };
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -10558,12 +10558,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc;
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -9626,12 +9626,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + CCodeGenerator VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff + StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1697 uuid: 03f07782-25a7-4178-8528-7f8638ca30ff " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; char *__cogitBuildInfo = __buildInfo;
@@ -5738,12 +5738,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc;
Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-02-24 01:02:35 UTC (rev 3630) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-02-24 19:25:16 UTC (rev 3631) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 from - CoInterpreter VMMaker.oscog-eem.1693 uuid: 609488bc-c34d-49c6-8040-676e1a9d9d0e
@@ Diff output truncated at 50000 characters. @@