Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

Compiler evaluate: - How to only allow access to given classes or capabilities?
by phil＠highoctane.be 26 Oct '14

26 Oct '14

"Compiler evaluate: source" is a powerful feature. Now, how can I disallow "dangerous" calls from the source? A bit like in java where we have the security manager. http://www.securingjava.com/chapter-two/chapter-two-8.html What do we have in stock? To avoid things like a Smalltalk quitPrimitive ... TIA Phil

1 0

[commit][3115] More changes for the ARM linux build.
by commits＠squeakvm.org 26 Oct '14

26 Oct '14

Revision: 3115 Author: eliot Date: 2014-10-25 16:00:07 -0700 (Sat, 25 Oct 2014) Log Message: ----------- More changes for the ARM linux build. Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext Removed Paths: ------------- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -22,7 +22,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnicodePlugin \ UnixOSProcessPlugin \ UUIDPlugin \ Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnixOSProcessPlugin \ UUIDPlugin \ XDisplayControlPlugin Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2014-10-25 23:00:07 UTC (rev 3115) @@ -18,7 +18,7 @@ --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/plugins.ext 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,6 +1,8 @@ # Copied, perhaps edited, from ../../src/examplePlugins.ext EXTERNAL_PLUGINS = \ LocalePlugin \ +SqueakFFIPrims \ +SqueakSSL \ UnixOSProcessPlugin \ UUIDPlugin \ UnicodePlugin \ Deleted: branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in =================================================================== --- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in 2014-10-25 19:00:21 UTC (rev 3114) +++ branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.in 2014-10-25 23:00:07 UTC (rev 3115) @@ -1,29 +0,0 @@ -# Makefile.in for BitBltPlugin on Unix -# -# Author: ian.piumarta(a)inria.fr -# -# Last edited: Dec 1 2009 by eliot miranda - -[make_cfg] -[make_plg] - -TARGET= BitBltPlugin$a - -XINCLUDES= [includes] - -ifeq (,$(findstring ENABLE_FAST_BLT,$(CFLAGS))) - OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmOther$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o -else - ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin - ASMFLAGS = -cpu=6 - AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o - OBJS = BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmSimdAlphaBlend$o BitBltArmSimdBitLogical$o BitBltArmSimdPixPaint$o BitBltArmSimdSourceWord$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o -endif - -$(TARGET) : $(OBJS) Makefile - $(LINK) $(TARGET) $(OBJS) - $(RANLIB) $(TARGET) - -[make_targets] - -.force :

1 0

New Cog VMs available
by Eliot Miranda 25 Oct '14

25 Oct '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3114/. CogVM binaries as per VMMaker.oscog-eem.913/r3114 Spur: Fix baaaad bug in checking for still-married contexts in Spur. One *cannot* simply follow what is assumed to be the frameContext field of what is presumed to be a context. On Spur we need to *know* whether we have a valid frameContext field, and for that we have to know there is a valid frame. So refactor, moving isFrame:onPage: from StackInterpreterPrimitives to StackInterpreter, and use it to validate the frame pointer of a maybe married context before testing the context for being forwarded. All: Avoid cogging methods containing unknown bytecodes early in scanMethod. Use a hack to avoid a test on the common path. Fix assert fail cases in ceInterpretMethodFromPIC:receiver: Both of these together fix assert fails due to cogging methods containing unknown bytecodes. Spur: Implement image segments. Use Igor's idea of splitting the computation of the transitive closure from the writing of the image segment for simplicity, even if the two are together into a single primitive for backwards-compatibility. All: Rewrite the two image segment primitives to pass back an error code on failure, and rewrite the (New)ObjectMemory code to answer informative failure codes. Print slots of word objects in longPrintOop: Fix parenthesization bugs in validation code in some Alien plugin primtiives. Make findClassContainingMethod:startingAt: et al robust in the face of faulted-out classes (nil method dictionaries). Include the AioPlugin in the Newspeak linux VMs; recent reports indicate it's essential to good performance in recent versions of OSProcessPlugin. Unix startup script: Quote the LD_LIBRARY_PATH setting to tolerate directory names with spaces. -- best, Eliot

1 0

[commit][3114] Rescue the Windows build after integrating the ARM BitBlt changes.
by commits＠squeakvm.org 25 Oct '14

25 Oct '14

Revision: 3114 Author: eliot Date: 2014-10-25 12:00:21 -0700 (Sat, 25 Oct 2014) Log Message: ----------- Rescue the Windows build after integrating the ARM BitBlt changes. Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 24 21:38:31 PDT 2014 + Sat Oct 25 12:00:33 PDT 2014

1 0

[commit][3113] Finish integrating Doug McPherson' s changes for building the Stack VM on ARM:
by commits＠squeakvm.org 25 Oct '14

25 Oct '14

Revision: 3113 Author: eliot Date: 2014-10-24 21:40:50 -0700 (Fri, 24 Oct 2014) Log Message: ----------- Finish integrating Doug McPherson's changes for building the Stack VM on ARM: Support building for ARM architecture 7-A (Cortex-A8, Cortex-A9, etc. see http://en.wikipedia.org/wiki/ARM_architecture) such as is used in BeagleBone Black, Parallella, countless smartphones, Chromebooks, etc, etc. Cog/platforms/Cross/vm/ 1. replace sqAtomicOps.h 2. replace sqMemoryFence.h Cog/platforms/unix/vm/ 1. replace sqUnixHeartbeat.c 2. replace sqUnixITimerHeartbeat.c 3. replace sqUnixITimerTickerHeartbeat.c Cog/ 1. rename build.linux32ARMv6 to build.linux32ARM Clean up building of BitBltPlugin and vm-display-X11 to compile/assemble only the required files based on 1) host_cpu=arm and 2) the presence of --enable-fast-bitblt option to unix/config/configure (for example in mvm scripts) Cog/platforms/unix/config/ 1. replace make.cfg.in 2. replace configure Cog/platforms/unix/plugins/BitBltPlugin/ 1. ******DELETE Makefile.in ******* 2. replace acinclude.m4 3. replace Makefile.inc Cog/platforms/Cross/plugins/BitBltPlugin/ - remove the conditional compile #if defined(ENABLE_FAST_BLT) which completely surrounds the content of each of these files. Each of these is now built or not built based on autoconf magic. 1. replace BitBltArm.c 2. replace BitBltArmLinux.c 3. replace BitBltArmOther.c 4. replace BitBltArmSimd.c 5. replace BitBltDispatch.c 6. replace BitBltGeneric.c Cog/platforms/unix/vm-display-X11/ - rename USE_FAST_BLT to ENABLE_FAST_BLT for consistency with BitBltPlugin 1. replace sqUnixX11.c 2. replace acinclude.m4 3. replace Makefile.inc Cog/build.linux32ARM/squeak.stack.v3/build/ 1. replace mvm 2. add SqueakSSL to plugins.ext 3. should do same edits for build.debug/ and build.assert/ (and add SqueakFFIPrims and SqueakSSL) Cog/platforms/unix/vm-display-null/ - Clean up harmless but annoying redundant compile flags in vm-display-null 1. replace Makefile.inc Modified Paths: -------------- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArm.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */ -#if ENABLE_FAST_BLT #include "BitBltArm.h" #include "BitBltArmSimd.h" @@ -35,4 +34,4 @@ if (armCpuFeatures & ARM_V6) addArmSimdFastPaths(); } -#endif /* ENABLE_FAST_BLT */ + Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmLinux.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -25,7 +25,6 @@ * An equivalent file will be required for other ARM platforms; see BitBtArmOther.c in this directory */ -#if ENABLE_FAST_BLT #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> @@ -77,4 +76,4 @@ return features; } -#endif /* ENABLE_FAST_BLT */ + Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmOther.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -28,7 +28,6 @@ * see BitBtArmLinux.c in this directory as an example */ -#if ENABLE_FAST_BLT #include "BitBltArm.h" /* There is no OS-neutral way of determining which type of ARM this is */ @@ -37,4 +36,4 @@ { return 0; } -#endif /* ENABLE_FAST_BLT */ + Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltArmSimd.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */ -#if ENABLE_FAST_BLT #include <stddef.h> #include <stdint.h> @@ -262,4 +261,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } -#endif /* ENABLE_FAST_BLT */ + Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltDispatch.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */ -#if ENABLE_FAST_BLT #include <stddef.h> #include<stdio.h> #include <stdlib.h> @@ -436,4 +435,4 @@ profile_record(storedCombinationRule, storedFlags, after - before); #endif } -#endif /* ENABLE_FAST_BLT */ + Modified: trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c =================================================================== --- trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-10-25 04:39:07 UTC (rev 3112) +++ trunk/platforms/Cross/plugins/BitBltPlugin/BitBltGeneric.c 2014-10-25 04:40:50 UTC (rev 3113) @@ -23,7 +23,6 @@ * */ -#if ENABLE_FAST_BLT #include <stddef.h> #include <stdio.h> #include <stdint.h> @@ -461,4 +460,4 @@ { addFastPaths(fastPaths, sizeof fastPaths / sizeof *fastPaths); } -#endif /* ENABLE_FAST_BLT */ + Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 3 13:44:24 PDT 2014 + Fri Oct 24 21:40:19 PDT 2014

1 0

[commit][3112] Finish integrating Doug McPherson' s changes for building the Stack VM on ARM:
by commits＠squeakvm.org 25 Oct '14

25 Oct '14

Revision: 3112 Author: eliot Date: 2014-10-24 21:39:07 -0700 (Fri, 24 Oct 2014) Log Message: ----------- Finish integrating Doug McPherson's changes for building the Stack VM on ARM: Support building for ARM architecture 7-A (Cortex-A8, Cortex-A9, etc. see http://en.wikipedia.org/wiki/ARM_architecture) such as is used in BeagleBone Black, Parallella, countless smartphones, Chromebooks, etc, etc. Cog/platforms/Cross/vm/ 1. replace sqAtomicOps.h 2. replace sqMemoryFence.h Cog/platforms/unix/vm/ 1. replace sqUnixHeartbeat.c 2. replace sqUnixITimerHeartbeat.c 3. replace sqUnixITimerTickerHeartbeat.c Cog/ 1. rename build.linux32ARMv6 to build.linux32ARM Clean up building of BitBltPlugin and vm-display-X11 to compile/assemble only the required files based on 1) host_cpu=arm and 2) the presence of --enable-fast-bitblt option to unix/config/configure (for example in mvm scripts) Cog/platforms/unix/config/ 1. replace make.cfg.in 2. replace configure Cog/platforms/unix/plugins/BitBltPlugin/ 1. ******DELETE Makefile.in ******* 2. replace acinclude.m4 3. replace Makefile.inc Cog/platforms/Cross/plugins/BitBltPlugin/ - remove the conditional compile #if defined(ENABLE_FAST_BLT) which completely surrounds the content of each of these files. Each of these is now built or not built based on autoconf magic. 1. replace BitBltArm.c 2. replace BitBltArmLinux.c 3. replace BitBltArmOther.c 4. replace BitBltArmSimd.c 5. replace BitBltDispatch.c 6. replace BitBltGeneric.c Cog/platforms/unix/vm-display-X11/ - rename USE_FAST_BLT to ENABLE_FAST_BLT for consistency with BitBltPlugin 1. replace sqUnixX11.c 2. replace acinclude.m4 3. replace Makefile.inc Cog/build.linux32ARM/squeak.stack.v3/build/ 1. replace mvm 2. add SqueakSSL to plugins.ext 3. should do same edits for build.debug/ and build.assert/ (and add SqueakFFIPrims and SqueakSSL) Cog/platforms/unix/vm-display-null/ - Clean up harmless but annoying redundant compile flags in vm-display-null 1. replace Makefile.inc Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/make.cfg.in branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.inc branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 branches/Cog/platforms/unix/vm-display-X11/Makefile.in branches/Cog/platforms/unix/vm-display-X11/acinclude.m4 branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c branches/Cog/platforms/unix/vm-display-null/Makefile.inc Added Paths: ----------- branches/Cog/build.linux32ARM/ Removed Paths: ------------- branches/Cog/build.linux32ARMv6/ Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm 2014-10-09 20:54:06 UTC (rev 3100) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build/mvm 2014-10-25 04:39:07 UTC (rev 3112) @@ -19,10 +19,10 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ - --without-vm-display-fbdev --without-npsqueak \ + --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm 2014-10-09 20:54:06 UTC (rev 3100) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2014-10-25 04:39:07 UTC (rev 3112) @@ -15,7 +15,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ - --without-vm-display-fbdev --without-npsqueak \ + --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm 2014-10-09 20:54:06 UTC (rev 3100) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.debug/mvm 2014-10-25 04:39:07 UTC (rev 3112) @@ -15,10 +15,10 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ - --without-vm-display-fbdev --without-npsqueak\ + --without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \ CC="gcc " \ CXX="g++ " \ - CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DENABLE_FAST_BLT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ LIBS="-lpthread -luuid" \ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 24 15:52:20 PDT 2014 + Fri Oct 24 21:38:31 PDT 2014 Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/config/configure 2014-10-25 04:39:07 UTC (rev 3112) @@ -463,7 +463,7 @@ # include <unistd.h> #endif" -ac_subst_vars='NM LD SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS cogit topdir cfgdir vmmdir vmpdir vmmcfg blddir SQ_MAJOR SQ_MINOR SQ_UPDATE SQ_VERSION VM_MAJOR VM_MINOR VM_RELEASE VM_VERSION imgdir expanded_relative_imgdir plgdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT WFLAGS AS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN CPP EGREP SED LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES HAVE_INTERP_H ALLOCA INTERP AWK VM_APP_ICONS npsqueak install_nps uninstall_nps SQ_LIBDIR int_modules ext_modules HAVE_LANGINFO_CODESET HAVE_NANOSLEEP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_CPPFLAGS X_INCLUDES BITBLT_OBJS LIBM_CFLAGS IA32ABI_OBJS LIB_UUID int_plugins ext_plugins LIBOBJS LTLIBOBJS' +ac_subst_vars='NM LD SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS cogit topdir cfgdir vmmdir vmpdir vmmcfg blddir SQ_MAJOR SQ_MINOR SQ_UPDATE SQ_VERSION VM_MAJOR VM_MINOR VM_RELEASE VM_VERSION imgdir expanded_relative_imgdir plgdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT WFLAGS AS RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN CPP EGREP SED LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES HAVE_INTERP_H ALLOCA INTERP AWK VM_APP_ICONS npsqueak install_nps uninstall_nps SQ_LIBDIR int_modules ext_modules HAVE_LANGINFO_CODESET HAVE_NANOSLEEP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_CPPFLAGS X_INCLUDES VM_DISPX11_OBJS VM_DISPX11_BITBLT_FLAGS BITBLT_OBJS BITBLT_FLAGS ARM_ARCH LIBM_CFLAGS IA32ABI_OBJS LIB_UUID int_plugins ext_plugins LIBOBJS LTLIBOBJS' ac_subst_files='make_cfg make_int make_ext make_prg Makefile_install Makefile_dist Makefile_rpm Makefile_deb' # Initialize some variables set by options. @@ -1031,6 +1031,7 @@ optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --disable-iconv disable iconv support default=enabled + --enable-fast-bitblt enable fast BitBlt optimizations (default=no) --enable-mpg-mmx enable MMX support in Mpeg3Plugin default=no --enable-mpg-pthreads enable pthread support in Mpeg3Plugin default=no @@ -5922,7 +5923,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5925 "configure"' > conftest.$ac_ext + echo '#line 5926 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6939,7 +6940,7 @@ # Provide some information about the compiler. -echo "$as_me:6942:" \ +echo "$as_me:6943:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -8002,11 +8003,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8006: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8009: \$? = $ac_status" >&5 + echo "$as_me:8010: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8270,11 +8271,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8273: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8274: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8277: \$? = $ac_status" >&5 + echo "$as_me:8278: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8374,11 +8375,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8377: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8378: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8381: \$? = $ac_status" >&5 + echo "$as_me:8382: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9843,7 +9844,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 9846 "configure"' > conftest.$ac_ext + echo '#line 9847 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10740,7 +10741,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10743 "configure" +#line 10744 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10840,7 +10841,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10843 "configure" +#line 10844 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13183,11 +13184,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13186: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13187: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13190: \$? = $ac_status" >&5 + echo "$as_me:13191: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13287,11 +13288,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13290: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13291: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13294: \$? = $ac_status" >&5 + echo "$as_me:13295: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13823,7 +13824,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 13826 "configure"' > conftest.$ac_ext + echo '#line 13827 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -14881,11 +14882,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14884: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14885: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14888: \$? = $ac_status" >&5 + echo "$as_me:14889: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14985,11 +14986,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14988: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14989: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14992: \$? = $ac_status" >&5 + echo "$as_me:14993: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16434,7 +16435,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 16437 "configure"' > conftest.$ac_ext + echo '#line 16438 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -17212,11 +17213,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17215: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17216: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17219: \$? = $ac_status" >&5 + echo "$as_me:17220: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17480,11 +17481,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17483: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17484: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17487: \$? = $ac_status" >&5 + echo "$as_me:17488: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17584,11 +17585,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17587: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17588: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17591: \$? = $ac_status" >&5 + echo "$as_me:17592: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19053,7 +19054,7 @@ libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 19056 "configure"' > conftest.$ac_ext + echo '#line 19057 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -25294,6 +25295,24 @@ have_gl="yes" fi; +vm_dispx11_objs="sqUnixX11.lo sqUnixMozilla.lo" +vm_dispx11_bitblt_flags="" + +case $host_cpu in +arm*) +# Check whether --enable-fast-bitblt or --disable-fast-bitblt was given. +if test "${enable_fast_bitblt+set}" = set; then + enableval="$enable_fast_bitblt" + if test "x$enableval" = "xyes" ; then + vm_dispx11_objs="sqUnixX11.lo sqUnixMozilla.lo sqUnixX11Arm.lo" + vm_dispx11_bitblt_flags="-DENABLE_FAST_BLT" + fi + +fi; +;; +esac + + ###xxx FIXME (AGAIN): mandrake needs explicit -lpthread VMLIBS=${LIBS} @@ -27118,6 +27137,11 @@ CFLAGS=${VMCFLAGS} CPPFLAGS=${VMCPPFLAGS} INCLUDES=${VMINCLUDES} + +VM_DISPX11_OBJS=$vm_dispx11_objs + +VM_DISPX11_BITBLT_FLAGS=$vm_dispx11_bitblt_flags + if test "${plibs}"; then llibs="${LIBS}" for l in ${plibs}; do @@ -27697,16 +27721,34 @@ plugin="BitBltPlugin" plibs="" rm -f BitBltPlugin.sub BitBltPlugin.lib +bitblt_objs="BitBltPlugin.o" +bitblt_flags="" +arm_arch="" + case $host_cpu in arm*) -bitblt_objs="BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmOther$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o BitBltArmSimdAlphaBlend$o BitBltArmSimdBitLogical$o BitBltArmSimdPixPaint$o BitBltArmSimdSourceWord$o" +case $host_cpu in + armv6*) arm_arch="6" ;; + armv7*) arm_arch="7-A" ;; +esac +# Check whether --enable-fast-bitblt or --disable-fast-bitblt was given. +if test "${enable_fast_bitblt+set}" = set; then + enableval="$enable_fast_bitblt" + if test "x$enableval" = "xyes" ; then + bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmOther.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" + bitblt_flags="-DENABLE_FAST_BLT" + fi + +fi; ;; -*) -bitblt_objs="BitBltPlugin.o" esac BITBLT_OBJS=$bitblt_objs +BITBLT_FLAGS=$bitblt_flags + +ARM_ARCH=$arm_arch + if test "${plibs}"; then llibs="${LIBS}" for l in ${plibs}; do @@ -27742,9 +27784,12 @@ plugin="IA32ABI" plibs="" rm -f IA32ABI.sub IA32ABI.lib -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ia32abicc.o" +ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o" case $host_cpu in +i386|i486|i586|i686) +ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ia32abicc.o" +;; powerpc|ppc) ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ppcia32abicc.o" ;; @@ -29515,7 +29560,11 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@X_CPPFLAGS@,$X_CPPFLAGS,;t t s,@X_INCLUDES@,$X_INCLUDES,;t t +s,@VM_DISPX11_OBJS@,$VM_DISPX11_OBJS,;t t +s,@VM_DISPX11_BITBLT_FLAGS@,$VM_DISPX11_BITBLT_FLAGS,;t t s,@BITBLT_OBJS@,$BITBLT_OBJS,;t t +s,@BITBLT_FLAGS@,$BITBLT_FLAGS,;t t +s,@ARM_ARCH@,$ARM_ARCH,;t t s,@LIBM_CFLAGS@,$LIBM_CFLAGS,;t t s,@IA32ABI_OBJS@,$IA32ABI_OBJS,;t t s,@LIB_UUID@,$LIB_UUID,;t t Modified: branches/Cog/platforms/unix/config/make.cfg.in =================================================================== --- branches/Cog/platforms/unix/config/make.cfg.in 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/config/make.cfg.in 2014-10-25 04:39:07 UTC (rev 3112) @@ -93,6 +93,10 @@ SOFLAGS= @SOFLAGS@ BITBLT_OBJS= @BITBLT_OBJS@ IA32ABI_OBJS= @IA32ABI_OBJS@ +VM_DISPX11_OBJS= @VM_DISPX11_OBJS@ +BITBLT_FLAGS= @BITBLT_FLAGS@ +VM_DISPX11_BITBLT_FLAGS= @VM_DISPX11_BITBLT_FLAGS@ +ARM_ARCH= @ARM_ARCH@ LIBM_CFLAGS= @LIBM_CFLAGS@ LIBS= @LIBS@ Modified: branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.inc 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/plugins/BitBltPlugin/Makefile.inc 2014-10-25 04:39:07 UTC (rev 3112) @@ -1 +1,5 @@ OBJS = $(BITBLT_OBJS) +XCFLAGS = $(BITBLT_FLAGS) +ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin +ASMFLAGS = -cpu=$(ARM_ARCH) +AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o \ No newline at end of file Modified: branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/plugins/BitBltPlugin/acinclude.m4 2014-10-25 04:39:07 UTC (rev 3112) @@ -1,9 +1,24 @@ +bitblt_objs="BitBltPlugin.o" +bitblt_flags="" +arm_arch="" + case $host_cpu in arm*) -bitblt_objs="BitBltPlugin$o BitBltArm$o BitBltArmLinux$o BitBltArmOther$o BitBltArmSimd$o BitBltDispatch$o BitBltGeneric$o BitBltArmSimdAlphaBlend$o BitBltArmSimdBitLogical$o BitBltArmSimdPixPaint$o BitBltArmSimdSourceWord$o" +case $host_cpu in + armv6*) arm_arch="6" ;; + armv7*) arm_arch="7-A" ;; +esac +AC_ARG_ENABLE(fast-bitblt, + [ --enable-fast-bitblt enable fast BitBlt optimizations (default=no)], + [ if test "x$enableval" = "xyes" ; then + bitblt_objs="BitBltPlugin.o BitBltArm.o BitBltArmLinux.o BitBltArmOther.o BitBltArmSimd.o BitBltDispatch.o BitBltGeneric.o BitBltArmSimdAlphaBlend.o BitBltArmSimdBitLogical.o BitBltArmSimdPixPaint.o BitBltArmSimdSourceWord.o" + bitblt_flags="-DENABLE_FAST_BLT" + fi + ], + []) ;; -*) -bitblt_objs="BitBltPlugin.o" esac AC_SUBST(BITBLT_OBJS, $bitblt_objs) +AC_SUBST(BITBLT_FLAGS, $bitblt_flags) +AC_SUBST(ARM_ARCH, $arm_arch) Modified: branches/Cog/platforms/unix/vm-display-X11/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/Makefile.in 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/vm-display-X11/Makefile.in 2014-10-25 04:39:07 UTC (rev 3112) @@ -42,25 +42,18 @@ TARGET = vm-display-X11$a +OBJS = $(VM_DISPX11_OBJS) +XCFLAGS = $(VM_DISPX11_BITBLT_FLAGS) +ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin +ASMFLAGS = -cpu=$(ARM_ARCH) +AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o -XCFLAGS = $(X_CFLAGS) - XINCLUDES = [includes] $(X_INCLUDES) \ -I$(topdir)/platforms/Cross/plugins/FilePlugin \ -I$(topdir)/platforms/Cross/plugins/B3DAcceleratorPlugin \ -I$(topdir)/platforms/unix/plugins/B3DAcceleratorPlugin \ -I/usr/X11R6/include -ifeq (,$(findstring ENABLE_FAST_BLT,$(CFLAGS))) - OBJS = sqUnixX11$o sqUnixMozilla$o -else - ASMINCLUDES = -I$(topdir)/platforms/Cross/plugins/BitBltPlugin - ASMFLAGS = -cpu=6 - AS = asasm $(ASMFLAGS) $(ASMINCLUDES) -o - XCFLAGS = $(X_CFLAGS) -DUSE_FAST_BLT=1 - OBJS = sqUnixX11$o sqUnixMozilla$o sqUnixX11Arm$o -endif - $(TARGET) : $(OBJS) Makefile $(LINK) $(TARGET) $(OBJS) $(X_LIBS) $(RANLIB) $(TARGET) Modified: branches/Cog/platforms/unix/vm-display-X11/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/acinclude.m4 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/vm-display-X11/acinclude.m4 2014-10-25 04:39:07 UTC (rev 3112) @@ -10,6 +10,23 @@ [have_gl="$withval"], [have_gl="yes"]) +vm_dispx11_objs="sqUnixX11.lo sqUnixMozilla.lo" +vm_dispx11_bitblt_flags="" + +case $host_cpu in +arm*) +AC_ARG_ENABLE(fast-bitblt, + [ --enable-fast-bitblt enable fast BitBlt optimizations (default=no)], + [ if test "x$enableval" = "xyes" ; then + vm_dispx11_objs="sqUnixX11.lo sqUnixMozilla.lo sqUnixX11Arm.lo" + vm_dispx11_bitblt_flags="-DENABLE_FAST_BLT" + fi + ], + []) +;; +esac + + ###xxx FIXME (AGAIN): mandrake needs explicit -lpthread VMLIBS=${LIBS} @@ -63,3 +80,6 @@ CFLAGS=${VMCFLAGS} CPPFLAGS=${VMCPPFLAGS} INCLUDES=${VMINCLUDES} + +AC_SUBST(VM_DISPX11_OBJS, $vm_dispx11_objs) +AC_SUBST(VM_DISPX11_BITBLT_FLAGS, $vm_dispx11_bitblt_flags) Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2014-10-25 04:39:07 UTC (rev 3112) @@ -63,7 +63,7 @@ #undef HAVE_OPENGL_GL_H /* don't include Quartz OpenGL if configured */ #include "SqDisplay.h" -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) /* XXX referring to plugin variables *requires* BitBitPlugin to be included by VMM as an internal plugin */ # if defined(__arm__) # include "../../../Cross/plugins/BitBltPlugin/BitBltArm.h" @@ -6141,7 +6141,7 @@ } } -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) extern void armSimdConvert_x888_8_LEPacking32_8_wide(unsigned int width, unsigned int height, @@ -6188,7 +6188,7 @@ void copyImage32To8(int *fromImageData, int *toImageData, int width, int height, int affectedL, int affectedT, int affectedR, int affectedB) { -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) armSimdCopyImage32To8(fromImageData, toImageData, width, height, affectedL, affectedT, affectedR, affectedB, stDownGradingColors); # else @@ -6227,7 +6227,7 @@ firstWord8+= scanLine8; } #undef map32To8 -#endif /* !USE_FAST_BLT */ +#endif /* !ENABLE_FAST_BLT */ } void copyImage16To32(int *fromImageData, int *toImageData, int width, int height, @@ -6352,7 +6352,7 @@ #undef map16To24 } -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) extern void armSimdConvert_x888_0565_LEPacking32_16_wide(unsigned int width, unsigned int height, @@ -6394,7 +6394,7 @@ void copyImage32To16(int *fromImageData, int *toImageData, int width, int height, int affectedL, int affectedT, int affectedR, int affectedB) { -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) if (stRNMask == 5 && stRShift == 11 && stGNMask == 6 && stGShift == 5 && stBNMask == 5 && stBShift == 0) armSimdCopyImage32To16(fromImageData, toImageData, width, height, affectedL, affectedT, affectedR, affectedB); @@ -6489,7 +6489,7 @@ } -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) extern void armSimdConvert_x888_x888BGR_LEPacking32_32_wide(unsigned int width, unsigned int height, unsigned int *dst, unsigned int dstStride, @@ -6525,13 +6525,13 @@ void copyImage32To32(int *fromImageData, int *toImageData, int width, int height, int affectedL, int affectedT, int affectedR, int affectedB) { -#if defined(USE_FAST_BLT) +#if defined(ENABLE_FAST_BLT) # if defined(__arm__) if ((armCpuFeatures & ARM_V6) && stRNMask == 8 && stRShift == 0 && stGNMask == 8 && stGShift == 8 && stBNMask == 8 && stBShift == 16) armSimdCopyImage32To32(fromImageData, toImageData, width, height, affectedL, affectedT, affectedR, affectedB); else # else -# error unsupported use of USE_FAST_BLT +# error unsupported use of ENABLE_FAST_BLT # endif #endif { Modified: branches/Cog/platforms/unix/vm-display-null/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/vm-display-null/Makefile.inc 2014-10-24 22:52:56 UTC (rev 3111) +++ branches/Cog/platforms/unix/vm-display-null/Makefile.inc 2014-10-25 04:39:07 UTC (rev 3112) @@ -1,2 +1,2 @@ XCPPFLAGS= -I$(topdir)/platforms/unix/plugins/B3DAcceleratorPlugin -XCFLAGS= $(WFLAGS) $(X_CFLAGS) $(X_INCLUDES) +XCFLAGS= $(WFLAGS) $(X_INCLUDES)

1 0

[commit][3111] CogVM source as per VMMaker.oscog-eem.913
by commits＠squeakvm.org 25 Oct '14

25 Oct '14

Revision: 3111 Author: eliot Date: 2014-10-24 15:52:56 -0700 (Fri, 24 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.913 Fix baaaad bug in checking for still-married contexts in Spur. One *cannot* simply follow what is assumed to be the frameContext field of what is presumed to be a context. On Spur we need to *know* whether we have a valid frameContext field, and for that we have to know there is a valid frame. So refactor, moving isFrame:onPage: from StackInterpreterPrimitives to StackInterpreter, and use it to validate the frame pointer of a maybe married context before testing the context for being forwarded. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.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/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1113,6 +1113,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj) NoDbgRegParms; @@ -1277,7 +1278,6 @@ static sqInt writeImageFileIO(void); static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveContextAt(void); static void primitiveContextAtPut(void); @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.913"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43875,11 +43875,11 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 1) == 0) @@ -43891,28 +43891,33 @@ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFP = pointerForOop(senderOop - 1); + maybeFP = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFP, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); limitFP = ((thePage == GIV(stackPage)) && (currentFP != null) ? currentFP : (thePage->headFP)); - if (!((theFP >= limitFP) - && ((isNonImmediate(((sqInt)(frameCallerFP(theFP))))) - && (((withSmallIntegerTags(frameCallerFP(theFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)))) - && (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)))))) { + if (!((maybeFP >= limitFP) + && ((isNonImmediate(((sqInt)(frameCallerFP(maybeFP))))) + && (((withSmallIntegerTags(frameCallerFP(maybeFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)))) + && (((((usqInt)(longAt(maybeFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFP + FoxIFrameFlags) + 2)) != 0)))))) { return 0; } - frameCtxt = longAt(theFP + FoxThisContext); + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFP + FoxThisContext); - return frameCtxt == aContext; + return maybeFrameCtxt == aContext; } sqInt @@ -46465,7 +46470,29 @@ && (ClassFloatCompactIndex == ((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)); } +static sqInt +isFrameonPage(char *aFrame, StackPage *aPage) +{ + char *prevFP; + char *theFP; + assert(!((isFree(aPage)))); + theFP = (aPage->headFP); + prevFP = theFP - 4; + while (1) { + if (theFP == aFrame) { + return 1; + } + if (!((theFP > prevFP) + && (theFP < ((aPage->baseFP))))) break; + prevFP = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } + return 0; +} + + /* Answer if the argument, which can be any object, is a live context. */ static sqInt @@ -46566,11 +46593,11 @@ static sqInt isWidowedContext(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; + char *maybeFrame; + sqInt maybeFrameCtxt; sqInt senderOop; char *shouldBeFrameCallerField; - char *theFrame; StackPage *thePage; assert((isContext(aOnceMarriedContext)) @@ -46579,15 +46606,15 @@ senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFrame = pointerForOop(senderOop - 1); + maybeFrame = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); if (!((isFree(thePage)) - || (theFrame < ((thePage->headFP))))) { + || (maybeFrame < ((thePage->headFP))))) { /* The frame pointer is within the bounds of a live page. Now check if it matches a frame. */ @@ -46595,13 +46622,18 @@ /* begin withoutSmallIntegerTags: */ assert(((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord))) & 1)); shouldBeFrameCallerField = pointerForOop((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord))) - 1); - if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) - && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { - frameCtxt = longAt(theFrame + FoxThisContext); + if (((frameCallerFP(maybeFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(maybeFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFrame + FoxIFrameFlags) + 2)) != 0))) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFrame + FoxThisContext); - if (frameCtxt == aOnceMarriedContext) { + if (maybeFrameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -52537,25 +52569,7 @@ } } -static sqInt -isFrameonPage(char *aFrame, StackPage *aPage) -{ - char *theFP; - theFP = (aPage->headFP); - while (1) { - if (theFP == aFrame) { - return 1; - } - if (!((theFP != ((aPage->baseFP))) - && ((stackPageFor(theFP)) == aPage))) break; - /* begin frameCallerFP: */ - theFP = pointerForOop(longAt(theFP + FoxSavedFP)); - } - return 0; -} - - /* Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh). */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 22:52:56 UTC (rev 3111) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1116,6 +1116,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj) NoDbgRegParms; @@ -1280,7 +1281,6 @@ static sqInt writeImageFileIO(void); static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveContextAt(void); static void primitiveContextAtPut(void); @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.913"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43884,11 +43884,11 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 1) == 0) @@ -43900,28 +43900,33 @@ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFP = pointerForOop(senderOop - 1); + maybeFP = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFP, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); limitFP = ((thePage == GIV(stackPage)) && (currentFP != null) ? currentFP : (thePage->headFP)); - if (!((theFP >= limitFP) - && ((isNonImmediate(((sqInt)(frameCallerFP(theFP))))) - && (((withSmallIntegerTags(frameCallerFP(theFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)))) - && (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)))))) { + if (!((maybeFP >= limitFP) + && ((isNonImmediate(((sqInt)(frameCallerFP(maybeFP))))) + && (((withSmallIntegerTags(frameCallerFP(maybeFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord)))) + && (((((usqInt)(longAt(maybeFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFP + FoxIFrameFlags) + 2)) != 0)))))) { return 0; } - frameCtxt = longAt(theFP + FoxThisContext); + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFP + FoxThisContext); - return frameCtxt == aContext; + return maybeFrameCtxt == aContext; } sqInt @@ -46474,7 +46479,29 @@ && (ClassFloatCompactIndex == ((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)); } +static sqInt +isFrameonPage(char *aFrame, StackPage *aPage) +{ + char *prevFP; + char *theFP; + assert(!((isFree(aPage)))); + theFP = (aPage->headFP); + prevFP = theFP - 4; + while (1) { + if (theFP == aFrame) { + return 1; + } + if (!((theFP > prevFP) + && (theFP < ((aPage->baseFP))))) break; + prevFP = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } + return 0; +} + + /* Answer if the argument, which can be any object, is a live context. */ static sqInt @@ -46575,11 +46602,11 @@ static sqInt isWidowedContext(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; + char *maybeFrame; + sqInt maybeFrameCtxt; sqInt senderOop; char *shouldBeFrameCallerField; - char *theFrame; StackPage *thePage; assert((isContext(aOnceMarriedContext)) @@ -46588,15 +46615,15 @@ senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << ShiftForWord)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFrame = pointerForOop(senderOop - 1); + maybeFrame = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); if (!((isFree(thePage)) - || (theFrame < ((thePage->headFP))))) { + || (maybeFrame < ((thePage->headFP))))) { /* The frame pointer is within the bounds of a live page. Now check if it matches a frame. */ @@ -46604,13 +46631,18 @@ /* begin withoutSmallIntegerTags: */ assert(((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord))) & 1)); shouldBeFrameCallerField = pointerForOop((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << ShiftForWord))) - 1); - if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) - && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { - frameCtxt = longAt(theFrame + FoxThisContext); + if (((frameCallerFP(maybeFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(maybeFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFrame + FoxIFrameFlags) + 2)) != 0))) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFrame + FoxThisContext); - if (frameCtxt == aOnceMarriedContext) { + if (maybeFrameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -52546,25 +52578,7 @@ } } -static sqInt -isFrameonPage(char *aFrame, StackPage *aPage) -{ - char *theFP; - theFP = (aPage->headFP); - while (1) { - if (theFP == aFrame) { - return 1; - } - if (!((theFP != ((aPage->baseFP))) - && ((stackPageFor(theFP)) == aPage))) break; - /* begin frameCallerFP: */ - theFP = pointerForOop(longAt(theFP + FoxSavedFP)); - } - return 0; -} - - /* Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh). */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1304,6 +1304,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj) NoDbgRegParms; @@ -1465,7 +1466,6 @@ static sqInt cloneContext(sqInt aContext) NoDbgRegParms; static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveContextAt(void); static void primitiveContextAtPut(void); @@ -2335,7 +2335,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.913"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -63476,12 +63476,12 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 3) == 0) @@ -63493,37 +63493,44 @@ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFP = pointerForOop(senderOop - 1); + maybeFP = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFP, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); limitFP = ((thePage == GIV(stackPage)) && (currentFP != null) ? currentFP : (thePage->headFP)); - if (!((theFP >= limitFP) - && ((isNonImmediate(((sqInt)(frameCallerFP(theFP))))) - && (((withSmallIntegerTags(frameCallerFP(theFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) - && (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)))))) { + if (!((maybeFP >= limitFP) + && ((isNonImmediate(((sqInt)(frameCallerFP(maybeFP))))) + && (((withSmallIntegerTags(frameCallerFP(maybeFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) + && (((((usqInt)(longAt(maybeFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFP + FoxIFrameFlags) + 2)) != 0)))))) { return 0; } - frameCtxt = longAt(theFP + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFP + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFP, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; } - return frameCtxt == aContext; + return maybeFrameCtxt == aContext; } sqInt @@ -66612,7 +66619,29 @@ && (ClassFloatCompactIndex == ((longAt(oop)) & 0x3FFFFF)); } +static sqInt +isFrameonPage(char *aFrame, StackPage *aPage) +{ + char *prevFP; + char *theFP; + assert(!((isFree(aPage)))); + theFP = (aPage->headFP); + prevFP = theFP - (wordSize()); + while (1) { + if (theFP == aFrame) { + return 1; + } + if (!((theFP > prevFP) + && (theFP < ((aPage->baseFP))))) break; + prevFP = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } + return 0; +} + + /* Answer if the argument, which can be any object, is a live context. */ static sqInt @@ -66702,12 +66731,12 @@ static sqInt isWidowedContext(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; + char *maybeFrame; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; char *shouldBeFrameCallerField; - char *theFrame; StackPage *thePage; assert((isContext(aOnceMarriedContext)) @@ -66716,15 +66745,15 @@ senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFrame = pointerForOop(senderOop - 1); + maybeFrame = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); if (!((isFree(thePage)) - || (theFrame < ((thePage->headFP))))) { + || (maybeFrame < ((thePage->headFP))))) { /* The frame pointer is within the bounds of a live page. Now check if it matches a frame. */ @@ -66732,24 +66761,31 @@ /* begin withoutSmallIntegerTags: */ assert(((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) & 1)); shouldBeFrameCallerField = pointerForOop((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) - 1); - if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) - && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { - frameCtxt = longAt(theFrame + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + if (((frameCallerFP(maybeFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(maybeFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFrame + FoxIFrameFlags) + 2)) != 0))) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFrame + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFrame, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; /* begin setFrameContext:to: */ - longAtput(theFrame + FoxThisContext, frameCtxt); + longAtput(maybeFrame + FoxThisContext, maybeFrameCtxt); } - if (frameCtxt == aOnceMarriedContext) { + if (maybeFrameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -74069,25 +74105,7 @@ } } -static sqInt -isFrameonPage(char *aFrame, StackPage *aPage) -{ - char *theFP; - theFP = (aPage->headFP); - while (1) { - if (theFP == aFrame) { - return 1; - } - if (!((theFP != ((aPage->baseFP))) - && ((stackPageFor(theFP)) == aPage))) break; - /* begin frameCallerFP: */ - theFP = pointerForOop(longAt(theFP + FoxSavedFP)); - } - return 0; -} - - /* Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh). */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 22:52:56 UTC (rev 3111) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c + CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1307,6 +1307,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; static sqInt isNullExternalPrimitiveCall(sqInt aMethodObj) NoDbgRegParms; @@ -1468,7 +1469,6 @@ static sqInt cloneContext(sqInt aContext) NoDbgRegParms; static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveContextAt(void); static void primitiveContextAtPut(void); @@ -2338,7 +2338,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.913"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -63485,12 +63485,12 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 3) == 0) @@ -63502,37 +63502,44 @@ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFP = pointerForOop(senderOop - 1); + maybeFP = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFP)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFP, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFP)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFP)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFP, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); limitFP = ((thePage == GIV(stackPage)) && (currentFP != null) ? currentFP : (thePage->headFP)); - if (!((theFP >= limitFP) - && ((isNonImmediate(((sqInt)(frameCallerFP(theFP))))) - && (((withSmallIntegerTags(frameCallerFP(theFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) - && (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)))))) { + if (!((maybeFP >= limitFP) + && ((isNonImmediate(((sqInt)(frameCallerFP(maybeFP))))) + && (((withSmallIntegerTags(frameCallerFP(maybeFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) + && (((((usqInt)(longAt(maybeFP + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFP + FoxIFrameFlags) + 2)) != 0)))))) { return 0; } - frameCtxt = longAt(theFP + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFP + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFP, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; } - return frameCtxt == aContext; + return maybeFrameCtxt == aContext; } sqInt @@ -66621,7 +66628,29 @@ && (ClassFloatCompactIndex == ((longAt(oop)) & 0x3FFFFF)); } +static sqInt +isFrameonPage(char *aFrame, StackPage *aPage) +{ + char *prevFP; + char *theFP; + assert(!((isFree(aPage)))); + theFP = (aPage->headFP); + prevFP = theFP - (wordSize()); + while (1) { + if (theFP == aFrame) { + return 1; + } + if (!((theFP > prevFP) + && (theFP < ((aPage->baseFP))))) break; + prevFP = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } + return 0; +} + + /* Answer if the argument, which can be any object, is a live context. */ static sqInt @@ -66711,12 +66740,12 @@ static sqInt isWidowedContext(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; + char *maybeFrame; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; char *shouldBeFrameCallerField; - char *theFrame; StackPage *thePage; assert((isContext(aOnceMarriedContext)) @@ -66725,15 +66754,15 @@ senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFrame = pointerForOop(senderOop - 1); + maybeFrame = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ /* begin pageIndexFor: */ - assert((((((char *) theFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) theFrame)) <= (((char *) GIV(pages)))))); - index = pageIndexForstackBasePlus1bytesPerPage(theFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); + assert((((((char *) maybeFrame)) >= (GIV(stackBasePlus1) - 1)) && ((((char *) maybeFrame)) <= (((char *) GIV(pages)))))); + index = pageIndexForstackBasePlus1bytesPerPage(maybeFrame, GIV(stackBasePlus1), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); if (!((isFree(thePage)) - || (theFrame < ((thePage->headFP))))) { + || (maybeFrame < ((thePage->headFP))))) { /* The frame pointer is within the bounds of a live page. Now check if it matches a frame. */ @@ -66741,24 +66770,31 @@ /* begin withoutSmallIntegerTags: */ assert(((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) & 1)); shouldBeFrameCallerField = pointerForOop((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) - 1); - if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) - && (((((usqInt)(longAt(theFrame + FoxMethod)))) < (startOfMemory()) - ? ((longAt(theFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 - : (byteAt((theFrame + FoxIFrameFlags) + 2)) != 0))) { - frameCtxt = longAt(theFrame + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + if (((frameCallerFP(maybeFrame)) == shouldBeFrameCallerField) + && (((((usqInt)(longAt(maybeFrame + FoxMethod)))) < (startOfMemory()) + ? ((longAt(maybeFrame + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 + : (byteAt((maybeFrame + FoxIFrameFlags) + 2)) != 0))) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFrame + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFrame, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; /* begin setFrameContext:to: */ - longAtput(theFrame + FoxThisContext, frameCtxt); + longAtput(maybeFrame + FoxThisContext, maybeFrameCtxt); } - if (frameCtxt == aOnceMarriedContext) { + if (maybeFrameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -74078,25 +74114,7 @@ } } -static sqInt -isFrameonPage(char *aFrame, StackPage *aPage) -{ - char *theFP; - theFP = (aPage->headFP); - while (1) { - if (theFP == aFrame) { - return 1; - } - if (!((theFP != ((aPage->baseFP))) - && ((stackPageFor(theFP)) == aPage))) break; - /* begin frameCallerFP: */ - theFP = pointerForOop(longAt(theFP + FoxSavedFP)); - } - return 0; -} - - /* Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh). */ Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - StackInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + StackInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1074,6 +1074,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMachineCodeFrame(char *theFP) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; @@ -1257,7 +1258,6 @@ static sqInt cloneContext(sqInt aContext) NoDbgRegParms; static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveClosureCopyWithCopiedValues(void); static void primitiveContextAt(void); @@ -2083,7 +2083,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.913"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -49571,12 +49571,12 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 3) == 0) @@ -49588,33 +49588,40 @@ senderOop = longAt((aContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFP = pointerForOop(senderOop - 1); + maybeFP = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ - index = pageIndexForstackMemorybytesPerPage(theFP, GIV(stackMemory), GIV(bytesPerPage)); + index = pageIndexForstackMemorybytesPerPage(maybeFP, GIV(stackMemory), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); limitFP = ((thePage == GIV(stackPage)) && (currentFP != null) ? currentFP : (thePage->headFP)); - if (!((theFP >= limitFP) - && ((isNonImmediate(((sqInt)(frameCallerFP(theFP))))) - && (((withSmallIntegerTags(frameCallerFP(theFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) - && ((byteAt((theFP + FoxFrameFlags) + 2)) != 0))))) { + if (!((maybeFP >= limitFP) + && ((isNonImmediate(((sqInt)(frameCallerFP(maybeFP))))) + && (((withSmallIntegerTags(frameCallerFP(maybeFP))) == (longAt((aContext + BaseHeaderSize) + (InstructionPointerIndex << 2)))) + && ((byteAt((maybeFP + FoxFrameFlags) + 2)) != 0))))) { return 0; } - frameCtxt = longAt(theFP + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFP + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFP, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; } - return frameCtxt == aContext; + return maybeFrameCtxt == aContext; } @@ -53410,7 +53417,29 @@ && (ClassFloatCompactIndex == ((longAt(oop)) & 0x3FFFFF)); } +static sqInt +isFrameonPage(char *aFrame, StackPage *aPage) +{ + char *prevFP; + char *theFP; + assert(!((isFree(aPage)))); + theFP = (aPage->headFP); + prevFP = theFP - (wordSize()); + while (1) { + if (theFP == aFrame) { + return 1; + } + if (!((theFP > prevFP) + && (theFP < ((aPage->baseFP))))) break; + prevFP = theFP; + /* begin frameCallerFP: */ + theFP = pointerForOop(longAt(theFP + FoxSavedFP)); + } + return 0; +} + + /* Answer if the argument, which can be any object, is a live context. */ static sqInt @@ -53489,12 +53518,12 @@ static sqInt isWidowedContext(sqInt aOnceMarriedContext) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; + char *maybeFrame; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; char *shouldBeFrameCallerField; - char *theFrame; StackPage *thePage; assert((isContext(aOnceMarriedContext)) @@ -53503,13 +53532,13 @@ senderOop = longAt((aOnceMarriedContext + BaseHeaderSize) + (SenderIndex << 2)); /* begin withoutSmallIntegerTags: */ assert((senderOop & 1)); - theFrame = pointerForOop(senderOop - 1); + maybeFrame = pointerForOop(senderOop - 1); /* begin stackPageFor: */ /* begin stackPageAt: */ - index = pageIndexForstackMemorybytesPerPage(theFrame, GIV(stackMemory), GIV(bytesPerPage)); + index = pageIndexForstackMemorybytesPerPage(maybeFrame, GIV(stackMemory), GIV(bytesPerPage)); thePage = stackPageAtpages(index, GIV(pages)); if (!((isFree(thePage)) - || (theFrame < ((thePage->headFP))))) { + || (maybeFrame < ((thePage->headFP))))) { /* The frame pointer is within the bounds of a live page. Now check if it matches a frame. */ @@ -53517,22 +53546,29 @@ /* begin withoutSmallIntegerTags: */ assert(((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) & 1)); shouldBeFrameCallerField = pointerForOop((longAt((aOnceMarriedContext + BaseHeaderSize) + (InstructionPointerIndex << 2))) - 1); - if (((frameCallerFP(theFrame)) == shouldBeFrameCallerField) - && ((byteAt((theFrame + FoxFrameFlags) + 2)) != 0)) { - frameCtxt = longAt(theFrame + FoxThisContext); - if (((longAt(frameCtxt)) & (0x3FFFFF - 8)) == 0) { + if (((frameCallerFP(maybeFrame)) == shouldBeFrameCallerField) + && ((byteAt((maybeFrame + FoxFrameFlags) + 2)) != 0)) { + + /* On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow. */ + + maybeFrameCtxt = longAt(maybeFrame + FoxThisContext); + if (1 + && ((isFrameonPage(maybeFrame, thePage)) + && (((longAt(maybeFrameCtxt)) & (0x3FFFFF - 8)) == 0))) { /* begin followForwarded: */ - assert(isUnambiguouslyForwarder(frameCtxt)); - referent = longAt((frameCtxt + BaseHeaderSize) + (0 << 2)); + assert(isUnambiguouslyForwarder(maybeFrameCtxt)); + referent = longAt((maybeFrameCtxt + BaseHeaderSize) + (0 << 2)); while (((referent & 3) == 0) && (((longAt(referent)) & 0x3FFFFF) == 8)) { referent = longAt((referent + BaseHeaderSize) + (0 << 2)); } - frameCtxt = referent; + maybeFrameCtxt = referent; /* begin setFrameContext:to: */ - longAtput(theFrame + FoxThisContext, frameCtxt); + longAtput(maybeFrame + FoxThisContext, maybeFrameCtxt); } - if (frameCtxt == aOnceMarriedContext) { + if (maybeFrameCtxt == aOnceMarriedContext) { /* It is still married! */ @@ -63874,25 +63910,7 @@ } } -static sqInt -isFrameonPage(char *aFrame, StackPage *aPage) -{ - char *theFP; - theFP = (aPage->headFP); - while (1) { - if (theFP == aFrame) { - return 1; - } - if (!((theFP != ((aPage->baseFP))) - && ((stackPageFor(theFP)) == aPage))) break; - /* begin frameCallerFP: */ - theFP = pointerForOop(longAt(theFP + FoxSavedFP)); - } - return 0; -} - - /* Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh). */ Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-10-24 20:43:48 UTC (rev 3110) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-10-24 22:52:56 UTC (rev 3111) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 from - StackInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d + StackInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.909 uuid: 0d4fb242-44a2-408b-bc90-a737cfdd364d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.913 uuid: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1071,6 +1071,7 @@ static sqInt isBaseFrame(char *theFP) NoDbgRegParms; static sqInt isEmptyList(sqInt aLinkedList) NoDbgRegParms; sqInt isFloatObject(sqInt oop); +static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static sqInt isLiveContext(sqInt oop) NoDbgRegParms; static sqInt isMachineCodeFrame(char *theFP) NoDbgRegParms; static sqInt isMarriedOrWidowedContext(sqInt aContext) NoDbgRegParms; @@ -1254,7 +1255,6 @@ static sqInt cloneContext(sqInt aContext) NoDbgRegParms; static sqInt fieldOrSenderFPofContext(sqInt index, sqInt contextObj) NoDbgRegParms; static sqInt fieldofFrame(sqInt index, char *theFP) NoDbgRegParms; -static sqInt isFrameonPage(char *aFrame, StackPage *aPage) NoDbgRegParms; static void primitiveClone(void); static void primitiveClosureCopyWithCopiedValues(void); static void primitiveContextAt(void); @@ -2080,7 +2080,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.909"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.913"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -49562,12 +49562,12 @@ static sqInt checkIsStillMarriedContextcurrentFP(sqInt aContext, char *currentFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt frameCtxt; sqInt index; char *limitFP; + char *maybeFP; + sqInt maybeFrameCtxt; sqInt referent; sqInt senderOop; - char *theFP; StackPage *thePage; if (!((((aContext & 3) == 0) @@ -49579,33 +49579,40 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.913.mcz
by commits＠source.squeak.org 25 Oct '14

25 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.913.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.913 Author: eem Time: 24 October 2014, 3:48:03.341 pm UUID: 236b8f3e-0ff4-4a68-baf9-e3fc62b97da7 Ancestors: VMMaker.oscog-eem.912 Fix baaaad bug in checking for still-married contexts in Spur. One *cannot* simply follow what is assumed to be the frameContext field of what is presumed to be a context. On Spur we need to *know* whether we have a valid frameContext field, and for that we have to know there is a valid frame. So refactor, moving isFrame:onPage: from StackInterpreterPrimitives to StackInterpreter, and use it to validate the frame pointer of a maybe married context before testing the context for being forwarded. =============== Diff against VMMaker.oscog-eem.912 =============== Item was changed: ----- Method: StackInterpreter>>checkIsStillMarriedContext:currentFP: (in category 'frame access') ----- checkIsStillMarriedContext: aContext currentFP: currentFP "Another version of isWidowedContext: for debugging. This will not bereave a widowed context." + | thePage maybeFP limitFP maybeFrameCtxt | - | thePage theFP limitFP frameCtxt | <inline: false> <var: #currentFP type: #'char *'> <var: #thePage type: #'StackPage *'> + <var: #maybeFP type: #'char *'> - <var: #theFP type: #'char *'> <var: #limitFP type: #'char *'> ((objectMemory isContext: aContext) and: [self isMarriedOrWidowedContext: aContext]) ifFalse: [^false]. + maybeFP := self frameOfMarriedContext: aContext. + thePage := stackPages stackPageFor: maybeFP. - theFP := self frameOfMarriedContext: aContext. - thePage := stackPages stackPageFor: theFP. limitFP := (thePage = stackPage and: [currentFP notNil]) ifTrue: [currentFP] ifFalse: [thePage headFP]. + (maybeFP >= limitFP + and: [(objectMemory isNonImmediate: (self frameCallerFP: maybeFP) asInteger) + and: [(self withSmallIntegerTags: (self frameCallerFP: maybeFP)) - (theFP >= limitFP - and: [(objectMemory isNonImmediate: (self frameCallerFP: theFP) asInteger) - and: [(self withSmallIntegerTags: (self frameCallerFP: theFP)) = (objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext) + and: [self frameHasContext: maybeFP]]]) ifFalse: - and: [self frameHasContext: theFP]]]) ifFalse: [^false]. + maybeFrameCtxt := self frameContext: maybeFP. + "On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow." + (objectMemory hasSpurMemoryManagerAPI + and: [(self isFrame: maybeFP onPage: thePage) + and: [objectMemory isForwarded: maybeFrameCtxt]]) ifTrue: + [maybeFrameCtxt := objectMemory followForwarded: maybeFrameCtxt]. + ^maybeFrameCtxt = aContext! - frameCtxt := self frameContext: theFP. - (objectMemory isForwarded: frameCtxt) ifTrue: - [frameCtxt := objectMemory followForwarded: frameCtxt]. - ^frameCtxt = aContext! Item was added: + ----- Method: StackInterpreter>>isFrame:onPage: (in category 'frame access') ----- + isFrame: aFrame onPage: aPage + <var: #aFrame type: #'char *'> + <var: #aPage type: #'StackPage *'> + | theFP prevFP | + <var: #theFP type: #'char *'> + <var: #prevFP type: #'char *'> + self deny: (stackPages isFree: aPage). + "Walk the static chain making sure progress is being made, + and in the right direction, looking for a match with aFrame." + theFP := aPage headFP. + prevFP := theFP - objectMemory wordSize. + [theFP = aFrame ifTrue: [^true]. + theFP > prevFP + and: [theFP < aPage baseFP]] whileTrue: + [prevFP := theFP. + theFP := self frameCallerFP: theFP]. + ^false! Item was changed: ----- Method: StackInterpreter>>isWidowedContext: (in category 'frame access') ----- isWidowedContext: aOnceMarriedContext "See if the argument is married to a live frame or not. If it is not, turn it into a bereaved single context." + | maybeFrame thePage shouldBeFrameCallerField maybeFrameCtxt | + <var: #maybeFrame type: #'char *'> - | theFrame thePage shouldBeFrameCallerField frameCtxt | - <var: #theFrame type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #shouldBeFrameCallerField type: #'char *'> self assert: ((objectMemory isContext: aOnceMarriedContext) and: [self isMarriedOrWidowedContext: aOnceMarriedContext]). + maybeFrame := self frameOfMarriedContext: aOnceMarriedContext. + thePage := stackPages stackPageFor: maybeFrame. - theFrame := self frameOfMarriedContext: aOnceMarriedContext. - thePage := stackPages stackPageFor: theFrame. ((stackPages isFree: thePage) + or: [maybeFrame < thePage headFP]) ifFalse: - or: [theFrame < thePage headFP]) ifFalse: ["The frame pointer is within the bounds of a live page. Now check if it matches a frame." shouldBeFrameCallerField := self withoutSmallIntegerTags: (objectMemory fetchPointer: InstructionPointerIndex ofObject: aOnceMarriedContext). + ((self frameCallerFP: maybeFrame) = shouldBeFrameCallerField + and: [self frameHasContext: maybeFrame]) ifTrue: + [maybeFrameCtxt := self frameContext: maybeFrame. + "On Spur we need to follow the context to check for a match, but since the VM is + only speculating about maybeFrame being a frame, and only speculating about + maybeContext being a context, we need to be sure before we can safely follow." + (objectMemory hasSpurMemoryManagerAPI + and: [(self isFrame: maybeFrame onPage: thePage) + and: [objectMemory isForwarded: maybeFrameCtxt]]) ifTrue: + [maybeFrameCtxt := objectMemory followForwarded: maybeFrameCtxt. + self setFrameContext: maybeFrame to: maybeFrameCtxt]. + maybeFrameCtxt = aOnceMarriedContext ifTrue: "It is still married!!" - ((self frameCallerFP: theFrame) = shouldBeFrameCallerField - and: [self frameHasContext: theFrame]) ifTrue: - [frameCtxt := self frameContext: theFrame. - (objectMemory isForwarded: frameCtxt) ifTrue: - [frameCtxt := objectMemory followForwarded: frameCtxt. - self setFrameContext: theFrame to: frameCtxt]. - frameCtxt = aOnceMarriedContext ifTrue: "It is still married!!" [^false]]]. "It is out of range or doesn't match the frame's context. It is widowed. Time to wear black." self markContextAsDead: aOnceMarriedContext. ^true! Item was removed: - ----- Method: StackInterpreterPrimitives>>isFrame:onPage: (in category 'object access primitives') ----- - isFrame: aFrame onPage: aPage - <var: #aFrame type: #'char *'> - <var: #aPage type: #'StackPage *'> - | theFP | - <var: #theFP type: #'char *'> - theFP := aPage headFP. - [theFP = aFrame ifTrue: [^true]. - theFP ~= aPage baseFP - and: [(stackPages stackPageFor: theFP) = aPage]] whileTrue: - [theFP := self frameCallerFP: theFP]. - ^false!

1 0

[commit][3110] CogVM source as per VMMaker.oscog-eem.912
by commits＠squeakvm.org 24 Oct '14

24 Oct '14

Revision: 3110 Author: eliot Date: 2014-10-24 13:43:48 -0700 (Fri, 24 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.912 Fix another assert fail case in ceInterpretMethodFromPIC:receiver: Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2085,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14400,18 +14400,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36757,15 +36760,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36776,7 +36781,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36791,7 +36810,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36845,18 +36864,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38731,7 +38750,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -2088,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14409,18 +14409,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ @@ -36766,15 +36769,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36785,7 +36790,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36800,7 +36819,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36854,18 +36873,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((((usqInt)(newFreeChunk + sz2))) >= GIV(freeStart) + next = ((((usqInt)(newFreeChunk + sz3))) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38740,7 +38759,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2335,7 +2335,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16289,18 +16289,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2338,7 +2338,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.911"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.912"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16298,18 +16298,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Oct 24 11:52:39 PDT 2014 + Fri Oct 24 13:43:54 PDT 2014 Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2081,7 +2081,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14639,18 +14639,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2084,7 +2084,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14648,18 +14648,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2330,7 +2330,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5629,6 +5629,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l296; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5646,7 +5647,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l296: /* end baseFrameReturn */; goto l295; } @@ -16906,18 +16907,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2333,7 +2333,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5638,6 +5638,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l296; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5655,7 +5656,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l296: /* end baseFrameReturn */; goto l295; } @@ -16915,18 +16916,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursrc/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2322,7 +2322,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -11548,18 +11548,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursrc/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2325,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -11557,18 +11557,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2073,7 +2073,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -10202,18 +10202,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/cointerp.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/cointerpmt.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreterMT VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreterMT VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2170,7 +2170,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -10654,18 +10654,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/cointerpmt.h 2014-10-24 20:43:48 UTC (rev 3110) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2076,7 +2076,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -10211,18 +10211,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-10-24 18:53:45 UTC (rev 3109) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-10-24 20:43:48 UTC (rev 3110) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c from - CoInterpreterMT VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd + CoInterpreterMT VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.911 uuid: 39c7bff8-ff88-43a5-88bc-cbbdb206cbcd " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.912 uuid: d8b9d04a-adc6-44f8-b460-225d5ab73f6c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2173,7 +2173,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.911]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.912]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -10663,18 +10663,21 @@ sqInt primitiveIndex; sqInt top; - assert(!(methodHasCogMethod(aMethodObj))); + + /* pop off inner return and locate open or closed PIC */ + pic = ((CogMethod *) ((popStack()) - (interpretOffset()))); assert((((pic->cmType)) == CMOpenPIC) || (((pic->cmType)) == CMClosedPIC)); if (((pic->cmType)) == CMOpenPIC) { + assert(!(methodHasCogMethod(aMethodObj))); if (methodShouldBeCogged(aMethodObj)) { cogselector(aMethodObj, (pic->selector)); - if (methodHasCogMethod(aMethodObj)) { - executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); - } } } + if (methodHasCogMethod(aMethodObj)) { + executeCogMethodfromUnlinkedSendWithReceiver(cogMethodOf(aMethodObj), rcvr); + } GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */

1 0

VM Maker: VMMaker.oscog-eem.912.mcz
by commits＠source.squeak.org 24 Oct '14

24 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.912.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.912 Author: eem Time: 24 October 2014, 1:36:10.594 pm UUID: d8b9d04a-adc6-44f8-b460-225d5ab73f6c Ancestors: VMMaker.oscog-eem.911 Fix another assert fail case in ceInterpretMethodFromPIC:receiver: =============== Diff against VMMaker.oscog-eem.911 =============== Item was changed: ----- Method: CoInterpreter>>ceInterpretMethodFromPIC:receiver: (in category 'trampolines') ----- ceInterpretMethodFromPIC: aMethodObj receiver: rcvr <api> | pic primitiveIndex | <var: #pic type: #'CogMethod *'> + "pop off inner return and locate open or closed PIC" - self assert: (self methodHasCogMethod: aMethodObj) not. - "pop off inner return and locate open PIC" pic := self cCoerceSimple: self popStack - cogit interpretOffset to: #'CogMethod *'. self assert: (pic cmType = CMOpenPIC or: [pic cmType = CMClosedPIC]). "If found from an open PIC then it must be an uncogged method and, since it's been found + in the method cache, should be cogged if possible. If found from a closed PIC then at the + time the closed PIC was created the method was uncoggable, either because there was + no space, it had too many literals or it contained an illegal bytecode). So don't try and cog + it, but subsequently it may have been cogged via another path. If the method is, or ends up + cogged, jump to machine code, otherwise interpret." - in the method cache, should be cogged if possible. If found from a closed PIC it should - be interpreted (since being reached by that route implies it is uncoggable, either because - there was no space, it had too many literals or it contained an illegal bytecode)." pic cmType = CMOpenPIC ifTrue: + [self assert: (self methodHasCogMethod: aMethodObj) not. + (self methodShouldBeCogged: aMethodObj) ifTrue: + [cogit cog: aMethodObj selector: pic selector]]. + (self methodHasCogMethod: aMethodObj) ifTrue: + [self executeCogMethod: (self cogMethodOf: aMethodObj) + fromUnlinkedSendWithReceiver: rcvr + "NOTREACHED"]. - [(self methodShouldBeCogged: aMethodObj) ifTrue: - [cogit cog: aMethodObj selector: pic selector. - (self methodHasCogMethod: aMethodObj) ifTrue: - [self executeCogMethod: (self cogMethodOf: aMethodObj) - fromUnlinkedSendWithReceiver: rcvr]]]. messageSelector := pic selector. newMethod := aMethodObj. primitiveIndex := self primitiveIndexOf: aMethodObj. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: objectMemory nilObject. argumentCount := pic cmNumArgs. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2014