Vm-dev June 2013

vm-dev@lists.squeakfoundation.org

16 participants
88 discussions

[commit][2741] Update the Newspeak version of the VMProfileLinuxSupportPlugin.
by commits＠squeakvm.org 12 Jun '13

12 Jun '13

Revision: 2741 Author: eliot Date: 2013-06-12 12:40:48 -0700 (Wed, 12 Jun 2013) Log Message: ----------- Update the Newspeak version of the VMProfileLinuxSupportPlugin. Improve robustness of the nscogbuild/unixbuild mvm scripts. Modified Paths: -------------- branches/Cog/nscogbuild/unixbuild/astbld/mvm branches/Cog/nscogbuild/unixbuild/astbldt/mvm branches/Cog/nscogbuild/unixbuild/bld/mvm branches/Cog/nscogbuild/unixbuild/bldt/mvm branches/Cog/nscogbuild/unixbuild/dbgbld/mvm branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/astbld/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,6 +1,6 @@ #!/bin/bash INSTALLDIR=nsvmlinuxast -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi OPT=-O1 @@ -9,7 +9,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogbuild/unixbuild/astbldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/astbldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,7 +1,7 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxastpt -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi OPT=-O1 @@ -10,7 +10,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/bld/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,6 +1,6 @@ #!/bin/bash INSTALLDIR=nsvmlinux -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi # Some gcc versions create a broken VM using -O2 @@ -13,7 +13,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogbuild/unixbuild/bldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/bldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,7 +1,7 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxpt -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi # Some gcc versions create a broken VM using -O2 @@ -14,7 +14,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,6 +1,6 @@ #!/bin/bash INSTALLDIR=nsvmlinuxdbg -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi OPT=-O0 @@ -9,7 +9,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm =================================================================== --- branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,7 +1,7 @@ #!/bin/bash # VM with VM profiler and threaded heartbeat assuming multiple thread priorities INSTALLDIR=nsvmlinuxdbgpt -if [ $# -ge 1 ]; then +if [ $# -ge 1 -a -d "$1" ]; then INSTALLDIR="$1"; shift fi OPT=-O0 @@ -10,7 +10,7 @@ read a case $a in n|no|N|NO) echo "ok but this isn't safe!!";; -*) test -f Makefile && make reallyclean +*) rm config.h; test -f Makefile && make reallyclean esac test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \ --without-vm-display-fbdev --without-npsqueak \ Modified: branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-11 20:12:31 UTC (rev 2740) +++ branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-12 19:40:48 UTC (rev 2741) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 + VMPluginCodeGenerator VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c " __DATE__ ; @@ -12,6 +12,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#include <limits.h> #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif @@ -58,6 +59,7 @@ EXPORT(sqInt) primitiveExecutableModules(void); EXPORT(sqInt) primitiveInterpretAddress(void); static sqInt reapmodulenames(struct dl_phdr_info *info, size_t size, void *ignored); +static sqInt reapmodulesymlinks(struct dl_phdr_info *info, size_t size, void *ignored); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); @@ -72,6 +74,7 @@ static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); static sqInt (*isBytes)(sqInt oop); static sqInt (*methodReturnValue)(sqInt oop); +static sqInt (*nilObject)(void); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); static sqInt (*primitiveFailFor)(sqInt reasonCode); @@ -88,6 +91,7 @@ extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); extern sqInt isBytes(sqInt oop); extern sqInt methodReturnValue(sqInt oop); +extern sqInt nilObject(void); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); extern sqInt primitiveFailFor(sqInt reasonCode); @@ -101,9 +105,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 (e)" #endif ; static sqInt numModules; @@ -203,9 +207,11 @@ } -/* Answer an Array of strings for executable modules (the VM executable and - loaded libraries). - */ +/* Answer an Array of pairs of strings for executable modules (the VM + executable and loaded libraries). + The first element in each pair is the filename of the module. The second + element is either nil or + the symlink's target, if the filename is a symlink. */ EXPORT(sqInt) primitiveExecutableModules(void) @@ -217,13 +223,13 @@ /* skip the fake linux-gate.so.1 */ - resultObj = instantiateClassindexableSize(classArray(), numModules - 1); + resultObj = instantiateClassindexableSize(classArray(), (numModules - 1) * 2); if (resultObj == 0) { return primitiveFailFor(PrimErrNoMemory); } pushRemappableOop(resultObj); primErr = (numModules = 0); - dl_iterate_phdr(reapmodulenames,0); + dl_iterate_phdr(reapmodulesymlinks,0); resultObj = popRemappableOop(); if (primErr != 0) { return primitiveFailFor(primErr); @@ -269,6 +275,48 @@ } +/* like reap:module:names:, but follows symlinks */ + +static sqInt +reapmodulesymlinks(struct dl_phdr_info *info, size_t size, void *ignored) +{ + const char *elfModuleName; + extern char *GetAttributeString(sqInt); + sqInt len; + sqInt moduleNameObj; + char symLinkBuf[PATH_MAX]; + + ; + elfModuleName = numModules ? info->dlpi_name : GetAttributeString(0); + if ((elfModuleName == null) + || (((len = strlen(elfModuleName))) == 0)) { + return 0; + } + moduleNameObj = instantiateClassindexableSize(classString(), len); + if (moduleNameObj == 0) { + primErr = PrimErrNoMemory; + return 1; + } + strncpy(arrayValueOf(moduleNameObj), elfModuleName, len); + storePointerofObjectwithValue(numModules, topRemappableOop(), moduleNameObj); + strcpy(symLinkBuf, elfModuleName); + if (((len = readlink(elfModuleName, symLinkBuf, PATH_MAX))) > 0) { + moduleNameObj = instantiateClassindexableSize(classString(), len); + if (moduleNameObj == 0) { + primErr = PrimErrNoMemory; + return 1; + } + strncpy(arrayValueOf(moduleNameObj), symLinkBuf, len); + storePointerofObjectwithValue(numModules + 1, topRemappableOop(), moduleNameObj); + } + else { + storePointerofObjectwithValue(numModules + 1, topRemappableOop(), nilObject()); + } + numModules += 2; + return 0; +} + + /* Note: This is coded so that it can be run in Squeak. */ EXPORT(sqInt) @@ -290,6 +338,7 @@ instantiateClassindexableSize = interpreterProxy->instantiateClassindexableSize; isBytes = interpreterProxy->isBytes; methodReturnValue = interpreterProxy->methodReturnValue; + nilObject = interpreterProxy->nilObject; popRemappableOop = interpreterProxy->popRemappableOop; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; primitiveFailFor = interpreterProxy->primitiveFailFor; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jun 11 13:11:09 PDT 2013 + Wed Jun 12 12:39:49 PDT 2013

1 0

VM Maker: VMMaker-oscog-EstebanLorenzano.239.mcz
by commits＠source.squeak.org 12 Jun '13

12 Jun '13

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.239.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.239 Author: EstebanLorenzano Time: 12 June 2013, 3:59:23.041 pm UUID: 82137893-018c-467a-8b71-cfc71ef91f33 Ancestors: VMMaker-oscog-EstebanLorenzano.238, VMMaker.oscog-eem.298 - merged with Eliot's =============== Diff against VMMaker-oscog-EstebanLorenzano.238 =============== Item was changed: ----- Method: CCodeGenerator>>checkForGlobalUsage:in: (in category 'utilities') ----- checkForGlobalUsage: vars in: aTMethod vars do: [:var | (variables includes: var) ifTrue: "find the set of method names using this global var" [(globalVariableUsage at: var ifAbsentPut: [Set new]) add: aTMethod selector]]. + aTMethod clearReferencesToGlobalStruct. - aTMethod referencesGlobalStructMakeZero. (aTMethod locals select: [:l| self reservedWords includes: l]) do: [:l| | em | em := aTMethod definingClass name, '>>', aTMethod selector, ' has variable that is a C reserved word: ', l. self error: em. self logger cr; nextPutAll: em; cr; flush]! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>checkForGlobalUsage:in: (in category 'utilities') ----- checkForGlobalUsage: vars in: aTMethod "override to handle global struct needs" super checkForGlobalUsage: vars in: aTMethod. + - "if localStructDef is false, we don't ever need to include a reference to it in a function" - localStructDef ifFalse:[^self]. vars asSet do: [:var | "if any var is global and in the global var struct + tell the TMethod it may be refering to the struct, depending upon the #defines" - tell the TMethod it will be refering to the struct" ((variables includes: var) and: [self placeInStructure: var]) ifTrue: + [aTMethod referencesGlobalStruct]]! - [aTMethod referencesGlobalStructIncrementBy: (vars occurrencesOf: var)]]! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>emitCCodeOn:doInlining:doAssertions: (in category 'C code generator') ----- emitCCodeOn: aStream doInlining: inlineFlag doAssertions: assertionFlag super emitCCodeOn: aStream doInlining: inlineFlag doAssertions: assertionFlag. + "we add an initialiser for the pointer to the global struct; " + aStream + cr; + nextPutAll: 'void initGlobalStructure(void) {';cr; + nextPutAll: '#if SQ_USE_GLOBAL_STRUCT_REG';cr; + nextPutAll: 'foo = &fum;' ; cr; + nextPutAll: '#endif'; cr; + nextPutAll:'}'; + cr! - "if the machine needs the globals structure defined locally in the interp.c file, don't add the folowing function" - localStructDef ifFalse:[self emitStructureInitFunctionOn: aStream]! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>emitCVariablesOn: (in category 'C code generator') ----- emitCVariablesOn: aStream "Store the global variable declarations on the given stream. Break logic into vars for structure and vars for non-structure." | structure nonstruct | structure := WriteStream on: (String new: 32768). nonstruct := WriteStream on: (String new: 32768). aStream nextPutAll: '/*** Variables ***/'; cr. structure nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: '# define _iss /* define in-struct static as void */'; cr; nextPutAll: 'static struct foo {'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define _iss static'; cr; nextPutAll: '#endif'; cr. self buildSortedVariablesCollection do: [ :var | | decl varString inStruct target | target := (inStruct := self placeInStructure: (varString := var asString)) ifTrue: [structure] ifFalse: [nonstruct]. decl := variableDeclarations at: varString ifAbsent: ['sqInt ' , varString]. decl first == $# "support cgen var: #bytecodeSetSelector declareC: '#define bytecodeSetSelector 0' hack" ifTrue: [target nextPutAll: decl; cr] ifFalse: [self isGeneratingPluginCode ifTrue: [varString = 'interpreterProxy' ifTrue: "quite special..." [self preDeclareInterpreterProxyOn: target] ifFalse: [target nextPutAll: 'static ']] ifFalse: [(vmClass mustBeGlobal: varString) ifFalse: [target nextPutAll: (inStruct ifTrue: ['_iss '] ifFalse: ['static '])]]. target nextPutAll: decl; nextPut: $;; cr]]. structure nextPutAll: '#undef _iss'; cr; nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; nextPutAll: ' } fum;'; cr; + nextPutAll: ' #if SQ_USE_GLOBAL_STRUCT_REG';cr; + nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; + nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* using a global reg pointer */'; cr; + nextPutAll:'#else';cr; nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT register struct foo * foo = &fum;'; cr; nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT volatile register struct foo * foo = &fum;'; cr; + nextPutAll: '#endif';cr; nextPutAll: '# define GIV(interpreterInstVar) (foo->interpreterInstVar)'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define DECL_MAYBE_SQ_GLOBAL_STRUCT /* oh, no mr bill!! */'; cr; nextPutAll: '# define DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT /* oh no, mr bill!! */'; cr; nextPutAll: '# define GIV(interpreterInstVar) interpreterInstVar'; cr; nextPutAll: '#endif'; cr. + "if the machine needs the fum structure defining locally, do it now; global register users don't need that, but DO need some batshit insane C macro fudging in order to convert the define of USE_GLOBAL_STRUCT_REG into a simple string to use in the asm clause below. Sigh." + structure + nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; + nextPutAll: '#if SQ_USE_GLOBAL_STRUCT_REG';cr; + nextPutAll: '#define fooxstr(s) foostr(s)'; cr; + nextPutAll: '#define foostr(s) #s'; cr; + nextPutAll: 'register struct foo * foo asm(fooxstr(USE_GLOBAL_STRUCT_REG));'; cr; + nextPutAll: '#else'; cr; + nextPutAll: 'static struct foo * foo = &fum;'; cr; + nextPutAll: '#endif'; cr; + nextPutAll: '#endif'; cr. - "if the machine needs the fum structure defining locally, do it now" - localStructDef ifTrue: - [structure - nextPutAll: '#if SQ_USE_GLOBAL_STRUCT'; cr; - nextPutAll: 'static struct foo * foo = &fum;'; cr; - nextPutAll: '#endif'; cr]. aStream nextPutAll: structure contents; nextPutAll: nonstruct contents; cr! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>emitGlobalStructFlagOn: (in category 'C code generator') ----- emitGlobalStructFlagOn: aStream + "Depending upon the value of structDefDefine (See also #structDefDefine:), define SQ_USE_GLOBAL_STRUCT before including the header. Also derive the flag for using the global register; define USE_GLOBAL_STRUCT_REG to do so" - "Define SQ_USE_GLOBAL_STRUCT before including the header." aStream nextPutAll: '#if '; nextPutAll: structDefDefine; cr; nextPutAll: '# define SQ_USE_GLOBAL_STRUCT 1'; cr; nextPutAll: '#else'; cr; nextPutAll: '# define SQ_USE_GLOBAL_STRUCT 0'; cr; nextPutAll: '#endif'; cr; + nextPutAll: '#if USE_GLOBAL_STRUCT_REG '; cr; + nextPutAll: '# define SQ_USE_GLOBAL_STRUCT_REG 1'; cr; + nextPutAll: '#else'; cr; + nextPutAll: '# define SQ_USE_GLOBAL_STRUCT_REG 0'; cr; + nextPutAll: '#endif'; cr; cr! Item was removed: - ----- Method: CCodeGeneratorGlobalStructure>>emitStructureInitFunctionOn: (in category 'C code generator') ----- - emitStructureInitFunctionOn: aStream - "For the VM using a global struct for most of the global vars (useful for ARM and PPC so far), append the initGlobalStructure() function" - aStream - cr; - nextPutAll: 'void initGlobalStructure(void) {foo = &fum;}'; - cr! Item was removed: - ----- Method: CCodeGeneratorGlobalStructure>>globalStructDefined: (in category 'C code generator') ----- - globalStructDefined: aBool - localStructDef := aBool! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>initialize (in category 'C code generator') ----- initialize super initialize. + localStructDef := nil. "ignored ivar - no longer used" - localStructDef := false. structDefDefine := '1'! Item was changed: ----- Method: CCodeGeneratorGlobalStructure>>structDefDefine: (in category 'initialize-release') ----- structDefDefine: aString + "set the string that will appear in the C file to define whether or not to use the global struct; reasonable values would be: + 'USE_GLOBAL_STRUCT' - which would be defined in a header or makefile + '0' - which would mean never do it + '1' - which would mean always do it" structDefDefine := aString! Item was added: + ----- Method: CoInterpreter>>interpreterAllocationReserveBytes (in category 'stack pages') ----- + interpreterAllocationReserveBytes + "At a rough approximation we may need to allocate up to a couple + of page's worth of contexts when switching stack pages, assigning + to senders, etc. But the snapshot primitive voids all stack pages. + So a safe margin is the size of a large context times the maximum + number of frames per page times the number of pages." + | maxUsedBytesPerPage maxFramesPerPage | + maxUsedBytesPerPage := self stackPageFrameBytes + self stackLimitOffset. + maxFramesPerPage := maxUsedBytesPerPage / BytesPerWord // MFrameSlots. + ^maxFramesPerPage * LargeContextSize * numStackPages! Item was added: + ----- Method: CogVMSimulator>>ioLocalSecondsOffset (in category 'I/O primitives support') ----- + ioLocalSecondsOffset + ^DateAndTime localOffset asSeconds! Item was changed: ----- Method: CrossPlatformVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - A cross platform tree leaves it up to the makefiles to decide whether to use the global struct or not." ^CCodeGeneratorGlobalStructure new initialize; - globalStructDefined: true; structDefDefine: 'USE_GLOBAL_STRUCT'; logger: logger; options: optionsDictionary; yourself! Item was changed: ----- Method: InterpreterPrimitives>>primitiveUtcWithOffset (in category 'system control primitives') ----- primitiveUtcWithOffset "Answer an array with UTC microseconds since the Posix epoch and the current seconds offset from GMT in the local time zone. This is a named (not numbered) primitive in the null module (ie the VM)" + | resultArray | - | offset resultArray | - <export: true> + "2177452800000000 = '1/1/1970' asDate asSeconds - '1/1/1901' asDate asSeconds * 1,000,000" + objectMemory pushRemappableOop: (self positive64BitIntegerFor: self ioUTCMicroseconds - 2177452800000000). - <var: #clock type: 'sqLong'> - offset := self ioUTCMicroseconds - self ioLocalMicroseconds. - objectMemory pushRemappableOop: (self positive64BitIntegerFor: self ioUTCMicroseconds). resultArray := objectMemory instantiateClass: objectMemory classArray indexableSize: 2. + self storePointer: 0 ofObject: resultArray withValue: objectMemory popRemappableOop. + self storePointerUnchecked: 1 ofObject: resultArray withValue: (objectMemory integerObjectOf: self ioLocalSecondsOffset). - self stObject: resultArray at: 1 put: objectMemory popRemappableOop. - self stObject: resultArray at: 2 put: (objectMemory integerObjectOf: offset). self pop: 1 thenPush: resultArray ! Item was changed: ----- Method: MacOSPowerPCOS9VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - Mac OS uses the global struct and local def of the structure. The global struct/loca def regime appears to be about 10% faster than the default regime for Smalltalk-intensive macro benchmarks for both the Intel and gcc 4.0 compiler on x86. eem 12/10/2008 14:34 2.16 GHz Intel Core Duo MacBook Pro Mac OS X 10.4.11" ^CCodeGeneratorGlobalStructure new initialize; - globalStructDefined: true; structDefDefine: '1'; "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" logger: logger; yourself! Item was changed: ----- Method: NewObjectMemory>>allocate:headerSize:h1:h2:h3:doFill:format: (in category 'allocation') ----- allocate: byteSize headerSize: hdrSize h1: baseHeader h2: classOopArg h3: extendedSize doFill: doFill format: format "Allocate a new object of the given size and number of header words. (Note: byteSize already includes space for the base header word.) Initialize the header fields of the new object and fill the remainder of the object with a value appropriate for the format. May cause a GC" | newObj classOop | <inline: true> + <var: #i type: #usqInt> + <var: #end type: #usqInt> - <var: #i type: 'usqInt'> - <var: #end type: 'usqInt'> newObj := self allocateChunk: byteSize + (hdrSize - 1 * BytesPerWord). newObj = 0 ifTrue: ["remap classOop because GC may move the classOop" hdrSize > 1 ifTrue: [self pushRemappableOop: classOopArg]. newObj := self allocateChunkAfterGC: byteSize + (hdrSize - 1 * BytesPerWord). hdrSize > 1 ifTrue: [classOop := self popRemappableOop]. newObj = 0 ifTrue: [^newObj]] ifFalse: [classOop := classOopArg]. hdrSize = 3 ifTrue: [self longAt: newObj put: (extendedSize bitOr: HeaderTypeSizeAndClass). self longAt: newObj + BytesPerWord put: (classOop bitOr: HeaderTypeSizeAndClass). self longAt: newObj + (BytesPerWord*2) put: (baseHeader bitOr: HeaderTypeSizeAndClass). newObj := newObj + (BytesPerWord*2)]. hdrSize = 2 ifTrue: [self longAt: newObj put: (classOop bitOr: HeaderTypeClass). self longAt: newObj + BytesPerWord put: (baseHeader bitOr: HeaderTypeClass). newObj := newObj + BytesPerWord]. hdrSize = 1 ifTrue: [self longAt: newObj put: (baseHeader bitOr: HeaderTypeShort)]. "clear new object" doFill ifTrue: [| fillWord end i | fillWord := format <= 4 + ifTrue: [nilObj] "if pointers, fill with nil oop" + ifFalse: [0]. - ifTrue: [nilObj] "if pointers, fill with nil oop" - ifFalse: [0]. end := newObj + byteSize. + i := newObj + BytesPerWord. "skip header" - i := newObj + BytesPerWord. [i < end] whileTrue: [self longAt: i put: fillWord. + i := i + BytesPerWord]. + self assert: i = freeStart.]. - i := i + BytesPerWord]]. DoExpensiveAssertionChecks ifTrue: [self okayOop: newObj. self oopHasOkayClass: newObj. (self safeObjectAfter: newObj) = freeStart ifFalse: [self error: 'allocate bug: did not set header of new oop correctly']]. ^newObj! Item was changed: ----- Method: NewObjectMemory>>allocateChunkAfterGC: (in category 'allocation') ----- allocateChunkAfterGC: byteSize + "Garbage collect and then allocate a chunk of the given size. Sender must be sure - "Garbage colect and then allocate a chunk of the given size. Sender must be sure that the requested size includes enough space for the header word(s)." | newChunk enoughSpace | <inline: true> <var: #newChunk type: #usqInt> enoughSpace := self sufficientSpaceToAllocate: byteSize. enoughSpace ifFalse: ["signal that space is running low, but proceed with allocation if possible" self setSignalLowSpaceFlagAndSaveProcess]. (self oop: freeStart + byteSize isGreaterThan: reserveStart) ifTrue: [^0 "Allocation failed. Client should e.g. fail the primtive"]. + "if we get here, there is enough space for allocation to succeed " - "if we get here, there is enough space for allocation to succeed " newChunk := freeStart. freeStart := freeStart + byteSize. ^self oopForPointer: newChunk! Item was changed: ----- Method: NewObjectMemory>>eeAllocate:headerSize:h1:h2:h3: (in category 'allocation') ----- eeAllocate: byteSize headerSize: hdrSize h1: baseHeader h2: classOop h3: extendedSize "Allocate a new object of the given size and number of header words. (Note: byteSize already includes + space for the base header word.) Initialize the header fields of the new object. + Does *not* initialize the objects' fields. Will *not* cause a GC. This version is for the execution engine's use only." - space for the base header word.) Initialize the header fields of the new object and fill the remainder of - the object with the given value. Will not cause a GC. This version is for the execution engine" | newObj | <inline: true> <asmLabel: false> + <var: #i type: #usqInt> + <var: #end type: #usqInt> - <var: #i type: 'usqInt'> - <var: #end type: 'usqInt'> newObj := self allocateInterpreterChunk: byteSize + (hdrSize - 1 * BytesPerWord). newObj = 0 ifTrue: [^newObj]. hdrSize = 3 ifTrue: [self longAt: newObj put: (extendedSize bitOr: HeaderTypeSizeAndClass). self longAt: newObj + BytesPerWord put: (classOop bitOr: HeaderTypeSizeAndClass). self longAt: newObj + (BytesPerWord*2) put: (baseHeader bitOr: HeaderTypeSizeAndClass). newObj := newObj + (BytesPerWord*2)]. hdrSize = 2 ifTrue: [self longAt: newObj put: (classOop bitOr: HeaderTypeClass). self longAt: newObj + BytesPerWord put: (baseHeader bitOr: HeaderTypeClass). newObj := newObj + BytesPerWord]. hdrSize = 1 ifTrue: [self longAt: newObj put: (baseHeader bitOr: HeaderTypeShort)]. DoExpensiveAssertionChecks ifTrue: [self okayOop: newObj. self oopHasOkayClass: newObj. (self safeObjectAfter: newObj) = freeStart ifFalse: [self error: 'allocate bug: did not set header of new oop correctly']]. ^newObj! Item was changed: ----- Method: NewObjectMemory>>freeStart (in category 'accessing') ----- freeStart + "This is a horrible hack and only works because C macros are generated after Interpreter variables." + <cmacro: '() GIV(freeStart)'> - "This is a horribe hack and only works because C macros are generated after Interpreter variables." - <cmacro: '() freeStart'> ^freeStart! Item was changed: ----- Method: NewObjectMemory>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of zero. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" | endSeg segOop fieldPtr fieldOop doingClass lastPtr extraSize mapOop lastOut outPtr hdrTypeBits header data | <inline: false> <var: #endSeg type: #usqInt> <var: #segOop type: #usqInt> <var: #fieldPtr type: #usqInt> <var: #lastOut type: #usqInt> <var: #outPtr type: #usqInt> <var: #lastPtr type: #usqInt> DoAssertionChecks ifTrue: [self verifyCleanHeaders]. lastOut := outPointerArray + (self lastPointerOf: outPointerArray). endSeg := segmentWordArray + (self sizeBitsOf: segmentWordArray) - BaseHeaderSize. "Version check. Byte order of the WordArray now" data := self longAt: segmentWordArray + BaseHeaderSize. + (coInterpreter readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: - (self readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Not readable -- try again with reversed bytes..." [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. data := self longAt: segmentWordArray + BaseHeaderSize. + (coInterpreter readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: - (self readableFormat: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: "Still NG -- put things back and fail" [self reverseBytesFrom: segmentWordArray + BaseHeaderSize to: endSeg + BytesPerWord. DoAssertionChecks ifTrue: [self verifyCleanHeaders]. ^0]]. "Reverse the Byte type objects if the data is from opposite endian machine. Revese the words in Floats if from an earlier version with different Float order. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal." (data >> 16) = (self imageSegmentVersion >> 16) ifTrue: "Need to swap floats if the segment is being loaded into a little-endian VM from a version that keeps Floats in big-endian word order as was the case prior to the 6505 image format." [(self isPlatformFloatOrderVersion: (data bitAnd: 16rFFFF "low 2 bytes")) ifFalse: [self vmEndianness ~= 1 "~= 1 => little-endian" ifTrue: [segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. self wordSwapFloatsFrom: segOop to: endSeg + BytesPerWord]]] ifFalse: "Reverse the byte-type objects once" [segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. "Oop of first embedded object" self byteSwapByteObjectsFrom: segOop to: endSeg + BytesPerWord flipFloatsIf: (self isPlatformFloatOrderVersion: (data bitAnd: 16rFFFF "low 2 bytes"))]. "Proceed through the segment, remapping pointers..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self headerType: segOop) <= 1 ifTrue: ["This object has a class field (type = 0 or 1) -- start with that." fieldPtr := segOop - BytesPerWord. doingClass := true] ifFalse: ["No class field -- start with first data field" fieldPtr := segOop + BaseHeaderSize. doingClass := false]. lastPtr := segOop + (self lastPointerOf: segOop). "last field" lastPtr > endSeg ifTrue: [DoAssertionChecks ifTrue: [self verifyCleanHeaders]. ^0 "out of bounds"]. "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. doingClass ifTrue: [hdrTypeBits := self headerType: fieldPtr. fieldOop := fieldOop - hdrTypeBits]. (self isIntegerObject: fieldOop) ifTrue: ["Integer -- nothing to do" fieldPtr := fieldPtr + BytesPerWord] ifFalse: [(fieldOop bitAnd: 3) = 0 ifFalse: [^0 "bad oop"]. (fieldOop bitAnd: 16r80000000) = 0 ifTrue: ["Internal pointer -- add segment offset" mapOop := fieldOop + segmentWordArray] ifFalse: ["External pointer -- look it up in outPointers" outPtr := outPointerArray + (fieldOop bitAnd: 16r7FFFFFFF). outPtr > lastOut ifTrue: [^0 "out of bounds"]. mapOop := self longAt: outPtr]. doingClass ifTrue: [self longAt: fieldPtr put: mapOop + hdrTypeBits. fieldPtr := fieldPtr + 8. doingClass := false] ifFalse: [self longAt: fieldPtr put: mapOop. fieldPtr := fieldPtr + BytesPerWord]. segOop < youngStart ifTrue: [self possibleRootStoreInto: segOop value: mapOop]]]. segOop := self objectAfter: segOop]. "Again, proceed through the segment checking consistency..." segOop := self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord. [segOop <= endSeg] whileTrue: [(self oopHasAcceptableClass: segOop) ifFalse: [^0 "inconsistency"]. fieldPtr := segOop + BaseHeaderSize. "first field" lastPtr := segOop + (self lastPointerOf: segOop). "last field" "Go through all oops, remapping them..." [fieldPtr > lastPtr] whileFalse: ["Examine each pointer field" fieldOop := self longAt: fieldPtr. (self oopHasAcceptableClass: fieldOop) ifFalse: [^0 "inconsistency"]. fieldPtr := fieldPtr + BytesPerWord]. segOop := self objectAfter: segOop]. "Truncate the segment word array to size = BytesPerWord (vers stamp only)" extraSize := self extraHeaderBytes: segmentWordArray. hdrTypeBits := self headerType: segmentWordArray. extraSize = 8 ifTrue: [self longAt: segmentWordArray-extraSize put: BaseHeaderSize + BytesPerWord + hdrTypeBits] ifFalse: [header := self longAt: segmentWordArray. self longAt: segmentWordArray put: header - (header bitAnd: SizeMask) + BaseHeaderSize + BytesPerWord]. "and return the roots array which was first in the segment" DoAssertionChecks ifTrue: [self verifyCleanHeaders]. ^self oopFromChunk: segmentWordArray + BaseHeaderSize + BytesPerWord! Item was changed: ----- Method: NewObjectMemory>>maybeFillWithAllocationCheckFillerFrom:to: (in category 'allocation') ----- maybeFillWithAllocationCheckFillerFrom: start to: end + "Fill free memory with a bit pattern for checking if the last object has been overwritten." - "Fill free memory with a bit pattern for chekcing if the last object has been overwritten." <inline: true> + <var: 'start' type: #usqInt> + <var: 'end' type: #usqInt> + <var: 'i' type: #usqInt> AllocationCheckFiller ~= 0 ifTrue: [start to: end by: BytesPerWord do: [:i| self longAt: i put: (AllocationCheckFiller = 16rADD4E55 ifTrue: [i] ifFalse: [AllocationCheckFiller])]]! Item was changed: ----- Method: NewObjectMemory>>oopHasAcceptableClass: (in category 'image segment in/out') ----- oopHasAcceptableClass: signedOop "Similar to oopHasOkayClass:, except that it only returns true or false." | oopClass formatMask behaviorFormatBits oopFormatBits oop | <var: #oop type: #usqInt> <var: #oopClass type: #usqInt> (self isIntegerObject: signedOop) ifTrue: [^ true]. oop := self cCoerce: signedOop to: #usqInt. + (self addressCouldBeObj: oop) ifFalse: [^ false]. - oop < freeStart ifFalse: [^ false]. - ((oop \\ BytesPerWord) = 0) ifFalse: [^ false]. - (oop + (self sizeBitsOf: oop)) <= freeStart ifFalse: [^ false]. oopClass := self cCoerce: (self fetchClassOfNonInt: oop) to: #usqInt. + (self addressCouldBeObj: oopClass) ifFalse: [^ false]. - - (self isIntegerObject: oopClass) ifTrue: [^ false]. - (oopClass < freeStart) ifFalse: [^ false]. - ((oopClass \\ BytesPerWord) = 0) ifFalse: [^ false]. (oopClass + (self sizeBitsOf: oopClass)) <= freeStart ifFalse: [^ false]. + ((self isPointersNonInt: oopClass) and: [(self lengthOf: oopClass) >= 3]) ifFalse: [^ false]. + formatMask := (self isBytesNonInt: oop) ifTrue: [16rC00] "ignore extra bytes size bits" ifFalse: [16rF00]. behaviorFormatBits := (self formatOfClass: oopClass) bitAnd: formatMask. oopFormatBits := (self baseHeader: oop) bitAnd: formatMask. behaviorFormatBits = oopFormatBits ifFalse: [^ false]. ^ true! Item was changed: ----- Method: NewObjectMemory>>safeObjectAfter: (in category 'object enumeration') ----- safeObjectAfter: oop "Return the object or start of free space immediately following the given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only." | sz | + <asmLabel: false> (self isFreeObject: oop) ifTrue: [sz := self sizeOfFree: oop] ifFalse: [sz := self sizeBitsOf: oop]. ^oop + sz >= freeStart ifTrue: [freeStart] ifFalse: [self oopFromChunk: oop + sz]! Item was changed: ----- Method: ObjectMemory>>oopHasAcceptableClass: (in category 'image segment in/out') ----- oopHasAcceptableClass: signedOop "Similar to oopHasOkayClass:, except that it only returns true or false." | oopClass formatMask behaviorFormatBits oopFormatBits oop | <var: #oop type: #usqInt> <var: #oopClass type: #usqInt> (self isIntegerObject: signedOop) ifTrue: [^ true]. oop := self cCoerce: signedOop to: #usqInt. + (self addressCouldBeObj: oop) ifFalse: [^ false]. - oop < freeBlock ifFalse: [^ false]. - ((oop \\ BytesPerWord) = 0) ifFalse: [^ false]. - (oop + (self sizeBitsOf: oop)) < freeBlock ifFalse: [^ false]. oopClass := self cCoerce: (self fetchClassOfNonInt: oop) to: #usqInt. + (self addressCouldBeObj: oopClass) ifFalse: [^ false]. - - (self isIntegerObject: oopClass) ifTrue: [^ false]. - (oopClass < freeBlock) ifFalse: [^ false]. - ((oopClass \\ BytesPerWord) = 0) ifFalse: [^ false]. (oopClass + (self sizeBitsOf: oopClass)) < freeBlock ifFalse: [^ false]. + ((self isPointersNonInt: oopClass) and: [(self lengthOf: oopClass) >= 3]) ifFalse: [^ false]. - (self isBytesNonInt: oop) - ifTrue: [ formatMask := 16rC00 ] "ignore extra bytes size bits" - ifFalse: [ formatMask := 16rF00 ]. + formatMask := (self isBytesNonInt: oop) + ifTrue: [16rC00] "ignore extra bytes size bits" + ifFalse: [16rF00]. + behaviorFormatBits := (self formatOfClass: oopClass) bitAnd: formatMask. oopFormatBits := (self baseHeader: oop) bitAnd: formatMask. behaviorFormatBits = oopFormatBits ifFalse: [^ false]. ^ true! Item was changed: ----- Method: RiscOSVMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "set up a CCodeGenerator for this VMMaker - RiscOS uses the global struct and no local def of the structure because of the global register trickery" ^CCodeGeneratorGlobalStructure new initialize; - globalStructDefined: false; logger: logger; yourself! Item was changed: ----- Method: StackInterpreter>>floatValueOf: (in category 'utilities') ----- floatValueOf: oop "Answer the C double precision floating point value of the argument, or fail if it is not a Float, and answer 0. Note: May be called by translated primitive code." | isFloat result | + <asmLabel: false> <returnTypeC: #double> <var: #result type: #double> isFloat := self isInstanceOfClassFloat: oop. isFloat ifTrue: [self cCode: '' inSmalltalk: [result := Float new: 2]. objectMemory fetchFloatAt: oop + BaseHeaderSize into: result. ^result]. self primitiveFail. ^0.0! Item was changed: ----- Method: StackInterpreter>>interpreterAllocationReserveBytes (in category 'stack pages') ----- interpreterAllocationReserveBytes "At a rough approximation we may need to allocate up to a couple of page's worth of contexts when switching stack pages, assigning to senders, etc. But the snapshot primitive voids all stack pages. So a safe margin is the size of a large context times the maximum number of frames per page times the number of pages." | maxUsedBytesPerPage maxFramesPerPage | maxUsedBytesPerPage := self stackPageFrameBytes + self stackLimitOffset. + maxFramesPerPage := maxUsedBytesPerPage / BytesPerWord // FrameSlots. - maxFramesPerPage := maxUsedBytesPerPage / BytesPerWord // MFrameSlots. ^maxFramesPerPage * LargeContextSize * numStackPages! Item was added: + ----- Method: StackInterpreterSimulator>>ioLocalSecondsOffset (in category 'I/O primitives support') ----- + ioLocalSecondsOffset + ^DateAndTime localOffset asSeconds! Item was added: + ----- Method: TMethod>>clearReferencesToGlobalStruct (in category 'accessing') ----- + clearReferencesToGlobalStruct + globalStructureBuildMethodHasFoo := false! Item was changed: ----- Method: TMethod>>emitCLocalsOn:generator: (in category 'C code generation') ----- emitCLocalsOn: aStream generator: aCodeGen "Emit a C function header for this method onto the given stream." | volatileVariables | volatileVariables := properties includesKey: #volatile. + self refersToGlobalStruct ifTrue: - self globalStructureBuildMethodHasFoo > 1 ifTrue: [aStream next: 3 put: Character space; "there's already an opening ${ on this line; see sender" nextPutAll: (volatileVariables ifTrue: ['DECL_MAYBE_VOLATILE_SQ_GLOBAL_STRUCT'] ifFalse: ['DECL_MAYBE_SQ_GLOBAL_STRUCT'])]. aStream cr. locals isEmpty ifFalse: [(aCodeGen sortStrings: locals) do: [ :var | aStream next: 4 put: Character space. volatileVariables ifTrue: [aStream nextPutAll: #volatile; space]. aStream nextPutAll: (self declarationAt: var); nextPut: $;; cr]. aStream cr]! Item was removed: - ----- Method: TMethod>>globalStructureBuildMethodHasFoo (in category 'accessing') ----- - globalStructureBuildMethodHasFoo - ^globalStructureBuildMethodHasFoo! Item was added: + ----- Method: TMethod>>referencesGlobalStruct (in category 'accessing') ----- + referencesGlobalStruct + globalStructureBuildMethodHasFoo := true! Item was removed: - ----- Method: TMethod>>referencesGlobalStructIncrementBy: (in category 'accessing') ----- - referencesGlobalStructIncrementBy: value - globalStructureBuildMethodHasFoo := globalStructureBuildMethodHasFoo + value.! Item was removed: - ----- Method: TMethod>>referencesGlobalStructMakeZero (in category 'accessing') ----- - referencesGlobalStructMakeZero - globalStructureBuildMethodHasFoo := 0! Item was added: + ----- Method: TMethod>>refersToGlobalStruct (in category 'accessing') ----- + refersToGlobalStruct + ^globalStructureBuildMethodHasFoo! Item was changed: ----- Method: TMethod>>setSelector:definingClass:args:locals:block:primitive:properties:comment: (in category 'initialization') ----- setSelector: sel definingClass: class args: argList locals: localList block: aBlockNode primitive: aNumber properties: methodProperties comment: aComment "Initialize this method using the given information." selector := sel. definingClass := class. returnType := #sqInt. "assume return type is long for now" args := argList asOrderedCollection collect: [:arg | arg key]. locals := (localList collect: [:arg | arg key]) asSet. declarations := Dictionary new. self addTypeForSelf. primitive := aNumber. properties := methodProperties. comment := aComment. parseTree := aBlockNode. "hack; allows nodes to find their parent, etc" parseTree := aBlockNode asTranslatorNodeIn: self. labels := OrderedCollection new. complete := false. "set to true when all possible inlining has been done" export := self extractExportDirective. static := self extractStaticDirective. canAsmLabel := self extractLabelDirective. self extractSharedCase. self removeFinalSelfReturn. "must preceed recordDeclarations because this may set returnType" self recordDeclarations. + globalStructureBuildMethodHasFoo := false! - globalStructureBuildMethodHasFoo := 0! Item was changed: ----- Method: UnixVMMaker>>createCodeGenerator (in category 'initialisation') ----- createCodeGenerator ^CCodeGeneratorGlobalStructure new initialize; - globalStructDefined: true; logger: logger; yourself! Item was changed: ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- generateNewspeakCogVM ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit"Cogit chooseCogitClass" with: #( NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: 'oscogvm/nscogsrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin ThreadedIA32FFIPlugin + UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! - UUIDPlugin UnixOSProcessPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakInterpreterVM (in category 'configurations') ----- generateNewspeakInterpreterVM ^VMMaker generate: NewspeakInterpreter to: (FileDirectory default pathFromURI: 'oscogvm/nssrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin + UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! - UUIDPlugin UnixOSProcessPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateNewspeakStackVM (in category 'configurations') ----- generateNewspeakStackVM ^VMMaker generate: StackInterpreter with: #(NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: 'oscogvm/nsstacksrc') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin InflatePlugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SurfacePlugin SqueakSSLPlugin ThreadedIA32FFIPlugin + UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! - UUIDPlugin UnixOSProcessPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)! Item was changed: ----- Method: VMMaker class>>generateSqueakCogVM (in category 'configurations') ----- generateSqueakCogVM ^VMMaker generate: (Smalltalk at: ([:choices| choices at: (UIManager default chooseFrom: choices) ifAbsent: [^self]] value: #(CoInterpreter CoInterpreterMT))) and: StackToRegisterMappingCogit with: #( MULTIPLEBYTECODESETS false NewspeakVM false) to: (FileDirectory default pathFromURI: 'oscogvm/src') platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') including:#( ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin CroquetPlugin DSAPlugin DeflatePlugin DropPlugin FT2Plugin FFTPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin ThreadedIA32FFIPlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin + Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin)! - Win32OSProcessPlugin VMProfileMacSupportPlugin)! Item was added: + InterpreterPlugin subclass: #VMProfileLinuxSupportPlugin + instanceVariableNames: 'numModules primErr' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Plugins'! + + !VMProfileLinuxSupportPlugin commentStamp: 'eem 6/5/2013 12:10' prior: 0! + This class provides support for the VMProfiler on Linux (at least linux versions that provide dl_iterate_phdr). This support is for reading symbols from the executable. We can use the OS's nm command to list symbols in the VM executable and loaded libraries. To do this we need to know what libraries are loaded, not simply which libraries are linked against, since some libraries are loaded dynamically, and for each loaded library what the vm address relocation, if any, is for the loaded library. + + Further, we need to know the actual addresses in memory of symbols in the program and in memory. Since the OS may be using address randomization we cannot assume that the addresses answered by nm for symbols in the program and/or libraries match the addresses of the same symbols in memory. Instead we must correlate. dlsym can be used to look up symbols in loaded dynamic load libraries, but it does _not_ answer the addresses of symbols in the main program. Back in the day nlist could be used to do this, but it is no more. Instead this module contains a reference to interpret and answers its address ia a primitive (alas this means the plugin must be internal, but it's extremely small, and the VM links against libdl.so anyway). Any address space shift will therefore be the difference between nm's output for interpret and the primitive's value. We can similarly compute the address shift for libraries by using dlsym to lookup a symbol in a library and comparing it to nm's output for the library. + + + The primitive primitiveExecutableModules returns the names of the executable and the loaded libraries.! Item was added: + ----- Method: VMProfileLinuxSupportPlugin class>>declareHeaderFilesIn: (in category 'translation') ----- + declareHeaderFilesIn: cg + + cg + addHeaderFile: '<limits.h>'; + addHeaderFile: '#ifndef _GNU_SOURCE\# define _GNU_SOURCE\#endif\#include <link.h>' withCRs! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>count:num:modules: (in category 'iteration callbacks') ----- + count: info num: size modules: ignored + <var: #info type: #'struct dl_phdr_info *'> + <var: #size type: #'size_t'> + <var: #ignored type: #'void *'> + numModules := numModules + 1. + ^0! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>primitiveDLSymInLibrary (in category 'primitives') ----- + primitiveDLSymInLibrary + "Answer the address of the symbol whose name is the first argument + in the library whose name is the second argument, or nil if none." + | nameObj symName libName lib sz addr ok | + <export: true> + <var: #symName type: #'char *'> + <var: #libName type: #'char *'> + <var: #lib type: #'void *'> + <var: #addr type: #'void *'> + nameObj := interpreterProxy stackValue: 0. + (interpreterProxy isBytes: nameObj) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + sz := interpreterProxy byteSizeOf: nameObj. + libName := self malloc: sz+1. + self st: libName rn: (interpreterProxy firstIndexableField: nameObj) cpy: sz. + libName at: sz put: 0. + nameObj := interpreterProxy stackValue: 1. + (interpreterProxy isBytes: nameObj) ifFalse: + [self free: libName. + ^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + sz := interpreterProxy byteSizeOf: nameObj. + symName := self malloc: sz+1. + self st: symName rn: (interpreterProxy firstIndexableField: nameObj) cpy: sz. + symName at: sz put: 0. + lib := self dl: libName open: (#'RTLD_LAZY' bitOr: #'RTLD_NODELETE'). + lib ifNil: + [self free: libName; free: symName. + ^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + self dlerror. "clear dlerror" + addr := self dl: lib sym: symName. + ok := self dlerror isNil. + self free: symName. + self free: libName. + self dlclose: lib. + ok ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrNotFound]. + ^interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: addr asUnsignedLong)! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>primitiveExecutableModules (in category 'primitives') ----- + primitiveExecutableModules + "Answer an Array of pairs of strings for executable modules (the VM executable and loaded libraries). + The first element in each pair is the filename of the module. The second element is either nil or + the symlink's target, if the filename is a symlink." + <export: true> + <var: #name type: 'const char *'> + <var: #nameObjData type: #'char *'> + | resultObj | + numModules := 0. + self cCode: 'dl_iterate_phdr(countnummodules,0)' inSmalltalk: [0]. + resultObj := interpreterProxy + instantiateClass: interpreterProxy classArray + indexableSize: numModules - 1 * 2. "skip the fake linux-gate.so.1" + resultObj = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. + interpreterProxy pushRemappableOop: resultObj. + primErr := numModules := 0. + self cCode: 'dl_iterate_phdr(reapmodulesymlinks,0)' inSmalltalk: [0]. + resultObj := interpreterProxy popRemappableOop. + primErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: primErr]. + ^interpreterProxy methodReturnValue: resultObj! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>primitiveInterpretAddress (in category 'primitives') ----- + primitiveInterpretAddress + "Answer the address of the interpret routine." + <export: true> + | interpret | + <var: #interpret declareC: 'extern void interpret()'> + self touch: interpret. + ^interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: interpret asUnsignedLong)! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>reap:module:names: (in category 'iteration callbacks') ----- + reap: info module: size names: ignored + | elfModuleName len moduleNameObj GetAttributeString | + <var: #info type: #'struct dl_phdr_info *'> + <var: 'elfModuleName' type: #'const char *'> + <var: #GetAttributeString declareC: 'extern char *GetAttributeString(sqInt)'> + <var: #size type: #'size_t'> + <var: #ignored type: #'void *'> + self touch: GetAttributeString. + elfModuleName := self cCode: 'numModules ? info->dlpi_name : GetAttributeString(0)'. + (elfModuleName isNil + or: [(len := self strlen: elfModuleName) = 0]) ifTrue: + [^0]. "skip the fake linux-gate.so.1" + moduleNameObj := interpreterProxy + instantiateClass: interpreterProxy classString + indexableSize: len. + moduleNameObj = 0 ifTrue: + [primErr := PrimErrNoMemory. + ^1]. "stop iteration" + self st: (interpreterProxy arrayValueOf: moduleNameObj) + rn: elfModuleName + cpy: len. "(char *)strncpy()" + interpreterProxy + storePointer: numModules + ofObject: interpreterProxy topRemappableOop + withValue: moduleNameObj. + numModules := numModules + 1. + ^0! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>reap:module:symlinks: (in category 'iteration callbacks') ----- + reap: info module: size symlinks: ignored + "like reap:module:names:, but follows symlinks" + | elfModuleName len moduleNameObj GetAttributeString symLinkBuf | + <var: #info type: #'struct dl_phdr_info *'> + <var: 'elfModuleName' type: #'const char *'> + <var: #GetAttributeString declareC: 'extern char *GetAttributeString(sqInt)'> + <var: #symLinkBuf declareC: 'char symLinkBuf[PATH_MAX]'> + <var: #size type: #'size_t'> + <var: #ignored type: #'void *'> + self touch: GetAttributeString. + elfModuleName := self cCode: 'numModules ? info->dlpi_name : GetAttributeString(0)'. + (elfModuleName isNil + or: [(len := self strlen: elfModuleName) = 0]) ifTrue: + [^0]. "skip the fake linux-gate.so.1" + moduleNameObj := interpreterProxy + instantiateClass: interpreterProxy classString + indexableSize: len. + moduleNameObj = 0 ifTrue: + [primErr := PrimErrNoMemory. + ^1]. "stop iteration" + self st: (interpreterProxy arrayValueOf: moduleNameObj) + rn: elfModuleName + cpy: len. "(char *)strncpy()" + interpreterProxy + storePointer: numModules + ofObject: interpreterProxy topRemappableOop + withValue: moduleNameObj. + "now dereference the symlink, if it exists" + self str: symLinkBuf cpy: elfModuleName. + (len := self read: elfModuleName li: symLinkBuf nk: #'PATH_MAX') > 0 + ifTrue: + [moduleNameObj := interpreterProxy + instantiateClass: interpreterProxy classString + indexableSize: len. + moduleNameObj = 0 ifTrue: + [primErr := PrimErrNoMemory. + ^1]. "stop iteration" + self st: (interpreterProxy arrayValueOf: moduleNameObj) + rn: symLinkBuf + cpy: len. "(char *)strncpy()" + interpreterProxy + storePointer: numModules + 1 + ofObject: interpreterProxy topRemappableOop + withValue: moduleNameObj] + ifFalse: + [interpreterProxy + storePointer: numModules + 1 + ofObject: interpreterProxy topRemappableOop + withValue: interpreterProxy nilObject]. + numModules := numModules + 2. + ^0! Item was changed: ----- Method: Win32VMMaker>>createCodeGenerator (in category 'initialize') ----- createCodeGenerator "Set up a CCodeGenerator for this VMMaker - On Windows we use the gcc 2.95.x compiler which does better without the global struct." ^CCodeGeneratorGlobalStructure new initialize; - globalStructDefined: true; structDefDefine: '0'; "structDefDefine: 'defined(PPC) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__)';" logger: logger; yourself!

1 0

[commit][2740] Add the linux policy change dance to sqUnixVMProfile.c ( cf sqUnixHeartbeat.c).
by commits＠squeakvm.org 11 Jun '13

11 Jun '13

Revision: 2740 Author: eliot Date: 2013-06-11 13:12:31 -0700 (Tue, 11 Jun 2013) Log Message: ----------- Add the linux policy change dance to sqUnixVMProfile.c (cf sqUnixHeartbeat.c). Fix a bail_out typo. Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixVMProfile.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jun 10 18:15:11 PDT 2013 + Tue Jun 11 13:11:09 PDT 2013 Modified: branches/Cog/platforms/unix/vm/sqUnixVMProfile.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2013-06-11 01:16:01 UTC (rev 2739) +++ branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2013-06-11 20:12:31 UTC (rev 2740) @@ -47,8 +47,8 @@ #if __linux__ # if !defined(__USE_GNU) # define UNDEF__USE_GNU 1 +# define __USE_GNU /* to get register defines in sys/ucontext.h */ # endif -# define __USE_GNU /* to get register defines in sys/ucontext.h */ #endif #include <sys/ucontext.h> #if __linux__ && UNDEF__USE_GNU @@ -111,7 +111,7 @@ if ((er = pthread_setschedparam(pthread_self(), profThreadPolicy, &profThreadPriority))) - bail_out(er,"pthread_getschedparam failed"); + bail_out(er,"pthread_setschedparam failed"); profileState = quiescent; while (profileState != dead) { @@ -229,6 +229,11 @@ * want to profile. */ profThreadPriority.sched_priority += 2; + /* If the priority isn't appropriate for the policy (typically SCHED_OTHER) + * then change policy. + */ + if (sched_get_priority_max(profThreadPolicy) < profThreadPriority.sched_priority) + profThreadPolicy = SCHED_FIFO; profileState = nascent; if ((er= pthread_create(&careLess, (const pthread_attr_t *)0, @@ -340,6 +345,11 @@ * want to profile. */ profThreadPriority.sched_priority += 2; + /* If the priority isn't appropriate for the policy (typically SCHED_OTHER) + * then change policy. + */ + if (sched_get_priority_max(profThreadPolicy) < profThreadPriority.sched_priority) + profThreadPolicy = SCHED_FIFO; profileState = nascent; if ((er= pthread_create(&careLess, (const pthread_attr_t *)0,

1 0

[commit][2739] Cog VM source as per VMMaker.oscog-eem.298.
by commits＠squeakvm.org 11 Jun '13

11 Jun '13

Revision: 2739 Author: eliot Date: 2013-06-10 18:16:01 -0700 (Mon, 10 Jun 2013) Log Message: ----------- Cog VM source as per VMMaker.oscog-eem.298. Change the VMProfileLinuxSupportPlugin to follow symlinks, answering pairs of module name, dereferenced symlink or nil. Modified Paths: -------------- branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jun 10 13:58:47 PDT 2013 + Mon Jun 10 18:15:11 PDT 2013 Modified: branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-10 20:59:49 UTC (rev 2738) +++ branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-11 01:16:01 UTC (rev 2739) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 + VMPluginCodeGenerator VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 uuid: da5c90a8-14fa-4f7a-a58f-40f16337392c " __DATE__ ; @@ -12,6 +12,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#include <limits.h> #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif @@ -58,6 +59,7 @@ EXPORT(sqInt) primitiveExecutableModules(void); EXPORT(sqInt) primitiveInterpretAddress(void); static sqInt reapmodulenames(struct dl_phdr_info *info, size_t size, void *ignored); +static sqInt reapmodulesymlinks(struct dl_phdr_info *info, size_t size, void *ignored); EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); @@ -72,6 +74,7 @@ static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); static sqInt (*isBytes)(sqInt oop); static sqInt (*methodReturnValue)(sqInt oop); +static sqInt (*nilObject)(void); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); static sqInt (*primitiveFailFor)(sqInt reasonCode); @@ -88,6 +91,7 @@ extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); extern sqInt isBytes(sqInt oop); extern sqInt methodReturnValue(sqInt oop); +extern sqInt nilObject(void); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); extern sqInt primitiveFailFor(sqInt reasonCode); @@ -101,9 +105,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.298 (e)" #endif ; static sqInt numModules; @@ -203,9 +207,11 @@ } -/* Answer an Array of strings for executable modules (the VM executable and - loaded libraries). - */ +/* Answer an Array of pairs of strings for executable modules (the VM + executable and loaded libraries). + The first element in each pair is the filename of the module. The second + element is either nil or + the symlink's target, if the filename is a symlink. */ EXPORT(sqInt) primitiveExecutableModules(void) @@ -217,13 +223,13 @@ /* skip the fake linux-gate.so.1 */ - resultObj = instantiateClassindexableSize(classArray(), numModules - 1); + resultObj = instantiateClassindexableSize(classArray(), (numModules - 1) * 2); if (resultObj == 0) { return primitiveFailFor(PrimErrNoMemory); } pushRemappableOop(resultObj); primErr = (numModules = 0); - dl_iterate_phdr(reapmodulenames,0); + dl_iterate_phdr(reapmodulesymlinks,0); resultObj = popRemappableOop(); if (primErr != 0) { return primitiveFailFor(primErr); @@ -269,6 +275,48 @@ } +/* like reap:module:names:, but follows symlinks */ + +static sqInt +reapmodulesymlinks(struct dl_phdr_info *info, size_t size, void *ignored) +{ + const char *elfModuleName; + extern char *GetAttributeString(sqInt); + sqInt len; + sqInt moduleNameObj; + char symLinkBuf[PATH_MAX]; + + ; + elfModuleName = numModules ? info->dlpi_name : GetAttributeString(0); + if ((elfModuleName == null) + || (((len = strlen(elfModuleName))) == 0)) { + return 0; + } + moduleNameObj = instantiateClassindexableSize(classString(), len); + if (moduleNameObj == 0) { + primErr = PrimErrNoMemory; + return 1; + } + strncpy(arrayValueOf(moduleNameObj), elfModuleName, len); + storePointerofObjectwithValue(numModules, topRemappableOop(), moduleNameObj); + strcpy(symLinkBuf, elfModuleName); + if (((len = readlink(elfModuleName, symLinkBuf, PATH_MAX))) > 0) { + moduleNameObj = instantiateClassindexableSize(classString(), len); + if (moduleNameObj == 0) { + primErr = PrimErrNoMemory; + return 1; + } + strncpy(arrayValueOf(moduleNameObj), symLinkBuf, len); + storePointerofObjectwithValue(numModules + 1, topRemappableOop(), moduleNameObj); + } + else { + storePointerofObjectwithValue(numModules + 1, topRemappableOop(), nilObject()); + } + numModules += 2; + return 0; +} + + /* Note: This is coded so that it can be run in Squeak. */ EXPORT(sqInt) @@ -290,6 +338,7 @@ instantiateClassindexableSize = interpreterProxy->instantiateClassindexableSize; isBytes = interpreterProxy->isBytes; methodReturnValue = interpreterProxy->methodReturnValue; + nilObject = interpreterProxy->nilObject; popRemappableOop = interpreterProxy->popRemappableOop; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; primitiveFailFor = interpreterProxy->primitiveFailFor;

1 0

VM Maker: VMMaker.oscog-eem.298.mcz
by commits＠source.squeak.org 11 Jun '13

11 Jun '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.298.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.298 Author: eem Time: 10 June 2013, 6:12:31.011 pm UUID: da5c90a8-14fa-4f7a-a58f-40f16337392c Ancestors: VMMaker.oscog-eem.297 Change the VMProfileLinuxSupportPlugin to follow symlinks, answering pairs of module name, dereferenced symlink or nil. =============== Diff against VMMaker.oscog-eem.297 =============== Item was changed: ----- Method: VMProfileLinuxSupportPlugin class>>declareHeaderFilesIn: (in category 'translation') ----- declareHeaderFilesIn: cg + cg + addHeaderFile: '<limits.h>'; + addHeaderFile: '#ifndef _GNU_SOURCE\# define _GNU_SOURCE\#endif\#include <link.h>' withCRs! - cg addHeaderFile: '#ifndef _GNU_SOURCE\# define _GNU_SOURCE\#endif\#include <link.h>' withCRs! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>primitiveExecutableModules (in category 'primitives') ----- primitiveExecutableModules + "Answer an Array of pairs of strings for executable modules (the VM executable and loaded libraries). + The first element in each pair is the filename of the module. The second element is either nil or + the symlink's target, if the filename is a symlink." - "Answer an Array of strings for executable modules (the VM executable and loaded libraries)." <export: true> <var: #name type: 'const char *'> <var: #nameObjData type: #'char *'> | resultObj | numModules := 0. self cCode: 'dl_iterate_phdr(countnummodules,0)' inSmalltalk: [0]. resultObj := interpreterProxy instantiateClass: interpreterProxy classArray + indexableSize: numModules - 1 * 2. "skip the fake linux-gate.so.1" - indexableSize: numModules - 1. "skip the fake linux-gate.so.1" resultObj = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: resultObj. primErr := numModules := 0. + self cCode: 'dl_iterate_phdr(reapmodulesymlinks,0)' inSmalltalk: [0]. - self cCode: 'dl_iterate_phdr(reapmodulenames,0)' inSmalltalk: [0]. resultObj := interpreterProxy popRemappableOop. primErr ~= 0 ifTrue: [^interpreterProxy primitiveFailFor: primErr]. ^interpreterProxy methodReturnValue: resultObj! Item was added: + ----- Method: VMProfileLinuxSupportPlugin>>reap:module:symlinks: (in category 'iteration callbacks') ----- + reap: info module: size symlinks: ignored + "like reap:module:names:, but follows symlinks" + | elfModuleName len moduleNameObj GetAttributeString symLinkBuf | + <var: #info type: #'struct dl_phdr_info *'> + <var: 'elfModuleName' type: #'const char *'> + <var: #GetAttributeString declareC: 'extern char *GetAttributeString(sqInt)'> + <var: #symLinkBuf declareC: 'char symLinkBuf[PATH_MAX]'> + <var: #size type: #'size_t'> + <var: #ignored type: #'void *'> + self touch: GetAttributeString. + elfModuleName := self cCode: 'numModules ? info->dlpi_name : GetAttributeString(0)'. + (elfModuleName isNil + or: [(len := self strlen: elfModuleName) = 0]) ifTrue: + [^0]. "skip the fake linux-gate.so.1" + moduleNameObj := interpreterProxy + instantiateClass: interpreterProxy classString + indexableSize: len. + moduleNameObj = 0 ifTrue: + [primErr := PrimErrNoMemory. + ^1]. "stop iteration" + self st: (interpreterProxy arrayValueOf: moduleNameObj) + rn: elfModuleName + cpy: len. "(char *)strncpy()" + interpreterProxy + storePointer: numModules + ofObject: interpreterProxy topRemappableOop + withValue: moduleNameObj. + "now dereference the symlink, if it exists" + self str: symLinkBuf cpy: elfModuleName. + (len := self read: elfModuleName li: symLinkBuf nk: #'PATH_MAX') > 0 + ifTrue: + [moduleNameObj := interpreterProxy + instantiateClass: interpreterProxy classString + indexableSize: len. + moduleNameObj = 0 ifTrue: + [primErr := PrimErrNoMemory. + ^1]. "stop iteration" + self st: (interpreterProxy arrayValueOf: moduleNameObj) + rn: symLinkBuf + cpy: len. "(char *)strncpy()" + interpreterProxy + storePointer: numModules + 1 + ofObject: interpreterProxy topRemappableOop + withValue: moduleNameObj] + ifFalse: + [interpreterProxy + storePointer: numModules + 1 + ofObject: interpreterProxy topRemappableOop + withValue: interpreterProxy nilObject]. + numModules := numModules + 2. + ^0!

1 0

[commit][2738] Cog VM source as per VMMaker.oscog-eem.297.
by commits＠squeakvm.org 10 Jun '13

10 Jun '13

Revision: 2738 Author: eliot Date: 2013-06-10 13:59:49 -0700 (Mon, 10 Jun 2013) Log Message: ----------- Cog VM source as per VMMaker.oscog-eem.297. Fix 3 (!!) bugs in primitiveDLSymInLibrary. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-08 15:54:24 UTC (rev 2737) +++ branches/Cog/nscogsrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-10 20:59:49 UTC (rev 2738) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 + VMPluginCodeGenerator VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 " __DATE__ ; @@ -74,7 +74,6 @@ static sqInt (*methodReturnValue)(sqInt oop); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); -static unsigned long (*positiveMachineIntegerValueOf)(sqInt oop); static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*stackValue)(sqInt offset); @@ -91,7 +90,6 @@ extern sqInt methodReturnValue(sqInt oop); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); -extern unsigned long positiveMachineIntegerValueOf(sqInt oop); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt pushRemappableOop(sqInt oop); extern sqInt stackValue(sqInt offset); @@ -103,9 +101,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (e)" #endif ; static sqInt numModules; @@ -176,6 +174,7 @@ sz = byteSizeOf(nameObj); libName = malloc(sz + 1); strncpy(libName, firstIndexableField(nameObj), sz); + libName[sz] = 0; nameObj = stackValue(1); if (!(isBytes(nameObj))) { free(libName); @@ -184,7 +183,8 @@ sz = byteSizeOf(nameObj); symName = malloc(sz + 1); strncpy(symName, firstIndexableField(nameObj), sz); - lib = dlopen(libName, RTLD_LAZY || RTLD_NODELETE); + symName[sz] = 0; + lib = dlopen(libName, RTLD_LAZY | RTLD_NODELETE); if (!(lib)) { free(libName); free(symName); @@ -199,7 +199,7 @@ if (!ok) { return primitiveFailFor(PrimErrNotFound); } - return methodReturnValue(positiveMachineIntegerValueOf(((unsigned long)addr))); + return methodReturnValue(positive32BitIntegerFor(((unsigned long)addr))); } @@ -292,7 +292,6 @@ methodReturnValue = interpreterProxy->methodReturnValue; popRemappableOop = interpreterProxy->popRemappableOop; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; - positiveMachineIntegerValueOf = interpreterProxy->positiveMachineIntegerValueOf; primitiveFailFor = interpreterProxy->primitiveFailFor; pushRemappableOop = interpreterProxy->pushRemappableOop; stackValue = interpreterProxy->stackValue; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Jun 6 15:16:42 PDT 2013 + Mon Jun 10 13:58:47 PDT 2013 Modified: branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c =================================================================== --- branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-08 15:54:24 UTC (rev 2737) +++ branches/Cog/src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c 2013-06-10 20:59:49 UTC (rev 2738) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 + VMPluginCodeGenerator VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 from - VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 + VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 */ -static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 uuid: 9f0fd793-5a49-476d-9a76-c84180415334 " __DATE__ ; +static char __buildInfo[] = "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 uuid: cb5c5783-9e64-4e06-ac22-1303b40171e9 " __DATE__ ; @@ -74,7 +74,6 @@ static sqInt (*methodReturnValue)(sqInt oop); static sqInt (*popRemappableOop)(void); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); -static unsigned long (*positiveMachineIntegerValueOf)(sqInt oop); static sqInt (*primitiveFailFor)(sqInt reasonCode); static sqInt (*pushRemappableOop)(sqInt oop); static sqInt (*stackValue)(sqInt offset); @@ -91,7 +90,6 @@ extern sqInt methodReturnValue(sqInt oop); extern sqInt popRemappableOop(void); extern sqInt positive32BitIntegerFor(sqInt integerValue); -extern unsigned long positiveMachineIntegerValueOf(sqInt oop); extern sqInt primitiveFailFor(sqInt reasonCode); extern sqInt pushRemappableOop(sqInt oop); extern sqInt stackValue(sqInt offset); @@ -103,9 +101,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 (i)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (i)" #else - "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.294 (e)" + "VMProfileLinuxSupportPlugin VMMaker.oscog-eem.297 (e)" #endif ; static sqInt numModules; @@ -176,6 +174,7 @@ sz = byteSizeOf(nameObj); libName = malloc(sz + 1); strncpy(libName, firstIndexableField(nameObj), sz); + libName[sz] = 0; nameObj = stackValue(1); if (!(isBytes(nameObj))) { free(libName); @@ -184,7 +183,8 @@ sz = byteSizeOf(nameObj); symName = malloc(sz + 1); strncpy(symName, firstIndexableField(nameObj), sz); - lib = dlopen(libName, RTLD_LAZY || RTLD_NODELETE); + symName[sz] = 0; + lib = dlopen(libName, RTLD_LAZY | RTLD_NODELETE); if (!(lib)) { free(libName); free(symName); @@ -199,7 +199,7 @@ if (!ok) { return primitiveFailFor(PrimErrNotFound); } - return methodReturnValue(positiveMachineIntegerValueOf(((unsigned long)addr))); + return methodReturnValue(positive32BitIntegerFor(((unsigned long)addr))); } @@ -292,7 +292,6 @@ methodReturnValue = interpreterProxy->methodReturnValue; popRemappableOop = interpreterProxy->popRemappableOop; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; - positiveMachineIntegerValueOf = interpreterProxy->positiveMachineIntegerValueOf; primitiveFailFor = interpreterProxy->primitiveFailFor; pushRemappableOop = interpreterProxy->pushRemappableOop; stackValue = interpreterProxy->stackValue;

1 0

VM Maker: VMMaker.oscog-eem.297.mcz
by commits＠source.squeak.org 10 Jun '13

10 Jun '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.297.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.297 Author: eem Time: 10 June 2013, 1:57:07.909 pm UUID: cb5c5783-9e64-4e06-ac22-1303b40171e9 Ancestors: VMMaker.oscog-eem.296 Fix 3 (!!) bugs in primitiveDLSymInLibrary =============== Diff against VMMaker.oscog-eem.296 =============== Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>primitiveDLSymInLibrary (in category 'primitives') ----- primitiveDLSymInLibrary "Answer the address of the symbol whose name is the first argument in the library whose name is the second argument, or nil if none." | nameObj symName libName lib sz addr ok | <export: true> <var: #symName type: #'char *'> <var: #libName type: #'char *'> <var: #lib type: #'void *'> <var: #addr type: #'void *'> nameObj := interpreterProxy stackValue: 0. (interpreterProxy isBytes: nameObj) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. sz := interpreterProxy byteSizeOf: nameObj. libName := self malloc: sz+1. self st: libName rn: (interpreterProxy firstIndexableField: nameObj) cpy: sz. + libName at: sz put: 0. nameObj := interpreterProxy stackValue: 1. (interpreterProxy isBytes: nameObj) ifFalse: [self free: libName. ^interpreterProxy primitiveFailFor: PrimErrBadArgument]. sz := interpreterProxy byteSizeOf: nameObj. symName := self malloc: sz+1. self st: symName rn: (interpreterProxy firstIndexableField: nameObj) cpy: sz. + symName at: sz put: 0. + lib := self dl: libName open: (#'RTLD_LAZY' bitOr: #'RTLD_NODELETE'). - lib := self dl: libName open: #'RTLD_LAZY' | #'RTLD_NODELETE'. lib ifNil: [self free: libName; free: symName. ^interpreterProxy primitiveFailFor: PrimErrInappropriate]. self dlerror. "clear dlerror" addr := self dl: lib sym: symName. ok := self dlerror isNil. self free: symName. self free: libName. self dlclose: lib. ok ifFalse: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. + ^interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: addr asUnsignedLong)! - ^interpreterProxy methodReturnValue: (interpreterProxy positiveMachineIntegerValueOf: addr asUnsignedLong)!

1 0

Re: [Pharo-fuel] [Pharo-dev] Corrupt BlockClosure
by Max Leske 10 Jun '13

10 Jun '13

I can now reprocuce corrupt sessions. The trick is to debug DFSession>>numberOfMethodCalls: 1. start new session 2. debug "DFSession uniqueInstance printString" 3. step into #numberOfMehthodCalls 4. proceed 5. stop the session 5. right click on the new session in the session browser and click "Export session" 6. boom! The reason is of course, that now the compiled method of #numberOfMethodCalls is referenced by the session and will be serialized by Fuel and when Fuel gets to the corrupt BlockClosure, serialization fails. So the real question still is: how did that BlockClosure obtain a wrong start PC? What I find particularly interesting, is that even changing the method does not fix the BlockClosure. I added the line "Transcript show: 'foo'." before the block (so the block should get a new start PC). Then running the procedure detailed above still produced an open debugger. To illustrate that the block did indeed not get fixed I ran "BlockClosure allInstances select: [ :e | e startpc = 59 ]", with 59 being the new startPC ("55 <8F 01 00 03> closureNumCopied: 0 numArgs: 1 bytes 59 to 61"). The result does not include the block. Any ideas? Max On 24.05.2013, at 08:10, roberto.minelli(a)usi.ch wrote: > Hi, > > Thanks all of you for interest ;) > > On May 24, 2013, at 7:15 AM, Max Leske <maxleske(a)gmail.com> > wrote: > >> I played around with reverting the method and serializing but that doesn't change anything (the existing BlockClosure is obviously not modified). >> Then I thought that maybe the method was changed during a running DFSession but still couldn't reproduce. > > Me neither!! > >> >> @Roberto >> Can you tell us anything about what you did befor / during / after running your session? > > Nope. Unfortunately I've a couple of "broken sessions" I cannot serialize because of that bug.. But all of them refers sooner or later to the DFSession>>#numberOfMethodCalls method. Dunno why. > >> @Roberto >> Is it possible to reproduce the stack with a new session? Or did this only happen once? > > I have no clue how to reproduce, but it did not happen only once. As I said, there are 3/4 sessions I couldn't export due to this SubscriptOutOfBounds. > > Cheers, > Roby > > >> >> >> On 24.05.2013, at 06:44, Max Leske <maxleske(a)gmail.com> wrote: >> >>> >>> On 23.05.2013, at 22:58, Camille Teruel <camille.teruel(a)gmail.com> wrote: >>> >>>> Hi, >>>> >>>> This is indeed strange, the BlockClosure has an incorrect startpc (31 instead of 43). You can fix it with: >>>> theBlock instVar: 2 put: 43. >>>> The wrong startpc corresponds to the beginning of the block in the previous version of the method (DFSession>>#numberOfMethodCalls), but I don't know why. >>> >>> Would it help to recompile the method? >>> >>>> I don't know fuel enough but could it be because the method of the block changed between serialization and materialization? >>> >>> No, there was never a materialization of that session. >>> >>>> >>>> Camille >>>> >>>> On 23 mai 2013, at 21:02, Max Leske wrote: >>>> >>>>> Hi Marcus >>>>> >>>>> Roberto sent this mail to the Fuel-dev list. When we looked at the problem we noticed that serialization fails because of a corrupt BlockClosure. Since that's not really our territorry Mariano suggested to forward this to you. >>>>> >>>>> The image with the corrupt BlockClosure is available here: https://dl.dropboxusercontent.com/u/6281855/DFlow-SubscriptOutOfBounds.zip. >>>>> To see the stack, right click on the only entry in the right window and click "export session". You'll find the corrupt BlockClosure at BlockClosure>>fuelAccept: >>>>> >>>>> @Roberto >>>>> Is it possible to reproduce the stack with a new session? Or did this only happen once? >>>>> >>>>> >>>>> Cheers, >>>>> Max >>>>> >>>>> >>>>> Begin forwarded message: >>>>> >>>>>> From: Mariano Martinez Peck <marianopeck(a)gmail.com> >>>>>> Subject: Re: [Pharo-fuel] [Fuel] SubscriptOutOfBounds: 27 >>>>>> Date: 23. Mai 2013 14:23:45 MESZ >>>>>> To: The Fuel Project <pharo-fuel(a)lists.gforge.inria.fr> >>>>>> Reply-To: The Fuel Project <pharo-fuel(a)lists.gforge.inria.fr> >>>>>> >>>>>> Indeed, it would be nice if you can known which CompiledMethod and blockclosure are having the problem. Not only the source code but the real bytecodes. >>>>>> Also, can you isolate and just try to serialize them alone and reproduce the problem? In other words, a reproducible test case? :) >>>>>> Thanks! >>>>>> >>>>>> >>>>>> On Thu, May 23, 2013 at 8:41 AM, Max Leske <maxleske(a)gmail.com> wrote: >>>>>> What's the compiled method? Is it a special one? Which selector in which class? >>>>>> >>>>>> Max >>>>>> >>>>>> On 23.05.2013, at 12:45, "roberto.minelli(a)usi.ch" <roberto.minelli(a)usi.ch> wrote: >>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> While using Fuel in a 2.0 image to serialize some objects (including CompiledMethods) I'm getting this error: SubscriptOutOfBounds: 27. >>>>>>> >>>>>>> I spent hours in the debugger before writing this email, but I'm not able to figure out why this is happening. I attach the full stack of the error (STACK#1). >>>>>>> >>>>>>> I understood that it has something to do with a particular CompiledMethod in my image and/or a BlockClosure which for some reason cannot be printed (i.e., the printString returns <error in printString: evaluate "self printString" to debug>) and when I try to printString to debug I got the STACK#2 which in turn does not bring me to any possible solution. >>>>>>> >>>>>>> Hope some of you will have an intuition on that or at least tell me where to look or how to script a possible workaround. >>>>>>> >>>>>>> Thanks in advance, >>>>>>> Roby >>>>>>> >>>>>>> ############################################################################################ >>>>>>> ######################################### STACK#1 ########################################### >>>>>>> ########################################################################################### >>>>>>> CompiledMethod(Object)>>errorSubscriptBounds: >>>>>>> CompiledMethod(Object)>>at: >>>>>>> InstructionStream>>interpretNextInstructionFor: >>>>>>> CompiledMethod>>abstractBytecodeMessageAt: in Block: [(InstructionStream new method: self pc: pc)... >>>>>>> BlockClosure>>on:do: >>>>>>> CompiledMethod>>abstractBytecodeMessageAt: >>>>>>> BlockClosure>>blockCreationBytecodeMessage >>>>>>> BlockClosure>>endPC >>>>>>> BlockClosure>>abstractBytecodeMessagesDo: >>>>>>> BlockClosure>>isClean >>>>>>> BlockClosure>>shouldBeSubstitutedByCleanCopy >>>>>>> BlockClosure>>fuelAccept: >>>>>>> FLFullGeneralMapper(FLLightGeneralMapper)>>mapAndTrace: >>>>>>> FLFullGlobalMapper>>mapAndTrace: in Block: [(anObject class == CompiledMethod... >>>>>>> FLLargeIdentityDictionary>>at:ifAbsent: >>>>>>> FLFullGlobalMapper>>mapAndTrace: >>>>>>> FLPluggableSubstitutionMapper>>mapAndTrace: >>>>>>> FLPluggableSubstitutionMapper>>mapAndTrace: >>>>>>> FLAnalysis>>mapAndTrace: >>>>>>> FLAnalysis>>run >>>>>>> FLAnalyzer>>setDefaultAnalysis in Block: [:anObject | (FLAnalysis... >>>>>>> FLAnalyzer>>analysisFor: >>>>>>> FLSerialization>>analysisStep >>>>>>> FLSerialization>>run >>>>>>> DFSerializer(FLSerializer)>>setDefaultSerialization in Block: [:anObject :anEncoder | (FLSerialization... >>>>>>> DFSerializer(FLSerializer)>>serialize:on: in Block: [:anEncoder | ... >>>>>>> FLEncoder class>>on:globalEnvironment:do: in Block: [aBlock value: anEncoder] >>>>>>> BlockClosure>>ensure: >>>>>>> FLEncoder class>>on:globalEnvironment:do: >>>>>>> DFSerializer(FLSerializer)>>serialize:on: >>>>>>> >>>>>>> >>>>>>> ############################################################################################ >>>>>>> ######################################### STACK#2 ########################################### >>>>>>> ############################################################################################ >>>>>>> Decompiler(Object)>>error: >>>>>>> Decompiler>>decompileBlock: >>>>>>> BlockClosure>>decompile >>>>>>> BlockClosure>>printOn: >>>>>>> BlockClosure(Object)>>printStringLimitedTo: in Block: [:s | self printOn: s] >>>>>>> String class(SequenceableCollection class)>>streamContents:limitedTo: >>>>>>> BlockClosure(Object)>>printStringLimitedTo: >>>>>>> BlockClosure(Object)>>printString >>>>>>> BlockClosure>>DoIt >>>>>>> Compiler>>evaluate:in:to:notifying:ifFail:logged: >>>>>>> SmalltalkEditor>>evaluateSelectionAndDo: in Block: [rcvr class evaluatorClass new... >>>>>>> BlockClosure>>on:do: >>>>>>> SmalltalkEditor>>evaluateSelectionAndDo: >>>>>>> SmalltalkEditor>>evaluateSelection >>>>>>> PluggableTextMorph>>doIt in Block: [textMorph editor evaluateSelection] >>>>>>> PluggableTextMorph>>handleEdit: in Block: [result := editBlock value] >>>>>>> TextMorphForEditView(TextMorph)>>handleEdit: >>>>>>> PluggableTextMorph>>handleEdit: >>>>>>> PluggableTextMorph>>doIt >>>>>>> SmalltalkEditor class>>buildSmalltalkEditorKeymappingsOn: in Block: [:morph | morph doIt] >>>>>>> BlockClosure>>cull: >>>>>>> BlockClosure>>cull:cull: >>>>>>> BlockClosure>>cull:cull:cull: >>>>>>> KMCategoryTarget>>completeMatch:buffer: >>>>>>> KMKeymap>>notifyCompleteMatchTo:buffer: in Block: [:l | l completeMatch: self buffer: aBuffer] >>>>>>> Array(SequenceableCollection)>>do: >>>>>>> KMKeymap>>notifyCompleteMatchTo:buffer: >>>>>>> KMKeymap>>onMatchWith:notify:andDo: >>>>>>> KMCategory>>onMatchWith:notify:andDo: in Block: [:entry | entry... >>>>>>> Set>>do: >>>>>>> >>>>>>> >>>>>>> >>>>>>> _______________________________________________ >>>>>>> Pharo-fuel mailing list >>>>>>> Pharo-fuel(a)lists.gforge.inria.fr >>>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-fuel >>>>>> >>>>>> _______________________________________________ >>>>>> Pharo-fuel mailing list >>>>>> Pharo-fuel(a)lists.gforge.inria.fr >>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-fuel >>>>>> >>>>>> >>>>>> >>>>>> -- >>>>>> Mariano >>>>>> http://marianopeck.wordpress.com >>>>>> _______________________________________________ >>>>>> Pharo-fuel mailing list >>>>>> Pharo-fuel(a)lists.gforge.inria.fr >>>>>> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-fuel >>>>> >>>> >>> >> >> _______________________________________________ >> Pharo-fuel mailing list >> Pharo-fuel(a)lists.gforge.inria.fr >> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-fuel > > > _______________________________________________ > Pharo-fuel mailing list > Pharo-fuel(a)lists.gforge.inria.fr > http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-fuel

2 8

new Cog VMs available
by Eliot Miranda 08 Jun '13

08 Jun '13

CogVM source as per VMMaker.oscog-eem.296/r2732. Make the Production/Debug/Assert distinction static so one can find it with strings - vm. Add an ident for the ITIMER_HEARTBEAT linux VMs. Fix bug in eden filling/object overwrite checking. must use unsigned vars in the fill loop. Add a plugin to support the VMProfiler on linux (now Steve Rees has told us how to get proper thread priorities on newer linuxes). Replace broken primitiveUtcWithOffset with a version that works. Cast primitiveUtcWithOffset in terms of a new ioLocalSecondsOffset. Add stricter checking code to OSProcessPlugins. Add SqueakSSL plugin to nsvm plugins. Change -version output to print if a Production, Debug or Assert VM. Add some error checking to the UnixOSProcessPlugin's forkAndExecInDirectory prim. Eliminate some compiler warnings in the plugin. Eliminate some excessive use of push/popRemappableOop[:] in the SocketPlugin. Fix numberic option parsing in sqSocketSetOptions... (quite possibly the longest C function name I've ever seen). The old code only supported 1-digit length values, so setsockopt(SO_SNDBUF, 4096 didn't do what was expected at all (attempted to set the buffer size to 909717556, which is little-endian ascii for '4096', '4096' asByteArray unsignedLongAt: 1 => 909717556). Occasionally bizarre interactions cause the heartbeat's interval timer to disable. e.g. on CentOS linux when using PAM to authenticate, a failing authen- tication sequence disables the interval timer, for reasons unknown (setting a breakpoint in setitimer doesn't show an actual call). So a work around is to check the timer as a side-effect of ioRelinquishProcessorForMicroseconds. Add Callback LIFO ordering support to the new-style Callback return primitives to the IA32ABI Aline plugins. Fix some compiler warnings there-in. Improve the debug message printing in sqUnixExternalPrims.c so it prints line numbers. -- best, Eliot

2 1

Re: [Pharo-dev] FogBugz (Case [Issue]10840) Collection - WeakSet>>#size utterly broken
by Igor Stasenko 08 Jun '13

08 Jun '13

Here is a simple solution for you: set asArray size. But come on, why asking for weak container size??? What you gonna do with this information? Iterate over it? And besides, there is #slowSize. A size is left as it is. Because it is fast. There is no way to get accurate size of weak container either way, because at the very next message, GC can be triggered and some items turn garbage => size is invalid. So, it doesn't matters if you calculate size slow or fast, it will be always inaccurate. And issue is invalid. -- Best regards, Igor Stasenko.

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 June 2013