Vm-dev April 2012

vm-dev@lists.squeakfoundation.org

30 participants
84 discussions

Compact classes not in the compact array
by Guillermo Polito 06 Apr '12

06 Apr '12

Hi! I was wandering what are the implications of a class being compact or not. And also what happens if a class has it's format thinking it's compact but it's not in the compact classes array? I'm looking at the implications of bootstrapping a smalltalk inside the same environment, and having two CompiledMethod classes, two Array classes, etc, brings me to this issue :). Thanks! Guille

4 5

Another JIT + GCC issue?
by Igor Stasenko 06 Apr '12

06 Apr '12

Hi Eliot & all, i & Esteban were investigating what is wrong with crash on windoze (see http://code.google.com/p/pharo/issues/detail?id=5568) what we found: - a stack vm runs given snippet well. - a cog vm crashing horribly or throws an exception (see below) - if i set -O1 optimization for gcc3x-cointerp.c then everything is _FINE_ but if you build with -O2, there is interesting issue with this. If you start a fresh 1.4 image and run a following snippet in workspace: | oldm window aForm startPoint endPoint | oldm := DisplayObject>>#slideFrom:to:nSteps:delay: . "self assert: (DisplayObject>>#slideFrom:to:nSteps:delay: ~~oldm)." window := SystemWindow allInstances first. aForm := window imageForm offset: 0@0. startPoint := (-194@61). endPoint := (276.0(a)134.0). aForm slideFrom: startPoint to: endPoint nSteps: 12 delay: 15. At first run it shows a DNU: Smallinteger>>DNU #extent: (or just crashes). It looks like something happens with stack, since receiver should be a Point, and if you open the debugger and evaluate the corresponding line: newLoc := locationBlock value it will print (-76@79) as expected next, if you close the debugger and run the very same doit again, bug disappears and no longer reproducible, and everything works as it should be. So, i presume it is related to place where a compiled method is jit-ed for a first time, and invoked .. but if it is already jited , everything runs smoothly. The compiler version i using on my machine: gcc.exe (GCC) 4.6.1 The compiler used on jenkins slave machine: GCC 4.5.2 And, of course, concerning why this doesn't crashing on Eliot's VMs : well, since it is related to compiler optimization(s), and VM code is a lil-bit different in a branch we using on Jenkins, it could happen that this is not an issue in one case, while causing problems in another one. Another option (not necessary impossible), that we missed some critical fix when merging code from Eliot's branch :) So, for the time till the cause of it can be found i will change the configuration to build windows Cog VMs gcc3x-cointerp.c with -O1 flag. -- Best regards, Igor Stasenko.

3 5

There might be a bug in Bitblt copyloop
by Igor Stasenko 06 Apr '12

06 Apr '12

The way how i discovered it is a bit complicated, so i need to explain it in detail. I am using a SurfacePlugin for gluing the cairo image surface (which is holds a bitmap bits somewhere in C heap) with bitblt. For that, you need to register a surface with surface plugin and provide a callbacks by filling following structure: typedef struct sqSurfaceDispatch { /* Version information. Must be provided by the client so the surface manager can check if certain operations are supported. */ int majorVersion; int minorVersion; /* Version 1.0 */ fn_getSurfaceFormat getSurfaceFormat; fn_lockSurface lockSurface; fn_unlockSurface unlockSurface; fn_showSurface showSurface; } sqSurfaceDispatch; The function to register a surface is provided by a surface plugin is following: int ioRegisterSurface(int surfaceHandle, sqSurfaceDispatch *fn, int *surfaceID); Register a new surface with the given handle and the set of surface functions. The new ID is returned in surfaceID. Returns true if successful, false otherwise. you passing a handle (which in my case is cairo surface handle, the filled struct and as result you get a surfaceID. A surface ID is one which is used directly in language side, by setting a Form's bits instance variable to smallinteger with id value. I.e. imagine that i call ioRegisterSurface: int id = 0; ioRegisterSurface(myHandle, myDispatch, &id); and then in language side i creating a Form with same id: externalForm := Form extent: (self width@self height) depth: 32 bits: id . Now you can use this form for any bitblt operations.. and when it happens, a bitblt detects that bits are not an instance of Bitmap, but a smallinteger.. and so instead of working with bitmap bits directly it using a sqSurfaceDispatch structure, which we provided before to access surface bits. So, the most important one is getSurfaceFormat function which having following form: int getSurfaceFormat(int handle, int* width, int* height, int* depth, int* isMSB); Return general information about the OS drawing surface. Return true if successful, false otherwise. The returned values describe the basic properties such as width, height, depth and LSB vs. MSB pixels. And now finally about the bug itself. I implemented all these functions (needed for sqSurfaceDispatch) using nativeboost and they worked well, but for surfaces of certain dimensions i got VM crashes. For instance, if i create a surface 400@400 x 32bpp it works perfectly, but if i create a surface 800@800 x 32bpp it crashing.. however if i use 801@801, it works.. after some debugging i discovered that bitblt tries to read bytes past the actual buffer size, i.e. if in getSurfaceFormat() i reporting width=800 height= 800 depth= 32 msb = true i see that bitblt reading bytes past buffer start address + (800*800*4) bytes (there is additional function involved, which answers the pitch for the scanline: int lockSurface(int handle, int *pitch, int x, int y, int w, int h); so it is actually not (800*800*4) but pitch * (height = 800) anyways... i placed a workaround by reporting 1 pixel less height, so if i have 800*800 bitmap, i reporting 800*799 Why we don't have issues with this in image? Well i think because you can safely read couple more bytes past any object in object memory and be 100% sure that you won't have SEGFAULT. In contrast, if you working with buffers allocated on C heap, and your buffer size is close to page size alignment (4kb) it could be quite easy to hit SEGFAULT by reading even 1 byte past the buffer size. So, i suspect there is a bug in one of the copy loop bounds, something as subtle as: [0 ... count] vs [0 .. count) i.e. it loops over 0 to: count instead of: 0 to: count -1 i would appreciate if people with better expertise about bitblt will comment what i have found. -- Best regards, Igor Stasenko.

3 2

Fwd: [Pharo-project] using the system applied proxy in unix
by Guillermo Polito 06 Apr '12

06 Apr '12

> > ---------- Forwarded message ---------- > From: Marcus Denker <marcus.denker(a)inria.fr> > Date: Fri, Apr 6, 2012 at 11:30 AM > Subject: Re: [Pharo-project] using the system applied proxy in unix > To: Pharo-project(a)lists.gforge.inria.fr > > > > On Apr 6, 2012, at 11:26 AM, Guillermo Polito wrote: > > > Hi, > > > > I have configured the proxy for the whole system in my ubuntu 11.10, but > pharo does not want to recognize it :). If i configure the proxy again in > my pharo image it works, but I don't want to have the configurations > duplicated... > > > The plugin that does the detection was nover portet to Linux and > Windows... so automatic proxy setting only works on the mac for now. > Which plugin is it? Thanks! Marcus > > -- > Marcus Denker -- http://marcusdenker.de > > >

1 0

Stack VM is broken
by Igor Stasenko 06 Apr '12

06 Apr '12

Again, some undefined symbols.. This one using latest VMMaker sources: Name: VMMaker-oscog-EstebanLorenzano.155 Author: EstebanLorenzano Time: 5 April 2012, 10:57:51 am UUID: c53d1f34-009e-425c-9f88-398f8d39c5e8 Ancestors: VMMaker-oscog-EstebanLorenzano.150, VMMaker.oscog-eem.154 merged with latest from Eliot (emm.154) [0mCreating library file: c:/jenkins/workspace/StackVM-Win32/cog/results/libStackVM.dll.aCMakeFiles/StackVM.dir/objects.a(sqWin32Prefs.c.obj):sqWin32Prefs.c:(.text+0xf1d): undefined reference to `recordPrimTraceFunc (see the full build log at https://ci.lille.inria.fr/pharo/view/Cog/job/StackVM-Win32/1/consoleFull) the fix should be simple. Cog (jit) builds fine using same sources. -- Best regards, Igor Stasenko.

2 2

[commit] r2546 - Add version infor for the Cross/plugins tree. Add a -version switch to win32.
by commits＠squeakvm.org 05 Apr '12

05 Apr '12

Author: eliot Date: 2012-04-05 12:21:49 -0700 (Thu, 05 Apr 2012) New Revision: 2546 Added: branches/Cog/scripts/svnciplugins Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Window.c Log: Add version infor for the Cross/plugins tree. Add a -version switch to win32. Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2012-04-05 18:48:38 UTC (rev 2545) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2012-04-05 19:21:49 UTC (rev 2546) @@ -21,6 +21,7 @@ #define MERCURIAL 0 #define GIT 0 +#include "../plugins/sqPluginsSCCSVersion.h" #if SUBVERSION static char SvnRawRevisionString[] = "$Rev$"; @@ -29,9 +30,6 @@ static char SvnRawRepositoryURL[] = "$URL$"; # define URL_START (SvnRawRepositoryURL + 6) -static long -revisionAsLong() { return atol(REV_START); } - static char * revisionAsString() { @@ -52,9 +50,6 @@ # undef REV_START # undef URL_START #else /* SUBVERSION */ -static long -revisionAsLong() { return -1; } - static char * revisionAsString() { return "?"; } @@ -64,12 +59,28 @@ static char *sourceVersion = 0; -static char *sourceVersionString() +static char * +sourceVersionString(char separator) { if (!sourceVersion) { - int len = strlen(revisionAsString()) + strlen(repositoryURL()) + 3; +#if WIN32 + char *fmt = "VM: r%s %s%cPlugins: r%s %s"; + int len = strlen(fmt) + + strlen(revisionAsString()) + + strlen(repositoryURL()) + + strlen(pluginsRevisionAsString()) + + strlen(pluginsRepositoryURL()); sourceVersion = malloc(len); - sprintf(sourceVersion,"r%s %s",revisionAsString(),repositoryURL()); + sprintf(sourceVersion, fmt, + revisionAsString(), repositoryURL(), + separator, + pluginsRevisionAsString(), pluginsRepositoryURL()); +#else + asprintf(&sourceVersion, "VM: r%s %s Plugins: r%s %s", + revisionAsString(), repositoryURL(), + separator, + pluginsRevisionAsString(), pluginsRepositoryURL()); +#endif } return sourceVersion; } Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Apr 3 14:23:49 PDT 2012 + Thu Apr 5 12:21:16 PDT 2012 Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2012-04-05 18:48:38 UTC (rev 2545) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2012-04-05 19:21:49 UTC (rev 2546) @@ -611,7 +611,7 @@ #endif if (id == 1009) /* source tree version info */ - return sourceVersionString(); + return sourceVersionString(' '); // return "Mac Carbon 3.8.18b4 29-May-08 >02DA4BFD-4050-4372-8DBB-9582DA7D0218<"; // return "Mac Carbon 3.8.18b3 10-Apr-08 >DC0EAF5D-C46C-479D-B2A3-DBD4A2DF95A8<"; @@ -945,7 +945,7 @@ #endif if (verbose) sprintf(info+strlen(info), "Revision: "); - sprintf(info+strlen(info), "%s\n", sourceVersionString()); + sprintf(info+strlen(info), "%s\n", sourceVersionString('\n')); return info; } #if COGVM Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-04-05 18:48:38 UTC (rev 2545) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2012-04-05 19:21:49 UTC (rev 2546) @@ -481,7 +481,7 @@ #endif case 1009: /* source tree version info */ - return sourceVersionString(); + return sourceVersionString(' '); default: if ((id - 2) < squeakArgCnt) @@ -1506,7 +1506,7 @@ #endif if (verbose) sprintf(info+strlen(info), "Revision: "); - sprintf(info+strlen(info), "%s\n", sourceVersionString()); + sprintf(info+strlen(info), "%s\n", sourceVersionString('\n')); if (verbose) sprintf(info+strlen(info), "Build host: "); sprintf(info+strlen(info), "%s\n", ux_version); Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2012-04-05 18:48:38 UTC (rev 2545) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2012-04-05 19:21:49 UTC (rev 2546) @@ -756,6 +756,58 @@ gdInfoString = _strdup(tmpString); } +char * +getVersionInfo(int verbose) +{ +#if STACKVM + extern char *__interpBuildInfo; +# define INTERP_BUILD __interpBuildInfo +# if COGVM + extern char *__cogitBuildInfo; +# endif +#else +# define INTERP_BUILD interpreterVersion +#endif + char *info= (char *)malloc(4096); + info[0]= '\0'; + + sprintf(info+strlen(info), "%s\n", vmBuildString); + if (verbose) + sprintf(info+strlen(info), "Built from: "); + sprintf(info+strlen(info), "%s\n", INTERP_BUILD); +#if COGVM + if (verbose) + sprintf(info+strlen(info), "With: "); + sprintf(info+strlen(info), "%s\n", GetAttributeString(1008)); /* __cogitBuildInfo */ +#endif + if (verbose) + sprintf(info+strlen(info), "Revision: "); + sprintf(info+strlen(info), "%s\n", sourceVersionString('\n')); + return info; +} + + +static void +versionInfo(void) +{ +#if 0 + /* we could create a console but to version the non-consoel VM it is + * sufficient to do e.g. Squeak.exe >foo; cat foo. But feel free to + * add the code if you have the energy ;) + */ + DWORD mode; + HANDLE stdouth = GetStdHandle(STD_OUTPUT_HANDLE); + + if (GetConsoleMode(stdouth, &mode) != 0) { + char *vi = getVersionInfo(0); + WriteConsole(stdouth, vi, strlen(vi), 0, 0); + } + else +#endif + printf("%s", getVersionInfo(0)); + exit(0); +} + /****************************************************************************/ /* Error handling */ /****************************************************************************/ @@ -855,7 +907,7 @@ fprintf(f,"Cogit Build: %s\n", __cogitBuildInfo); # endif #endif - fprintf(f,"Source Version: %s\n", sourceVersionString()); + fprintf(f,"Source Version: %s\n", sourceVersionString('\n')); fflush(f); fprintf(f,"\n" "Current byte code: %d\n" @@ -1521,6 +1573,7 @@ if (!strcmp(argv[0], "-help")) { printUsage(1); return 1; } + else if (!strcmp(argv[0], "-version")) { versionInfo(); return 1; } else if (!strcmp(argv[0], "-headless")) { fHeadlessImage = true; return 1; } else if (!strcmp(argv[0], "-headfull")) { fHeadlessImage = false; return 1;} #ifdef VISTA_SECURITY /* IE7/Vista protected mode support */ Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2012-04-05 18:48:38 UTC (rev 2545) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2012-04-05 19:21:49 UTC (rev 2546) @@ -2793,7 +2793,7 @@ #endif case 1009: /* source tree version info */ - return sourceVersionString(); + return sourceVersionString(' '); /* Windows internals */ case 10001: /* addl. hardware info */ Added: branches/Cog/scripts/svnciplugins =================================================================== --- branches/Cog/scripts/svnciplugins (rev 0) +++ branches/Cog/scripts/svnciplugins 2012-04-05 19:21:49 UTC (rev 2546) @@ -0,0 +1,6 @@ +#!/bin/sh +# checkin script for subverison that serves to cause +# platforms/Cross/plugins/sqPluginsSCCSVersion.h to be checked-in so that its version +# info reflects that of the current check-in. +svn propset checkindate "`date`" platforms/Cross/plugins/sqPluginsSCCSVersion.h +svn ci platforms/Cross/plugins Property changes on: branches/Cog/scripts/svnciplugins ___________________________________________________________________ Added: svn:executable + *

1 0

[commit] r2545 - And be more accurate as to what is being versioned (i.e. just Cross.plugins,
by commits＠squeakvm.org 05 Apr '12

05 Apr '12

Author: eliot Date: 2012-04-05 11:48:38 -0700 (Thu, 05 Apr 2012) New Revision: 2545 Modified: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Log: And be more accurate as to what is being versioned (i.e. just Cross.plugins, not the whole trunk tree). Modified: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h =================================================================== --- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h 2012-04-05 18:45:10 UTC (rev 2544) +++ trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h 2012-04-05 18:48:38 UTC (rev 2545) @@ -27,9 +27,9 @@ static char * pluginsRepositoryURL() { - char *maybe_platforms = strstr(URL_START, "/platforms"); - if (maybe_platforms) - *maybe_platforms = 0; + char *maybe_sqplugins = strstr(URL_START, "/sqPlugins"); + if (maybe_sqplugins) + *maybe_sqplugins = 0; return URL_START; } # undef PLUGINS_REV_START Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 5 11:44:25 PDT 2012 + Thu Apr 5 11:48:08 PDT 2012

1 0

[commit] r2544 - Add distinct source code control version info for the plugins tree.
by commits＠squeakvm.org 05 Apr '12

05 Apr '12

Author: eliot Date: 2012-04-05 11:45:10 -0700 (Thu, 05 Apr 2012) New Revision: 2544 Added: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Log: Add distinct source code control version info for the plugins tree. Added: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h =================================================================== --- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h (rev 0) +++ trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h 2012-04-05 18:45:10 UTC (rev 2544) @@ -0,0 +1,43 @@ +/* + * A set of definitions for C source code control systems, to provide accurate + * and definitive version information to the VM. This file identifies the + * platform plugin code, which is shared between Cog and the trunk interpreter. + * It is included by platforms/Cross/vm/sqSCCSVersion.h. + * + * Currently instantiated only for Subversion. Please add definitions for + * other repositories as appropriate. + */ + +#if SUBVERSION +static char SvnRawPluginsRevisionString[] = "$Rev$"; +# define PLUGINS_REV_START (SvnRawPluginsRevisionString + 6) + +static char SvnRawPluginsRepositoryURL[] = "$URL$"; +# define URL_START (SvnRawPluginsRepositoryURL + 6) + +static char * +pluginsRevisionAsString() +{ + char *maybe_space = strchr(PLUGINS_REV_START,' '); + if (maybe_space) + *maybe_space = 0; + return PLUGINS_REV_START; +} + +static char * +pluginsRepositoryURL() +{ + char *maybe_platforms = strstr(URL_START, "/platforms"); + if (maybe_platforms) + *maybe_platforms = 0; + return URL_START; +} +# undef PLUGINS_REV_START +# undef URL_START +#else /* SUBVERSION */ +static char * +pluginsRevisionAsString() { return "?"; } + +static char * +pluginsRepositoryURL() { return "unknown"; } +#endif /* SUBVERSION */ Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Added: checkindate + Thu Apr 5 11:44:25 PDT 2012 Added: svn:keywords + URL Rev

1 0

[commit] r2543 - recordPrimTraceFunc is a COGVM only feature.
by commits＠squeakvm.org 05 Apr '12

05 Apr '12

Author: eliot Date: 2012-04-05 10:13:44 -0700 (Thu, 05 Apr 2012) New Revision: 2543 Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.c Log: recordPrimTraceFunc is a COGVM only feature. Modified: branches/Cog/platforms/win32/vm/sqWin32Prefs.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2012-04-05 01:40:25 UTC (rev 2542) +++ branches/Cog/platforms/win32/vm/sqWin32Prefs.c 2012-04-05 17:13:44 UTC (rev 2543) @@ -291,7 +291,7 @@ } void CreatePrefsMenu(void) { -#if STACKVM +#if COGVM extern sqInt recordPrimTraceFunc(); #endif HMENU hMenu,pMenu; @@ -370,7 +370,7 @@ TEXT("Dump call stack")); AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_PRINTALLSTACKS, TEXT("Dump all processes")); -#if STACKVM +#if COGVM if (recordPrimTraceFunc()) AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_DUMPPRIMLOG, TEXT("Dump recent primitives"));

1 0

VM Maker: Cog-eem.47.mcz
by commits＠source.squeak.org 05 Apr '12

05 Apr '12

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.47.mcz ==================== Summary ==================== Name: Cog-eem.47 Author: eem Time: 5 April 2012, 10:00:28.116 am UUID: 00cfe515-a00e-43b8-97b4-a117046d5ed0 Ancestors: Cog-eem.46 Moved TempScopeEditor to its own package (http://source.squeak.org/trunk/TemporaryVariableScopeEditor) =============== Diff against Cog-eem.46 =============== Item was removed: - ParseNodeVisitor subclass: #BlockNodeCollectingVisitor - instanceVariableNames: 'blockNodes' - classVariableNames: '' - poolDictionaries: '' - category: 'Cog-Scripts'! Item was removed: - ----- Method: BlockNodeCollectingVisitor>>blockNodes (in category 'accessing') ----- - blockNodes - ^blockNodes! Item was removed: - ----- Method: BlockNodeCollectingVisitor>>visitBlockNode: (in category 'visiting') ----- - visitBlockNode: aBlockNode - (blockNodes ifNil: [blockNodes := OrderedCollection new]) addLast: aBlockNode. - super visitBlockNode: aBlockNode! Item was removed: - ParseNodeVisitor subclass: #ReadBeforeWrittenVisitor - instanceVariableNames: 'readBeforeWritten written' - classVariableNames: '' - poolDictionaries: '' - category: 'Cog-Scripts'! - - !ReadBeforeWrittenVisitor commentStamp: '<historical>' prior: 0! - Answer the set of temporary variables that are read before they are written.! Item was removed: - ----- Method: ReadBeforeWrittenVisitor>>readBeforeWritten (in category 'accessing') ----- - readBeforeWritten - ^readBeforeWritten ifNil: [IdentitySet new]! Item was removed: - ----- Method: ReadBeforeWrittenVisitor>>visitAssignmentNode: (in category 'visiting') ----- - visitAssignmentNode: anAssignmentNode - anAssignmentNode value accept: self. - anAssignmentNode variable isTemp - ifTrue: - [written ifNil: [written := IdentitySet new]. - written add: anAssignmentNode variable] - ifFalse: - [anAssignmentNode variable accept: self]! Item was removed: - ----- Method: ReadBeforeWrittenVisitor>>visitBlockNode: (in category 'visiting') ----- - visitBlockNode: aBlockNode - | savedWritten | - savedWritten := written copy. - super visitBlockNode: aBlockNode. - written := savedWritten! Item was removed: - ----- Method: ReadBeforeWrittenVisitor>>visitTempVariableNode: (in category 'visiting') ----- - visitTempVariableNode: aTempVariableNode - (aTempVariableNode isArg - or: [written notNil - and: [written includes: aTempVariableNode]]) ifTrue: - [^self]. - readBeforeWritten ifNil: - [readBeforeWritten := IdentitySet new]. - readBeforeWritten add: aTempVariableNode! Item was removed: - Object subclass: #TempScopeEditor - instanceVariableNames: 'method methodNode out tempMap blockNodes sourceString soFar' - classVariableNames: '' - poolDictionaries: '' - category: 'Cog-Scripts'! Item was removed: - ----- Method: TempScopeEditor class>>edit (in category 'as yet unclassified') ----- - edit - "Trawl the system for methods containing misdeclared temps and correct these methods." - SystemNavigation default allSelect: - [:m| | scanner | - (m isQuick not - and: [(scanner := InstructionStream on: m) scanFor: - [:b| b = 143 and: [scanner followingByte >= 16]]]) ifTrue: - [(self new forMethod: m) edit]. - false]! Item was removed: - ----- Method: TempScopeEditor>>anyScopes:outsideExtent: (in category 'editing') ----- - anyScopes: referenceScopeDict outsideExtent: blockExtent - ^referenceScopeDict notNil - and: [referenceScopeDict notEmpty - and: [referenceScopeDict anySatisfy: - [:set| - set anySatisfy: [:location| (blockExtent rangeIncludes: location) not]]]]! Item was removed: - ----- Method: TempScopeEditor>>blockNode:isEnclosingScopeFor: (in category 'editing') ----- - blockNode: aBlockNode isEnclosingScopeFor: aTempVariableNode - ^((self - anyScopes: (aTempVariableNode instVarNamed: 'readingScopes') - outsideExtent: aBlockNode blockExtent) - or: [self - anyScopes: (aTempVariableNode instVarNamed: 'writingScopes') - outsideExtent: aBlockNode blockExtent]) not! Item was removed: - ----- Method: TempScopeEditor>>buildTempMap (in category 'editing') ----- - buildTempMap - "Build the map for moving remote temps. Each remote temp - that should be moved is entered into the map referencing its - smallest enclosing scope. This may seem backwards but it - means that the map is one-to-one, not one-to-many." - | readBeforeWritten | - readBeforeWritten := (methodNode accept: ReadBeforeWrittenVisitor new) readBeforeWritten. - blockNodes do: - [:blockNode| - (blockNode temporaries notEmpty - and: [blockNode temporaries last isIndirectTempVector]) ifTrue: - [blockNode temporaries last remoteTemps do: - [:remoteTemp| | enclosingScopes smallestEnclosingBlockScope | - (readBeforeWritten includes: remoteTemp) ifFalse: - [enclosingScopes := blockNodes select: [:blockScope| - self blockNode: blockScope - isEnclosingScopeFor: remoteTemp]. - enclosingScopes notEmpty ifTrue: - [smallestEnclosingBlockScope := enclosingScopes last. - smallestEnclosingBlockScope ~~ blockNode ifTrue: - [tempMap at: remoteTemp put: smallestEnclosingBlockScope]]]]]]! Item was removed: - ----- Method: TempScopeEditor>>copyMethodMovingTemps (in category 'editing') ----- - copyMethodMovingTemps - | methodBodyStart tempsToKeep tempsStart tempsEnd | - methodBodyStart := method methodClass parserClass new - parseMethodComment: sourceString setPattern: [:ignored|]; - startOfNextToken. - tempsStart := sourceString indexOf: $| startingAt: methodBodyStart. - tempsEnd := sourceString indexOf: $| startingAt: tempsStart + 1. - (tempsToKeep := self tempsToKeepAtMethodLevel) isEmpty - ifTrue: - [| startOfFirstBlock | - startOfFirstBlock := (methodNode encoder sourceRangeFor: blockNodes second closureCreationNode) first. - tempsStart < startOfFirstBlock - ifTrue: - [out next: tempsStart - 1 putAll: sourceString. - soFar := tempsEnd + 1] - ifFalse: - [soFar := 1]] - ifFalse: - [out next: tempsStart putAll: sourceString. - tempsToKeep do: [:t| out space; nextPutAll: t name]. - soFar := tempsEnd. - (sourceString at: soFar - 1) isSeparator ifTrue: - [soFar := soFar - 1]]. - blockNodes allButFirst do: - [:blockNode| - self processBlockNode: blockNode]. - out next: sourceString size - soFar + 1 putAll: sourceString startingAt: soFar! Item was removed: - ----- Method: TempScopeEditor>>edit (in category 'editing') ----- - edit - self buildTempMap. - tempMap notEmpty ifTrue: - [| mr | - mr := method methodReference. - self copyMethodMovingTemps. - Transcript cr; show: mr actualClass name, ' >> ', mr methodSymbol. - method methodClass compile: out contents classified: mr category]! Item was removed: - ----- Method: TempScopeEditor>>editNoCompile (in category 'editing') ----- - editNoCompile - self buildTempMap. - ^tempMap isEmpty ifFalse: - [self copyMethodMovingTemps. - out contents]! Item was removed: - ----- Method: TempScopeEditor>>forMethod: (in category 'initialize-release') ----- - forMethod: aCompiledMethod - method := aCompiledMethod. - sourceString := aCompiledMethod getSourceFromFile asString. - methodNode := method methodClass parserClass new - parse: sourceString - class: method methodClass. - methodNode ensureClosureAnalysisDone. - blockNodes := (methodNode accept: BlockNodeCollectingVisitor new) - blockNodes reject: [:bn| bn optimized]. - out := (String new: sourceString size) writeStream. - tempMap := IdentityDictionary new - - - "(TempScopeEditor new forMethod: SARInstaller class>>#ensurePackageWithId:) edit"! Item was removed: - ----- Method: TempScopeEditor>>processBlockNode: (in category 'editing') ----- - processBlockNode: blockNode - | tempsToMoveHere startOfBlock endOfArgs maybeBlockTempsStart blockTempsInSource | - tempsToMoveHere := (tempMap select: [:aBlockNode| aBlockNode == blockNode]) keys. - tempsToMoveHere isEmpty ifTrue: [^self]. - startOfBlock := (methodNode encoder sourceRangeFor: blockNode closureCreationNode) first. - endOfArgs := blockNode arguments isEmpty - ifTrue: [startOfBlock] - ifFalse: [sourceString indexOf: $| startingAt: startOfBlock]. - out next: endOfArgs - soFar + 1 putAll: sourceString startingAt: soFar. - maybeBlockTempsStart := sourceString indexOf: $| startingAt: endOfArgs + 1 ifAbsent: sourceString size + 1. - blockTempsInSource := (sourceString copyFrom: endOfArgs + 1 to: maybeBlockTempsStart - 1) allSatisfy: - [:c| c isSeparator]. - blockTempsInSource - ifTrue: - [out next: maybeBlockTempsStart - endOfArgs putAll: sourceString startingAt: endOfArgs + 1. - (self tempsToKeepFor: blockNode) do: - [:tempNode| out space; nextPutAll: tempNode name]. - tempsToMoveHere do: [:t| out space; nextPutAll: t name]. - soFar := sourceString indexOf: $| startingAt: maybeBlockTempsStart + 1. - (sourceString at: soFar - 1) isSeparator ifTrue: - [soFar := soFar - 1]] - ifFalse: - [out space; nextPut: $|. - tempsToMoveHere do: [:t| out space; nextPutAll: t name]. - out space; nextPut: $|. - soFar := endOfArgs + 1]! Item was removed: - ----- Method: TempScopeEditor>>tempsToKeepAtMethodLevel (in category 'editing') ----- - tempsToKeepAtMethodLevel - ^(self tempsToKeepFor: blockNodes first) select: - [:t|t scope >= 0]! Item was removed: - ----- Method: TempScopeEditor>>tempsToKeepFor: (in category 'editing') ----- - tempsToKeepFor: blockNode - | tempsToKeep | - tempsToKeep := OrderedCollection new. - blockNode temporaries do: - [:t| - t isIndirectTempVector - ifTrue: - [t remoteTemps do: - [:rt| - (tempMap includesKey: rt) ifFalse: - [tempsToKeep addLast: rt]]] - ifFalse: - [tempsToKeep addLast: t]]. - ^tempsToKeep!

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2012