Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

Tim R. Deliverables for CMake?
by gettimothy 27 May '14

27 May '14

Hi Tim R. Could you please define the deliverables for this project so I make sure I meet them? Unless I a missing something obvious, do not think I will be able to build on the Mac/IOS trees due to my platform being Linux. My next task is to get all the "missing plugins" that pharo has moved to squeak and following that, do the build tree revamp for Eliot. Following that is Windows builds (however that is done) Thanks for your time. tty

2 2

What libraries to build/link against on SunOS do you suggest?
by gettimothy 27 May '14

27 May '14

Howdy all. While getting Squeak running on OpenIndiana/SunOS is a low priority, it would be kinda neat if its just a matter of flags and linking. OpenIndiana does not have the GNU libs installed by default (i.e. cannot find math.h--which I believe is pretty standard/basic stuff) OI/SunOS has this package tool where several C development libraries are available for install: gcc-3 gcc-3-runtime gcc-43 gcc-dev-4 gcc-libgcc gcc-libgomp gcc-libssp illumos-gcc konkretcmpi sunstudio12u1 (Sun Studio C,C++ etc compilers and Tools sunstudioexpress Any suggestions? thx tty

2 2

Relative Paths for CMakeLists.txt ?
by gettimothy 27 May '14

27 May '14

Hi Pharo team. I just learned that the generators in CMakeVMMaker do not produce a relative path. I learned this when I attempted to build a generated CMakeConfiguration on a SunOS partition where my build path is not the same as my Linux partition's. Have you guys had to deal with this? I have done some lite browsing on the topic, but wanted to check with you first. thx. tty

3 4

[commit][2931] Type the memory allocators as accepting and answering usqInts to give a chance at
by commits＠squeakvm.org 26 May '14

26 May '14

Revision: 2931 Author: eliot Date: 2014-05-26 13:28:22 -0700 (Mon, 26 May 2014) Log Message: ----------- Type the memory allocators as accepting and answering usqInts to give a chance at allocating more than 2Gb. Modified Paths: -------------- branches/Cog/platforms/Mac OS/vm/sqMacMemory.c branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqUnixMemory.c branches/Cog/platforms/win32/vm/sqWin32Alloc.c branches/Cog/platforms/win32/vm/sqWin32Alloc.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon May 26 12:50:58 PDT 2014 + Mon May 26 13:27:49 PDT 2014 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMemory.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/Mac OS/vm/sqMacMemory.c 2014-05-26 20:28:22 UTC (rev 2931) @@ -51,7 +51,7 @@ } usqInt -sqAllocateMemoryMac(sqInt desiredHeapSize, sqInt minHeapSize) +sqAllocateMemoryMac(usqInt desiredHeapSize, usqInt minHeapSize) { void * debug, *actually; #if SPURVM Modified: branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h 2014-05-26 20:28:22 UTC (rev 2931) @@ -74,7 +74,7 @@ #define allocateMemoryMinimumImageFileHeaderSize(heapSize, minimumMemory, fileStream, headerSize) \ sqAllocateMemoryMac(heapSize, minimumMemory) -usqInt sqAllocateMemoryMac(sqInt desiredHeapSize, sqInt minHeapSize); +usqInt sqAllocateMemoryMac(usqInt desiredHeapSize, usqInt minHeapSize); #define sqAllocateMemory(x,y) sqAllocateMemoryMac(&y,x) Modified: branches/Cog/platforms/unix/vm/sqPlatformSpecific.h =================================================================== --- branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/unix/vm/sqPlatformSpecific.h 2014-05-26 20:28:22 UTC (rev 2931) @@ -41,7 +41,7 @@ #include "sqMemoryAccess.h" -extern sqInt sqAllocateMemory(sqInt minHeapSize, sqInt desiredHeapSize); +extern usqInt sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize); #define allocateMemoryMinimumImageFileHeaderSize(heapSize, minimumMemory, fileStream, headerSize) \ sqAllocateMemory(minimumMemory, heapSize) extern sqInt sqGrowMemoryBy(sqInt oldLimit, sqInt delta); Modified: branches/Cog/platforms/unix/vm/sqUnixMemory.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-05-26 20:28:22 UTC (rev 2931) @@ -56,7 +56,7 @@ #include "config.h" #include "debug.h" -void *uxAllocateMemory(sqInt minHeapSize, sqInt desiredHeapSize); +void *uxAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize); char *uxGrowMemoryBy(char *oldLimit, sqInt delta); char *uxShrinkMemoryBy(char *oldLimit, sqInt delta); sqInt uxMemoryExtraBytesLeft(sqInt includingSwap); @@ -107,29 +107,27 @@ /* answer the address of (minHeapSize <= N <= desiredHeapSize) bytes of memory. */ -void *uxAllocateMemory(sqInt minHeapSize, sqInt desiredHeapSize) +void *uxAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) { #if !ALWAYS_USE_MMAP if (!useMmap) return malloc(desiredHeapSize); #endif - if (heap) - { + if (heap) { fprintf(stderr, "uxAllocateMemory: already called\n"); exit(1); - } + } pageSize= getpagesize(); pageMask= ~(pageSize - 1); DPRINTF(("uxAllocateMemory: pageSize 0x%x (%d), mask 0x%x\n", pageSize, pageSize, pageMask)); #if (!MAP_ANON) - if ((devZero= open("/dev/zero", O_RDWR)) < 0) - { + if ((devZero= open("/dev/zero", O_RDWR)) < 0) { perror("uxAllocateMemory: /dev/zero"); return 0; - } + } #endif DPRINTF(("uxAllocateMemory: /dev/zero descriptor %d\n", devZero)); @@ -137,22 +135,19 @@ heapLimit= valign(max(desiredHeapSize, useMmap)); - while ((!heap) && (heapLimit >= minHeapSize)) - { + while ((!heap) && (heapLimit >= minHeapSize)) { DPRINTF(("uxAllocateMemory: mapping 0x%08x bytes (%d Mbytes)\n", heapLimit, heapLimit >> 20)); - if (MAP_FAILED == (heap= mmap(0, heapLimit, MAP_PROT, MAP_FLAGS, devZero, 0))) - { + if (MAP_FAILED == (heap= mmap(0, heapLimit, MAP_PROT, MAP_FLAGS, devZero, 0))) { heap= 0; heapLimit= valign(heapLimit / 4 * 3); } - } + } - if (!heap) - { + if (!heap) { fprintf(stderr, "uxAllocateMemory: failed to allocate at least %lld bytes)\n", (long long)minHeapSize); useMmap= 0; return malloc(desiredHeapSize); - } + } heapSize= heapLimit; @@ -271,7 +266,7 @@ #if defined(SQ_IMAGE32) && defined(SQ_HOST64) -sqInt sqAllocateMemory(sqInt minHeapSize, sqInt desiredHeapSize) +usqInt sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) { sqMemoryBase= uxAllocateMemory(minHeapSize, desiredHeapSize); if (!sqMemoryBase) return 0; @@ -296,7 +291,7 @@ #else -sqInt sqAllocateMemory(sqInt minHeapSize, sqInt desiredHeapSize) { return (sqInt)(long)uxAllocateMemory(minHeapSize, desiredHeapSize); } +usqInt sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) { return (sqInt)(long)uxAllocateMemory(minHeapSize, desiredHeapSize); } sqInt sqGrowMemoryBy(sqInt oldLimit, sqInt delta) { return (sqInt)(long)uxGrowMemoryBy((char *)(long)oldLimit, delta); } sqInt sqShrinkMemoryBy(sqInt oldLimit, sqInt delta) { return (sqInt)(long)uxShrinkMemoryBy((char *)(long)oldLimit, delta); } sqInt sqMemoryExtraBytesLeft(sqInt includingSwap) { return uxMemoryExtraBytesLeft(includingSwap); } Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-05-26 20:28:22 UTC (rev 2931) @@ -53,7 +53,7 @@ /************************************************************************/ /* sqAllocateMemory: Initialize virtual memory */ /************************************************************************/ -void *sqAllocateMemory(int minHeapSize, int desiredHeapSize) +void *sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) { SYSTEM_INFO sysInfo; DWORD initialCommit, commit; Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.h 2014-05-26 19:55:25 UTC (rev 2930) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.h 2014-05-26 20:28:22 UTC (rev 2931) @@ -21,7 +21,7 @@ #undef sqShrinkMemoryBy #undef sqMemoryExtraBytesLeft -void *sqAllocateMemory(int minHeapSize, int desiredHeapSize); +void *sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize); #define allocateMemoryMinimumImageFileHeaderSize(heapSize, minimumMemory, fileStream, headerSize) \ sqAllocateMemory(minimumMemory, heapSize) int sqGrowMemoryBy(int oldLimit, int delta);

1 0

[commit][2930] CogVM source as per VMMaker.oscog-eem.733
by commits＠squeakvm.org 26 May '14

26 May '14

Revision: 2930 Author: eliot Date: 2014-05-26 12:55:25 -0700 (Mon, 26 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.733 Use unsigned comparisons when testing if there's sufficient heap space in readImageFromFile:HeapSize:StartingAt:. Leads to accurate failure message when failing to allocate large heap. Add an assert to check that all weaklinks are accessible (but the bug has already been found with the nextCorpse encoding bug). Spur: Implement primitives to get (primitiveIsPinned) and (un)set (primitivePin) per-object pinning. Fix traversal in sortedFreeListPairwiseReverseDo: when there is only one element in the sorted free list. Weak containers and ephemerons in new space must be processed after all strongly reachable objects have been scavenged. So when the scavenger reaches a weak container or ephemeron it copies it to future space, leaving behind a forwarding pointer in the corpse, but it does not yet scavenge its contents. The corpse is used to construct the list of scavenged weak/ephemeral objects. The corpse's forwarding pointer is already taken to point to the survivor. Instead, the list is constructed by having a list head variable, and linking the list through a value stored in some of the corpse's unused header fields (format & identityHash). 0 marks the end of the list. Of course this doesn't work if an object is the first object in newSpace as this offset will be computed to be zero, improperly teminating the list! Fix this by adding one to the corpse offset and substracting 1 when decoding. Implement a simple policy to deal with the fact that typically heap growth happens during tenuring, not after a failed allocation. If, after scavenging, the heap has grown by some factor of its size at the previous global GC, do a global GC. Default the factor to 0.333333. Provide VM parameter access to this value: 55 ratio of growth and image size at or above which a GC will be performed post scavenge Add a printFreeChunks debugging utility that sweeps through memory instead of traversing the free lists. Add a Newspeak linux Spur Cog build. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h 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 branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/nsspurcogbuild/unixbuild/ branches/Cog/nsspurcogbuild/unixbuild/HowToBuild branches/Cog/nsspurcogbuild/unixbuild/abld/ branches/Cog/nsspurcogbuild/unixbuild/abld/mvm branches/Cog/nsspurcogbuild/unixbuild/abldt/ branches/Cog/nsspurcogbuild/unixbuild/abldt/mvm branches/Cog/nsspurcogbuild/unixbuild/abldt/plugins.ext branches/Cog/nsspurcogbuild/unixbuild/abldt/plugins.int branches/Cog/nsspurcogbuild/unixbuild/bld/ branches/Cog/nsspurcogbuild/unixbuild/bld/mvm branches/Cog/nsspurcogbuild/unixbuild/bldt/ branches/Cog/nsspurcogbuild/unixbuild/bldt/mvm branches/Cog/nsspurcogbuild/unixbuild/bldt/plugins.ext branches/Cog/nsspurcogbuild/unixbuild/bldt/plugins.int branches/Cog/nsspurcogbuild/unixbuild/dbld/ branches/Cog/nsspurcogbuild/unixbuild/dbld/mvm branches/Cog/nsspurcogbuild/unixbuild/dbldt/ branches/Cog/nsspurcogbuild/unixbuild/dbldt/mvm branches/Cog/nsspurcogbuild/unixbuild/dbldt/plugins.ext branches/Cog/nsspurcogbuild/unixbuild/dbldt/plugins.int branches/Cog/nsspurcogbuild/unixbuild/mkNamedPrims.sh branches/Cog/nsspurcogbuild/unixbuild/third-party/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/.gitignore branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/COPYING branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/ChangeLog branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/INSTALL branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/MEMORY-LEAK branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/NOTES branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/TODO branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/acinclude.m4 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aclocal.m4 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/alsalisp.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/hctl.lisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/hello.lisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/itest.lisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/alsalisp/test.lisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aserver/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aserver/COPYING branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aserver/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aserver/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/aserver/aserver.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/output.0 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/output.1 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/requests branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/traces.0 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/autom4te.cache/traces.1 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/compile branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/config.guess branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/config.sub branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/configure branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/configure.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/cvscompile branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/depcomp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/README.1st branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/asoundrc.txt branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/doxygen.cfg.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/index.doxygen branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/pictures/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/pictures/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/pictures/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/pictures/wave1.gif branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/doc/pictures/wave2.gif branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/gitcompile branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/alisp.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/alsa branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/alsa-symbols.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/aserver.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/asoundef.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/asoundlib-head.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/asoundlib-tail.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/conf.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/config.h.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/control.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/control_external.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/error.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/global.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/hwdep.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/iatomic.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/input.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/list.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/mixer.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/mixer_abst.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/output.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_external.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_extplug.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_ioplug.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_old.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_plugin.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/pcm_rate.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/rawmidi.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/search.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/seq.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/seq_event.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/seq_midi_event.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/seqmid.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/asequencer.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/asound.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/asound_fm.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/asoundef.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/emu10k1.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/hdsp.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/sb16_csp.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/sscape_ioctl.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sound/type_compat.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/sys.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/include/timer.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/install-sh branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/ltmain.sh branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/missing branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/ac97.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/hda.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/python/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/python/common.py branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/python/hda.py branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/python/main.py branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/python.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/sbase.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/sbase.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/modules/mixer/simple/sbasedl.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/Versions.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/alisp.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/alisp_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/alisp/alisp_snd.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/async.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/compat/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/compat/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/compat/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/compat/empty.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/compat/hsearch_r.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/alsa.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/AACI.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ATIIXP-MODEM.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ATIIXP-SPDMA.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ATIIXP.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/AU8810.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/AU8820.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/AU8830.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Audigy.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Audigy2.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Aureon51.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Aureon71.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CA0106.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CMI8338-SWIEC.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CMI8338.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CMI8738-MC6.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CMI8738-MC8.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CMI8788.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/CS46xx.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/EMU10K1.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/EMU10K1X.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ENS1370.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ENS1371.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ES1968.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/FM801.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/GUS.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/HDA-Intel.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ICE1712.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ICE1724.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ICH-MODEM.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ICH.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/ICH4.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Maestro3.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/NFORCE.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/PC-Speaker.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/PMac.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/PMacToonie.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/PS3.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/RME9636.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/RME9652.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/SI7018/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/SI7018/sndoc-mixer.alisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/SI7018/sndop-mixer.alisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/SI7018.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/TRID4DWAVENX.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/USB-Audio.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VIA686A.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VIA8233.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VIA8233A.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VIA8237.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VX222.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VXPocket.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/VXPocket440.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/YMF744.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/aliases.alisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/cards/aliases.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/center_lfe.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/default.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/dmix.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/dpl.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/dsnoop.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/front.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/hdmi.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/iec958.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/modem.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/rear.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/side.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/surround40.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/surround41.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/surround50.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/surround51.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/pcm/surround71.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/smixer.conf branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf/sndo-mixer.alisp branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/conf.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/confmisc.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/cards.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control_ext.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control_shm.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/control_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/ctl_symbols_list.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/hcontrol.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/namehint.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/setup.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/control/tlv.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/dlmisc.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/error.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/hwdep.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/hwdep_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/hwdep_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/hwdep/hwdep_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/input.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/bag.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/mixer.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/mixer_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/mixer_simple.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/simple.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/simple_abst.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/mixer/simple_none.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/names.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/output.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/atomic.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/interval.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/interval.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/interval_inline.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/ladspa.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/mask.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/mask.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/mask_inline.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_adpcm.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_alaw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_asym.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_copy.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_direct.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_direct.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix_generic.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix_i386.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix_i386.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix_x86_64.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dmix_x86_64.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dshare.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_dsnoop.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_empty.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_ext_parm.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_extplug.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_file.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_generic.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_generic.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_hooks.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_iec958.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_ioplug.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_ladspa.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_lfloat.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_linear.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_meter.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_misc.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_mmap.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_mmap_emul.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_mulaw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_multi.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_null.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_params.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_plug.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_plugin.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_plugin.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_rate.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_rate_linear.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_route.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_share.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_shm.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_simple.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_softvol.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/pcm_symbols_list.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/plugin_ops.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/scopes/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/scopes/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/scopes/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/pcm/scopes/level.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/rawmidi.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/rawmidi_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/rawmidi_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/rawmidi_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/rawmidi/rawmidi_virt.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_event.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_midi_event.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_old.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seq_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/seq/seqmid.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/shmarea.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/socket.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer_local.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer_query.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer_query_hw.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/timer/timer_symbols.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/src/userfile.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/client_event_filter.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/code.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/control.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/latency.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/midifile.3 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/midifile.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/midifile.h branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/midiloop.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/namehint.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/oldapi.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/omixer.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/pcm.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/pcm_min.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/playmidi1.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/queue_timer.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/rawmidi.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/seq-decoder.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/seq-sender.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/seq.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/test/timer.c branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/ branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/Makefile.am branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/Makefile.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/alsa-lib.spec.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/alsa.m4 branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/alsa.pc.in branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/utils/buildrpm branches/Cog/nsspurcogbuild/unixbuild/third-party/alsa-lib-1.0.17a/version Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-26 19:55:25 UTC (rev 2930) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 + CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 from - StackToRegisterMappingCogit VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 + StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -7780,7 +7780,6 @@ AbstractInstruction *jumpTarget1114; AbstractInstruction *jumpTarget1115; AbstractInstruction *jumpTarget1116; - AbstractInstruction *jumpTarget1117; AbstractInstruction *jumpTarget112; AbstractInstruction *jumpTarget113; AbstractInstruction *jumpTarget114; @@ -7797,6 +7796,7 @@ AbstractInstruction *jumpTarget124; AbstractInstruction *jumpTarget125; AbstractInstruction *jumpTarget126; + AbstractInstruction *jumpTarget127; AbstractInstruction *jumpTarget13; AbstractInstruction *jumpTarget14; AbstractInstruction *jumpTarget15; @@ -8333,12 +8333,12 @@ } assert(jumpTarget13 != 0); jumpTarget4 = jumpTarget13; - offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset17 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset16) + ? isQuick(self_in_dispatchConcretize, offset17) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 4); - ((self_in_dispatchConcretize->machineCode))[1] = (offset16 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset17 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8352,13 +8352,13 @@ } assert(jumpTarget111 != 0); jumpTarget21 = jumpTarget111; - offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset16 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 4); - ((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset16 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset16) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset16) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset16) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8374,12 +8374,12 @@ } assert(jumpTarget14 != 0); jumpTarget5 = jumpTarget14; - offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); + offset19 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset18) + ? isQuick(self_in_dispatchConcretize, offset19) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 5); - ((self_in_dispatchConcretize->machineCode))[1] = (offset18 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset19 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -8393,13 +8393,13 @@ } assert(jumpTarget112 != 0); jumpTarget22 = jumpTarget112; - offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); + offset18 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 5); - ((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = (offset18 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset18) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 24) & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 6); return; @@ -8651,13 +8651,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget119); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { - jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); + jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget120); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { + jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); } - assert(jumpTarget119 != 0); - jumpTarget29 = jumpTarget119; + assert(jumpTarget120 != 0); + jumpTarget29 = jumpTarget120; offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset26) @@ -8670,13 +8670,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1110); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { - jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); + jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget119); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) { + jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address))); } - assert(jumpTarget1110 != 0); - jumpTarget210 = jumpTarget1110; + assert(jumpTarget119 != 0); + jumpTarget210 = jumpTarget119; offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 12); @@ -8691,13 +8691,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget120); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) { - jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address))); + jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget121); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { + jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); } - assert(jumpTarget120 != 0); - jumpTarget30 = jumpTarget120; + assert(jumpTarget121 != 0); + jumpTarget30 = jumpTarget121; offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset27) @@ -8710,13 +8710,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1111); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { - jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); + jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1110); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) { + jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address))); } - assert(jumpTarget1111 != 0); - jumpTarget211 = jumpTarget1111; + assert(jumpTarget1110 != 0); + jumpTarget211 = jumpTarget1110; offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 13); @@ -8731,13 +8731,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget121); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) { - jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address))); + jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget122); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { + jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); } - assert(jumpTarget121 != 0); - jumpTarget31 = jumpTarget121; + assert(jumpTarget122 != 0); + jumpTarget31 = jumpTarget122; offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset28) @@ -8750,13 +8750,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1112); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { - jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); + jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1111); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) { + jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address))); } - assert(jumpTarget1112 != 0); - jumpTarget212 = jumpTarget1112; + assert(jumpTarget1111 != 0); + jumpTarget212 = jumpTarget1111; offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 15); @@ -8771,13 +8771,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget122); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) { - jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address))); + jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget123); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { + jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); } - assert(jumpTarget122 != 0); - jumpTarget32 = jumpTarget122; + assert(jumpTarget123 != 0); + jumpTarget32 = jumpTarget123; offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset29) @@ -8790,13 +8790,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1113); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { - jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); + jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1112); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) { + jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address))); } - assert(jumpTarget1113 != 0); - jumpTarget213 = jumpTarget1113; + assert(jumpTarget1112 != 0); + jumpTarget213 = jumpTarget1112; offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 14); @@ -8812,13 +8812,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget123); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) { - jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address))); + jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget124); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { + jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); } - assert(jumpTarget123 != 0); - jumpTarget33 = jumpTarget123; + assert(jumpTarget124 != 0); + jumpTarget33 = jumpTarget124; offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset30) @@ -8831,13 +8831,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1114); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { - jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); + jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1113); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) { + jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address))); } - assert(jumpTarget1114 != 0); - jumpTarget214 = jumpTarget1114; + assert(jumpTarget1113 != 0); + jumpTarget214 = jumpTarget1113; offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 7); @@ -8853,13 +8853,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget124); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) { - jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address))); + jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget125); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) { + jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address))); } - assert(jumpTarget124 != 0); - jumpTarget34 = jumpTarget124; + assert(jumpTarget125 != 0); + jumpTarget34 = jumpTarget125; offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset31) @@ -8872,13 +8872,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1115); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) { - jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address))); + jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1114); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) { + jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address))); } - assert(jumpTarget1115 != 0); - jumpTarget215 = jumpTarget1115; + assert(jumpTarget1114 != 0); + jumpTarget215 = jumpTarget1114; offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 6); @@ -8893,13 +8893,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget125); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) { - jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address))); + jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget126); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) { + jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address))); } - assert(jumpTarget125 != 0); - jumpTarget35 = jumpTarget125; + assert(jumpTarget126 != 0); + jumpTarget35 = jumpTarget126; offset32 = (((sqInt) jumpTarget35)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset32) @@ -8912,13 +8912,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1116); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) { - jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address))); + jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1115); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) { + jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address))); } - assert(jumpTarget1116 != 0); - jumpTarget216 = jumpTarget1116; + assert(jumpTarget1115 != 0); + jumpTarget216 = jumpTarget1115; offset122 = (((sqInt) jumpTarget216)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 11); @@ -8933,13 +8933,13 @@ /* begin concretizeConditionalJump: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget126); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) { - jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address))); + jumpTarget127 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget127); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget127)) { + jumpTarget127 = ((AbstractInstruction *) ((jumpTarget127->address))); } - assert(jumpTarget126 != 0); - jumpTarget36 = jumpTarget126; + assert(jumpTarget127 != 0); + jumpTarget36 = jumpTarget127; offset33 = (((sqInt) jumpTarget36)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 ? isQuick(self_in_dispatchConcretize, offset33) @@ -8952,13 +8952,13 @@ /* begin concretizeConditionalJumpLong: */ /* begin computeJumpTargetOffsetPlus: */ /* begin jumpTargetAddress */ - jumpTarget1117 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); - assertSaneJumpTarget(jumpTarget1117); - if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1117)) { - jumpTarget1117 = ((AbstractInstruction *) ((jumpTarget1117->address))); + jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0])); + assertSaneJumpTarget(jumpTarget1116); + if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) { + jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address))); } - assert(jumpTarget1117 != 0); - jumpTarget217 = jumpTarget1117; + assert(jumpTarget1116 != 0); + jumpTarget217 = jumpTarget1116; offset123 = (((sqInt) jumpTarget217)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6))); ((self_in_dispatchConcretize->machineCode))[0] = 15; ((self_in_dispatchConcretize->machineCode))[1] = (128 + 10); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-26 19:55:25 UTC (rev 2930) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 + CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-26 19:55:25 UTC (rev 2930) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.726 uuid: b0fc7b91-c835-49e5-a4b2-4bdad9a39331 + CCodeGenerator VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-26 19:55:25 UTC (rev 2930) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -963,6 +963,7 @@ EXPORT(sqInt) primitiveInterruptChecksPerMSec(void); static void primitiveInterruptSemaphore(void); static void primitiveInvokeObjectAsMethod(void); +static void primitiveIsPinned(void); EXPORT(sqInt) primitiveIsRoot(void); EXPORT(sqInt) primitiveIsWindowObscured(void); EXPORT(sqInt) primitiveIsYoung(void); @@ -1013,6 +1014,7 @@ static void primitivePerform(void); static void primitivePerformInSuperclass(void); static void primitivePerformWithArgs(void); +static void primitivePin(void); EXPORT(sqInt) primitiveProfilePrimitive(void); EXPORT(sqInt) primitiveProfileSample(void); EXPORT(sqInt) primitiveProfileSemaphore(void); @@ -1168,7 +1170,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1302,12 +1304,12 @@ _iss sqInt nilObj; _iss usqInt newMethod; _iss sqInt messageSelector; +_iss usqInt youngStart; _iss StackPage * pages; -_iss usqInt youngStart; _iss char * stackBasePlus1; -_iss sqInt remapBufferCount; _iss sqInt trueObj; _iss sqInt falseObj; +_iss sqInt remapBufferCount; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss usqInt reserveStart; @@ -1662,8 +1664,8 @@ /* 180 */ (void (*)(void))0, /* 181 */ (void (*)(void))0, /* 182 */ (void (*)(void))0, - /* 183 */ (void (*)(void))0, - /* 184 */ (void (*)(void))0, + /* 183 */ primitiveIsPinned, + /* 184 */ primitivePin, /* 185 */ primitiveExitCriticalSection, /* 186 */ primitiveEnterCriticalSection, /* 187 */ primitiveTestAndSetOwnershipOfCriticalSection, @@ -2056,7 +2058,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.724"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -24022,15 +24024,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -24041,7 +24045,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24056,7 +24074,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24110,18 +24128,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38835,6 +38853,29 @@ } +/* Answer if the receiver is pinned, i.e. immobile. */ + +static void +primitiveIsPinned(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt aValue; + sqInt obj; + + obj = longAt(GIV(stackPointer)); + if (((obj & 1)) + || (isForwarded(obj))) { + (GIV(primFailCode) = PrimErrBadReceiver); + return; + } + /* begin pop: */ + GIV(stackPointer) += (GIV(argumentCount) - 1) * BytesPerWord; + null; + /* begin stackTopPut: */ + aValue = GIV(falseObj); + longAtPointerput(GIV(stackPointer), aValue); +} + + /* Primitive. Answer whether the argument to the primitive is a root for young space */ @@ -41229,6 +41270,53 @@ } +/* Pin or unpin the receiver, i.e. make it immobile or mobile. Answer whether + the object was + already pinned. N.B. pinning does *not* prevent an object from being + garbage collected. */ + +static void +primitivePin(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt boolean; + sqInt failure; + sqInt obj; + char *sp; + sqInt wasPinned; + + (GIV(primFailCode) = PrimErrUnsupported); + return; + + obj = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + if (((obj & 1)) + || ((isForwarded(obj)) + || ((((obj & 1) == 0) + && (((((usqInt) (longAt(obj))) >> 12) & 0x1F) == ClassMethodContextCompactIndex)) + && ((((longAt((obj + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) + && (!(isWidowedContext(obj))))))) { + (GIV(primFailCode) = PrimErrBadReceiver); + return; + } + boolean = longAt(GIV(stackPointer)); + if (!((boolean == GIV(falseObj)) + || (boolean == GIV(trueObj)))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + wasPinned = GIV(falseObj); + /* begin pinObject: */ + GIV(primFailCode) = PrimErrUnsupported; + if (failure != 0) { + (GIV(primFailCode) = failure); + return; + } + + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) - 1) - 1) * BytesPerWord)), wasPinned); + GIV(stackPointer) = sp; +} + + /* Primitive. Answer the last primitive method sampled by the profiler. */ EXPORT(sqInt) @@ -45226,8 +45314,10 @@ 48 various header flags. See getCogVMFlags. 49 max size the image promises to grow the external semaphore table to (0 sets to default, which is 256 as of writing) - 50-55 nil; reserved for VM parameters that persist in the image (such as + 50-54 nil; reserved for VM parameters that persist in the image (such as eden above) + 55 ratio of growth and image size at or above which a GC will be performed + post scavenge 56 number of process switches since startup (read-only) 57 number of ioProcessEvents calls since startup (read-only) 58 number of ForceInterruptCheck calls since startup (read-only) @@ -45273,6 +45363,7 @@ sqInt valuePointer21; sqInt valuePointer22; sqInt valuePointer23; + sqInt valuePointer24; sqInt valuePointer3; sqInt valuePointer4; sqInt valuePointer5; @@ -45285,25 +45376,25 @@ if (GIV(argumentCount) == 0) { result = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << ShiftForWord)), paramsArraySize); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer = (((GIV(freeStart) - (startOfMemory())) << 1) | 1); - longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), valuePointer); + valuePointer1 = (((GIV(freeStart) - (startOfMemory())) << 1) | 1); + longAtput((result + BaseHeaderSize) + (0 << ShiftForWord), valuePointer1); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer1 = positive64BitIntegerFor(GIV(youngStart) - (startOfMemory())); - longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), valuePointer1); + valuePointer2 = positive64BitIntegerFor(GIV(youngStart) - (startOfMemory())); + longAtput((result + BaseHeaderSize) + (1 << ShiftForWord), valuePointer2); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer2 = positive64BitIntegerFor(GIV(endOfMemory) - (startOfMemory())); - longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), valuePointer2); + valuePointer3 = positive64BitIntegerFor(GIV(endOfMemory) - (startOfMemory())); + longAtput((result + BaseHeaderSize) + (2 << ShiftForWord), valuePointer3); longAtput((result + BaseHeaderSize) + (3 << ShiftForWord), GIV(nilObj)); longAtput((result + BaseHeaderSize) + (4 << ShiftForWord), GIV(nilObj)); longAtput((result + BaseHeaderSize) + (5 << ShiftForWord), ((GIV(tenuringThreshold) << 1) | 1)); longAtput((result + BaseHeaderSize) + (6 << ShiftForWord), ((GIV(statFullGCs) << 1) | 1)); longAtput((result + BaseHeaderSize) + (7 << ShiftForWord), ((((GIV(statFullGCUsecs) + 500) / 1000) << 1) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer3 = (((GIV(statIncrGCs)) << 1) | 1); - longAtput((result + BaseHeaderSize) + (8 << ShiftForWord), valuePointer3); + valuePointer4 = (((GIV(statIncrGCs)) << 1) | 1); + longAtput((result + BaseHeaderSize) + (8 << ShiftForWord), valuePointer4); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer4 = (((((GIV(statIncrGCUsecs)) + 500) / 1000) << 1) | 1); - longAtput((result + BaseHeaderSize) + (9 << ShiftForWord), valuePointer4); + valuePointer5 = (((((GIV(statIncrGCUsecs)) + 500) / 1000) << 1) | 1); + longAtput((result + BaseHeaderSize) + (9 << ShiftForWord), valuePointer5); longAtput((result + BaseHeaderSize) + (10 << ShiftForWord), ((GIV(statTenures) << 1) | 1)); for (i = 11; i <= 19; i += 1) { longAtput((result + BaseHeaderSize) + (i << ShiftForWord), ConstZero); @@ -45314,8 +45405,8 @@ longAtput((result + BaseHeaderSize) + (23 << ShiftForWord), ((GIV(shrinkThreshold) << 1) | 1)); longAtput((result + BaseHeaderSize) + (24 << ShiftForWord), ((GIV(growHeadroom) << 1) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer5 = (((ioHeartbeatMilliseconds()) << 1) | 1); - longAtput((result + BaseHeaderSize) + (25 << ShiftForWord), valuePointer5); + valuePointer6 = (((ioHeartbeatMilliseconds()) << 1) | 1); + longAtput((result + BaseHeaderSize) + (25 << ShiftForWord), valuePointer6); longAtput((result + BaseHeaderSize) + (26 << ShiftForWord), ((GIV(statMarkCount) << 1) | 1)); longAtput((result + BaseHeaderSize) + (27 << ShiftForWord), ((GIV(statSweepCount) << 1) | 1)); longAtput((result + BaseHeaderSize) + (28 << ShiftForWord), ((GIV(statMkFwdCount) << 1) | 1)); @@ -45331,20 +45422,20 @@ longAtput((result + BaseHeaderSize) + (38 << ShiftForWord), ((GIV(statPendingFinalizationSignals) << 1) | 1)); longAtput((result + BaseHeaderSize) + (39 << ShiftForWord), ((BytesPerWord << 1) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer6 = (((imageFormatVersion()) << 1) | 1); - longAtput((result + BaseHeaderSize) + (40 << ShiftForWord), valuePointer6); + valuePointer7 = (((imageFormatVersion()) << 1) | 1); + longAtput((result + BaseHeaderSize) + (40 << ShiftForWord), valuePointer7); longAtput((result + BaseHeaderSize) + (41 << ShiftForWord), ((GIV(numStackPages) << 1) | 1)); longAtput((result + BaseHeaderSize) + (42 << ShiftForWord), ((desiredNumStackPages << 1) | 1)); longAtput((result + BaseHeaderSize) + (43 << ShiftForWord), ((GIV(edenBytes) << 1) | 1)); longAtput((result + BaseHeaderSize) + (44 << ShiftForWord), ((desiredEdenBytes << 1) | 1)); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer7 = getCogCodeSize(); - longAtput((result + BaseHeaderSize) + (45 << ShiftForWord), valuePointer7); + valuePointer8 = getCogCodeSize(); + longAtput((result + BaseHeaderSize) + (45 << ShiftForWord), valuePointer8); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer8 = getDesiredCogCodeSize(); - longAtput((result + BaseHeaderSize) + (46 << ShiftForWord), valuePointer8); + valuePointer9 = getDesiredCogCodeSize(); + longAtput((result + BaseHeaderSize) + (46 << ShiftForWord), valuePointer9); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer9 = (((((((GIV(processHasThreadId) + valuePointer10 = (((((((GIV(processHasThreadId) ? 1 : 0)) + ((GIV(flagInterpretedMethods) ? 2 @@ -45353,46 +45444,47 @@ : 4))) + ((GIV(noThreadingOfGUIThread) ? 8 : 0))) << 1) | 1); - longAtput((result + BaseHeaderSize) + (47 << ShiftForWord), valuePointer9); + longAtput((result + BaseHeaderSize) + (47 << ShiftForWord), valuePointer10); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer10 = (((ioGetMaxExtSemTableSize()) << 1) | 1); - longAtput((result + BaseHeaderSize) + (48 << ShiftForWord), valuePointer10); + valuePointer11 = (((ioGetMaxExtSemTableSize()) << 1) | 1); + longAtput((result + BaseHeaderSize) + (48 << ShiftForWord), valuePointer11); for (i = 49; i <= 54; i += 1) { longAtput((result + BaseHeaderSize) + (i << ShiftForWord), GIV(nilObj)); } + /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer11 = positive64BitIntegerFor(GIV(statProcessSwitch)); - longAtput((result + BaseHeaderSize) + (55 << ShiftForWord), valuePointer11); + valuePointer12 = positive64BitIntegerFor(GIV(statProcessSwitch)); + longAtput((result + BaseHeaderSize) + (55 << ShiftForWord), valuePointer12); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer12 = positive64BitIntegerFor(GIV(statIOProcessEvents)); - longAtput((result + BaseHeaderSize) + (56 << ShiftForWord), valuePointer12); + valuePointer13 = positive64BitIntegerFor(GIV(statIOProcessEvents)); + longAtput((result + BaseHeaderSize) + (56 << ShiftForWord), valuePointer13); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer13 = positive64BitIntegerFor(GIV(statForceInterruptCheck)); - longAtput((result + BaseHeaderSize) + (57 << ShiftForWord), valuePointer13); + valuePointer14 = positive64BitIntegerFor(GIV(statForceInterruptCheck)); + longAtput((result + BaseHeaderSize) + (57 << ShiftForWord), valuePointer14); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer14 = positive64BitIntegerFor(GIV(statCheckForEvents)); - longAtput((result + BaseHeaderSize) + (58 << ShiftForWord), valuePointer14); + valuePointer15 = positive64BitIntegerFor(GIV(statCheckForEvents)); + longAtput((result + BaseHeaderSize) + (58 << ShiftForWord), valuePointer15); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer15 = positive64BitIntegerFor(GIV(statStackOverflow)); - longAtput((result + BaseHeaderSize) + (59 << ShiftForWord), valuePointer15); + valuePointer16 = positive64BitIntegerFor(GIV(statStackOverflow)); + longAtput((result + BaseHeaderSize) + (59 << ShiftForWord), valuePointer16); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer16 = positive64BitIntegerFor(GIV(statStackPageDivorce)); - longAtput((result + BaseHeaderSize) + (60 << ShiftForWord), valuePointer16); + valuePointer17 = positive64BitIntegerFor(GIV(statStackPageDivorce)); + longAtput((result + BaseHeaderSize) + (60 << ShiftForWord), valuePointer17); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer17 = getCodeCompactionCount(); - longAtput((result + BaseHeaderSize) + (61 << ShiftForWord), valuePointer17); + valuePointer18 = getCodeCompactionCount(); + longAtput((result + BaseHeaderSize) + (61 << ShiftForWord), valuePointer18); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer18 = getCodeCompactionMSecs(); - longAtput((result + BaseHeaderSize) + (0x3E << ShiftForWord), valuePointer18); + valuePointer19 = getCodeCompactionMSecs(); + longAtput((result + BaseHeaderSize) + (0x3E << ShiftForWord), valuePointer19); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer19 = (((numMethodsOfType(CMMethod)) << 1) | 1); - longAtput((result + BaseHeaderSize) + (0x3F << ShiftForWord), valuePointer19); + valuePointer20 = (((numMethodsOfType(CMMethod)) << 1) | 1); + longAtput((result + BaseHeaderSize) + (0x3F << ShiftForWord), valuePointer20); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer20 = GIV(trueObj); - longAtput((result + BaseHeaderSize) + (64 << ShiftForWord), valuePointer20); + valuePointer21 = GIV(trueObj); + longAtput((result + BaseHeaderSize) + (64 << ShiftForWord), valuePointer21); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer21 = (((stackPageByteSize()) << 1) | 1); - longAtput((result + BaseHeaderSize) + (65 << ShiftForWord), valuePointer21); + valuePointer22 = (((stackPageByteSize()) << 1) | 1); + longAtput((result + BaseHeaderSize) + (65 << ShiftForWord), valuePointer22); for (i = 66; i <= 68; i += 1) { /* reserved for more Cog-related info */ @@ -45400,11 +45492,11 @@ longAtput((result + BaseHeaderSize) + (i << ShiftForWord), GIV(nilObj)); } /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer22 = (((VM_PROXY_MAJOR) << 1) | 1); - longAtput((result + BaseHeaderSize) + (69 << ShiftForWord), valuePointer22); + valuePointer23 = (((VM_PROXY_MAJOR) << 1) | 1); + longAtput((result + BaseHeaderSize) + (69 << ShiftForWord), valuePointer23); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer23 = (((VM_PROXY_MINOR) << 1) | 1); - longAtput((result + BaseHeaderSize) + (70 << ShiftForWord), valuePointer23); + valuePointer24 = (((VM_PROXY_MINOR) << 1) | 1); + longAtput((result + BaseHeaderSize) + (70 << ShiftForWord), valuePointer24); assert(paramsArraySize == 71); /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), result); @@ -45412,15 +45504,15 @@ return; } arg = longAt(GIV(stackPointer)); - if (!((arg & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); - return; - } - arg = (arg >> 1); if (GIV(argumentCount) == 1) { /* read VM parameter */ + if (!((arg & 1))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + arg = (arg >> 1); if ((arg < 1) || (arg > paramsArraySize)) { (GIV(primFailCode) = PrimErrBadIndex); @@ -45567,6 +45659,10 @@ if (arg == 49) { result = (((ioGetMaxExtSemTableSize()) << 1) | 1); } + if ((arg == 55) + && (0)) { + result = floatObjectOf(getHeapGrowthToSizeGCRatio()); + } if (arg == 56) { result = positive64BitIntegerFor(GIV(statProcessSwitch)); } @@ -45621,11 +45717,22 @@ return; } index = (index >> 1); - if ((index <= 0) + if ((index < 1) || (index > 0x3F)) { (GIV(primFailCode) = PrimErrBadIndex); return; } + if ((arg & 1)) { + arg = (arg >> 1); + } + else { + if (!((index == 55) + && (((arg & 1) == 0) + && (ClassFloatCompactIndex == ((((usqInt) (longAt(arg))) >> 12) & 0x1F))))) { + (GIV(primFailCode) = PrimErrBadArgument); + return; + } + } /* begin success: */ /* Don't overwrite an error code that has already been set. */ @@ -45647,19 +45754,19 @@ GIV(primFailCode) = 0; } if (index == 6) { - result = GIV(tenuringThreshold); + result = ((GIV(tenuringThreshold) << 1) | 1); GIV(tenuringThreshold) = arg; /* begin initPrimCall */ GIV(primFailCode) = 0; } if (index == 23) { - result = extraVMMemory; + result = ((extraVMMemory << 1) | 1); extraVMMemory = arg; /* begin initPrimCall */ GIV(primFailCode) = 0; } if (index == 24) { - result = GIV(shrinkThreshold); + result = ((GIV(shrinkThreshold) << 1) | 1); if (arg > 0) { GIV(shrinkThreshold) = arg; /* begin initPrimCall */ @@ -45667,7 +45774,7 @@ } } if (index == 25) { - result = GIV(growHeadroom); + result = ((GIV(growHeadroom) << 1) | 1); if (arg > 0) { GIV(growHeadroom) = arg; /* begin initPrimCall */ @@ -45679,7 +45786,7 @@ /* 0 turns off the heartbeat */ - result = ioHeartbeatMilliseconds(); + result = (((ioHeartbeatMilliseconds()) << 1) | 1); ioSetHeartbeatMilliseconds(arg); /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45688,7 +45795,7 @@ if (index == 43) { if ((arg >= 0) && (arg <= 0xFFFF)) { - result = desiredNumStackPages; + result = ((desiredNumStackPages << 1) | 1); desiredNumStackPages = arg; /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45696,7 +45803,7 @@ } if (index == 45) { if (arg >= 0) { - result = desiredEdenBytes; + result = ((desiredEdenBytes << 1) | 1); desiredEdenBytes = arg; /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45705,7 +45812,7 @@ if ((index == 47) && (1)) { if (arg >= 0) { - result = getDesiredCogCodeSize(); + result = (((getDesiredCogCodeSize()) << 1) | 1); setDesiredCogCodeSize(arg); /* begin initPrimCall */ GIV(primFailCode) = 0; @@ -45714,7 +45821,7 @@ if ((index == 48) && (1)) { if (arg >= 0) { - result = (((((((GIV(processHasThreadId) + result = ((((((((((GIV(processHasThreadId) ? 1 : 0)) + ((GIV(flagInterpretedMethods) ? 2 @@ -45722,7 +45829,7 @@ ? 0 : 4))) + ((GIV(noThreadingOfGUIThread) ? 8 - : 0))) << 1) | 1); + : 0))) << 1) | 1)) << 1) | 1); /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin setCogVMFlags: */ @@ -45740,7 +45847,7 @@ if (index == 49) { if ((arg >= 0) && (arg <= 0xFFFF)) { - result = ioGetMaxExtSemTableSize(); + result = (((ioGetMaxExtSemTableSize()) << 1) | 1); /* begin initPrimCall */ GIV(primFailCode) = 0; /* begin setMaxExtSemSizeTo: */ @@ -45748,9 +45855,14 @@ ioSetMaxExtSemTableSize(arg); } } + if ((index == 55) + && (0)) { + result = floatObjectOf(getHeapGrowthToSizeGCRatio()); + GIV(primFailCode) = setHeapGrowthToSizeGCRatio(floatValueOf(arg)); + } if (!GIV(primFailCode)) { /* begin pop:thenPush: */ - longAtput((sp2 = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), ((result << 1) | 1)); + longAtput((sp2 = GIV(stackPointer) + ((3 - 1) * BytesPerWord)), result); GIV(stackPointer) = sp2; return; } @@ -49616,7 +49728,7 @@ sqInt headerFlags; sqInt headerSize; squeakFileOffsetType headerStart; - sqInt heapSize; + usqInt heapSize; sqInt i; sqInt i1; sqInt i11; @@ -49629,7 +49741,7 @@ sqInt lastHash; sqInt memEnd; sqInt memLimit; - sqInt minimumMemory; + usqInt minimumMemory; sqInt oldBaseAddr; sqInt oop; sqInt swapBytes; @@ -50622,7 +50734,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-26 19:55:25 UTC (rev 2930) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-22 04:14:03 UTC (rev 2929) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-26 19:55:25 UTC (rev 2930) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 from - CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 + CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.724 uuid: 30e942d9-0d06-42d3-8f9a-893dbdee37c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -966,6 +966,7 @@ EXPORT(sqInt) primitiveInterruptChecksPerMSec(void); static void primitiveInterruptSemaphore(void); static void primitiveInvokeObjectAsMethod(void); +static void primitiveIsPinned(void); EXPORT(sqInt) primitiveIsRoot(void); EXPORT(sqInt) primitiveIsWindowObscured(void); EXPORT(sqInt) primitiveIsYoung(void); @@ -1016,6 +1017,7 @@ static void primitivePerform(void); static void primitivePerformInSuperclass(void); static void primitivePerformWithArgs(void); +static void primitivePin(void); EXPORT(sqInt) primitiveProfilePrimitive(void); EXPORT(sqInt) primitiveProfileSample(void); EXPORT(sqInt) primitiveProfileSemaphore(void); @@ -1171,7 +1173,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)) NoDbgRegParms; static sqInt roomToPushNArgs(sqInt n) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1305,12 +1307,12 @@ _iss sqInt nilObj; _iss usqInt newMethod; _iss sqInt messageSelector; +_iss usqInt youngStart; _iss StackPage * pages; -_iss usqInt youngStart; _iss char * stackBasePlus1; -_iss sqInt remapBufferCount; _iss sqInt trueObj; _iss sqInt falseObj; +_iss sqInt remapBufferCount; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss usqInt reserveStart; @@ -1665,8 +1667,8 @@ /* 180 */ (void (*)(void))0, /* 181 */ (void (*)(void))0, /* 182 */ (void (*)(void))0, - /* 183 */ (void (*)(void))0, - /* 184 */ (void (*)(void))0, + /* 183 */ primitiveIsPinned, + /* 184 */ primitivePin, /* 185 */ primitiveExitCriticalSection, /* 186 */ primitiveEnterCriticalSection, /* 187 */ primitiveTestAndSetOwnershipOfCriticalSection, @@ -2059,7 +2061,7 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.733.mcz
by commits＠source.squeak.org 26 May '14

26 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.733.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.733 Author: eem Time: 26 May 2014, 12:38:43.918 pm UUID: 6d38bb55-fe48-480d-a606-d577925a2785 Ancestors: VMMaker.oscog-eem.732 Use unsigned comparisons when testing if there's sufficient heap space in readImageFromFile:HeapSize:StartingAt:. Remove break in CogVMSimulator>>ceSend:super:to:numArgs:. Monticello should really check for break methods on commit. Refactor cloneSimulation into cloneSImulationWindow and cloneSimulation. Remember the clone and the parent. Use this to make the Spur GC take a clone and push it off the cliff every global GC to allow repeating GCs that hit bugs. Add an assert to check that all weaklinks are accessible (but the bug has already been found with the nextCorpse encoding bug). =============== Diff against VMMaker.oscog-eem.732 =============== Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr minimumMemory heapSize bytesRead bytesToShift firstSegSize hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize | <var: #f type: #sqImageFile> + <var: #heapSize type: #usqInt> <var: #dataSize type: #'size_t'> + <var: #minimumMemory type: #usqInt> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. "N.B. not used." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory ifNil: [self insufficientMemoryAvailableError]. heapBase := objectMemory setHeapBase: objectMemory memory + cogCodeSize memoryLimit: objectMemory memory + heapSize endOfMemory: objectMemory memory + cogCodeSize + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" self initializeCodeGenerator. ^dataSize! Item was changed: ----- Method: CogVMSimulator>>ceSend:super:to:numArgs: (in category 'trampolines') ----- + ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs + "self stringOf: selector" + "self printOop: rcvr" + "(superNormalBar ~= 0 and: [(self stringOf: selector) = #bitShift:]) ifTrue: + [self halt]." - ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs - self break. self logSend: selector. cogit assertCStackWellAligned. + self maybeCheckStackDepth: numArgs + 1 sp: stackPointer pc: (stackPages longAt: stackPointer). + ^super ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs! - self - maybeCheckStackDepth: numArgs + 1 - sp: stackPointer - pc: (stackPages longAt: stackPointer). - ^ super - ceSend: selector - super: superNormalBar - to: rcvr - numArgs: numArgs! Item was changed: ----- Method: CogVMSimulator>>cloneSimulation (in category 'debug support') ----- cloneSimulation | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | + self setClone: nil. savedDisplayView := displayView. displayView := nil. savedDisplayForm := displayForm. displayForm = nil. savedQuitBlock := quitBlock. quitBlock := nil. savedTranscript := transcript. transcript := nil. + ^[| theClone | + Smalltalk garbageCollect. + theClone := self veryDeepCopy. + theClone parent: self; transcript: Transcript. + theClone objectMemory parent: objectMemory. + self setClone: theClone. + objectMemory setClone: theClone objectMemory. + theClone] - [| clone window | - clone := self veryDeepCopy. - window := clone openAsMorph. - window setLabel: 'Clone of ', (savedDisplayView containingWindow label allButFirst: 'Simulation of ' size)] ensure: [displayView := savedDisplayView. displayForm = savedDisplayForm. quitBlock := savedQuitBlock. transcript := savedTranscript]! Item was added: + ----- Method: CogVMSimulator>>cloneSimulationWindow (in category 'debug support') ----- + cloneSimulationWindow + | label | + label := 'Clone of ', (displayView containingWindow label allButFirst: 'Simulation of ' size). + ^self cloneSimulation openAsMorph + setLabel: label; + yourself! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; + add: 'clone VM' action: #cloneSimulationWindow; - add: 'clone VM' action: #cloneSimulation; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: Spur32BitMemoryManager subclass: #Spur32BitMMLESimulator + instanceVariableNames: 'clone parent bootstrapping' - instanceVariableNames: 'bootstrapping' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-SpurMemoryManagerSimulation'! Item was added: + ----- Method: Spur32BitMMLESimulator>>getClone (in category 'accessing') ----- + getClone + + ^ clone! Item was added: + ----- Method: Spur32BitMMLESimulator>>globalGarbageCollect (in category 'gc - global') ----- + globalGarbageCollect + "If we're /not/ a clone, clone the VM and push it over the cliff. + If it survives, destroy the clone and continue. We should be OK until next time." + parent ifNil: + [[coInterpreter cloneSimulation objectMemory globalGarbageCollect] + on: Halt + do: [:ex| + (ex messageText beginsWith: 'GC number') + ifTrue: + [Transcript cr; cr; show: ex messageText; cr; cr. + ex resume] + ifFalse: [ex pass]]. + coInterpreter setClone: nil. + self setClone: nil. + Smalltalk garbageCollect]. + ^super globalGarbageCollect! Item was added: + ----- Method: Spur32BitMMLESimulator>>parent (in category 'accessing') ----- + parent + + ^ parent! Item was added: + ----- Method: Spur32BitMMLESimulator>>parent: (in category 'accessing') ----- + parent: anObject + + parent := anObject! Item was added: + ----- Method: Spur32BitMMLESimulator>>setClone: (in category 'accessing') ----- + setClone: aSpurMMSimulator + + clone := aSpurMMSimulator! Item was added: + ----- Method: SpurGenerationScavenger>>allFutureSpaceEntitiesDo: (in category 'weakness and ephemerality') ----- + allFutureSpaceEntitiesDo: aBlock + "Enumerate all future space objects, including free objects." + <inline: true> + | prevObj prevPrevObj objOop limit | + prevPrevObj := prevObj := nil. + objOop := manager objectStartingAt: futureSpace start. + limit := futureSurvivorStart. + [self oop: objOop isLessThan: limit] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := manager objectAfter: objOop limit: limit]! Item was added: + ----- Method: SpurGenerationScavenger>>allWeakSurvivorsOnWeakList (in category 'weakness and ephemerality') ----- + allWeakSurvivorsOnWeakList + self allFutureSpaceEntitiesDo: + [:survivor| + (manager isWeakNonImm: survivor) ifTrue: + [(self is: survivor onWeaklingList: weakList) ifFalse: + [^false]]]. + ^true! Item was changed: ----- Method: SpurGenerationScavenger>>processWeaklings (in category 'weakness and ephemerality') ----- processWeaklings "Go through the remembered set and the weak list, nilling references to any objects that didn't survive the scavenge. Read the class comment for a more in-depth description of the algorithm." <inline: false> | i rootObj weakCorpse weakObj | + self assert: self allWeakSurvivorsOnWeakList. i := 0. [i < rememberedSetSize] whileTrue: [rootObj := rememberedSet at: i. (manager isWeakNonImm: rootObj) ifTrue: [self processWeakSurvivor: rootObj. "If no more referents, remove by overwriting with the last element in the set." (manager hasYoungReferents: rootObj) ifFalse: [manager setIsRememberedOf: rootObj to: false. i + 1 < rememberedSetSize ifTrue: [rememberedSet at: i put: (rememberedSet at: rememberedSetSize - 1)]. rememberedSetSize := rememberedSetSize - 1] ifTrue: [i := i + 1]] ifFalse: [i := i + 1]]. weakList ifNotNil: [weakCorpse := self firstCorpse: weakList. [weakCorpse notNil] whileTrue: [self assert: (manager isForwarded: weakCorpse). weakObj := manager followForwarded: weakCorpse. self processWeakSurvivor: weakObj. weakCorpse := self nextCorpseOrNil: weakCorpse]. weakList := nil]! Item was added: + ----- Method: SpurMemoryManager>>allOldMarkedWeakObjectsOnWeaklingStack (in category 'weakness and ephemerality') ----- + allOldMarkedWeakObjectsOnWeaklingStack + self allOldSpaceEntitiesDo: + [:o| + ((self isWeakNonImm: o) + and: [self isMarked: o]) ifTrue: + [(self is: o onObjStack: weaklingStack) ifFalse: + [^false]]]. + ^true! Item was added: + ----- Method: SpurMemoryManager>>is:onObjStack: (in category 'obj stacks') ----- + is: oop onObjStack: objStack + <inline: false> + | index nextPage | + self assert: (self numSlotsOfAny: objStack) = ObjStackPageSlots. + "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so + if there were 6 slots in an oop stack, full would be 2, and the last 0-rel index is 5." + index := (self fetchPointer: ObjStackTopx ofObject: objStack) + ObjStackNextx. + [index >= ObjStackFixedSlots] whileTrue: + [oop = (self fetchPointer: index ofObject: objStack) ifTrue: + [^true]. + index := index - 1]. + nextPage := self fetchPointer: ObjStackNextx ofObject: objStack. + nextPage ~= 0 ifTrue: + [(self is: oop onObjStack: nextPage) ifTrue: + [^true]]. + ^false! Item was changed: ----- Method: SpurMemoryManager>>nilUnmarkedWeaklingSlots (in category 'weakness and ephemerality') ----- nilUnmarkedWeaklingSlots "Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack." <inline: false> self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'nilling...'; flush]. + self assert: self allOldMarkedWeakObjectsOnWeaklingStack. weaklingStack = nilObj ifTrue: [^self]. self objStack: weaklingStack from: 0 do: [:weakling| (self nilUnmarkedWeaklingSlotsIn: weakling) ifTrue: [coInterpreter signalFinalization: weakling]]. self emptyObjStack: weaklingStack! Item was changed: ----- Method: StackInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | headerStart headerSize headerFlags dataSize oldBaseAddr swapBytes minimumMemory bytesRead bytesToShift heapSize firstSegSize hdrEdenBytes hdrMaxExtSemTabSize hdrNumStackPages | <var: #f type: #sqImageFile> + <var: #heapSize type: #usqInt> <var: #dataSize type: #'size_t'> + <var: #minimumMemory type: #usqInt> <var: #desiredHeapSize type: #usqInt> <var: #headerStart type: #squeakFileOffsetType> <var: #imageOffset type: #squeakFileOffsetType> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "decrease Squeak object heap to leave extra memory for the VM" heapSize := desiredHeapSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := self reserveExtraCHeap: heapSize Bytes: extraVMMemory. "compare memory requirements with availability". minimumMemory := dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory ifNil: [self insufficientMemoryAvailableError]. objectMemory setHeapBase: objectMemory memory memoryLimit: objectMemory memory + heapSize endOfMemory: objectMemory memory + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" ^dataSize! Item was changed: StackInterpreterPrimitives subclass: #StackInterpreterSimulator + instanceVariableNames: 'clone parent bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' - instanceVariableNames: 'bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat performFilters eventQueue assertVEPAES' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !StackInterpreterSimulator commentStamp: 'eem 9/3/2013 11:05' prior: 0! This class defines basic memory access and primitive simulation so that the StackInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. To see the thing actually run, you could (after backing up this image and changes), execute (StackInterpreterSimulator new openOn: Smalltalk imageName) test ((StackInterpreterSimulator newWithOptions: #(NewspeakVM true MULTIPLEBYTECODESETS true)) openOn: 'ns101.image') test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example of what Eliot uses to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: | vm | vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. vm setBreakSelector: #&. vm openAsMorph; run! Item was changed: ----- Method: StackInterpreterSimulator>>cloneSimulation (in category 'debug support') ----- cloneSimulation | savedDisplayView savedDisplayForm savedQuitBlock savedTranscript | + self setClone: nil. savedDisplayView := displayView. displayView := nil. savedDisplayForm := displayForm. displayForm = nil. savedQuitBlock := quitBlock. quitBlock := nil. savedTranscript := transcript. transcript := nil. + ^[| theClone | + Smalltalk garbageCollect. + theClone := self veryDeepCopy. + theClone parent: self; transcript: Transcript. + theClone objectMemory parent: objectMemory. + self setClone: theClone. + objectMemory setClone: theClone objectMemory. + theClone] - [| clone window | - clone := self veryDeepCopy. - window := clone openAsMorph. - window setLabel: 'Clone of ', (savedDisplayView containingWindow label allButFirst: 'Simulation of ' size)] ensure: [displayView := savedDisplayView. displayForm = savedDisplayForm. quitBlock := savedQuitBlock. transcript := savedTranscript]! Item was added: + ----- Method: StackInterpreterSimulator>>cloneSimulationWindow (in category 'debug support') ----- + cloneSimulationWindow + | label | + label := 'Clone of ', (displayView containingWindow label allButFirst: 'Simulation of ' size). + ^self cloneSimulation openAsMorph + setLabel: label; + yourself! Item was added: + ----- Method: StackInterpreterSimulator>>getClone (in category 'accessing') ----- + getClone + + ^ clone! Item was added: + ----- Method: StackInterpreterSimulator>>parent (in category 'accessing') ----- + parent + + ^ parent! Item was added: + ----- Method: StackInterpreterSimulator>>parent: (in category 'accessing') ----- + parent: anObject + + parent := anObject! Item was added: + ----- Method: StackInterpreterSimulator>>setClone: (in category 'accessing') ----- + setClone: aSpurMMSimulator + + clone := aSpurMMSimulator! Item was changed: ----- Method: StackInterpreterSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; + add: 'clone VM' action: #cloneSimulationWindow; - add: 'clone VM' action: #cloneSimulation; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'print prim trace log' action: #dumpPrimTraceLog; addLine; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'inspect interpreter' action: #inspect; addLine; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'turn valid exec ptrs assert o', (assertVEPAES ifTrue: ['ff'] ifFalse: ['n']) action: [assertVEPAES := assertVEPAES not]; add: (printSends ifTrue: ['no print sends'] ifFalse: ['print sends']) action: [self ensureDebugAtEachStepBlock. printSends := printSends not]; "currently printReturns does nothing" "add: (printReturns ifTrue: ['no print returns'] ifFalse: ['print returns']) action: [self ensureDebugAtEachStepBlock. printReturns := printReturns not];" add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph!

1 0

Re: [squeak-dev] A UTC based implementation of DateAndTime
by David T. Lewis 26 May '14

26 May '14

On Mon, May 26, 2014 at 02:17:47PM +0000, J. Vuletich (mail lists) wrote: > Hi David, Folks, > > Quoting "David T. Lewis" <lewis(a)mail.msen.com>: > > >I have been working on a variation of class DateAndTime that replaces its > >instance variables (seconds offset jdn nanos) with two instance variables, > >utcMicroseconds to represent microseconds elapsed since the Posix epoch, > >and > >localOffsetSeconds to represent the local time zone offset. When > >instantiating > >the time now, A single call primitiveUtcWithOffset is used to obtain these > >two values atomically as reported by the underlying platform. > > > >There are several advantages to this representation of DateAndTime, the > >most > >important of which is that its magnitude is unambiguous regardless > >of daylight > >savings transitions in local time zones. > > > >This is my attempt to address some historical baggage in Squeak. The VM > >reports time related to the local time zone, and the image attempts to > >convert to UTC (sometimes incorrectly). A UTC based representation makes > >the > >implementation of time zone tables more straightforward (see for example > >the Olson time zone tables in TimeZoneDatabase on SqueakMap). > >... > >Dave > > I very much support this approach. I did a bit of testing of > <primitive: 'primitiveUtcWithOffset'> . I found that on a Mac, with > 'Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.331] Squeak > Cog 4.0.2776' 'Mac OS' 'intel' '1092' (from Eliot's site), the second > element I get (time zone offset) is -140473411. > > The correct value would be -10800, as answered in Windows. I could not > test on Linux yet (could not get the vm to run in Ubuntu 14.04 64 bit > :( ). > > Any clue on what's wrong on Mac OS? > > BTW, which would be the current non-Cog VMs to try? > Oops, I mistakenly said that the Cog VMs could be used. But it looks like there is a regression or code merge problem of some sort. I'm afraid that I was testing with my own locally compiled Cog VM and did not notice the problem. A unix Mac VM from squeakvm.org/unix should demonstrate the correct behavior. CC to vm-dev list: Eliot, the fix for this was here (but it seems to have been overridden by a more recent change): Name: VMMaker.oscog-dtl.286 Author: dtl Time: 4 May 2013, 11:29:25.237 am UUID: 8be237d9-7812-4792-9723-90f9cff0c2e9 Ancestors: VMMaker.oscog-eem.285 Replace broken primitiveUtcWithOffset with a version that works. Dave

2 1

VM Maker: CMakeVMMakerSqueak-tty.22.mcz
by commits＠source.squeak.org 26 May '14

26 May '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.22.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.22 Author: tty Time: 26 May 2014, 1:27:42.451 pm UUID: 0a52c2a6-81a2-457d-b772-79c599312bea Ancestors: CMakeVMMakerSqueak-tty.21 Added CMakeVMMakerSqueak-libs tree covering ssl and freetype for SqueakCogMTWindowsConfig. Observed thirdParty CMakeLists.txt was generated for both. I cannot test this build on linux. =============== Diff against CMakeVMMakerSqueak-tty.21 =============== Item was changed: SystemOrganization addCategory: #CMakeVMMakerSqueak! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Tests'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Unix'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Android'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-SunOS'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-FreeBSD'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Builder'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOS'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-IOS'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Windows'! + SystemOrganization addCategory: #'CMakeVMMakerSqueak-Libs'! Item was added: + SqueakCMThirdpartyLibrary subclass: #SqueakCMFreetype2 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Libs'! + + !SqueakCMFreetype2 commentStamp: '<historical>' prior: 0! + This is a configuration for building freetype2 library! Item was added: + ----- Method: SqueakCMFreetype2 class>>canonicalName (in category 'accessing') ----- + canonicalName + ^ 'freetype2'! Item was added: + ----- Method: SqueakCMFreetype2>>archiveMD5Sum (in category 'package properties') ----- + archiveMD5Sum + + ^ 'c15f6dc8ed190d67b89ae09aaf7896b4'! Item was added: + ----- Method: SqueakCMFreetype2>>build (in category 'generating actions') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${ft2config}" + COMMAND ./configure --prefix=''${installPrefix}'' ', self configurationFlags, ' + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + ) + add_custom_command(OUTPUT "${ft2libInstalled}" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${ft2config}" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: SqueakCMFreetype2>>copyArtefacts (in category 'generating actions') ----- + copyArtefacts + + self + copy: '${ft2libInstalled}' + to: '${externalModulesDir}/${libraryFileName}'.! Item was added: + ----- Method: SqueakCMFreetype2>>defineAsTarget (in category 'generating actions') ----- + defineAsTarget + + gen puts: + + ' + add_custom_target(${libName} + DEPENDS ${externalModulesDir}/${libraryFileName} + ) + ' + + ! Item was added: + ----- Method: SqueakCMFreetype2>>defineGlobalTargets (in category 'generating actions') ----- + defineGlobalTargets + | var | + var := self canonicalName , '_LIB'. + vmGen set: var toString: self targetForLinking. + " + define a library as imported one + and make it depend from it's build target + " + vmGen + puts: + ('add_library("{1}" SHARED IMPORTED GLOBAL) + set_target_properties("{1}" PROPERTIES IMPORTED_LOCATION "{1}") + add_dependencies("{1}" "{2}") + ' format: { '${',var, '}' . self buildTarget } + ). + + vmGen cmd: 'add_dependencies' params: + vmGen moduleName , ' ' , self buildTarget! Item was added: + ----- Method: SqueakCMFreetype2>>downloadURL (in category 'package properties') ----- + downloadURL + ^ 'http://ftp.igh.cnrs.fr/pub/nongnu/freetype/freetype-2.4.9.tar.gz' + ! Item was added: + ----- Method: SqueakCMFreetype2>>includeDir (in category 'accessing') ----- + includeDir + "see setVariables" + + " `<prefix>/include/freetype2' must be in your current inclusion path " + + + ^ '"${thirdpartyDir}/out/include" "${thirdpartyDir}/out/include/freetype2"'! Item was added: + ----- Method: SqueakCMFreetype2>>libraryFileName (in category 'package properties') ----- + libraryFileName + ^ 'libfreetype.6.dylib'! Item was added: + ----- Method: SqueakCMFreetype2>>setVariables (in category 'generating actions') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #freetype2_includeDir toString: '${installPrefix}/include'; + set: #libraryFileName to: self libraryFileName; + set: #freetype2_location toString: '${externalModulesDir}/${libraryFileName}'; + set: #ft2config toString: '${libSourcesDir}/builds/unix/config.status'; + set: #ft2libInstalled toString: '${installPrefix}/lib/${libraryFileName}'! Item was added: + ----- Method: SqueakCMFreetype2>>unpackedDirName (in category 'package properties') ----- + unpackedDirName + + ^ 'freetype-2.4.9'! Item was added: + SqueakCMThirdpartyLibrary subclass: #SqueakCMOpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Libs'! Item was added: + ----- Method: SqueakCMOpenSSL class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + ^ 'openssl'! Item was added: + CMThirdpartyLibrary subclass: #SqueakCMThirdpartyLibrary + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Libs'! + + !SqueakCMThirdpartyLibrary commentStamp: 'tty 5/26/2014 12:51' prior: 0! + A SqueakCMThirdpartyLibrary is the root library for copies of classes in CMakeVMMaker-Libs. + I replace only the Squeak incompatible methods of my parent + + ! Item was added: + ----- Method: SqueakCMThirdpartyLibrary class>>canonicalName (in category 'as yet unclassified') ----- + canonicalName + "answer the library canonical name, like + 'freetype2' + or 'cairo' + etc. + + Note , this method is used to find the corresponding library + from all subclasses of CMThirdpartyLibrary + " + ^ self subclassResponsibility! Item was added: + ----- Method: SqueakCMThirdpartyLibrary class>>named:config: (in category 'as yet unclassified') ----- + named: aName config: aCPlatformConfig + + ^ (self allSubclasses detect: [:cls | + cls canonicalName = aName and: [ cls supports: aCPlatformConfig ] ]) + new! Item was added: + ----- Method: SqueakCMThirdpartyLibrary class>>platformName (in category 'as yet unclassified') ----- + platformName + ^nil! Item was added: + ----- Method: SqueakCMThirdpartyLibrary class>>supports: (in category 'as yet unclassified') ----- + supports: aConfig + "default implementation" + ^ self platformName = aConfig platformName ! Item was added: + ----- Method: SqueakCMThirdpartyLibrary>>generateFor: (in category 'as yet unclassified') ----- + generateFor: aVMGenerator + + | libDir stream contents | + + vmGen := aVMGenerator. + + gen := CMakeGenerator new + output: (String new writeStream). + + libDir := (aVMGenerator thirdpartyDir / self canonicalName) assureExistence. + + stream := String new writeStream. + + self generate. + + stream nextPutAll: (vmGen config fixLineEndsOf: gen output contents). + + contents := stream contents. + + (self isFile: (libDir / gen outputFileName) fullName hasContents: contents) ifFalse: [ + "contents changed, update the file. Because fucking cmake will force rebuild everything if we change its modification date + without changing its contents" + (FileStream forceNewFileNamed: (libDir / gen outputFileName) pathName) nextPutAll: contents; close. + ]. + + + vmGen addSubdirectory: vmGen thirdpartyDirName , '/' , self canonicalName. + self defineGlobalTargets. + ! Item was added: + SqueakCMFreetype2 subclass: #SqueakCMWin32Freetype2 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Libs'! + + !SqueakCMWin32Freetype2 commentStamp: '<historical>' prior: 0! + Some overrides to make freetype build on windows: + + Two artifacts to copy: + + libfreetype.dll.a + libfreetype-6.dll + + the first one is used at link time with FTPlugin to + designate the exported symbols of .dll as well as .dll file name. + + The second one is ready to use library produced by freetype makefiles. + + We pass + + -march=i686 + + instead of + + -arch i386 + + to freetype configure, because MSYS GCC on windows don't understands the -arch option. + ! Item was added: + ----- Method: SqueakCMWin32Freetype2 class>>platformName (in category 'as yet unclassified') ----- + platformName + ^'win32'! Item was added: + ----- Method: SqueakCMWin32Freetype2>>copyArtefacts (in category 'generating actions') ----- + copyArtefacts + + gen puts: + 'add_custom_command( + OUTPUT "${externalModulesDir}/${libraryFileName}" + COMMAND cp "${ft2libInstalled}" "${externalModulesDir}" + COMMAND cp "${ft2binInstalled}" "${externalModulesDir}" + DEPENDS "${ft2libInstalled}" + )'! Item was added: + ----- Method: SqueakCMWin32Freetype2>>defaultConfigurationFlags (in category 'settings') ----- + defaultConfigurationFlags + ^#( + 'CFLAGS=''-march=i686''' + 'LDFLAGS=''-march=i686''')! Item was added: + ----- Method: SqueakCMWin32Freetype2>>defineGlobalTargets (in category 'generating actions') ----- + defineGlobalTargets + | var | + var := self canonicalName , '_LIB'. + vmGen set: var toString: self targetForLinking. + " + define a library as imported one + and make it depend from it's build target + " + vmGen + puts: + ('add_library("{1}" STATIC IMPORTED GLOBAL) + set_target_properties("{1}" PROPERTIES IMPORTED_LOCATION "{1}") + add_dependencies("{1}" "{2}") + ' format: { '${',var, '}' . self buildTarget } + ). + + vmGen cmd: 'add_dependencies' params: + vmGen moduleName , ' ' , self buildTarget! Item was added: + ----- Method: SqueakCMWin32Freetype2>>libraryFileName (in category 'package properties') ----- + libraryFileName + ^ 'libfreetype.dll.a'! Item was added: + ----- Method: SqueakCMWin32Freetype2>>setVariables (in category 'generating actions') ----- + setVariables + super setVariables. + + "add include path" + gen + set: #freetype2_includeDir toString: '${installPrefix}/include'; + set: #libraryFileName to: self libraryFileName; + set: #freetype2_location toString: '${externalModulesDir}/${libraryFileName}'; + set: #ft2config toString: '${libSourcesDir}/builds/unix/config.status'; + set: #ft2libInstalled toString: '${installPrefix}/lib/${libraryFileName}'; + set: #ft2binInstalled toString: '${installPrefix}/bin/libfreetype-6.dll'. + ! Item was added: + SqueakCMOpenSSL subclass: #SqueakCMWin32OpenSSL + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Libs'! Item was added: + ----- Method: SqueakCMWin32OpenSSL class>>platformName (in category 'as yet unclassified') ----- + platformName + ^'win32'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>archiveMD5Sum (in category 'as yet unclassified') ----- + archiveMD5Sum + "answer the MD5 checksum (in string) for downloaded library archive + (to check that downloaded file is not corrupt). + + You can take this sum by issuing: + md5 filename + from command line + " + ^ 'ae412727c8c15b67880aef7bd2999b2e'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>build (in category 'as yet unclassified') ----- + build + + gen + puts: + ' + add_custom_command(OUTPUT "${libSourcesDir}/Makefile" + COMMAND ./config shared --prefix=''${installPrefix}'' + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${unpackTarget}" + ) + + add_custom_command(OUTPUT "${installPrefix}/bin/libeay32.dll" "${installPrefix}/bin/ssleay32.dll" + COMMAND make + COMMAND make install + WORKING_DIRECTORY "${libSourcesDir}" + DEPENDS "${libSourcesDir}/Makefile" + COMMENT "Building ${libName}" + ) + ' + ! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>configurationFlags (in category 'as yet unclassified') ----- + configurationFlags + ^ 'shared'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>copyArtefacts (in category 'as yet unclassified') ----- + copyArtefacts + + self copy: '${installPrefix}/bin/libeay32.dll' to: '${externalModulesDir}/libeay32.dll'. + self copy: '${installPrefix}/bin/ssleay32.dll' to: '${externalModulesDir}/ssleay32.dll'. + " self copy: '${installPrefix}/lib/libssl.dll.a' to: '${externalModulesDir}/libssl.dll.a'. + self copy: '${installPrefix}/lib/libcrypto.dll.a' to: '${externalModulesDir}/libcrypto.dll.a'. + " + " + 'libcrypto.dll.a' 'libssl.dll.a'. + "! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>defineAsTarget (in category 'as yet unclassified') ----- + defineAsTarget + + gen puts: + 'add_custom_target(', self buildTarget , ' + DEPENDS + "${externalModulesDir}/libeay32.dll" + "${externalModulesDir}/ssleay32.dll" + )' + + "${externalModulesDir}/${libraryFileName}" + ! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>defineGlobalTargets (in category 'as yet unclassified') ----- + defineGlobalTargets + + ! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>downloadURL (in category 'as yet unclassified') ----- + downloadURL + ^'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>includeDir (in category 'as yet unclassified') ----- + includeDir + + ^ '"${thirdpartyDir}/out/include"'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>libraryFileName (in category 'as yet unclassified') ----- + libraryFileName + ^ 'libssl.dll.a'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>setVariables (in category 'as yet unclassified') ----- + setVariables + super setVariables. + + gen + set: #libraryFileName to: self libraryFileName; + set: #libInstalled to: '${installPrefix}/lib/${libraryFileName}'! Item was added: + ----- Method: SqueakCMWin32OpenSSL>>unpackedDirName (in category 'as yet unclassified') ----- + unpackedDirName + ^ 'openssl-1.0.1c'! Item was added: + ----- Method: SqueakCogFamilyWindowsConfig>>addThirdpartyLibrary: (in category 'as yet unclassified') ----- + addThirdpartyLibrary: libName + | libs lib | + + libs := self thirdpartyLibs. + + lib := libs + detect: [:each | each canonicalName = libName ] + ifNone: [ nil ]. + + lib ifNil: [ + lib := SqueakCMThirdpartyLibrary named: libName config: self. + "add dependencies first, so thirpartyLibs collection will be naturally dependency sorted" + lib dependencies do: [:dep | self addThirdpartyLibrary: dep ]. + libs add: lib ]. + + ^ lib!

1 0

CMakeVMMakerSqueak--3'rd party libraries tree
by gettimothy 26 May '14

26 May '14

Hi All, I have not yet ported the classes for 3'rd party libraries. This is affecting the Window's builds. I will be on it in the a.m. cheers. tty

1 0

VM Maker: CMakeVMMakerSqueak-tty.21.mcz
by commits＠source.squeak.org 26 May '14

26 May '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.21.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.21 Author: tty Time: 25 May 2014, 7:55:22.258 pm UUID: 66c3137d-a43d-4bec-9116-b905f63ec614 Ancestors: CMakeVMMakerSqueak-tty.20 Overrode and modified buildScript to eliminate non-existent version-info shell script reference. Changed superclass on BSD and SunOS configs =============== Diff against CMakeVMMakerSqueak-tty.20 =============== Item was changed: + SqueakCogUnixConfig subclass: #SqueakCogBSDConfig - CogUnixConfig subclass: #SqueakCogBSDConfig uses: TSqueakStackUnixConfig - {#externalPlugins. #internalPlugins} instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-FreeBSD'! !SqueakCogBSDConfig commentStamp: 'tty 5/21/2014 12:24' prior: 0! I am a configuration for Cog on BSD. Usage: SqueakCogFreeBSDConfig generateWithSources or: SqueakCogFreeBSDConfig generate ! SqueakCogBSDConfig class uses: TSqueakStackUnixConfig classTrait instanceVariableNames: ''! Item was changed: ----- Method: SqueakCogFamilyWindowsConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ '#!!/usr/bin/env bash - if [ !! -e vmVersionInfo.h ]; then - ../scripts/extract-commit-info.sh - fi cmake -G "MSYS Makefiles" . make '! Item was changed: + SqueakCogUnixConfig subclass: #SqueakCogSunOSConfig - CogUnixConfig subclass: #SqueakCogSunOSConfig uses: TSqueakStackUnixConfig - {#externalPlugins. #internalPlugins} instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-SunOS'! !SqueakCogSunOSConfig commentStamp: 'tty 5/21/2014 15:39' prior: 0! A SqueakCogSunOSConfig is a copy of the SqueakCogBSDConfig. As of 2014.05.18 I have not been tested on SunOS and serve merely as a placeholder. ! SqueakCogSunOSConfig class uses: TSqueakStackUnixConfig classTrait instanceVariableNames: ''! Item was added: + ----- Method: SqueakCogUnixConfig>>buildScript (in category 'build script') ----- + buildScript + "answer the build script for building everything" + + + ^ + '#!!/usr/bin/env bash + + cmake . + make + + '! Item was changed: ----- Method: SqueakMacOSConfig>>buildScript (in category 'build script') ----- buildScript "answer the build script for building everything" ^ '#!!/usr/bin/env bash - if [ !! -e vmVersionInfo.h ]; then - ../scripts/extract-commit-info.sh - fi cmake . make make install '!

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2014