Vm-dev November 2013

vm-dev@lists.squeakfoundation.org

30 participants
103 discussions

Building VM on windows: lining problem
by phil＠highoctane.be 20 Nov '13

20 Nov '13

I've been moving forward with building the VM for Windows from the GitHub sources with MinGW. Now, to get the thing to compile, I had to replace the oft_t things by _oft_t, same for the 64 flavor. So, modifiying two header files, one being mingw.h where I put #define oft_t _oft_t at the end. This did the trick and I now have all plugins/dlls building fine: FT2Plugin.dll libcairo-2.dll libeay32.dll libfreetype-6.dll libfreetype.dll.a libFT2Plugin.dll.a libpixman-1-0.dll libpng-3.dll libSqueakFFIPrims.dll.a libSqueakSSL.dll.a SqueakFFIPrims.dll SqueakSSL.dll ssleay32.dll zlib1.dll are in results/ Also, to get there, one has to create a vmVersionInfo.h file in platforms\Cross\vm with something in the REVISION_STRING #define REVISION_STRING "Pharo VM - Philippe Back from GitHub Sources 20131119" I wonder why this isn't something automagically generated in the process as it seems that the CI build has something. The last step is getting Pharo.exe to link but this doesn't work: Linking C executable /C/MinGW/msys/1.0/home/Philippe/pharo-vm/results/Pharo.exe c:/mingw/bin/../lib/gcc/mingw32/4.8.1/../../../../mingw32/bin/ld.exe: cannot fin d -lcrtdll collect2.exe: error: ld returned 1 exit status make[2]: *** [C:/MinGW/msys/1.0/home/Philippe/pharo-vm/results/Pharo.exe] Error 1 make[1]: *** [CMakeFiles/Pharo.dir/all] Error 2 make: *** [all] Error 2 Looks like a library path is wrong or else. Idea? Also, there are quite a number of warnings spit out during the compiling process all over the place, more than the Mac VM build I think. e.g. [ 92%] Building C object CMakeFiles/Pharo.dir/C_/MinGW/msys/1.0/home/Philippe/ph aro-vm/platforms/win32/vm/sqWin32Prefs.c.obj In file included from C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/Cross/v m/sq.h:193:0, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/v m/sqWin32Prefs.c:20: C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/vm/sqPlatformSpecific.h :52:0: warning: "VM_EXPORT" redefined [enabled by default] # define VM_EXPORT __declspec( dllexport ) ^ In file included from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/v m/sqWin32Prefs.c:20:0: C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/Cross/vm/sq.h:48:0: note: thi s is the location of the previous definition #define VM_EXPORT ^ [ 93%] Building C object CMakeFiles/Pharo.dir/C_/MinGW/msys/1.0/home/Philippe/ph aro-vm/platforms/win32/vm/sqWin32Utils.c.obj In file included from C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/Cross/v m/sq.h:193:0, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/v m/sqWin32Utils.c:14: C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/vm/sqPlatformSpecific.h :52:0: warning: "VM_EXPORT" redefined [enabled by default] # define VM_EXPORT __declspec( dllexport ) ^ In file included from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/win32/v m/sqWin32Utils.c:14:0: C:/MinGW/msys/1.0/home/Philippe/pharo-vm/platforms/Cross/vm/sq.h:48:0: note: thi s is the location of the previous definition #define VM_EXPORT Phil

4 11

[commit][2816] Fix snafu in changing unix configure script to allow specifying of different
by commits＠squeakvm.org 20 Nov '13

20 Nov '13

Revision: 2816 Author: eliot Date: 2013-11-19 15:53:24 -0800 (Tue, 19 Nov 2013) Log Message: ----------- Fix snafu in changing unix configure script to allow specifying of different plugins dir. Judiciously apply some svn:ignore properties. Modified Paths: -------------- branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/spurcogbuild/macbuild/ branches/Cog/spurstackbuild/cygwinbuild/ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Nov 19 14:22:25 PST 2013 + Tue Nov 19 15:52:36 PST 2013 Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2013-11-19 22:23:16 UTC (rev 2815) +++ branches/Cog/platforms/unix/config/configure 2013-11-19 23:53:24 UTC (rev 2816) @@ -1038,7 +1038,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-src=dir generated src directory default=src - --with-plugins=dir generated plugins directory default=src/plugins + --with-plugins=dir generated plugins directory default=${vmmdir}/plugins --with-vmmcfg=dir vm configuration directory containing plugins.int and plugins.ext default=. --with-gnu-awk assume that awk is GNU gawk default=no --with-gnu-as assume that as is the GNU assembler default=no @@ -1540,12 +1540,12 @@ # Check whether --with-plugins or --without-plugins was given. if test "${with_plugins+set}" = set; then withval="$with_plugins" - vmpsrc="${with_plugins}" + vmpsrc="${topdir}/${with_plugins}" else - vmpsrc="src/plugins" + vmpsrc="${vmmdir}/plugins" fi; -vmpdir="${topdir}/${vmpsrc}" +vmpdir="${vmpsrc}" if test ! -d "${topdir}/${vmmsrc}"; then if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2013-11-19 22:23:16 UTC (rev 2815) +++ branches/Cog/platforms/unix/config/configure.ac 2013-11-19 23:53:24 UTC (rev 2816) @@ -47,11 +47,11 @@ vmmdir="${topdir}/${vmmsrc}" AC_ARG_WITH(plugins, -[ --with-plugins=dir generated plugins directory [default=src/plugins]], -[ vmpsrc="${with_plugins}"], -[ vmpsrc="src/plugins"]) +[ --with-plugins=dir generated plugins directory [default=${vmmdir}/plugins]], +[ vmpsrc="${topdir}/${with_plugins}"], +[ vmpsrc="${vmmdir}/plugins"]) -vmpdir="${topdir}/${vmpsrc}" +vmpdir="${vmpsrc}" if test ! -d "${topdir}/${vmmsrc}"; then if test -d "${topdir}/platforms/unix/${vmmsrc}/vm"; then Property changes on: branches/Cog/spurcogbuild/macbuild ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/spurstackbuild/cygwinbuild ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h

1 0

[commit][2815] Cog Spur VM source as per VMMaker.oscog-eem.516.
by commits＠squeakvm.org 19 Nov '13

19 Nov '13

Revision: 2815 Author: eliot Date: 2013-11-19 14:23:16 -0800 (Tue, 19 Nov 2013) Log Message: ----------- Cog Spur VM source as per VMMaker.oscog-eem.516. Add a Spur Cog Mac OS build. Add a sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto for Unix, and add the heartbeat file to the Unix build. Modified Paths: -------------- branches/Cog/platforms/unix/vm/Makefile.in branches/Cog/platforms/unix/vm/sqUnixMemory.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/spurcogbuild/ branches/Cog/spurcogbuild/macbuild/ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1 branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/Info.plist branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/makeit branches/Cog/spurcogbuild/macbuild/CoreMTVM.xcodeproj/ branches/Cog/spurcogbuild/macbuild/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/CoreVM.plist branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/ branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/johnmci.mode1 branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/johnmci.pbxuser branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/sophie.mode1 branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/sophie.pbxuser branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/temp branches/Cog/spurcogbuild/macbuild/CoreVM.xcodeproj/werdna.pbxuser branches/Cog/spurcogbuild/macbuild/CroquetPlugin/ branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/CroquetPlugin/CroquetPlugin_Prefix.pch branches/Cog/spurcogbuild/macbuild/CroquetPlugin/English.lproj/ branches/Cog/spurcogbuild/macbuild/CroquetPlugin/English.lproj/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/CroquetPlugin/Info.plist branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/ branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/English.lproj/ branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/English.lproj/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin_Prefix.pch branches/Cog/spurcogbuild/macbuild/FloatArrayPlugin/Info.plist branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/ branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/English.lproj/ branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/English.lproj/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/FloatMathPlugin_Prefix.pch branches/Cog/spurcogbuild/macbuild/FloatMathPlugin/Info.plist branches/Cog/spurcogbuild/macbuild/HowToBuild branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/ branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin-Info.plist branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/ branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/Info.plist branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/SqueakFFIPrims/SqueakFFIPrims_Prefix.pch branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/ branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/Info.plist branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/SqueakMTFFIPrims/SqueakFFIPrims_Prefix.pch branches/Cog/spurcogbuild/macbuild/SqueakSSL/ branches/Cog/spurcogbuild/macbuild/SqueakSSL/Info.plist branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/spurcogbuild/macbuild/Template/ branches/Cog/spurcogbuild/macbuild/Template/HowToMakeANewPlugin.txt branches/Cog/spurcogbuild/macbuild/Template/Info.plist branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/ branches/Cog/spurcogbuild/macbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/Template/Template_Prefix.pch branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/ branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/English.lproj/ branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/English.lproj/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/Info.plist branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/PkgInfo branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/ branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.mode1 branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.pbxuser branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/spurcogbuild/macbuild/UnixOSProcessPlugin/makeit branches/Cog/spurcogbuild/macbuild/makeall branches/Cog/spurcogbuild/macbuild/makeclean branches/Cog/spurcogbuild/macbuild/makevm branches/Cog/spurcogbuild/macbuild/mkNamedPrims.sh branches/Cog/spurcogbuild/macbuild/mvm branches/Cog/spurcogbuild/macbuild/plugins.ext branches/Cog/spurcogbuild/macbuild/plugins.int branches/Cog/spurcogbuild/macbuild/resources/ branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/ branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/MacOS/FT2Plugin branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/FT2Plugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/ branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/FloatMathPlugin branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/ branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/LocalePlugin branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/ branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/Croquet.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/Squeak VM.r branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/Squeak.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakChanges.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakGeneric.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakImage.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakPlugin.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakProject.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakScript.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/SqueakSources.icns branches/Cog/spurcogbuild/macbuild/resources/ProjectBuilder/Teleplace.icns branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/ branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/QuicktimePlugin branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/QuicktimePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/SpellCheck branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Info.plist branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/SpellingPlugin branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/ branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/InfoPlist.strings branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/PkgInfo branches/Cog/spurcogbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/SqueakPlugin.icns Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/spurstackbuild/unixbuild/astbld/ branches/Cog/spurstackbuild/unixbuild/astbldt/ branches/Cog/spurstackbuild/unixbuild/bld/ branches/Cog/spurstackbuild/unixbuild/bldt/ branches/Cog/spurstackbuild/unixbuild/dbgbld/ branches/Cog/spurstackbuild/unixbuild/dbgbldt/ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Nov 13 18:17:37 PST 2013 + Tue Nov 19 14:22:25 PST 2013 Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2013-11-18 23:19:10 UTC (rev 2814) +++ branches/Cog/platforms/unix/vm/Makefile.in 2013-11-19 22:23:16 UTC (rev 2815) @@ -49,7 +49,7 @@ IOBJS = $(INTERP)$o sqNamedPrims$o sqVirtualMachine$o sqHeapMap$o\ sqExternalSemaphores$o sqTicker$o aio$o debug$o osExports$o \ sqUnixExternalPrims$o sqUnixMemory$o sqUnixCharConv$o sqUnixMain$o \ - sqUnixVMProfile$o sqUnixThreads$o + sqUnixVMProfile$o sqUnixHeartbeat$o sqUnixThreads$o OBJS = [COBJS_OR_IOBJS] # see mkmf Modified: branches/Cog/platforms/unix/vm/sqUnixMemory.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMemory.c 2013-11-18 23:19:10 UTC (rev 2814) +++ branches/Cog/platforms/unix/vm/sqUnixMemory.c 2013-11-19 22:23:16 UTC (rev 2815) @@ -303,13 +303,13 @@ #endif +#define roundDownToPage(v) ((v)&pageMask) +#define roundUpToPage(v) (((v)+pageSize-1)&pageMask) #if COGVM -# define roundDownToPageBoundary(v) ((v)&pageMask) -# define roundUpToPageBoundary(v) (((v)+pageSize-1)&pageMask) void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { - unsigned long firstPage = roundDownToPageBoundary(startAddr); + unsigned long firstPage = roundDownToPage(startAddr); if (mprotect((void *)firstPage, endAddr - firstPage + 1, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) @@ -319,7 +319,7 @@ void sqMakeMemoryNotExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { - unsigned long firstPage = roundDownToPageBoundary(startAddr); + unsigned long firstPage = roundDownToPage(startAddr); if (mprotect((void *)firstPage, endAddr - firstPage + 1, PROT_READ | PROT_WRITE) < 0) @@ -327,7 +327,39 @@ } #endif /* COGVM */ +#if SPURVM +/* Allocate a region of memory of al least size bytes, at or above minAddress. + * If the attempt fails, answer null. If the attempt succeeds, answer the + * start of the region and assign its size through allocatedSizePointer. + */ +void * +sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer) +{ + void *alloc; + long bytes = roundUpToPage(size); + if (!pageSize) { + pageSize = getpagesize(); + pageMask = pageSize - 1; + } + *allocatedSizePointer = bytes; + while ((char *)minAddress + bytes > (char *)minAddress) { + alloc = mmap((void *)roundUpToPage((unsigned long)minAddress), bytes, + PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0); + if (alloc == MAP_FAILED) { + perror("sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto mmap:"); + return 0; + } + if (alloc >= minAddress) + return alloc; + munmap(alloc, bytes); + minAddress = (void *)((char *)minAddress + bytes); + } + return 0; +} +#endif /* SPURVM */ + + #if defined(TEST_MEMORY) #define MBytes *1024*1024 Added: branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1 =================================================================== --- branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1 (rev 0) +++ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1 2013-11-19 22:23:16 UTC (rev 2815) @@ -0,0 +1,1333 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>ActivePerspectiveName</key> + <string>Project</string> + <key>AllowedModules</key> + <array> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Name</key> + <string>Groups and Files Outline View</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Name</key> + <string>Editor</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCTaskListModule</string> + <key>Name</key> + <string>Task List</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDetailModule</string> + <key>Name</key> + <string>File and Smart Group Detail Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Name</key> + <string>Detailed Build Results Viewer</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXProjectFindModule</string> + <key>Name</key> + <string>Project Batch Find Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXRunSessionModule</string> + <key>Name</key> + <string>Run Log</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXBookmarksModule</string> + <key>Name</key> + <string>Bookmarks Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXClassBrowserModule</string> + <key>Name</key> + <string>Class Browser</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXCVSModule</string> + <key>Name</key> + <string>Source Code Control Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXDebugBreakpointsModule</string> + <key>Name</key> + <string>Debug Breakpoints Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>XCDockableInspector</string> + <key>Name</key> + <string>Inspector</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>n</string> + <key>Module</key> + <string>PBXOpenQuicklyModule</string> + <key>Name</key> + <string>Open Quickly Tool</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXDebugSessionModule</string> + <key>Name</key> + <string>Debugger</string> + </dict> + <dict> + <key>BundleLoadPath</key> + <string></string> + <key>MaxInstances</key> + <string>1</string> + <key>Module</key> + <string>PBXDebugCLIModule</string> + <key>Name</key> + <string>Debug Console</string> + </dict> + </array> + <key>Description</key> + <string>DefaultDescriptionKey</string> + <key>DockingSystemVisible</key> + <false/> + <key>Extension</key> + <string>mode1</string> + <key>FavBarConfig</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>732BAA9E0EE7128F00655F61</string> + <key>XCBarModuleItemNames</key> + <dict/> + <key>XCBarModuleItems</key> + <array/> + </dict> + <key>FirstTimeWindowDisplayed</key> + <false/> + <key>Identifier</key> + <string>com.apple.perspectives.project.mode1</string> + <key>MajorVersion</key> + <integer>31</integer> + <key>MinorVersion</key> + <integer>1</integer> + <key>Name</key> + <string>Default</string> + <key>Notifications</key> + <array/> + <key>OpenEditors</key> + <array/> + <key>PerspectiveWidths</key> + <array> + <integer>-1</integer> + <integer>-1</integer> + </array> + <key>Perspectives</key> + <array> + <dict> + <key>ChosenToolbarItems</key> + <array> + <string>active-target-popup</string> + <string>active-buildstyle-popup</string> + <string>action</string> + <string>NSToolbarFlexibleSpaceItem</string> + <string>buildOrClean</string> + <string>build-and-runOrDebug</string> + <string>com.apple.ide.PBXToolbarStopButton</string> + <string>get-info</string> + <string>toggle-editor</string> + <string>NSToolbarFlexibleSpaceItem</string> + <string>com.apple.pbx.toolbar.searchfield</string> + </array> + <key>ControllerClassBaseName</key> + <string></string> + <key>IconName</key> + <string>WindowOfProjectWithEditor</string> + <key>Identifier</key> + <string>perspective.project</string> + <key>IsVertical</key> + <false/> + <key>Layout</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C37FBAC04509CD000000102</string> + <string>1C37FAAC04509CD000000102</string> + <string>1C08E77C0454961000C914BD</string> + <string>1C37FABC05509CD000000102</string> + <string>1C37FABC05539CD112110102</string> + <string>E2644B35053B69B200211256</string> + <string>1C37FABC04509CD000100104</string> + <string>1CC0EA4004350EF90044410B</string> + <string>1CC0EA4004350EF90041110B</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>1CE0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>yes</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>186</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>089C166AFE841209C02AAC07</string> + <string>08FB77ADFE841716C02AAC07</string> + <string>089C167CFE841241C02AAC07</string> + <string>089C1671FE841209C02AAC07</string> + <string>19C28FB4FE9D528D11CA2CBB</string> + <string>1C37FBAC04509CD000000102</string> + <string>1C37FABC05509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {186, 777}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <true/> + <key>XCSharingToken</key> + <string>com.apple.Xcode.GFSharingToken</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {203, 795}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>186</real> + </array> + <key>RubberWindowFrame</key> + <string>172 180 1063 836 0 0 1680 1028 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>203pt</string> + </dict> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20306471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>MyNewFile14.java</string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20406471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>MyNewFile14.java</string> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {855, 0}}</string> + <key>RubberWindowFrame</key> + <string>172 180 1063 836 0 0 1680 1028 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>0pt</string> + </dict> + <dict> + <key>BecomeActive</key> + <true/> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CE0B20506471E060097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Detail</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 5}, {855, 790}}</string> + <key>RubberWindowFrame</key> + <string>172 180 1063 836 0 0 1680 1028 </string> + </dict> + <key>Module</key> + <string>XCDetailModule</string> + <key>Proportion</key> + <string>790pt</string> + </dict> + </array> + <key>Proportion</key> + <string>855pt</string> + </dict> + </array> + <key>Name</key> + <string>Project</string> + <key>ServiceClasses</key> + <array> + <string>XCModuleDock</string> + <string>PBXSmartGroupTreeModule</string> + <string>XCModuleDock</string> + <string>PBXNavigatorGroup</string> + <string>XCDetailModule</string> + </array> + <key>TableOfContents</key> + <array> + <string>73A0CCA30F8A856300EB4B80</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>73A0CCA40F8A856300EB4B80</string> + <string>1CE0B20306471E060097A5F4</string> + <string>1CE0B20506471E060097A5F4</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.default</string> + </dict> + <dict> + <key>ControllerClassBaseName</key> + <string></string> + <key>IconName</key> + <string>WindowOfProject</string> + <key>Identifier</key> + <string>perspective.morph</string> + <key>IsVertical</key> + <integer>0</integer> + <key>Layout</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C37FBAC04509CD000000102</string> + <string>1C37FAAC04509CD000000102</string> + <string>1C08E77C0454961000C914BD</string> + <string>1C37FABC05509CD000000102</string> + <string>1C37FABC05539CD112110102</string> + <string>E2644B35053B69B200211256</string> + <string>1C37FABC04509CD000100104</string> + <string>1CC0EA4004350EF90044410B</string> + <string>1CC0EA4004350EF90041110B</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>11E0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>yes</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>186</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>29B97314FDCFA39411CA2CEA</string> + <string>1C37FABC05509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {186, 337}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <integer>1</integer> + <key>XCSharingToken</key> + <string>com.apple.Xcode.GFSharingToken</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {203, 355}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>186</real> + </array> + <key>RubberWindowFrame</key> + <string>373 269 690 397 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Morph</string> + <key>PreferredWidth</key> + <integer>300</integer> + <key>ServiceClasses</key> + <array> + <string>XCModuleDock</string> + <string>PBXSmartGroupTreeModule</string> + </array> + <key>TableOfContents</key> + <array> + <string>11E0B1FE06471DED0097A5F4</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.default.short</string> + </dict> + </array> + <key>PerspectivesBarVisible</key> + <false/> + <key>ShelfIsVisible</key> + <false/> + <key>SourceDescription</key> + <string>file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string> + <key>StatusbarIsVisible</key> + <true/> + <key>TimeStamp</key> + <real>0.0</real> + <key>ToolbarDisplayMode</key> + <integer>1</integer> + <key>ToolbarIsVisible</key> + <true/> + <key>ToolbarSizeMode</key> + <integer>1</integer> + <key>Type</key> + <string>Perspectives</string> + <key>UpdateMessage</key> + <string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string> + <key>WindowJustification</key> + <integer>5</integer> + <key>WindowOrderList</key> + <array> + <string>/Users/eliot/Cog/cogvm/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj</string> + </array> + <key>WindowString</key> + <string>172 180 1063 836 0 0 1680 1028 </string> + <key>WindowTools</key> + <array> + <dict> + <key>FirstTimeWindowDisplayed</key> + <false/> + <key>Identifier</key> + <string>windowTool.build</string> + <key>IsVertical</key> + <true/> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528F0623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string></string> + <key>StatusBarVisibility</key> + <true/> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {1111, 288}}</string> + <key>RubberWindowFrame</key> + <string>48 84 1111 797 0 0 1680 1028 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>288pt</string> + </dict> + <dict> + <key>BecomeActive</key> + <true/> + <key>ContentConfiguration</key> + <dict> + <key>PBXBuildLogShowsTranscriptDefaultKey</key> + <string>{{0, 5}, {1111, 458}}</string> + <key>PBXProjectModuleGUID</key> + <string>XCMainBuildResultsModuleGUID</string> + <key>PBXProjectModuleLabel</key> + <string>Build</string> + <key>XCBuildResultsTrigger_Collapse</key> + <integer>1021</integer> + <key>XCBuildResultsTrigger_Open</key> + <integer>1011</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 293}, {1111, 463}}</string> + <key>RubberWindowFrame</key> + <string>48 84 1111 797 0 0 1680 1028 </string> + </dict> + <key>Module</key> + <string>PBXBuildResultsModule</string> + <key>Proportion</key> + <string>463pt</string> + </dict> + </array> + <key>Proportion</key> + <string>756pt</string> + </dict> + </array> + <key>Name</key> + <string>Build Results</string> + <key>ServiceClasses</key> + <array> + <string>PBXBuildResultsModule</string> + </array> + <key>StatusbarIsVisible</key> + <true/> + <key>TableOfContents</key> + <array> + <string>73020E920EE71AAE0021D217</string> + <string>73DED5EA0EF1EC7100C60103</string> + <string>1CD0528F0623707200166675</string> + <string>XCMainBuildResultsModuleGUID</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.build</string> + <key>WindowString</key> + <string>48 84 1111 797 0 0 1680 1028 </string> + <key>WindowToolGUID</key> + <string>73020E920EE71AAE0021D217</string> + <key>WindowToolIsVisible</key> + <true/> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debugger</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>Debugger</key> + <dict> + <key>HorizontalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {317, 164}}</string> + <string>{{317, 0}, {377, 164}}</string> + </array> + </dict> + <key>VerticalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {694, 164}}</string> + <string>{{0, 164}, {694, 216}}</string> + </array> + </dict> + </dict> + <key>LauncherConfigVersion</key> + <string>8</string> + <key>PBXProjectModuleGUID</key> + <string>1C162984064C10D400B95A72</string> + <key>PBXProjectModuleLabel</key> + <string>Debug - GLUTExamples (Underwater)</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>DebugConsoleDrawerSize</key> + <string>{100, 120}</string> + <key>DebugConsoleVisible</key> + <string>None</string> + <key>DebugConsoleWindowFrame</key> + <string>{{200, 200}, {500, 300}}</string> + <key>DebugSTDIOWindowFrame</key> + <string>{{200, 200}, {500, 300}}</string> + <key>Frame</key> + <string>{{0, 0}, {694, 380}}</string> + <key>RubberWindowFrame</key> + <string>321 238 694 422 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXDebugSessionModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Debugger</string> + <key>ServiceClasses</key> + <array> + <string>PBXDebugSessionModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1CD10A99069EF8BA00B06720</string> + <string>1C0AD2AB069F1E9B00FABCE6</string> + <string>1C162984064C10D400B95A72</string> + <string>1C0AD2AC069F1E9B00FABCE6</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.debug</string> + <key>WindowString</key> + <string>321 238 694 422 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1CD10A99069EF8BA00B06720</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.find</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CDD528C0622207200134675</string> + <key>PBXProjectModuleLabel</key> + <string><No Editor></string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528D0623707200166675</string> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <integer>1</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {781, 167}}</string> + <key>RubberWindowFrame</key> + <string>62 385 781 470 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>781pt</string> + </dict> + </array> + <key>Proportion</key> + <string>50%</string> + </dict> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD0528E0623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string>Project Find</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{8, 0}, {773, 254}}</string> + <key>RubberWindowFrame</key> + <string>62 385 781 470 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXProjectFindModule</string> + <key>Proportion</key> + <string>50%</string> + </dict> + </array> + <key>Proportion</key> + <string>428pt</string> + </dict> + </array> + <key>Name</key> + <string>Project Find</string> + <key>ServiceClasses</key> + <array> + <string>PBXProjectFindModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C530D57069F1CE1000CFCEE</string> + <string>1C530D58069F1CE1000CFCEE</string> + <string>1C530D59069F1CE1000CFCEE</string> + <string>1CDD528C0622207200134675</string> + <string>1C530D5A069F1CE1000CFCEE</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>1CD0528E0623707200166675</string> + </array> + <key>WindowString</key> + <string>62 385 781 470 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1C530D57069F1CE1000CFCEE</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>MENUSEPARATOR</string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debuggerConsole</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAAC065D492600B07095</string> + <key>PBXProjectModuleLabel</key> + <string>Debugger Console</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {440, 358}}</string> + <key>RubberWindowFrame</key> + <string>650 41 440 400 0 0 1280 1002 </string> + </dict> + <key>Module</key> + <string>PBXDebugCLIModule</string> + <key>Proportion</key> + <string>358pt</string> + </dict> + </array> + <key>Proportion</key> + <string>358pt</string> + </dict> + </array> + <key>Name</key> + <string>Debugger Console</string> + <key>ServiceClasses</key> + <array> + <string>PBXDebugCLIModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C78EAAD065D492600B07095</string> + <string>1C78EAAE065D492600B07095</string> + <string>1C78EAAC065D492600B07095</string> + </array> + <key>WindowString</key> + <string>650 41 440 400 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.run</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>LauncherConfigVersion</key> + <string>3</string> + <key>PBXProjectModuleGUID</key> + <string>1CD0528B0623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string>Run</string> + <key>Runner</key> + <dict> + <key>HorizontalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {493, 167}}</string> + <string>{{0, 176}, {493, 267}}</string> + </array> + </dict> + <key>VerticalSplitView</key> + <dict> + <key>_collapsingFrameDimension</key> + <real>0.0</real> + <key>_indexOfCollapsedView</key> + <integer>0</integer> + <key>_percentageOfCollapsedView</key> + <real>0.0</real> + <key>isCollapsed</key> + <string>yes</string> + <key>sizes</key> + <array> + <string>{{0, 0}, {405, 443}}</string> + <string>{{414, 0}, {514, 443}}</string> + </array> + </dict> + </dict> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {460, 159}}</string> + <key>RubberWindowFrame</key> + <string>316 696 459 200 0 0 1280 1002 </string> + </dict> + <key>Module</key> + <string>PBXRunSessionModule</string> + <key>Proportion</key> + <string>159pt</string> + </dict> + </array> + <key>Proportion</key> + <string>159pt</string> + </dict> + </array> + <key>Name</key> + <string>Run Log</string> + <key>ServiceClasses</key> + <array> + <string>PBXRunSessionModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C0AD2B3069F1EA900FABCE6</string> + <string>1C0AD2B4069F1EA900FABCE6</string> + <string>1CD0528B0623707200166675</string> + <string>1C0AD2B5069F1EA900FABCE6</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.run</string> + <key>WindowString</key> + <string>316 696 459 200 0 0 1280 1002 </string> + <key>WindowToolGUID</key> + <string>1C0AD2B3069F1EA900FABCE6</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.scm</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAB2065D492600B07095</string> + <key>PBXProjectModuleLabel</key> + <string><No Editor></string> + <key>PBXSplitModuleInNavigatorKey</key> + <dict> + <key>Split0</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1C78EAB3065D492600B07095</string> + </dict> + <key>SplitCount</key> + <string>1</string> + </dict> + <key>StatusBarVisibility</key> + <integer>1</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {452, 0}}</string> + <key>RubberWindowFrame</key> + <string>743 379 452 308 0 0 1280 1002 </string> + </dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>0pt</string> + </dict> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CD052920623707200166675</string> + <key>PBXProjectModuleLabel</key> + <string>SCM</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>ConsoleFrame</key> + <string>{{0, 259}, {452, 0}}</string> + <key>Frame</key> + <string>{{0, 7}, {452, 259}}</string> + <key>RubberWindowFrame</key> + <string>743 379 452 308 0 0 1280 1002 </string> + <key>TableConfiguration</key> + <array> + <string>Status</string> + <real>30</real> + <string>FileName</string> + <real>199</real> + <string>Path</string> + <real>197.09500122070312</real> + </array> + <key>TableFrame</key> + <string>{{0, 0}, {452, 250}}</string> + </dict> + <key>Module</key> + <string>PBXCVSModule</string> + <key>Proportion</key> + <string>262pt</string> + </dict> + </array> + <key>Proportion</key> + <string>266pt</string> + </dict> + </array> + <key>Name</key> + <string>SCM</string> + <key>ServiceClasses</key> + <array> + <string>PBXCVSModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1C78EAB4065D492600B07095</string> + <string>1C78EAB5065D492600B07095</string> + <string>1C78EAB2065D492600B07095</string> + <string>1CD052920623707200166675</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.scm</string> + <key>WindowString</key> + <string>743 379 452 308 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.breakpoints</string> + <key>IsVertical</key> + <integer>0</integer> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>PBXBottomSmartGroupGIDs</key> + <array> + <string>1C77FABC04509CD000000102</string> + </array> + <key>PBXProjectModuleGUID</key> + <string>1CE0B1FE06471DED0097A5F4</string> + <key>PBXProjectModuleLabel</key> + <string>Files</string> + <key>PBXProjectStructureProvided</key> + <string>no</string> + <key>PBXSmartGroupTreeModuleColumnData</key> + <dict> + <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> + <array> + <real>168</real> + </array> + <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> + <array> + <string>MainColumn</string> + </array> + </dict> + <key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key> + <dict> + <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> + <array> + <string>1C77FABC04509CD000000102</string> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> + <array> + <array> + <integer>0</integer> + </array> + </array> + <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> + <string>{{0, 0}, {168, 350}}</string> + </dict> + <key>PBXTopSmartGroupGIDs</key> + <array/> + <key>XCIncludePerspectivesSwitch</key> + <integer>0</integer> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{0, 0}, {185, 368}}</string> + <key>GroupTreeTableConfiguration</key> + <array> + <string>MainColumn</string> + <real>168</real> + </array> + <key>RubberWindowFrame</key> + <string>315 424 744 409 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXSmartGroupTreeModule</string> + <key>Proportion</key> + <string>185pt</string> + </dict> + <dict> + <key>ContentConfiguration</key> + <dict> + <key>PBXProjectModuleGUID</key> + <string>1CA1AED706398EBD00589147</string> + <key>PBXProjectModuleLabel</key> + <string>Detail</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>Frame</key> + <string>{{190, 0}, {554, 368}}</string> + <key>RubberWindowFrame</key> + <string>315 424 744 409 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>XCDetailModule</string> + <key>Proportion</key> + <string>554pt</string> + </dict> + </array> + <key>Proportion</key> + <string>368pt</string> + </dict> + </array> + <key>MajorVersion</key> + <integer>2</integer> + <key>MinorVersion</key> + <integer>0</integer> + <key>Name</key> + <string>Breakpoints</string> + <key>ServiceClasses</key> + <array> + <string>PBXSmartGroupTreeModule</string> + <string>XCDetailModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>TableOfContents</key> + <array> + <string>1CDDB66807F98D9800BB5817</string> + <string>1CDDB66907F98D9800BB5817</string> + <string>1CE0B1FE06471DED0097A5F4</string> + <string>1CA1AED706398EBD00589147</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.breakpoints</string> + <key>WindowString</key> + <string>315 424 744 409 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1CDDB66807F98D9800BB5817</string> + <key>WindowToolIsVisible</key> + <integer>1</integer> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.debugAnimator</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>PBXNavigatorGroup</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Debug Visualizer</string> + <key>ServiceClasses</key> + <array> + <string>PBXNavigatorGroup</string> + </array> + <key>StatusbarIsVisible</key> + <integer>1</integer> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.debugAnimator</string> + <key>WindowString</key> + <string>100 100 700 500 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.bookmarks</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>Module</key> + <string>PBXBookmarksModule</string> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Proportion</key> + <string>100%</string> + </dict> + </array> + <key>Name</key> + <string>Bookmarks</string> + <key>ServiceClasses</key> + <array> + <string>PBXBookmarksModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>0</integer> + <key>WindowString</key> + <string>538 42 401 187 0 0 1280 1002 </string> + </dict> + <dict> + <key>Identifier</key> + <string>windowTool.classBrowser</string> + <key>Layout</key> + <array> + <dict> + <key>Dock</key> + <array> + <dict> + <key>BecomeActive</key> + <integer>1</integer> + <key>ContentConfiguration</key> + <dict> + <key>OptionsSetName</key> + <string>Hierarchy, all classes</string> + <key>PBXProjectModuleGUID</key> + <string>1CA6456E063B45B4001379D8</string> + <key>PBXProjectModuleLabel</key> + <string>Class Browser - NSObject</string> + </dict> + <key>GeometryConfiguration</key> + <dict> + <key>ClassesFrame</key> + <string>{{0, 0}, {374, 96}}</string> + <key>ClassesTreeTableConfiguration</key> + <array> + <string>PBXClassNameColumnIdentifier</string> + <real>208</real> + <string>PBXClassBookColumnIdentifier</string> + <real>22</real> + </array> + <key>Frame</key> + <string>{{0, 0}, {630, 331}}</string> + <key>MembersFrame</key> + <string>{{0, 105}, {374, 395}}</string> + <key>MembersTreeTableConfiguration</key> + <array> + <string>PBXMemberTypeIconColumnIdentifier</string> + <real>22</real> + <string>PBXMemberNameColumnIdentifier</string> + <real>216</real> + <string>PBXMemberTypeColumnIdentifier</string> + <real>97</real> + <string>PBXMemberBookColumnIdentifier</string> + <real>22</real> + </array> + <key>PBXModuleWindowStatusBarHidden2</key> + <integer>1</integer> + <key>RubberWindowFrame</key> + <string>385 179 630 352 0 0 1440 878 </string> + </dict> + <key>Module</key> + <string>PBXClassBrowserModule</string> + <key>Proportion</key> + <string>332pt</string> + </dict> + </array> + <key>Proportion</key> + <string>332pt</string> + </dict> + </array> + <key>Name</key> + <string>Class Browser</string> + <key>ServiceClasses</key> + <array> + <string>PBXClassBrowserModule</string> + </array> + <key>StatusbarIsVisible</key> + <integer>0</integer> + <key>TableOfContents</key> + <array> + <string>1C0AD2AF069F1E9B00FABCE6</string> + <string>1C0AD2B0069F1E9B00FABCE6</string> + <string>1CA6456E063B45B4001379D8</string> + </array> + <key>ToolbarConfiguration</key> + <string>xcode.toolbar.config.classbrowser</string> + <key>WindowString</key> + <string>385 179 630 352 0 0 1440 878 </string> + <key>WindowToolGUID</key> + <string>1C0AD2AF069F1E9B00FABCE6</string> + <key>WindowToolIsVisible</key> + <integer>0</integer> + </dict> + </array> +</dict> +</plist> Added: branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser =================================================================== --- branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser (rev 0) +++ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser 2013-11-19 22:23:16 UTC (rev 2815) @@ -0,0 +1,126 @@ +// !$*UTF8*$! +{ + 089C1669FE841209C02AAC07 /* Project object */ = { + activeBuildConfigurationName = Debug; + activeTarget = 8D01CCC60486CAD60068D4B7 /* BochsIA32Plugin */; + addToTargets = ( + 8D01CCC60486CAD60068D4B7 /* BochsIA32Plugin */, + ); + codeSenseManager = 732BAA990EE7127100655F61 /* Code sense */; + perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_LocationID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 300, + 200, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXErrorsWarningsDataSource_TypeID, + PBXErrorsWarningsDataSource_MessageID, + PBXErrorsWarningsDataSource_LocationID, + ); + }; + PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = 1; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 616, + 20, + 48, + 43, + 43, + 20, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + PBXFileDataSource_Target_ColumnID, + ); + }; + PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; + PBXFileTableDataSourceColumnWidthsKey = ( + 20, + 200, + 265, + 20, + 48, + 43, + 43, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXFileDataSource_FiletypeID, + PBXFileDataSource_Filename_ColumnID, + PBXTargetDataSource_PrimaryAttribute, + PBXFileDataSource_Built_ColumnID, + PBXFileDataSource_ObjectSize_ColumnID, + PBXFileDataSource_Errors_ColumnID, + PBXFileDataSource_Warnings_ColumnID, + ); + }; + PBXPerProjectTemplateStateSaveDate = 285385963; + PBXWorkspaceStateSaveDate = 285385963; + }; + sourceControlManager = 732BAA980EE7127100655F61 /* Source Control */; + userBuildSettings = { + }; + }; + 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1070, 2030}}"; + sepNavSelRange = "{798, 29}"; + sepNavVisRect = "{{0, 257}, {1070, 256}}"; + sepNavWindowFrame = "{{1856, 181}, {965, 1040}}"; + }; + }; + 732BAA980EE7127100655F61 /* Source Control */ = { + isa = PBXSourceControlManager; + fallbackIsa = XCSourceControlManager; + isSCMEnabled = 0; + scmConfiguration = { + repositoryNamesForRoots = { + "" = ""; + }; + }; + scmType = ""; + }; + 732BAA990EE7127100655F61 /* Code sense */ = { + isa = PBXCodeSenseManager; + indexTemplatePath = ""; + }; + 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {926, 1344}}"; + sepNavSelRange = "{84, 27}"; + sepNavVisRect = "{{0, 0}, {926, 911}}"; + sepNavWindowFrame = "{{1833, 333}, {965, 1040}}"; + }; + }; + 8D01CCC60486CAD60068D4B7 /* BochsIA32Plugin */ = { + activeExec = 0; + }; + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {926, 2492}}"; + sepNavSelRange = "{1306, 40}"; + sepNavVisRect = "{{0, 0}, {926, 911}}"; + sepNavWindowFrame = "{{1695, 328}, {965, 1040}}"; + }; + }; + DA3A20F80AA63D000050B983 /* config.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {926, 2828}}"; + sepNavSelRange = "{1798, 0}"; + sepNavVisRect = "{{0, 0}, {926, 911}}"; + sepNavWindowFrame = "{{1863, 230}, {965, 1040}}"; + }; + }; +} Added: branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/spurcogbuild/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2013-11-19 22:23:16 UTC (rev 2815) @@ -0,0 +1,277 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 73020E8D0EE714E60021D217 /* BochsIA32Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/BochsIA32Plugin -I\"../../../platforms/Mac OS/vm\" -I../../../src/vm"; }; }; + 737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libcpu.a */; }; + 737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libfpu.a */; }; + 737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../../processors/IA32/macbochs -I../../../processors/IA32/bochs -I../../../processors/IA32/bochs/instrument/stubs"; }; }; + 737483080EE7406A004E10F8 /* libdisasm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737483070EE7406A004E10F8 /* libdisasm.a */; }; + 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; + 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = BochsIA32Plugin.c; path = ../../../src/plugins/BochsIA32Plugin/BochsIA32Plugin.c; sourceTree = SOURCE_ROOT; }; + 73020E8E0EE7158C0021D217 /* BochsIA32Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BochsIA32Plugin.h; path = ../../../platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h; sourceTree = SOURCE_ROOT; }; + 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../../processors/IA32/macbochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; }; + 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../../processors/IA32/macbochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; }; + 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = sqBochsIA32Plugin.cpp; path = ../../../platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp; sourceTree = SOURCE_ROOT; }; + 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../../processors/IA32/macbochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; }; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.516.mcz
by commits＠source.squeak.org 19 Nov '13

19 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.516.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.516 Author: eem Time: 19 November 2013, 1:35:54.135 pm UUID: dc21e654-f5d1-4272-9ab9-548f244fdecc Ancestors: VMMaker.oscog-eem.515 Collapse mapObjectReferencesInMachineCodeForIncrementalGC/Scavenge onto mapObjectReferencesInMachineCodeForYoungGC. Provide a nice abstraction for simulating addressOf: (addressOf:put:). Fix absent super call in Spur32BitCoMemoryManager>>assimilateNewSegment:. Hence check free space after adding a segment. Include the mark bit in SpurCoMemMgr>>nullHeaderForMachineCodeMethod. =============== Diff against VMMaker.oscog-eem.515 =============== Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: + #addressOf:put: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was added: + ----- Method: CPluggableAccessor>>asInteger (in category 'coercion') ----- + asInteger + ^self! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCode: (in category 'jit - api') ----- mapObjectReferencesInMachineCode: gcMode <api> "Update all references to objects in machine code." gcMode caseOf: { + [GCModeScavenge] -> [self mapObjectReferencesInMachineCodeForYoungGC]. + [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForYoungGC]. - [GCModeScavenge] -> [self mapObjectReferencesInMachineCodeForScavenge]. - [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForIncrementalGC]. [GCModeFull] -> [self mapObjectReferencesInMachineCodeForFullGC]. [GCModeBecome] -> [self mapObjectReferencesInMachineCodeForBecome] }. (self asserta: methodZone freeStart <= methodZone youngReferrers) ifFalse: [self error: 'youngReferrers list overflowed']! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') ----- mapObjectReferencesInMachineCodeForBecome "Update all references to objects in machine code for a become. Unlike incrementalGC or fullGC a method that does not refer to young may refer to young as a result of the become operation. Unlike incrementalGC or fullGC the reference from a Cog method to its methodObject *must not* change since the two are two halves of the same object." | cogMethod hasYoungObj hasYoungObjPtr freedPIC | <var: #cogMethod type: #'CogMethod *'> hasYoungObj := false. + hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger. - hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger] - inSmalltalk: [CPluggableAccessor new - setObject: nil; - atBlock: [:obj :idx| hasYoungObj] - atPutBlock: [:obj :idx :val| hasYoungObj := val]]. codeModified := freedPIC := false. self mapObjectReferencesInGeneratedRuntime. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [self assert: hasYoungObj not. cogMethod cmType ~= CMFree ifTrue: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod selector: (objectRepresentation remapOop: cogMethod selector). cogMethod cmType = CMClosedPIC ifTrue: [((objectMemory isYoung: cogMethod selector) or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]] ifFalse: [(objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]. cogMethod cmType = CMMethod ifTrue: [| remappedMethod | self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. remappedMethod := objectRepresentation remapOop: cogMethod methodObject. remappedMethod ~= cogMethod methodObject ifTrue: [(coInterpreter methodHasCogMethod: remappedMethod) ifTrue: [self error: 'attempt to become two cogged methods']. (objectMemory withoutForwardingOn: cogMethod methodObject and: remappedMethod with: cogMethod cmUsesPenultimateLit sendToCogit: #method:hasSameCodeAs:checkPenultimate:) ifFalse: [self error: 'attempt to become cogged method into different method']. "For non-Newspeak there should ne a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only reset the method object's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. cogMethod methodHeader: (coInterpreter rawHeaderOf: remappedMethod); methodObject: remappedMethod. coInterpreter rawHeaderOf: remappedMethod put: cogMethod asInteger] ifFalse: [ self assert: (self noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject. cogMethod methodHeader: (coInterpreter rawHeaderOf: remappedMethod); methodObject: remappedMethod]]. (objectMemory isYoung: cogMethod methodObject) ifTrue: [hasYoungObj := true]]. self mapFor: cogMethod performUntil: (self cppIf: NewspeakVM ifTrue: [#remapNSIfObjectRef:pc:hasYoung:] ifFalse: [#remapIfObjectRef:pc:hasYoung:]) arg: hasYoungObjPtr. hasYoungObj ifTrue: [cogMethod cmRefersToYoung ifFalse: [cogMethod cmRefersToYoung: true. methodZone addToYoungReferrers: cogMethod]. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree. codeModified := true]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was removed: - ----- Method: Cogit>>mapObjectReferencesInMachineCodeForIncrementalGC (in category 'garbage collection') ----- - mapObjectReferencesInMachineCodeForIncrementalGC - "Update all references to objects in machine code for an incremental gc. - Avoid scanning all code by using the youngReferrers list. In an incremental - GC a method referring to young may no longer refer to young, but a method - not referring to young cannot and will not refer to young afterwards." - | pointer cogMethod hasYoungObj hasYoungObjPtr | - <var: #cogMethod type: #'CogMethod *'> - hasYoungObj := false. - hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger] - inSmalltalk: [CPluggableAccessor new - setObject: nil; - atBlock: [:obj :idx| hasYoungObj] - atPutBlock: [:obj :idx :val| hasYoungObj := val]]. - codeModified := false. - pointer := methodZone youngReferrers. - [pointer < methodZone zoneEnd] whileTrue: - [self assert: hasYoungObj not. - cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. - cogMethod cmType = CMFree - ifTrue: [self assert: cogMethod cmRefersToYoung not] - ifFalse: - [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. - cogMethod cmRefersToYoung ifTrue: - [self assert: (cogMethod cmType = CMMethod - or: [cogMethod cmType = CMOpenPIC]). - cogMethod selector: (objectRepresentation remapOop: cogMethod selector). - (objectMemory isYoung: cogMethod selector) ifTrue: - [hasYoungObj := true]. - cogMethod cmType = CMMethod ifTrue: - [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. - cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject). - (objectMemory isYoung: cogMethod methodObject) ifTrue: - [hasYoungObj := true]]. - self mapFor: cogMethod - performUntil: (self cppIf: NewspeakVM - ifTrue: [#remapNSIfObjectRef:pc:hasYoung:] - ifFalse: [#remapIfObjectRef:pc:hasYoung:]) - arg: hasYoungObjPtr. - hasYoungObj - ifTrue: [hasYoungObj := false] - ifFalse: [cogMethod cmRefersToYoung: false]]]. - pointer := pointer + BytesPerWord]. - methodZone pruneYoungReferrers. - codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." - [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was removed: - ----- Method: Cogit>>mapObjectReferencesInMachineCodeForScavenge (in category 'garbage collection') ----- - mapObjectReferencesInMachineCodeForScavenge - self shouldBeImplemented! Item was added: + ----- Method: Cogit>>mapObjectReferencesInMachineCodeForYoungGC (in category 'garbage collection') ----- + mapObjectReferencesInMachineCodeForYoungGC + "Update all references to objects in machine code for either a Spur scavenging gc + or a Squeak V3 incremental GC. Avoid scanning all code by using the youngReferrers + list. In a young gc a method referring to young may no longer refer to young, but a + method not referring to young cannot and will not refer to young afterwards." + | pointer cogMethod hasYoungObj hasYoungObjPtr | + <var: #cogMethod type: #'CogMethod *'> + hasYoungObj := false. + hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger. + codeModified := false. + pointer := methodZone youngReferrers. + [pointer < methodZone zoneEnd] whileTrue: + [self assert: hasYoungObj not. + cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. + cogMethod cmType = CMFree + ifTrue: [self assert: cogMethod cmRefersToYoung not] + ifFalse: + [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. + cogMethod cmRefersToYoung ifTrue: + [self assert: (cogMethod cmType = CMMethod + or: [cogMethod cmType = CMOpenPIC]). + cogMethod selector: (objectRepresentation remapOop: cogMethod selector). + (objectMemory isYoung: cogMethod selector) ifTrue: + [hasYoungObj := true]. + cogMethod cmType = CMMethod ifTrue: + [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. + cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject). + (objectMemory isYoung: cogMethod methodObject) ifTrue: + [hasYoungObj := true]]. + self mapFor: cogMethod + performUntil: (self cppIf: NewspeakVM + ifTrue: [#remapNSIfObjectRef:pc:hasYoung:] + ifFalse: [#remapIfObjectRef:pc:hasYoung:]) + arg: hasYoungObjPtr. + hasYoungObj + ifTrue: [hasYoungObj := false] + ifFalse: [cogMethod cmRefersToYoung: false]]]. + pointer := pointer + BytesPerWord]. + methodZone pruneYoungReferrers. + codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." + [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: Spur32BitCoMemoryManager>>assimilateNewSegment: (in category 'growing/shrinking memory') ----- assimilateNewSegment: segInfo "Update after adding a segment. Here we make sure the new segment is not executable." <var: #segInfo type: #'SpurSegmentInfo *'> + super assimilateNewSegment: segInfo. coInterpreter sqMakeMemoryNotExecutableFrom: segInfo segStart To: segInfo segLimit! Item was changed: ----- Method: Spur32BitCoMemoryManager>>nullHeaderForMachineCodeMethod (in category 'garbage collection') ----- nullHeaderForMachineCodeMethod <api> + <returnTypeC: #sqLong> + ^(self firstLongFormat << self formatShift) + + (1 << self markedBitFullShift) + + ClassBitmapCompactIndex! - ^self firstLongFormat << self formatShift + ClassBitmapCompactIndex! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: fileValueOf: loadBitBltDestForm fetchIntOrFloat:ofObject:ifNil: fetchIntOrFloat:ofObject: loadBitBltSourceForm loadPoint:from: primDigitAdd: primDigitSubtract: positive64BitValueOf: digitBitLogic:with:opIndex: signed32BitValueOf: isNormalized: primDigitDiv:negative: bytesOrInt:growTo: primitiveNewMethod isCogMethodReference: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison ensureContextHasBytecodePC: instVar:ofContext: ceBaseFrameReturn: inlineCacheTagForInstance: primitiveObjectAtPut commonVariable:at:put:cacheIndex: primDigitBitShiftMagnitude: externalInstVar:ofContext: primitiveGrowMemoryByAtLeast + primitiveFileSetPosition + cogMethodDoesntLookKosher:) includes: sel) ifFalse: - primitiveFileSetPosition) includes: sel) ifFalse: [self halt]. ^super isIntegerObject: oop! Item was changed: ----- Method: Spur32BitMMLECoSimulator>>longAt:put: (in category 'memory access') ----- longAt: byteAddress put: a32BitValue "Note: Adjusted for Smalltalk's 1-based array indexing." + "(byteAddress = 16r15FF7A8 and: [a32BitValue = 16r19D09D0]) ifTrue: - "(byteAddress = 16r1614CB8 and: [a32BitValue = 16rA000035]) ifTrue: [self halt]." byteAddress \\ 4 ~= 0 ifTrue: [self unalignedAccessError]. ^memory at: byteAddress // 4 + 1 put: a32BitValue! Item was changed: ----- Method: SpurMemoryManager>>growOldSpaceByAtLeast: (in category 'growing/shrinking memory') ----- growOldSpaceByAtLeast: minAmmount "Attempt to grow memory by at least minAmmount. Answer the size of the new segment, or nil if the attempt failed." | ammount | <var: #segInfo type: #'SpurSegmentInfo *'> "statGrowMemory counts attempts, not successes." statGrowMemory := statGrowMemory + 1. "we need to include overhead for a new object header plus the segment bridge." ammount := minAmmount + (self baseHeaderSize * 2 + self bridgeSize). "round up to the nearest power of two." ammount := 1 << (ammount - 1) highBit. "and grow by at least growHeadroom." ammount := ammount max: growHeadroom. ^(segmentManager addSegmentOfSize: ammount) ifNotNil: [:segInfo| self assimilateNewSegment: segInfo. + self checkFreeSpace. segInfo segSize]! Item was added: + ----- Method: VMClass>>addressOf:put: (in category 'translation support') ----- + addressOf: anObject put: aBlock + <doNotGenerate> + "Simulate a C pointer. Translates into &anObject in C. Provides something + that evaluates aBlock with the new value in response to at:put:" + | thing | + thing := anObject. + ^CPluggableAccessor new + setObject: nil; + atBlock: [:obj :idx| thing] + atPutBlock: [:obj :idx :val| aBlock value: (thing := val)]!

1 0

VM Maker: Cog-eem.121.mcz
by commits＠source.squeak.org 19 Nov '13

19 Nov '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.121.mcz ==================== Summary ==================== Name: Cog-eem.121 Author: eem Time: 19 November 2013, 1:31:54.036 pm UUID: 3f9a0428-8f85-45e3-a596-5e37f70eb880 Ancestors: Cog-eem.120 Allow one to specify the snapshotted transformed image's name. =============== Diff against Cog-eem.120 =============== Item was changed: ----- Method: SpurBootstrap>>writeSnapshotOfTransformedImage (in category 'testing') ----- writeSnapshotOfTransformedImage + self writeSnapshotOfTransformedImageAs: 'spur.image'! - "The bootstrapped image typically contains a few big free chunks and one huge free chunk. - Test snapshot writing and loading by turning the largest non-huge chunks into segment bridges - and saving." - | penultimate ultimate heap sizes counts barriers sim | - heap := TransformedImage veryDeepCopy. - sim := StackInterpreterSimulator onObjectMemory: heap. - sim bootstrapping: true. - heap coInterpreter: sim. - sim initializeInterpreter: 0; - setImageHeaderFlagsFrom: ImageHeaderFlags; - setDisplayForm: (Form extent: ImageScreenSize >> 16 @ (ImageScreenSize bitAnd: 16rFFFF)). - heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. - self assert: (heap isFreeObject: penultimate). - self assert: (heap isSegmentBridge: ultimate). - sizes := Bag new. - heap allObjectsInFreeTree: (heap freeLists at: 0) do: - [:f| - sizes add: (heap bytesInObject: f)]. - counts := sizes sortedCounts. - self assert: counts last key = 1. "1 huge chunk" - self assert: ((counts at: counts size - 1) key > 2 - and: [(counts at: counts size - 1) value > 1024]). - barriers := (1 to: (counts at: counts size - 1) key) collect: - [:ign| heap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. - barriers := barriers, {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}. - heap setEndOfMemory: barriers last. - heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. - self assert: (heap addressAfter: ultimate) = barriers last. - heap checkFreeSpace. - heap runLeakCheckerForFullGC: true. - heap segmentManager initializeFromFreeChunks: (barriers sort collect: [:b| heap objectStartingAt: b]). - heap checkFreeSpace. - heap runLeakCheckerForFullGC: true. - sim bereaveAndNormalizeContextsAndFlushExternalPrimitives. - sim imageName: 'spur.image'. - sim writeImageFileIO! Item was added: + ----- Method: SpurBootstrap>>writeSnapshotOfTransformedImageAs: (in category 'testing') ----- + writeSnapshotOfTransformedImageAs: imageFileName + "The bootstrapped image typically contains a few big free chunks and one huge free chunk. + Test snapshot writing and loading by turning the largest non-huge chunks into segment bridges + and saving." + | penultimate ultimate heap sizes counts barriers sim | + heap := TransformedImage veryDeepCopy. + sim := StackInterpreterSimulator onObjectMemory: heap. + sim bootstrapping: true. + heap coInterpreter: sim. + sim initializeInterpreter: 0; + setImageHeaderFlagsFrom: ImageHeaderFlags; + setDisplayForm: (Form extent: ImageScreenSize >> 16 @ (ImageScreenSize bitAnd: 16rFFFF)). + heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. + self assert: (heap isFreeObject: penultimate). + self assert: (heap isSegmentBridge: ultimate). + sizes := Bag new. + heap allObjectsInFreeTree: (heap freeLists at: 0) do: + [:f| + sizes add: (heap bytesInObject: f)]. + counts := sizes sortedCounts. + self assert: counts last key = 1. "1 huge chunk" + self assert: ((counts at: counts size - 1) key > 2 + and: [(counts at: counts size - 1) value > 1024]). + barriers := (1 to: (counts at: counts size - 1) key) collect: + [:ign| heap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. + barriers := barriers, {heap allocateOldSpaceChunkOfExactlyBytes: (heap bytesInObject: penultimate)}. + heap setEndOfMemory: barriers last. + heap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. + self assert: (heap addressAfter: ultimate) = barriers last. + heap checkFreeSpace. + heap runLeakCheckerForFullGC: true. + heap segmentManager initializeFromFreeChunks: (barriers sort collect: [:b| heap objectStartingAt: b]). + heap checkFreeSpace. + heap runLeakCheckerForFullGC: true. + sim bereaveAndNormalizeContextsAndFlushExternalPrimitives. + sim imageName: imageFileName. + sim writeImageFileIO!

1 0

VM on Windows with MingGW - Error with off_64 [solved]
by phil＠highoctane.be 19 Nov '13

19 Nov '13

This building problem seems to be caused by a MinGW bug: http://sourceforge.net/p/mingw/bugs/2024/ So, one solution for the time being is to edit io.h of the MinGW distribution. Replace (line 301 and 302): 1. __CRT_INLINE off64_t lseek64 (int, off64_t, int); 2. __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence) with 1. __CRT_INLINE _off64_t lseek64 (int, _off64_t, int); 2. __CRT_INLINE _off64_t lseek64 (int fd, _off64_t offset, int whence) i.e. replace all occurences of *off64_t* with *_off64_t* Then I found this: http://stackoverflow.com/questions/19666666/mingw-g-does-not-recognize-off-… I don't know where to change the g++ thing with CMake. Anyone knowing? Phil

1 0

Building PharoVM on Windows - Failure with freetype2
by phil＠highoctane.be 19 Nov '13

19 Nov '13

Hello, I am trying to build the pharo vm from the github sources. The toolchain is okay and built quite a significant part of the VM. It now fails at building freetype with: In file included from c:\mingw\include\unistd.h:36:0, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/zconf.h:245, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/zlib.h:34, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/ftgzip.c:66: c:\mingw\include\io.h:301:1: error: unknown type name 'off64_t' __CRT_INLINE off64_t lseek64 (int, off64_t, int); ^ c:\mingw\include\io.h:301:36: error: unknown type name 'off64_t' __CRT_INLINE off64_t lseek64 (int, off64_t, int); ^ c:\mingw\include\io.h:302:1: error: unknown type name 'off64_t' __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence) { ^ c:\mingw\include\io.h:302:39: error: unknown type name 'off64_t' __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence) { ^ In file included from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/zconf.h:245:0, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/zlib.h:34, from c:/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/ freetype2/freetype-2.4.9/src/gzip/ftgzip.c:66: c:\mingw\include\unistd.h:65:20: error: unknown type name 'off_t' int ftruncate(int, off_t); ^ make[3]: *** [/C/MinGW/msys/1.0/home/Philippe/pharo-vm/build/thirdparty/freetype 2/freetype-2.4.9/objs/ftgzip.lo] Error 1 make[2]: *** [thirdparty/out/lib/libfreetype.dll.a] Error 2 make[1]: *** [thirdParty/freetype2/CMakeFiles/freetype2.dir/all] Error 2 make: *** [all] Error 2 Clues? Phil

2 1

VM Maker: VMMaker.oscog-eem.515.mcz
by commits＠source.squeak.org 19 Nov '13

19 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.515.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.515 Author: eem Time: 18 November 2013, 7:06:41.755 pm UUID: 168ec040-51cd-4d3d-9b60-7dc3a981beaa Ancestors: VMMaker.oscog-eem.514 Make the Spur Cog VM compilable, marking the relevant SpurMemMgr methods <api>, and implementing missing CogObjectRepresentationForSpur methods. Rename CogObjectRepresentation>>remapObj: to remapObject: to avoid conflict with Objmem/SpurMemMgr>>remapObj:. Add SpurMemMgr>>isYoungObject: and use it and isYoungObject: appropriately. Fix checkOkayFields: given that Spur objects don't directly refer to classes. Fix uninitialization of newTargetMethodOrNil & errorSelectorOrNil in ceCPICMiss:receiver:. Add an analysis routine and support to Cogit to check that indeed super sends don't have their selector rewritten when linked. Rewrite markLiteralsAndUnlinkIfUnmarkedSend:pc:method: & markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: so that markAndTraceLiteral: is only invoked with literal args and cacheTagIsMarked: is only applied to cache tags. This allows Spur to answer true for cacheTagIsMarked:. =============== Diff against VMMaker.oscog-eem.514 =============== Item was changed: ----- Method: CoInterpreter>>checkOkayFields: (in category 'debug support') ----- checkOkayFields: oop "Check if the argument is an ok object. If this is a pointers object, check that its fields are all okay oops." | hasYoung i fieldOop | (oop = nil or: [oop = 0]) ifTrue: [ ^true ]. "?? eem 1/16/2013" (objectMemory isIntegerObject: oop) ifTrue: [ ^true ]. (objectMemory checkOkayOop: oop) ifFalse: [ ^false ]. (objectMemory checkOopHasOkayClass: oop) ifFalse: [ ^false ]. ((objectMemory isPointersNonImm: oop) or: [objectMemory isCompiledMethod: oop]) ifFalse: [ ^true ]. + hasYoung := objectMemory hasSpurMemoryManagerAPI not + and: [objectMemory isYoungObject: (objectMemory fetchClassOfNonImm: oop)]. - hasYoung := objectMemory isYoung: (objectMemory fetchClassOfNonImm: oop). (objectMemory isCompiledMethod: oop) ifTrue: [i := (self literalCountOf: oop) + LiteralStart - 1] ifFalse: [(objectMemory isContext: oop) ifTrue: [i := CtxtTempFrameStart + (self fetchStackPointerOf: oop) - 1] ifFalse: [i := (objectMemory lengthOf: oop) - 1]]. [i >= 0] whileTrue: [fieldOop := objectMemory fetchPointer: i ofObject: oop. (objectMemory isNonIntegerObject: fieldOop) ifTrue: [(i = 0 and: [objectMemory isCompiledMethod: oop]) ifTrue: [(cogMethodZone methodFor: (self pointerForOop: fieldOop)) = 0 ifTrue: [self print: 'method '; printHex: oop; print: ' has an invalid cog method reference'. ^false]] ifFalse: [hasYoung := hasYoung or: [objectMemory isYoung: fieldOop]. (objectMemory checkOkayOop: fieldOop) ifFalse: [ ^false ]. (self checkOopHasOkayClass: fieldOop) ifFalse: [ ^false ]]]. i := i - 1]. hasYoung ifTrue: [^objectMemory checkOkayYoungReferrer: oop]. ^true! Item was changed: ----- Method: CoInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := ((self isMachineCodeFrame: theFP) or: [(self iframeSavedIP: theFP) = 0]) ifTrue: [0] ifFalse: [theFP + FoxIFSavedIP]] ifFalse: [theIPPtr := theSP. theSP := theSP + BytesPerWord]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + BytesPerWord]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. + "forwarding scheme in SqueakV3 obj rep makes this hard to check." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) + and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. - self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) - and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]. (self isMachineCodeFrame: theFP) ifFalse: [(objectMemory shouldRemapObj: (self iframeMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [theIP := stackPages longAt: theIPPtr. theIP = cogit ceReturnToInterpreterPC ifTrue: [self assert: (self iframeSavedIP: theFP) > (self iframeMethod: theFP). theIPPtr := theFP + FoxIFSavedIP. theIP := stackPages longAt: theIPPtr] ifFalse: [self assert: theIP > (self iframeMethod: theFP)]. theIP := theIP - (self iframeMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self iframeMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self iframeMethod: theFP)]]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + BytesPerWord. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + BytesPerWord. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + BytesPerWord]]]! Item was added: + ----- Method: CogObjectRepresentation>>allYoungObjectsAgeInFullGC (in category 'garbage collection') ----- + allYoungObjectsAgeInFullGC + ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>markAndTraceLiteral: (in category 'garbage collection') ----- + markAndTraceLiteral: literal + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>markAndTraceLiteralIfYoung: (in category 'garbage collection') ----- + markAndTraceLiteralIfYoung: literal + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentationForSpur>>allYoungObjectsAgeInFullGC (in category 'garbage collection') ----- + allYoungObjectsAgeInFullGC + ^false! Item was added: + ----- Method: CogObjectRepresentationForSpur>>cacheTagIsMarked: (in category 'garbage collection') ----- + cacheTagIsMarked: cacheTag + "Answer if the cacheTag is not unmarked, i.e. answer true for compact class + indices and immediates; only answer false for unmarked objects. In Spur + linked send cache tags are class indices so effectively they're always marked." + ^true! Item was changed: + ----- Method: CogObjectRepresentationForSpur>>couldBeObject: (in category 'garbage collection') ----- + couldBeObject: literal + ^objectMemory isNonImmediate: literal! - ----- Method: CogObjectRepresentationForSpur>>couldBeObject: (in category 'debug support') ----- - couldBeObject: oop - ^objectMemory addressCouldBeObj: oop! Item was changed: + ----- Method: CogObjectRepresentationForSpur>>inlineCacheTagIsYoung: (in category 'garbage collection') ----- + inlineCacheTagIsYoung: cacheTag + "Since all cache tags in Spur are class indices none of + them are young or have to be updated in a scavenge." - ----- Method: CogObjectRepresentationForSpur>>inlineCacheTagIsYoung: (in category 'in-line cacheing') ----- - inlineCacheTagIsYoung: anInteger - "classIndices are not objects, heh, heh, heh..." ^false! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceLiteral: (in category 'garbage collection') ----- + markAndTraceLiteral: literal + (self couldBeObject: literal) ifTrue: + [self assert: (objectMemory addressCouldBeObj: literal). + objectMemory markAndTrace: literal]! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceLiteralIfYoung: (in category 'garbage collection') ----- + markAndTraceLiteralIfYoung: literal + self shouldNotImplement. "sumpin' wrong surely ;-)" + ((self couldBeObject: literal) + and: [objectMemory isYoungObject: literal]) ifTrue: + [self assert: (objectMemory addressCouldBeObj: literal). + objectMemory markAndTrace: literal]! Item was added: + ----- Method: CogObjectRepresentationForSpur>>remapObject: (in category 'garbage collection') ----- + remapObject: objOop + ^(objectMemory shouldRemapObj: objOop) + ifTrue: [objectMemory remapObj: objOop] + ifFalse: [objOop]! Item was added: + ----- Method: CogObjectRepresentationForSpur>>remapOop: (in category 'garbage collection') ----- + remapOop: objOop + ^(objectMemory shouldRemapOop: objOop) + ifTrue: [objectMemory remapObj: objOop] + ifFalse: [objOop]! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>couldBeObject: (in category 'garbage collection') ----- couldBeObject: oop + "Note this version filters-out compact class indices via the >= nilObj clause" ^(objectMemory isNonIntegerObject: oop) and: [self oop: oop isGreaterThanOrEqualTo: objectMemory nilObject]! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>markAndTraceLiteralIfYoung: (in category 'garbage collection') ----- markAndTraceLiteralIfYoung: literal ((self couldBeObject: literal) + and: [objectMemory isYoungObject: literal]) ifTrue: - and: [objectMemory isYoung: literal]) ifTrue: [self assert: (objectMemory addressCouldBeObj: literal). objectMemory markAndTrace: literal]! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>remapObj: (in category 'garbage collection') ----- - remapObj: oop - ^objectMemory remap: oop! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>remapObject: (in category 'garbage collection') ----- + remapObject: oop + ^objectMemory remap: oop! Item was changed: ----- Method: Cogit>>annotate:objRef: (in category 'method map') ----- annotate: abstractInstruction objRef: anOop <var: #abstractInstruction type: #'AbstractInstruction *'> <returnTypeC: #'AbstractInstruction *'> (objectRepresentation shouldAnnotateObjectReference: anOop) ifTrue: + [(objectMemory isYoungObject: anOop) ifTrue: - [(objectMemory isYoung: anOop) ifTrue: [hasYoungReferent := true]. ^self annotate: abstractInstruction with: IsObjectReference]. ^abstractInstruction! Item was changed: ----- Method: Cogit>>ceCPICMiss:receiver: (in category 'in-line cacheing') ----- ceCPICMiss: cPIC receiver: receiver "Code entry closed PIC miss. A send has fallen through a closed (finite) polymorphic inline cache. Either extend it or patch the send site to an open PIC. The stack looks like: receiver args sp=> sender return address" <var: #cPIC type: #'CogMethod *'> <api> | outerReturn newTargetMethodOrNil errorSelectorOrNil cacheTag result | self cCode: '' inSmalltalk: [cPIC isInteger ifTrue: [^self ceCPICMiss: (self cogMethodSurrogateAt: cPIC) receiver: receiver]]. outerReturn := coInterpreter stackTop. + cPIC cPICNumCases < numPICCases + ifTrue: + [self lookup: cPIC selector + for: receiver + methodAndErrorSelectorInto: + [:method :errsel| + newTargetMethodOrNil := method. + errorSelectorOrNil := errsel]] + ifFalse: [newTargetMethodOrNil := errorSelectorOrNil := nil]. - cPIC cPICNumCases < numPICCases ifTrue: - [self lookup: cPIC selector - for: receiver - methodAndErrorSelectorInto: - [:method :errsel| - newTargetMethodOrNil := method. - errorSelectorOrNil := errsel]]. "We assume lookupAndCog:for: will *not* reclaim the method zone" self assert: outerReturn = coInterpreter stackTop. cacheTag := objectRepresentation inlineCacheTagForInstance: receiver. (cPIC cPICNumCases >= numPICCases or: [(errorSelectorOrNil notNil and: [errorSelectorOrNil ~= SelectorDoesNotUnderstand]) or: [(objectRepresentation inlineCacheTagIsYoung: cacheTag) or: [newTargetMethodOrNil isNil or: [objectMemory isYoung: newTargetMethodOrNil]]]]) ifTrue: [result := self patchToOpenPICFor: cPIC selector numArgs: cPIC cmNumArgs receiver: receiver. self assert: result not. "If patchToOpenPICFor:.. returns we're out of code memory" ^coInterpreter ceSendFromInLineCacheMiss: cPIC]. "Now extend the PIC with the new case." self cogExtendPIC: cPIC CaseNMethod: newTargetMethodOrNil tag: cacheTag isMNUCase: errorSelectorOrNil = SelectorDoesNotUnderstand. "Jump back into the pic at its entry in case this is an MNU." coInterpreter executeCogMethodFromLinkedSend: cPIC withReceiver: receiver andCacheTag: (backEnd inlineCacheTagAt: outerReturn). "NOTREACHED" ^nil! Item was changed: ----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') ----- checkIntegrityOfObjectReferencesInCode: fullGCFlag <api> "Answer if all references to objects in machine-code are valid." | cogMethod ok count | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. ok := true. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifTrue: [(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [coInterpreter print: 'young referrer CM '; printHex: cogMethod asInteger. count = 0 ifTrue: [coInterpreter print: ' is not in youngReferrers'; cr] ifFalse: [coInterpreter print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr]. ok := false]]. (objectRepresentation checkValidObjectReference: cogMethod selector) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr. ok := false]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. (objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (self mapFor: cogMethod performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]. fullGCFlag ifFalse: + [(((objectMemory isYoungObject: cogMethod methodObject) - [(((objectMemory isYoung: cogMethod methodObject) or: [objectMemory isYoung: cogMethod selector]) and: [cogMethod cmRefersToYoung not]) ifTrue: [coInterpreter print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr. ok := false]]] ifFalse: [cogMethod cmType = CMClosedPIC ifTrue: [(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse: [ok := false]] ifFalse: [cogMethod cmType = CMOpenPIC ifTrue: [(self mapFor: cogMethod performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]]]]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: Cogit>>compileCPIC:Case0:Case1Method:tag:isMNUCase:numArgs: (in category 'in-line cacheing') ----- compileCPIC: cPIC Case0: case0CogMethod Case1Method: case1Method tag: case1Tag isMNUCase: isMNUCase numArgs: numArgs "Compile the code for a two-case PIC for case0CogMethod and case1Method,case1Tag. The tag for case0CogMethod is at the send site and so doesn't need to be generated. case1Method may be any of - a Cog method; jump to its unchecked entry-point - a CompiledMethod; jump to the ceInterpretFromPIC trampoline - nil; call ceMNUFromPIC" <var: #cPIC type: #'CogMethod *'> | operand targetEntry jumpNext | <var: #case0CogMethod type: #'CogMethod *'> <var: #targetEntry type: #'void *'> <var: #jumpNext type: #'AbstractInstruction *'> self assert: case1Method notNil. self compilePICProlog: numArgs. self assert: (objectRepresentation inlineCacheTagIsYoung: case1Tag) not. (isMNUCase not and: [coInterpreter methodHasCogMethod: case1Method]) ifTrue: [operand := 0. targetEntry := ((coInterpreter cogMethodOf: case1Method) asInteger + cmNoCheckEntryOffset) asVoidPointer] ifFalse: + [self assert: (case1Method isNil or: [(objectMemory isYoungObject: case1Method) not]). - [self assert: (case1Method isNil or: [(objectMemory isYoung: case1Method) not]). operand := case1Method. targetEntry := case1Method isNil ifTrue: [mnuCall] ifFalse: [interpretCall]]. jumpNext := self compileCPICEntry. self MoveCw: 0 R: SendNumArgsReg. self JumpLong: case0CogMethod asInteger + cmNoCheckEntryOffset. endCPICCase0 := self CmpCw: case1Tag R: TempReg. jumpNext jmpTarget: endCPICCase0. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: (isMNUCase ifTrue: [mnuCall] ifFalse: [targetEntry]) asInteger. endCPICCase1 := self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: numArgs). ^0 ! Item was changed: ----- Method: Cogit>>compileCogMethod: (in category 'compile abstract instructions') ----- compileCogMethod: selector <returnTypeC: #'CogMethod *'> | numBytecodes numBlocks numCleanBlocks result extra | + hasYoungReferent := (objectMemory isYoungObject: methodObj) - hasYoungReferent := (objectMemory isYoung: methodObj) or: [objectMemory isYoung: selector]. methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. inBlock := false. primInvokeLabel := nil. postCompileHook := nil. maxLitIndex := -1. extra := ((primitiveIndex := coInterpreter primitiveIndexOf: methodObj) > 0 and: [(coInterpreter isQuickPrimitiveIndex: primitiveIndex) not]) ifTrue: [30] ifFalse: [10]. initialPC := coInterpreter startPCOfMethod: methodObj. "initial estimate. Actual endPC is determined in scanMethod." endPC := (coInterpreter isQuickPrimitiveIndex: primitiveIndex) ifTrue: [initialPC - 1] ifFalse: [objectMemory byteLengthOf: methodObj]. numBytecodes := endPC - initialPC + 1. self allocateOpcodes: (numBytecodes + extra) * 10 bytecodes: numBytecodes ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. (numBlocks := self scanMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. numCleanBlocks := self scanForCleanBlocks. self allocateBlockStarts: numBlocks + numCleanBlocks. blockCount := 0. numCleanBlocks > 0 ifTrue: [self addCleanBlockStarts]. self maybeAllocAndInitCounters. blockEntryLabel := nil. methodLabel dependent: nil. (result := self compileEntireMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. ^self generateCogMethod: selector! Item was added: + ----- Method: Cogit>>linkedSuperSendCacheTags (in category 'analysis') ----- + linkedSuperSendCacheTags + "An example; answer the cache tags for linked super sends. They should all be + selectors because super sends don't have their cache tag rewritten when linked." + <doNotGenerate> + | cacheTags | + cacheTags := Set new. + methodZone methodsDo: + [:m| + m cmType = CMMethod ifTrue: + [self sendSitesIn: m do: + [:a :mcpc| | entryPoint | + entryPoint := backEnd callTargetFromReturnAddress: mcpc. + entryPoint > methodZoneBase ifTrue: + [self offsetAndSendTableFor: entryPoint + annotation: a + into: + [:off :table| + off = cmNoCheckEntryOffset ifTrue: + [cacheTags add: (backEnd inlineCacheTagAt: mcpc)]]]]]]. + ^cacheTags! Item was changed: ----- Method: Cogit>>mapObjectReferencesInGeneratedRuntime (in category 'garbage collection') ----- mapObjectReferencesInGeneratedRuntime "Update all references to objects in the generated runtime." 0 to: runtimeObjectRefIndex - 1 do: [:i| | mcpc literal mappedLiteral | mcpc := objectReferencesInRuntime at: i. literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. + mappedLiteral := objectRepresentation remapObject: literal. - mappedLiteral := objectRepresentation remapObj: literal. mappedLiteral ~= literal ifTrue: [backEnd storeLiteral: mappedLiteral beforeFollowingAddress: mcpc. codeModified := true]]! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> | literal cacheTag cacheTagMarked entryPoint targetMethod offset sendTable unlinkedRoutine | <var: #targetMethod type: #'CogMethod *'> <var: #sendTable type: #'sqInt *'> annotation = IsObjectReference ifTrue: [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. objectRepresentation markAndTraceLiteral: literal]. (self isSendAnnotation: annotation) ifTrue: [cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. - cacheTagMarked := objectRepresentation cacheTagIsMarked: cacheTag. - objectRepresentation markAndTraceLiteral: cacheTag. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint > methodZoneBase + ifTrue: "It's a linked send." + [self + offsetAndSendTableFor: entryPoint + annotation: annotation + into: [:off :table| offset := off. sendTable := table]. + targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. + offset = cmNoCheckEntryOffset + ifTrue: [objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" + cacheTagMarked := true] + ifFalse: [cacheTagMarked := objectRepresentation cacheTagIsMarked: cacheTag]. + (cacheTagMarked not + or: [self markAndTraceOrFreeCogMethod: targetMethod + firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: + ["Either the cacheTag is unmarked (e.g. new class) or the target + has been freed (because it is unmarked) so unlink the send." + unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). + backEnd + rewriteInlineCacheAt: mcpc asInteger + tag: targetMethod selector + target: unlinkedRoutine. + codeModified := true. + objectRepresentation markAndTraceLiteral: targetMethod selector]] + ifFalse: + [objectRepresentation markAndTraceLiteral: cacheTag]]. - entryPoint > methodZoneBase ifTrue: "It's a linked send." - [self - offsetAndSendTableFor: entryPoint - annotation: annotation - into: [:off :table| offset := off. sendTable := table]. - targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. - (cacheTagMarked not - or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: - ["Either the cacheTag is unmarked (e.g. new class) or the target - has been freed (because it is unmarked) so unlink the send." - unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true. - objectRepresentation markAndTraceLiteral: targetMethod selector]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSendOrPushImplicit: annotation pc: mcpc method: cogMethod <option: #NewspeakVM> "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> | literal cacheTag cacheTagMarked entryPoint targetMethod offset sendTable unlinkedRoutine | <var: #targetMethod type: #'CogMethod *'> <var: #sendTable type: #'sqInt *'> annotation = IsObjectReference ifTrue: [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. objectRepresentation markAndTraceLiteral: literal]. (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. cacheTagMarked := objectRepresentation cacheTagIsMarked: cacheTag. - objectRepresentation markAndTraceLiteral: cacheTag. entryPoint = ceImplicitReceiverTrampoline ifTrue: [| classpc mixinpc class mixin | + objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" - self assert: cacheTagMarked. "cacheTag is selector" classpc := mcpc asInteger + backEnd jumpShortByteSize. mixinpc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. class := backEnd unalignedLongAt: classpc. class ~= 0 ifTrue: [self assert: (objectMemory addressCouldBeObj: class). (objectRepresentation cacheTagIsMarked: class) ifTrue: [(mixin := backEnd unalignedLongAt: mixinpc) ~= 0 ifTrue: [objectRepresentation markAndTraceLiteral: mixin]] ifFalse: [backEnd unalignedLongAt: classpc put: 0; unalignedLongAt: mixinpc put: 0. codeModified := true]] ifFalse: [self assert: (backEnd unalignedLongAt: mixinpc) = 0]] ifFalse: + [entryPoint > methodZoneBase + ifTrue: "It's a linked send." + [self + offsetAndSendTableFor: entryPoint + annotation: annotation + into: [:off :table| offset := off. sendTable := table]. + offset = cmNoCheckEntryOffset + ifTrue: [objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" + cacheTagMarked := true] + ifFalse: [cacheTagMarked := objectRepresentation cacheTagIsMarked: cacheTag]. + targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. + (cacheTagMarked not + or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: + ["Either the cacheTag is unmarked (e.g. new class) or the target + has been freed (because it is unmarked) so unlink the send." + unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). + backEnd + rewriteInlineCacheAt: mcpc asInteger + tag: targetMethod selector + target: unlinkedRoutine. + codeModified := true. + objectRepresentation markAndTraceLiteral: targetMethod selector]] + ifFalse: + [objectRepresentation markAndTraceLiteral: cacheTag]]]. - [entryPoint > methodZoneBase ifTrue: "It's a linked send." - [self - offsetAndSendTableFor: entryPoint - annotation: annotation - into: [:off :table| offset := off. sendTable := table]. - targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. - (cacheTagMarked not - or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: - ["Either the cacheTag is unmarked (e.g. new class) or the target - has been freed (because it is unmarked) so unlink the send." - unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true. - objectRepresentation markAndTraceLiteral: targetMethod selector]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>remapIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation couldBeObject: literal) ifTrue: + [mappedLiteral := objectRepresentation remapObject: literal. - [mappedLiteral := objectRepresentation remapObj: literal. literal ~= mappedLiteral ifTrue: [backEnd storeLiteral: mappedLiteral beforeFollowingAddress: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. (self isSendAnnotation: annotation) ifTrue: [| cacheTag mappedCacheTag | cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (objectRepresentation couldBeObject: cacheTag) ifTrue: + [mappedCacheTag := objectRepresentation remapObject: cacheTag. - [mappedCacheTag := objectRepresentation remapObj: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. hasYoungPtr ~= 0 ifTrue: [| entryPoint offset targetMethod | "Since the unlinking routines may rewrite the cacheTag to the send's selector, and since they don't have the cogMethod to hand and can't add it to youngReferrers, the method must remain in youngReferrers if the targetMethod's selector is young." entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment ifTrue: [cmEntryOffset] ifFalse: [cmNoCheckEntryOffset]. targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. (objectMemory isYoung: targetMethod selector) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>remapNSIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapNSIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <option: #NewspeakVM> <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation couldBeObject: literal) ifTrue: + [mappedLiteral := objectRepresentation remapObject: literal. - [mappedLiteral := objectRepresentation remapObj: literal. literal ~= mappedLiteral ifTrue: [backEnd storeLiteral: mappedLiteral beforeFollowingAddress: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. (self isSendAnnotation: annotation) ifTrue: [| cacheTag mappedCacheTag entryPoint | cacheTag := backEnd inlineCacheTagAt: mcpc asInteger. (objectRepresentation couldBeObject: cacheTag) ifTrue: + [mappedCacheTag := objectRepresentation remapObject: cacheTag. - [mappedCacheTag := objectRepresentation remapObj: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint = ceImplicitReceiverTrampoline ifTrue: [| pc oop mappedOop | pc := mcpc asInteger + backEnd jumpShortByteSize. (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: [mappedOop := objectRepresentation remapOop: oop. mappedOop ~= oop ifTrue: [backEnd unalignedLongAt: pc put: mappedOop]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]. pc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: [mappedOop := objectRepresentation remapOop: oop. mappedOop ~= oop ifTrue: [backEnd unalignedLongAt: pc put: mappedOop]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]] ifFalse: [hasYoungPtr ~= 0 ifTrue: [| offset targetMethod | "Since the unlinking routines may rewrite the cacheTag to the send's selector, and since they don't have the cogMethod to hand and can't add it to youngReferrers, the method must remain in youngReferrers if the targetMethod's selector is young." entryPoint > methodZoneBase ifTrue: "It's a linked send." [offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment ifTrue: [cmEntryOffset] ifFalse: [cmNoCheckEntryOffset]. targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. (objectMemory isYoung: targetMethod selector) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]. ^0 "keep scanning"! Item was added: + ----- Method: Cogit>>sendSitesIn:do: (in category 'analysis') ----- + sendSitesIn: cogMethod do: binaryBlock + "Evaluate binaryBlock with the annotation and mcpc for each send site in cogMethod" + <doNotGenerate> + self mapFor: cogMethod + performUntil: (#withAnnotation:mcpc:evaluate:) + arg: [:ann :mcpc | (self isSendAnnotation: ann) ifTrue: [binaryBlock value: ann value: mcpc]]! Item was added: + ----- Method: Cogit>>withAnnotation:mcpc:evaluate: (in category 'analysis') ----- + withAnnotation: annotation mcpc: mcpc evaluate: binaryBlock + <doNotGenerate> + binaryBlock value: annotation value: mcpc. + ^0 "keep scanning"! Item was changed: ----- Method: NewCoObjectMemory>>withoutForwardingOn:and:with:sendToCogit: (in category 'cog jit support') ----- withoutForwardingOn: obj1 and: obj2 with: aBool sendToCogit: selector + "For the purposes of become: send selector to the cogit with obj1, obj2 and aBool, and - "For the purposes of become: send selector to the cogit with obj1 and obj2 and answer the result. Undo forwarding for the selector, but redo forwarding after since become:'s restoreHeadersAfter*Become* methods expect to be able to restore." <api> <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt,sqInt)'> | savedHeaderA savedHeaderB result | savedHeaderA := self baseHeader: obj1. self baseHeader: obj1 put: (self headerWhileForwardingOf: obj1). savedHeaderB := self baseHeader: obj2. self baseHeader: obj2 put: (self headerWhileForwardingOf: obj2). result := cogit perform: selector with: obj1 with: obj2 with: aBool. self baseHeader: obj1 put: savedHeaderA. self baseHeader: obj2 put: savedHeaderB. ^result! Item was changed: ----- Method: NewObjectMemory>>isYoungObject: (in category 'memory access') ----- isYoungObject: obj <api> "Answer if obj is young. Assume obj is non-immediate." + self assert: (self isNonImmediate: obj). ^self oop: obj isGreaterThanOrEqualTo: youngStart! Item was added: + ----- Method: Spur32BitCoMemoryManager>>withoutForwardingOn:and:sendToCogit: (in category 'cog jit support') ----- + withoutForwardingOn: obj1 and: obj2 sendToCogit: selector + "For the purposes of become: send selector to the cogit with obj1 and obj2 + and answer the result. Undo forwarding for the selector." + <api> + <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt)'> + | targetA targetB | + targetA := self followForwarded: obj1. + targetB := self followForwarded: obj2. + ^cogit perform: selector with: targetA with: targetB! Item was added: + ----- Method: Spur32BitCoMemoryManager>>withoutForwardingOn:and:with:sendToCogit: (in category 'cog jit support') ----- + withoutForwardingOn: obj1 and: obj2 with: aBool sendToCogit: selector + "For the purposes of become: send selector to the cogit with obj1, obj2 + and aBool and answer the result. Undo forwarding for the selector." + <api> + <var: #selector declareC: 'sqInt (*selector)(sqInt,sqInt,sqInt)'> + | targetA targetB | + targetA := self followForwarded: obj1. + targetB := self followForwarded: obj2. + ^cogit perform: selector with: targetA with: targetB with: aBool! Item was changed: ----- Method: Spur32BitMemoryManager>>isMarked: (in category 'header access') ----- isMarked: objOop + <api> self flag: #endianness. ^((self longAt: objOop + 4) >> self markedBitHalfShift bitAnd: 1) ~= 0! Item was changed: ----- Method: Spur32BitMemoryManager>>numTagBits (in category 'object access') ----- numTagBits + <api> ^2! Item was changed: ----- Method: Spur32BitMemoryManager>>shiftForWord (in category 'word size') ----- shiftForWord + <api> ^2! Item was changed: ----- Method: Spur32BitMemoryManager>>tagMask (in category 'word size') ----- tagMask + <api> ^3! Item was changed: ----- Method: Spur64BitMemoryManager>>isMarked: (in category 'header access') ----- isMarked: objOop + <api> ^((self longAt: objOop) >> self markedBitFullShift bitAnd: 1) ~= 0! Item was changed: ----- Method: Spur64BitMemoryManager>>numTagBits (in category 'object access') ----- numTagBits + <api> "4th bit reserved for object alignment, which could imply e.g. what space the object is in." ^3! Item was changed: ----- Method: Spur64BitMemoryManager>>shiftForWord (in category 'word size') ----- shiftForWord + <api> ^3! Item was changed: ----- Method: Spur64BitMemoryManager>>tagMask (in category 'word size') ----- tagMask + <api> ^7! Item was changed: ----- Method: SpurGenerationScavenger>>remember: (in category 'store check') ----- remember: objOop <inline: false> + self assert: (manager isYoung: objOop) not. - self assert: ((manager isNonImmediate: objOop) - and: [(manager isYoung: objOop) not]). rememberedSetSize < RememberedSetLimit ifTrue: [rememberedSet at: rememberedSetSize put: objOop. (rememberedSetSize := rememberedSetSize + 1) >= RememberedSetRedZone ifTrue: [manager scheduleScavenge]] ifFalse: [self error: 'remembered set overflow' "for now"]! Item was changed: ----- Method: SpurGenerationScavenger>>scavengeReferentsOf: (in category 'scavenger') ----- scavengeReferentsOf: referrer "scavengeReferentsOf: referrer inspects all the pointers in referrer. If any are new objects, it has them moved to FutureSurvivorSpace, and answers truth. If there are no new referents, it answers falsity. To handle weak arrays, if the referrer is weak only scavenge strong slots and answer true so that it won't be removed from the remembered set until later." | foundNewReferent | "forwarding objects should be followed by callers, unless the forwarder is a root in the remembered table." self assert: ((manager isForwarded: referrer) not or: [manager isRemembered: referrer]). "unscanned ephemerons should be scanned later." self assert: ((manager isEphemeron: referrer) not or: [(self isScavengeSurvivor: (manager keyOfEphemeron: referrer)) or: [self is: referrer onWeaklingList: ephemeronList]]). foundNewReferent := false. 0 to: (manager numStrongSlotsOf: referrer ephemeronInactiveIf: #isScavengeSurvivor:) - 1 do: [:i| | referent newLocation | referent := manager fetchPointer: i ofMaybeForwardedObject: referrer. (manager isNonImmediate: referent) ifTrue: ["a forwarding pointer could be because of become: or scavenging." (manager isForwarded: referent) ifTrue: [referent := manager followForwarded: referent]. + (manager isYoung: referent) - ((manager isNonImmediate: referent) - and: [manager isYoung: referent]) ifTrue: "if target is already in future space forwarding pointer was due to a become:." [(manager isInFutureSpace: referent) ifTrue: [newLocation := referent. foundNewReferent := true] ifFalse: [newLocation := self copyAndForward: referent. (manager isYoung: newLocation) ifTrue: [foundNewReferent := true]]. manager storePointerUnchecked: i ofMaybeForwardedObject: referrer withValue: newLocation] ifFalse: [manager storePointerUnchecked: i ofMaybeForwardedObject: referrer withValue: referent]]]. ^foundNewReferent or: [manager isWeakNonImm: referrer]! Item was added: + ----- Method: SpurMemoryManager>>beRootIfOld: (in category 'store check') ----- + beRootIfOld: oop + "If this object is old, mark it as a root (because a new object + may be stored into it)." + <api> + <inline: false> + (self isYoung: oop) ifTrue:"Yes, oop is an old object" + [self possibleRootStoreInto: oop]! Item was changed: ----- Method: SpurMemoryManager>>byteLengthOf: (in category 'object access') ----- byteLengthOf: objOop "Answer the number of indexable bytes in the given object. + Does not adjust contexts by stackPointer. + This is basically a special copy of lengthOf: for BitBlt. But it is also + whoorishly used for the Cogit." + <api> - Does not adjust contexts by stackPointer." | fmt numBytes | <inline: true> <asmLabel: false> fmt := self formatOf: objOop. numBytes := (self numSlotsOf: objOop) << self shiftForWord. fmt <= self sixtyFourBitIndexableFormat ifTrue: [^numBytes]. fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" [^numBytes - (fmt bitAnd: 7)]. fmt >= self firstShortFormat ifTrue: [^numBytes - ((fmt bitAnd: 3) << 1)]. "fmt >= self firstLongFormat" ^numBytes - ((fmt bitAnd: 1) << 2)! Item was changed: ----- Method: SpurMemoryManager>>characterTag (in category 'object access') ----- characterTag + <api> ^2! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rootTable, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rootTable entries have their rootBit set. Answer if all checks pass." | ok numRememberedRootsInHeap | <inline: false> ok := true. numRememberedRootsInHeap := 0. self allHeapEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | ((self isFreeObject: obj) + or: [(self isYoungObject: obj) and: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]]) ifFalse: - or: [(self isYoung: obj) and: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]]) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedRootsInHeap := numRememberedRootsInHeap + 1. (scavenger isInRememberedSet: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classAtIndex: (classIndex := self classIndexOf: obj). ((classOop isNil or: [classOop = nilObj]) and: [(self isHiddenObj: obj) not]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. self baseHeaderSize to: (self lastPointerOf: obj) by: BytesPerOop do: [:ptr| fieldOop := self longAt: obj + ptr. (self isNonImmediate: fieldOop) ifTrue: [| fi | fi := ptr - self baseHeaderSize / self wordSize. (fieldOop bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. "don't be misled by CogMethods; they appear to be young, but they're not" ((self isYoung: fieldOop) and: [self oop: fieldOop isGreaterThanOrEqualTo: startOfMemory]) ifTrue: [containsYoung := true]]]]]. (containsYoung and: [(self isYoung: obj) not]) ifTrue: [(self isRemembered: obj) ifFalse: [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. self eek. ok := false]]]]. numRememberedRootsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedRootsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]. 1 to: extraRootCount do: [:ri| | obj | obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]. ^ok! Item was changed: ----- Method: SpurMemoryManager>>classAtIndex: (in category 'class table') ----- classAtIndex: classIndex + <api> | classTablePage | self assert: (classIndex <= self tagMask or: [classIndex >= self arrayClassIndexPun]). classTablePage := self fetchPointer: classIndex >> self classTableMajorIndexShift ofObject: hiddenRootsObj. classTablePage = nilObj ifTrue: [^nil]. ^self fetchPointer: (classIndex bitAnd: self classTableMinorIndexMask) ofObject: classTablePage! Item was changed: ----- Method: SpurMemoryManager>>classIndexMask (in category 'header format') ----- classIndexMask + <api> "22-bit class mask => ~ 4M classes" ^16r3fffff! Item was changed: ----- Method: SpurMemoryManager>>classIndexOf: (in category 'header access') ----- classIndexOf: objOop + <api> ^(self longAt: objOop) bitAnd: self classIndexMask! Item was changed: ----- Method: SpurMemoryManager>>classTableMajorIndexShift (in category 'class table') ----- classTableMajorIndexShift + <api> "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" ^10! Item was changed: ----- Method: SpurMemoryManager>>classTableMinorIndexMask (in category 'class table') ----- classTableMinorIndexMask + <api> "1024 entries per page (2^10); 22 bit classIndex implies 2^12 pages" "self basicNew classTableMinorIndexMask" ^1 << self classTableMajorIndexShift - 1! Item was changed: ----- Method: SpurMemoryManager>>classTableRootObj (in category 'accessing') ----- classTableRootObj + <api> "For Cogit & bootstrap" ^hiddenRootsObj! Item was changed: ----- Method: SpurMemoryManager>>clone: (in category 'allocation') ----- clone: objOop | numSlots newObj | numSlots := self numSlotsOf: objOop. numSlots > self maxSlotsForNewSpaceAlloc ifTrue: [newObj := self allocateSlotsInOldSpace: numSlots format: (self formatOf: objOop) classIndex: (self classIndexOf: objOop)] ifFalse: [newObj := self allocateSlots: numSlots format: (self formatOf: objOop) classIndex: (self classIndexOf: objOop)]. (self isPointersNonImm: objOop) ifTrue: [0 to: numSlots - 1 do: [:i| | oop | oop := self fetchPointer: i ofObject: objOop. ((self isNonImmediate: oop) and: [self isForwarded: oop]) ifTrue: [oop := self followForwarded: oop]. self storePointerUnchecked: i ofObject: newObj withValue: oop]. ((self isRemembered: objOop) + and: [(self isYoungObject: newObj) not]) ifTrue: - and: [(self isYoung: newObj) not]) ifTrue: [scavenger remember: newObj. self setIsRememberedOf: newObj to: true]] ifFalse: [0 to: numSlots - 1 do: [:i| self storePointerUnchecked: i ofObject: newObj withValue: (self fetchPointer: i ofObject: objOop)]]. ^newObj! Item was changed: ----- Method: SpurMemoryManager>>compactClassIndexOf: (in category 'object access') ----- compactClassIndexOf: objOop + <api> + <inline: true> ^self classIndexOf: objOop! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwarders (in category 'gc - global') ----- eliminateAndFreeForwarders "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders" | lowestForwarded firstForwarded lastForwarded | <inline: false> self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. (self isForwarded: specialObjectsOop) ifTrue: [specialObjectsOop := self followForwarded: specialObjectsOop]. "N.B. we don't have to explcitly do mapInterpreterOops since the scavenge below will do it." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: DontTenureButDoUnmark. self checkFreeSpace. lowestForwarded := 0. "sweep, following forwarders in all live objects, and finding the first forwarder." self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarded = 0 ifTrue: [lowestForwarded := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. + self assert: (self isYoung: f) not. - self assert: ((self isImmediate: f) or: [self isYoung: f]) not. self storePointerUnchecked: i ofObject: o withValue: f]]]]. self checkFreeSpace. firstForwarded := lastForwarded := 0. "sweep from lowest forwarder, coalescing runs of forwarders. perhaps this should coalewsce free space and forwarders. the previous loop could reprise the discarding of free space in freeUnmarkedObjectsAndSortAndCoalesceFreeSpace." self allOldSpaceEntitiesFrom: lowestForwarded do: [:o| (self isForwarded: o) ifTrue: [firstForwarded = 0 ifTrue: [firstForwarded := o]. lastForwarded := o] ifFalse: [firstForwarded ~= 0 ifTrue: [| start bytes | start := self startOfObject: firstForwarded. bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start]. firstForwarded := 0]]. firstForwarded ~= 0 ifTrue: [| start bytes | start := self startOfObject: firstForwarded. bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start]. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>firstShortFormat (in category 'header formats') ----- firstShortFormat + <api> ^12! Item was changed: ----- Method: SpurMemoryManager>>fixedFieldsFieldWidth (in category 'object format') ----- fixedFieldsFieldWidth + <api> ^16! Item was changed: ----- Method: SpurMemoryManager>>fixedFieldsOfClassFormatMask (in category 'object format') ----- fixedFieldsOfClassFormatMask + <api> ^1 << self fixedFieldsFieldWidth - 1! Item was changed: ----- Method: SpurMemoryManager>>formatMask (in category 'header format') ----- formatMask + <api> "0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6,7,8 unused 9 (?) 64-bit indexable 10 - 11 32-bit indexable 12 - 15 16-bit indexable 16 - 23 byte indexable 24 - 31 compiled method" ^16r1f! Item was changed: ----- Method: SpurMemoryManager>>formatShift (in category 'header format') ----- formatShift + <api> ^24! Item was changed: ----- Method: SpurMemoryManager>>hasYoungReferents: (in category 'object testing') ----- hasYoungReferents: objOop 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| | oop | oop := self fetchPointer: i ofObject: objOop. + (self isYoung: oop) ifTrue: - ((self isNonImmediate: oop) - and: [self isYoung: oop]) ifTrue: [^true]]. ^false! Item was changed: ----- Method: SpurMemoryManager>>headerForSlots:format:classIndex: (in category 'header format') ----- headerForSlots: numSlots format: formatField classIndex: classIndex + <api> "The header format in LSB is MSB: | 8: numSlots | (on a byte boundary) | 2 bits | (msb,lsb = {isMarked,?}) | 22: identityHash | (on a word boundary) | 3 bits | (msb <-> lsb = {isGrey,isPinned,isRemembered} | 5: format | (on a byte boundary) | 2 bits | (msb,lsb = {isImmutable,?}) | 22: classIndex | (on a word boundary) : LSB The remaining bits (7) are used for isImmutable (bit 23) isRemembered (bit 29) isPinned (bit 30) isGrey (bit 31) isMarked (bit 55) leaving 2 unused bits, each next to a 22-bit field, allowing those fields to be expanded to 23 bits.. The three bit field { isGrey, isPinned, isRemembered } is for bits that are never set in young objects. This allows the remembered table to be pruned when full by using these bits as a reference count of newSpace objects from the remembered table. Objects with a high count should be tenured to prune the remembered table." <returnTypeC: #usqLong> <inline: true> ^ ((self cCoerceSimple: numSlots to: #usqLong) << self numSlotsFullShift) + (formatField << self formatShift) + classIndex! Item was changed: ----- Method: SpurMemoryManager>>identityHashHalfWordMask (in category 'header format') ----- identityHashHalfWordMask + <api> ^16r3fffff! Item was changed: ----- Method: SpurMemoryManager>>inPlaceBecome:and:copyHashFlag: (in category 'become implementation') ----- inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag "Do become in place by swapping object contents." | headerTemp temp1 temp2 o1HasYoung o2HasYoung | self assert: (self numSlotsOf: obj1) = (self numSlotsOf: obj2). "swap headers, but swapping headers swaps remembered bits; these need to be unswapped." temp1 := self isRemembered: obj1. temp2 := self isRemembered: obj2. headerTemp := self longLongAt: obj1. self longLongAt: obj1 put: (self longLongAt: obj2). self longLongAt: obj2 put: headerTemp. self setIsRememberedOf: obj1 to: temp1. self setIsRememberedOf: obj2 to: temp2. "swapping headers swaps hash; if !!copyHashFlag undo hash copy" copyHashFlag ifFalse: [temp1 := self rawHashBitsOf: obj1. self setHashBitsOf: obj1 to: (self rawHashBitsOf: obj2). self setHashBitsOf: obj2 to: temp1]. o1HasYoung := o2HasYoung := false. 0 to: (self numSlotsOf: obj1) - 1 do: [:i| temp1 := self fetchPointer: i ofObject: obj1. temp2 := self fetchPointer: i ofObject: obj2. self storePointerUnchecked: i ofObject: obj1 withValue: temp2. self storePointerUnchecked: i ofObject: obj2 withValue: temp1. + (self isYoung: temp2) ifTrue: - ((self isNonImmediate: temp2) and: [self isYoung: temp2]) ifTrue: [o1HasYoung := true]. + (self isYoung: temp1) ifTrue: - ((self isNonImmediate: temp1) and: [self isYoung: temp1]) ifTrue: [o2HasYoung := true]]. + (self isYoungObject: obj1) ifFalse: - (self isYoung: obj1) ifFalse: [o1HasYoung ifTrue: [self possibleRootStoreInto: obj1]]. + (self isYoungObject: obj2) ifFalse: - (self isYoung: obj2) ifFalse: [o2HasYoung ifTrue: [self possibleRootStoreInto: obj2]]! Item was changed: ----- Method: SpurMemoryManager>>isForwardedObjectClassIndexPun (in category 'class table puns') ----- isForwardedObjectClassIndexPun + <api> ^8 "Not to be confused with that of any immediate class"! Item was changed: ----- Method: SpurMemoryManager>>isMarked: (in category 'header access') ----- isMarked: objOop + <api> self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>isNonImmediate: (in category 'object testing') ----- + isNonImmediate: oop + <api> - isNonImmediate: oop ^(oop bitAnd: self tagMask) = 0! Item was added: + ----- Method: SpurMemoryManager>>isReallyYoungObject: (in category 'object testing') ----- + isReallyYoungObject: obj + <api> + "Answer if obj is young. This for compatibility with SqueakV3 where + the GC makes all objects young during full GC. Spur doesn't do so." + ^self isYoungObject: obj! Item was changed: ----- Method: SpurMemoryManager>>isYoung: (in category 'object testing') ----- + isYoung: oop + <api> + "Answer if oop is young." + ^(self isNonImmediate: oop) + and: [self oop: oop isLessThan: newSpaceLimit]! - isYoung: objOop - ^self oop: objOop isLessThan: newSpaceLimit! Item was added: + ----- Method: SpurMemoryManager>>isYoungObject: (in category 'object testing') ----- + isYoungObject: objOop + <api> + "Answer if obj is young. Assume obj is non-immediate." + self assert: (self isNonImmediate: objOop). + ^self oop: objOop isLessThan: newSpaceLimit! Item was changed: ----- Method: SpurMemoryManager>>markAndTrace: (in category 'gc - global') ----- markAndTrace: objOop + "Mark the argument, and all objects reachable from it, and any remaining objects + on the mark stack. Follow forwarding pointers in the scan." + <api> - "Mark the argument, and all objects reachable from it, and any remaining objects on the mark stack. - Follow forwarding pointers in the scan." | objToScan numStrongSlots index field | (self markAndShouldScan: objOop) ifFalse: [^self]. "if markAndTrace: is to follow and eliminate forwarding pointers in its scan it cannot be handed an r-value which is forwarded." self assert: (self isForwarded: objOop) not. "Now scan the object, and any remaining objects on the mark stack." objToScan := objOop. "To avoid overflowing the mark stack when we encounter large objects, we push the obj, then its numStrongSlots, and then index the object from the stack." [((self isImmediate: objToScan) or: [numStrongSlots := self numStrongSlotsOf: objToScan ephemeronInactiveIf: #inactiveOrFailedToDeferScan:. numStrongSlots > self traceImmediatelySlotLimit]) ifTrue: "scanning a large object. scan until hitting an unmarked object, then switch to it, if any." [(self isImmediate: objToScan) ifTrue: [index := self integerValueOf: objToScan. objToScan := self topOfObjStack: markStack] ifFalse: [index := numStrongSlots. self markAndTraceClassOf: objToScan]. [index > 0] whileTrue: [index := index - 1. field := self fetchPointer: index ofObject: objToScan. (self isOopForwarded: field) ifTrue: [field := self followForwarded: field. self storePointerUnchecked: index ofObject: objToScan withValue: field]. (self markAndShouldScan: field) ifTrue: [index > 0 ifTrue: [(self topOfObjStack: markStack) ~= objToScan ifTrue: [self push: objToScan onObjStack: markStack]. self push: (self integerObjectOf: index) onObjStack: markStack]. objToScan := field. index := -1]]. index >= 0 ifTrue: "if loop terminated without finding an unmarked referent, switch to top of stack." [objToScan := self popObjStack: markStack. objToScan = objOop ifTrue: [objToScan := self popObjStack: markStack]]] ifFalse: "scanning a small object. scan, marking, pushing unmarked referents, then switch to the top of the stack." [index := numStrongSlots. self markAndTraceClassOf: objToScan. [index > 0] whileTrue: [index := index - 1. field := self fetchPointer: index ofObject: objToScan. (self isOopForwarded: field) ifTrue: [field := self followForwarded: field. self storePointerUnchecked: index ofObject: objToScan withValue: field]. (self markAndShouldScan: field) ifTrue: [self push: field onObjStack: markStack. numStrongSlots := self numStrongSlotsOf: field ephemeronInactiveIf: #inactiveOrFailedToDeferScan:. numStrongSlots > self traceImmediatelySlotLimit ifTrue: [self push: (self integerObjectOf: numStrongSlots) onObjStack: markStack]]]. objToScan := self popObjStack: markStack]. objToScan notNil] whileTrue! Item was changed: ----- Method: SpurMemoryManager>>nonIndexablePointerFormat (in category 'header formats') ----- nonIndexablePointerFormat + <api> ^1! Item was changed: ----- Method: SpurMemoryManager>>numSlotsHalfShift (in category 'header format') ----- numSlotsHalfShift + <api> ^24! Item was changed: ----- Method: SpurMemoryManager>>numSlotsMask (in category 'header format') ----- numSlotsMask + <api> "8-bit slot count max 64-bit small obj size 254 * 8 = 2032 bytes max 32-bit small obj size 254 * 4 = 1016 bytes" ^255! Item was changed: ----- Method: SpurMemoryManager>>numTagBits (in category 'object access') ----- numTagBits + <api> ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>remapObj: (in category 'gc - scavenging') ----- remapObj: objOop "Scavenge or simply follow objOop. Answer the new location of objOop. The send should have been guarded by a send of shouldRemapOop: or shouldScavengeObj:. The method is called remapObj: for compatibility with ObjectMemory." + <api> <inline: false> | resolvedObj | self assert: (self shouldRemapOop: objOop). (self isForwarded: objOop) ifTrue: [resolvedObj := self followForwarded: objOop. (self isInFutureSpace: resolvedObj) ifTrue: "already scavenged" [^resolvedObj]] ifFalse: [resolvedObj := objOop]. (self isYoung: resolvedObj) ifFalse: "a becommed or compacted object whose target is in old space" [^resolvedObj]. ^scavenger copyAndForward: resolvedObj! Item was changed: ----- Method: SpurMemoryManager>>rememberedBitShift (in category 'header format') ----- rememberedBitShift + <api> "bit 0 of 3-bit field above format (little endian)" ^29! Item was changed: ----- Method: SpurMemoryManager>>shiftForWord (in category 'word size') ----- shiftForWord + <api> ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>shouldRemapObj: (in category 'gc - scavenging') ----- shouldRemapObj: objOop + <api> "Answer if the obj should be scavenged (or simply followed). The method is called shouldRemapObj: for compatibility with ObjectMemory." ^(self isForwarded: objOop) + or: [self isYoungObject: objOop]! - or: [self isYoung: objOop]! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofForwarder:withValue: (in category 'heap management') ----- storePointer: fieldIndex ofForwarder: objOop withValue: valuePointer self assert: (self isForwarded: objOop). self assert: (self isOopForwarded: valuePointer) not. + (self isYoungObject: objOop) ifFalse: "most stores into young objects" - (self isYoung: objOop) ifFalse: "most stores into young objects" [((self isNonImmediate: valuePointer) and: [self isYoung: valuePointer]) ifTrue: [self possibleRootStoreInto: objOop]]. ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) put: valuePointer! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofObject:withValue: (in category 'object access') ----- storePointer: fieldIndex ofObject: objOop withValue: valuePointer "Note must check here for stores of young objects into old ones." self assert: (self isForwarded: objOop) not. + (self isYoungObject: objOop) ifFalse: "most stores into young objects" - (self isYoung: objOop) ifFalse: "most stores into young objects" [(self isImmediate: valuePointer) ifFalse: [(self isYoung: valuePointer) ifTrue: [self possibleRootStoreInto: objOop]]]. ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) put: valuePointer! Item was changed: ----- Method: SpurMemoryManager>>storePointerUnchecked:ofObject:withValue: (in category 'object access') ----- storePointerUnchecked: fieldIndex ofObject: objOop withValue: valuePointer + <api> self assert: (self isForwarded: objOop) not. ^self longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) put: valuePointer! Item was changed: ----- Method: SpurMemoryManager>>tagMask (in category 'word size') ----- tagMask + <api> ^self subclassResponsibility! Item was changed: ----- Method: StackInterpreter>>checkOkayFields: (in category 'debug support') ----- checkOkayFields: oop "Check if the argument is an ok object. If this is a pointers object, check that its fields are all okay oops." | hasYoung i fieldOop | (oop = nil or: [oop = 0]) ifTrue: [ ^true ]. "?? eem 1/16/2013" (objectMemory isIntegerObject: oop) ifTrue: [ ^true ]. (objectMemory checkOkayOop: oop) ifFalse: [ ^false ]. (objectMemory checkOopHasOkayClass: oop) ifFalse: [ ^false ]. ((objectMemory isPointersNonImm: oop) or: [objectMemory isCompiledMethod: oop]) ifFalse: [ ^true ]. + hasYoung := objectMemory hasSpurMemoryManagerAPI not + and: [objectMemory isYoung: (objectMemory fetchClassOfNonImm: oop)]. - hasYoung := objectMemory isYoung: (objectMemory fetchClassOfNonImm: oop). (objectMemory isCompiledMethod: oop) ifTrue: [i := (self literalCountOf: oop) + LiteralStart - 1] ifFalse: [(objectMemory isContext: oop) ifTrue: [i := CtxtTempFrameStart + (self fetchStackPointerOf: oop) - 1] ifFalse: [i := (objectMemory lengthOf: oop) - 1]]. [i >= 0] whileTrue: [fieldOop := objectMemory fetchPointer: i ofObject: oop. (objectMemory isIntegerObject: fieldOop) ifFalse: [hasYoung := hasYoung or: [objectMemory isYoung: fieldOop]. (objectMemory checkOkayOop: fieldOop) ifFalse: [ ^false ]. (self checkOopHasOkayClass: fieldOop) ifFalse: [ ^false ]]. i := i - 1]. hasYoung ifTrue: [^objectMemory checkOkayYoungReferrer: oop]. ^true!

1 0

[commit][2814] remove disabledPlugins.c from vm source files; remove src/ vm from include directories
by commits＠squeakvm.org 19 Nov '13

19 Nov '13

Revision: 2814 Author: piumarta Date: 2013-11-18 15:19:10 -0800 (Mon, 18 Nov 2013) Log Message: ----------- remove disabledPlugins.c from vm source files; remove src/vm from include directories Modified Paths: -------------- trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm/build.cmake Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2013-11-18 23:17:09 UTC (rev 2813) +++ trunk/platforms/unix/ChangeLog 2013-11-18 23:19:10 UTC (rev 2814) @@ -1,5 +1,8 @@ 2013-11-18 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + * vm/build.cmake: Remove disabledPlugins.c from list of source + files. Remove ${src}/vm from include directories. + * cmake/Plugins.cmake: Remove handling of disabled plugins. Create sqNamedPrims.h from plugins_int once configuration is complete. Copy interp.h from generated source into build dir. Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2013-11-18 23:17:09 UTC (rev 2813) +++ trunk/platforms/unix/vm/build.cmake 2013-11-18 23:19:10 UTC (rev 2814) @@ -12,7 +12,6 @@ ${cross}/vm/sqNamedPrims.c ${cross}/vm/sqVirtualMachine.c ${bld}/version.c - ${bld}/disabledPlugins.c ) ADD_CUSTOM_COMMAND ( @@ -34,7 +33,7 @@ INCLUDE_DIRECTORIES ( ${bld} - ${src}/vm +# ${src}/vm # files are now copied/generated in ${bld} ${unix}/vm ${cross}/vm ${unix}/plugins/B3DAcceleratorPlugin # for sqUnixOpenGL.h

1 0

[commit][2813] do not create disabledPlugins.c; create sqNamedPrims. h for internal plugins successfully configured; copy interp. h into build dir
by commits＠squeakvm.org 19 Nov '13

19 Nov '13

Revision: 2813 Author: piumarta Date: 2013-11-18 15:17:09 -0800 (Mon, 18 Nov 2013) Log Message: ----------- do not create disabledPlugins.c; create sqNamedPrims.h for internal plugins successfully configured; copy interp.h into build dir Modified Paths: -------------- trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/Plugins.cmake Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2013-11-14 05:44:19 UTC (rev 2812) +++ trunk/platforms/unix/ChangeLog 2013-11-18 23:17:09 UTC (rev 2813) @@ -1,3 +1,9 @@ +2013-11-18 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * cmake/Plugins.cmake: Remove handling of disabled plugins. + Create sqNamedPrims.h from plugins_int once configuration is + complete. Copy interp.h from generated source into build dir. + 2013-11-13 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * cmake/Plugins.cmake: Look for plugins.{int,ext,exc} in ${bld}, Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2013-11-14 05:44:19 UTC (rev 2812) +++ trunk/platforms/unix/cmake/Plugins.cmake 2013-11-18 23:17:09 UTC (rev 2813) @@ -1,6 +1,6 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2013-11-13 21:43:50 by piumarta on emilia +# Last edited: 2013-11-18 15:12:57 by piumarta on emilia IF (EXISTS ${bld}/plugins.int) FILE (STRINGS ${bld}/plugins.int plugins_int) @@ -48,11 +48,9 @@ FILE (GLOB plugins_vm RELATIVE ${unix} ${unix}/vm-*) -FILE_COPY (${bld}/disabledPlugins.c ${config}/disabledPlugins.c) +# copy generated headers to ${bld} to eliminate ${src} from the include search path -MACRO (DISABLED_PLUGIN plugin) - FILE (APPEND ${bld}/disabledPlugins.c "disabled(${plugin})\n") -ENDMACRO (DISABLED_PLUGIN) +FILE_COPY (${bld}/interp.h ${src}/vm/interp.h) MACRO (INTERNAL_PLUGIN plugin) SET (plugin_sources "") @@ -147,9 +145,6 @@ ENDIF () IF (DEFINED plugin_disabled) LIST (REMOVE_ITEM ${plugins_list} ${plugin}) - IF (${plugins_list} STREQUAL "plugins_int") - LIST (APPEND plugins_dis ${plugin}) - ENDIF (${plugins_list} STREQUAL "plugins_int") MESSAGE ("!! ${plugin} disabled") SET (${plugin}_disabled 1) ELSE (DEFINED plugin_disabled) @@ -168,9 +163,6 @@ ENDMACRO (CONFIGURE_PLUGINS) MACRO (BUILD_PLUGINS) - FOREACH (plugin ${plugins_dis}) - DISABLED_PLUGIN (${plugin}) - ENDFOREACH (plugin) FOREACH (plugin ${plugins_int}) INTERNAL_PLUGIN (${plugin}) ENDFOREACH (plugin) @@ -180,6 +172,27 @@ FOREACH (plugin ${plugins_vm}) EXTERNAL_PLUGIN (${plugin}) ENDFOREACH (plugin) + # create sqNamedPrims.h containing a list of exports for all configured internal plugins + SET (exports_h "${bld}/sqNamedPrims.h") + FILE (WRITE ${exports_h} "/* Automatically generated by Plugins.cmake from plugins.int */\n") + FILE (APPEND ${exports_h} "extern sqExport vm_exports[];\n") + FILE (APPEND ${exports_h} "extern sqExport os_exports[];\n") + FOREACH (plugin ${plugins_int}) + FILE (APPEND ${exports_h} "extern sqExport ") + FILE (APPEND ${exports_h} ${plugin}) + FILE (APPEND ${exports_h} "_exports[];\n") + ENDFOREACH (plugin) + FILE (APPEND ${exports_h} "\n") + FILE (APPEND ${exports_h} "sqExport *pluginExports[] = {\n") + FILE (APPEND ${exports_h} "\tvm_exports,\n") + FILE (APPEND ${exports_h} "\tos_exports,\n") + FOREACH (plugin ${plugins_int}) + FILE (APPEND ${exports_h} "\t") + FILE (APPEND ${exports_h} ${plugin}) + FILE (APPEND ${exports_h} "_exports,\n") + ENDFOREACH (plugin) + FILE (APPEND ${exports_h} "\tNULL\n") + FILE (APPEND ${exports_h} "};\n") ENDMACRO (BUILD_PLUGINS) MACRO (PLUGIN_MESSAGE msg)

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2013