Vm-dev December 2014

vm-dev@lists.squeakfoundation.org

33 participants
160 discussions

VM Maker: VMMaker.oscog-eem.988.mcz
by commits＠source.squeak.org 16 Dec '14

16 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.988.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.988 Author: eem Time: 15 December 2014, 5:09:23.088 pm UUID: 76d73591-5a89-416d-b6f7-90cd2a89ffcb Ancestors: VMMaker.oscog-eem.987 Fix isSmallFloatValue: for the low boundary case. Eliminate an obsolete type declaration. =============== Diff against VMMaker.oscog-eem.987 =============== Item was changed: ----- Method: Spur64BitMemoryManager>>isSmallFloatValue: (in category 'interpreter access') ----- isSmallFloatValue: aFloat <inline: true> <var: #aFloat type: #double> + | exponent rawFloat | + rawFloat := self + cCode: [(self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0] + inSmalltalk: [(aFloat at: 1) << 32 + (aFloat at: 2)]. + exponent := rawFloat >> 52 bitAnd: 16r7FF. + ^exponent > self smallFloatExponentOffset + ifTrue: [exponent <= (255 + self smallFloatExponentOffset)] + ifFalse: + [(rawFloat bitAnd: (1 << 52 - 1)) = 0 + ifTrue: [exponent = 0] + ifFalse: [exponent = self smallFloatExponentOffset]]! - | exponent | - exponent := self - cCode: - [| rawFloat | - rawFloat := (self cCoerce: (self addressOf: aFloat) to: 'sqLong *') at: 0. - rawFloat >> 52 bitAnd: 16r7FF] - inSmalltalk: [self smallFloatExponentOffset - + (aFloat isFinite - ifTrue: - [aFloat = 0.0 - ifTrue: [0] - ifFalse: [aFloat exponent + 127]] - ifFalse: "Float nan & Float infinity exponent = -1, so mask to make > 0" - [aFloat exponent bitAnd: SmallInteger maxVal])]. - ^exponent - between: self smallFloatExponentOffset - and: 255 + self smallFloatExponentOffset! Item was changed: ----- Method: Spur64BitMemoryManager>>smallFloatValueOf: (in category 'interpreter access') ----- smallFloatValueOf: oop "Answer the C double precision floating point value of the argument, a SmallFloat. See section 61-bit Immediate Floats in the SpurMemoryManager class comment. msb lsb Decode: [8expsubset][52mantissa][1s][3tags] shift away tags: [ 000 ][8expsubset][52mantissa][1s] add exponent offset: [ 11 exponent ][52mantissa][1s] rot sign: [1s][ 11 exponent ][52mantissa]" | rot | <returnTypeC: #double> - <var: #result type: #double> self assert: (oop bitAnd: self tagMask) = self smallFloatTag. rot := oop >> self numTagBits. rot > 1 ifTrue: [rot := rot + (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1))]. rot := self rotateRight: rot. ^self cCode: [(self cCoerce: (self addressOf: rot) to: #'double *') at: 0] inSmalltalk: [(Float new: 2) at: 1 put: rot >> 32; at: 2 put: (rot bitAnd: 16rFFFFFFFF); yourself]!

1 0

VM Maker: VMMaker.oscog-eem.987.mcz
by commits＠source.squeak.org 16 Dec '14

16 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.987.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.987 Author: eem Time: 15 December 2014, 3:48:43.987 pm UUID: 08aad1a5-4044-4aec-aecc-53c535ab4e34 Ancestors: VMMaker.oscog-eem.986 Fix generateIsIntegerObject:on:indent: for 64-bit Spur. Make primitiveFloatAt support immedate floats. Fix the regression of breakmnu (breakSelectorLength must be initialized early). Make shortPrintOop: primnt immediate floats. Fix the stack page size for 64-bits. Add boundary cases for isSmallFloatValue: =============== Diff against VMMaker.oscog-eem.986 =============== Item was changed: ----- Method: CCodeGenerator>>generateIsIntegerObject:on:indent: (in category 'C translation') ----- generateIsIntegerObject: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + vmClass objectMemoryClass numSmallIntegerTagBits = 1 + ifTrue: + [aStream nextPutAll: '('. + self emitCExpression: msgNode args first on: aStream. + aStream nextPutAll: ' & 1)'] + ifFalse: + [aStream nextPutAll: '((('. + self emitCExpression: msgNode args first on: aStream. + aStream + nextPutAll: ') & '; + print: 1 << vmClass objectMemoryClass numSmallIntegerTagBits - 1; + nextPutAll: ') == 1)']! - aStream nextPutAll: '('. - self emitCExpression: msgNode args first on: aStream. - aStream nextPutAll: ' & 1)'.! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFloatAt (in category 'indexing primitives') ----- primitiveFloatAt "Provide platform-independent access to 32-bit words comprising a Float. Map index 1 onto the most significant word and index 2 onto the least significant word." | rcvr index result | <var: #result type: #usqInt> self initPrimCall. rcvr := self stackValue: 1. index := self stackTop. index = ConstOne ifTrue: [result := self positive32BitIntegerFor: + (objectMemory + fetchLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) + ofFloatObject: rcvr). - (objectMemory fetchLong32: (VMBIGENDIAN ifTrue: [0] ifFalse: [1]) - ofObject: rcvr). ^self pop: 2 thenPush: result]. index = ConstTwo ifTrue: [result := self positive32BitIntegerFor: + (objectMemory + fetchLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) + ofFloatObject: rcvr). - (objectMemory fetchLong32: (VMBIGENDIAN ifTrue: [1] ifFalse: [0]) - ofObject: rcvr). ^self pop: 2 thenPush: result]. self primitiveFailFor: ((objectMemory isIntegerObject: index) ifTrue: [PrimErrBadIndex] ifFalse: [PrimErrBadArgument])! Item was added: + ----- Method: ObjectMemory>>fetchLong32:ofFloatObject: (in category 'object access') ----- + fetchLong32: fieldIndex ofFloatObject: oop + "index by word size, and return a pointer as long as the word size" + ^self fetchLong32: fieldIndex ofObject: oop! Item was added: + ----- Method: Spur32BitMemoryManager>>fetchLong32:ofFloatObject: (in category 'object access') ----- + fetchLong32: fieldIndex ofFloatObject: oop + "index by word size, and return a pointer as long as the word size" + ^self fetchLong32: fieldIndex ofObject: oop! Item was added: + ----- Method: Spur64BitMemoryManager>>fetchLong32:ofFloatObject: (in category 'object access') ----- + fetchLong32: fieldIndex ofFloatObject: oop + "index by word size, and return a pointer as long as the word size" + + | rot | + (self isImmediateFloat: oop) ifFalse: + [^self fetchLong32: fieldIndex ofObject: oop]. + + rot := oop >> self numTagBits. + rot > 1 ifTrue: + [rot := rot + (self smallFloatExponentOffset << (self smallFloatMantissaBits + 1))]. + rot := self rotateRight: rot. + ^self + cCode: [self longAt: (self cCoerceSimple: (self addressOf: rot) to: #'char *') + + (fieldIndex << self shiftForWord)] + inSmalltalk: [self flag: #endian. + fieldIndex = 0 + ifTrue: [rot >> 32] + ifFalse: [rot bitAnd: 16rFFFFFFFF]]! Item was added: + ----- Method: SpurMemoryManager>>bytesPerOop (in category 'accessing') ----- + bytesPerOop + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>fetchLong32:ofFloatObject: (in category 'object access') ----- + fetchLong32: fieldIndex ofFloatObject: oop + "index by word size, and return a pointer as long as the word size" + ^self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>logBytesPerOop (in category 'header format') ----- + logBytesPerOop + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>printFreeListHeads (in category 'debug printing') ----- + printFreeListHeads + <api> + | expectedMask | + expectedMask := 0. + 0 to: self numFreeLists - 1 do: + [:i| + coInterpreter printHex: (freeLists at: i). + (freeLists at: i) ~= 0 ifTrue: + [expectedMask := expectedMask + (1 << i)]. + i \\ (32 >> self logBytesPerOop) = 0 + ifTrue: [coInterpreter cr] + ifFalse: [coInterpreter tab]]. + coInterpreter + print: 'mask: '; printHex: freeListsMask; + print: ' expected: '; printHex: expectedMask; + cr! Item was changed: ----- Method: StackInterpreter class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | vmClass | self class == thisContext methodClass ifFalse: [^self]. "Don't duplicate decls in subclasses" vmClass := aCCodeGenerator vmClass. "Generate primitiveTable etc based on vmClass, not just StackInterpreter" aCCodeGenerator addHeaderFile:'<stddef.h> /* for e.g. alloca */'; addHeaderFile:'<setjmp.h>'; addHeaderFile:'<wchar.h> /* for wint_t */'; addHeaderFile:'"vmCallback.h"'; addHeaderFile:'"sqMemoryFence.h"'; addHeaderFile:'"dispdbg.h"'. vmClass declareInterpreterVersionIn: aCCodeGenerator defaultName: 'Stack'. aCCodeGenerator var: #interpreterProxy type: #'struct VirtualMachine*'. aCCodeGenerator declareVar: #sendTrace type: 'volatile int'; declareVar: #byteCount type: 'unsigned long'. "These need to be pointers or unsigned." self declareC: #(instructionPointer method newMethod) as: #usqInt in: aCCodeGenerator. "These are all pointers; char * because Slang has no support for C pointer arithmetic." self declareC: #(localIP localSP localFP stackPointer framePointer stackLimit stackMemory breakSelector) as: #'char *' in: aCCodeGenerator. + aCCodeGenerator + var: #breakSelectorLength + declareC: 'sqInt breakSelectorLength = MinSmallInteger'. self declareC: #(stackPage overflowedPage) as: #'StackPage *' in: aCCodeGenerator. aCCodeGenerator removeVariable: 'stackPages'. "this is an implicit receiver in the translated code." "This defines bytecodeSetSelector as 0 if MULTIPLEBYTECODESETS is not defined, for the benefit of the interpreter on slow machines." aCCodeGenerator addConstantForBinding: (self bindingOf: #MULTIPLEBYTECODESETS). MULTIPLEBYTECODESETS == false ifTrue: [aCCodeGenerator removeVariable: 'extA'; removeVariable: 'extB'; removeVariable: 'bytecodeSetSelector']. aCCodeGenerator var: #methodCache declareC: 'long methodCache[MethodCacheSize + 1 /* ', (MethodCacheSize + 1) printString, ' */]'. aCCodeGenerator var: #atCache declareC: 'sqInt atCache[AtCacheTotalSize + 1 /* ', (AtCacheTotalSize + 1) printString, ' */]'. aCCodeGenerator var: #primitiveTable declareC: 'void (*primitiveTable[MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */])(void) = ', vmClass primitiveTableString. vmClass primitiveTable do: [:symbolOrNot| (symbolOrNot isSymbol and: [symbolOrNot ~~ #primitiveFail]) ifTrue: [(aCCodeGenerator methodNamed: symbolOrNot) ifNotNil: [:tMethod| tMethod returnType: #void]]]. vmClass objectMemoryClass hasSpurMemoryManagerAPI ifTrue: [aCCodeGenerator var: #primitiveAccessorDepthTable type: 'signed char' sizeString: 'MaxPrimitiveIndex + 2 /* ', (MaxPrimitiveIndex + 2) printString, ' */' array: vmClass primitiveAccessorDepthTable] ifFalse: [aCCodeGenerator removeVariable: #primitiveAccessorDepthTable]. aCCodeGenerator var: #primitiveFunctionPointer declareC: 'void (*primitiveFunctionPointer)()'. aCCodeGenerator var: #externalPrimitiveTable declareC: 'void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* ', (MaxExternalPrimitiveTableSize + 1) printString, ' */])(void)'. aCCodeGenerator var: #showSurfaceFn type: #'void *'. aCCodeGenerator var: #jmpBuf declareC: 'jmp_buf jmpBuf[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedCallbacks declareC: 'usqInt suspendedCallbacks[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #suspendedMethods declareC: 'usqInt suspendedMethods[MaxJumpBuf + 1 /* ', (MaxJumpBuf + 1) printString, ' */]'. aCCodeGenerator var: #interruptCheckChain declareC: 'void (*interruptCheckChain)(void) = 0'. self declareCAsUSqLong: #(nextPollUsecs nextWakeupUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs "these are high-frequency enough that they're overflowing quite quickly on modern hardware" statProcessSwitch statIOProcessEvents statForceInterruptCheck statCheckForEvents statStackOverflow statStackPageDivorce) in: aCCodeGenerator. aCCodeGenerator var: #nextProfileTick type: #sqLong! Item was changed: ----- Method: StackInterpreter>>initializeInterpreter: (in category 'initialization') ----- initializeInterpreter: bytesToShift "Initialize Interpreter state before starting execution of a new image." interpreterProxy := self sqGetInterpreterProxy. self dummyReferToProxy. objectMemory initializeObjectMemory: bytesToShift. self checkAssumedCompactClasses. self initializeExtraClassInstVarIndices. method := newMethod := objectMemory nilObject. + self cCode: '' inSmalltalk: [breakSelectorLength := objectMemory minSmallInteger]. - breakSelectorLength := objectMemory minSmallInteger. methodDictLinearSearchLimit := 8. self flushMethodCache. self flushAtCache. self initialCleanup. profileSemaphore := profileProcess := profileMethod := objectMemory nilObject. interruptKeycode := 2094. "cmd-. as used for Mac but no other OS" [globalSessionID = 0] whileTrue: [globalSessionID := self cCode: [(self time: #NULL) + self ioMSecs] inSmalltalk: [(Random new next * SmallInteger maxVal) asInteger]]! Item was changed: ----- Method: StackInterpreter>>shortPrintOop: (in category 'debug printing') ----- shortPrintOop: oop <inline: false> self printHexnp: oop. (objectMemory isImmediate: oop) ifTrue: + [(objectMemory isIntegerObject: oop) ifTrue: - [(objectMemory isImmediateCharacter: oop) ifTrue: [self + cCode: 'printf("=%ld\n", (long)integerValueOf(oop))' - cCode: 'printf("=$%ld ($%lc)\n", (long)characterValueOf(oop), (wint_t)characterValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. + (objectMemory isImmediateCharacter: oop) ifTrue: - (objectMemory isIntegerObject: oop) ifTrue: [self + cCode: 'printf("=$%ld ($%lc)\n", (long)characterValueOf(oop), (wint_t)characterValueOf(oop))' - cCode: 'printf("=%ld\n", (long)integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. + (objectMemory isImmediateFloat: oop) ifTrue: + [self + cCode: 'printf("=%g\n", floatValueOf(oop))' + inSmalltalk: [self print: '='; printFloat: (objectMemory floatValueOf: oop); cr]]. ^self]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]); cr]. ((objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]) ifTrue: [^self printOop: oop]. self print: ': a(n) '. self printNameOfClass: (objectMemory fetchClassOfNonImm: oop) count: 5. self cr! Item was changed: ----- Method: StackInterpreter>>stackPageFrameBytes (in category 'stack pages') ----- stackPageFrameBytes "Answer a byte size that accomodates a useful number of frames. 512 bytes is room for around 40 frames a page which is a good compromise between overflow rate and latency in divorcing a page." + ^objectMemory bytesPerOop = 8 + ifTrue: [1024] + ifFalse: [512]! - ^512! Item was changed: ----- Method: StackInterpreterTests>>testImmediateFloats (in category 'tests') ----- testImmediateFloats "self new testImmediateFloats" | vm smm smallFloatOop | vm := StackInterpreterSimulator newWithOptions: #(ObjectMemory Spur64BitMemoryManager). smm := vm objectMemory. #(0.0 -0.0 1.0e38 -1.0e38 1.0e-38 -1.0e-38 2.0 -2.0) do: [:f| | sfo | vm initPrimCall. self shouldnt: [sfo := smm smallFloatObjectOf: f] raise: Error. self assert: (smm smallFloatValueOf: sfo) equals: f. self assert: ((smm exponentOfSmallFloat: sfo) between: -126 and: 127)]. + {Float nan. Float infinity. Float negativeInfinity. 1.0e-39. 1.0e39. 5.8774717541114375e-39. 6.80564733841877e38 } do: - {Float nan. Float infinity. Float negativeInfinity. 1.0e-39. 1.0e39 } do: [:f| self deny: (smm isSmallFloatValue: f)]. vm initPrimCall. smallFloatOop := smm smallFloatTag + (1 << (smm smallFloatMantissaBits + smm numTagBits)). self shouldnt: [smm floatValueOf: smallFloatOop] raise: Error. self deny: vm failed. self assert: (smm isSmallFloatValue: (smm floatValueOf: smallFloatOop)). self assert: (smm floatObjectOf: (smm floatValueOf: smallFloatOop)) equals: smallFloatOop. vm initPrimCall. smallFloatOop := ((1 bitShift: 64) - 1 bitClear: (1 bitShift: smm numTagBits + 1) - 1) + smm smallFloatTag. self shouldnt: [smm floatValueOf: smallFloatOop] raise: Error. self deny: vm failed. self assert: (smm isSmallFloatValue: (smm floatValueOf: smallFloatOop)). self assert: (smm floatObjectOf: (smm floatValueOf: smallFloatOop)) equals: smallFloatOop!

1 0

[commit][3185] CogVM source as per VMMaker.oscog-eem.986
by commits＠squeakvm.org 15 Dec '14

15 Dec '14

Revision: 3185 Author: eliot Date: 2014-12-15 12:44:57 -0800 (Mon, 15 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.986 Spur: Eliminate the erroneous and confusing setRawNumSlotsOf:to: and setOverflowNumSlotsOf:to:. Use rawNumSlotsOf:put: & rawOverflowSlotsOf:put: which match the getters. Hence fix 64-bit compaction. Remember to update the fixed UnixOSProcessPlugin in Newspeak-land. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.985 uuid: f455e095-e61a-46a0-8994-c4bc33bb8a46 from UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 */ @@ -95,6 +95,7 @@ static sqInt maskForThisThreadAndResend(int sigNum); static sqInt maskSignalForThisThread(int sigNum); EXPORT(sqInt) moduleUnloaded(char *aModuleName); +static sqInt msg(char *s); static sqInt needSigaltstack(void); static sqInt newPthreadTypeByteArray(pthread_t aPthreadType); static sqInt newSQFileByteArray(void); @@ -1199,7 +1200,14 @@ { } +static sqInt +msg(char *s) +{ + fprintf(stderr, "\n%s: %s", moduleName, s); + return 0; +} + /* Answer if the plugin should use a signalstack to avoid delivering signals on the native stack, which can interfere with the JIT. As a side-effect, allocate one if one is not already available. We use GetAttributeString Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2348,7 +2348,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.986"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8852,7 +8852,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8912,7 +8912,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11600,7 +11600,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11660,7 +11660,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29418,7 +29418,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29465,7 +29465,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -43230,9 +43230,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -43420,9 +43418,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -44445,8 +44441,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -44472,8 +44466,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -44594,8 +44586,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -47058,8 +47048,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -48663,8 +48651,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -50636,8 +50622,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -50645,13 +50629,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -58933,8 +58913,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -70671,9 +70649,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2351,7 +2351,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.986"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8861,7 +8861,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8921,7 +8921,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11609,7 +11609,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11669,7 +11669,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29427,7 +29427,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29474,7 +29474,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -43239,9 +43239,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -43429,9 +43427,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -44454,8 +44450,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -44481,8 +44475,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -44603,8 +44595,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -47067,8 +47057,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -48672,8 +48660,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -50645,8 +50631,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -50654,13 +50638,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -58942,8 +58922,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -70680,9 +70658,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2097,7 +2097,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.986"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -29269,9 +29269,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -29459,9 +29457,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -30471,8 +30467,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -30498,8 +30492,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -30620,8 +30612,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -33120,8 +33110,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -34725,8 +34713,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -36719,8 +36705,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -36728,13 +36712,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -44888,8 +44868,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -59269,9 +59247,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2094,7 +2094,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.980"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.986"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -29260,9 +29260,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -29450,9 +29448,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -30462,8 +30458,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -30489,8 +30483,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -30611,8 +30603,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -33111,8 +33101,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -34716,8 +34704,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -36710,8 +36696,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -36719,13 +36703,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -44879,8 +44859,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -59260,9 +59238,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Dec 15 09:43:54 PST 2014 + Mon Dec 15 12:41:47 PST 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2344,7 +2344,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.980]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.986]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5591,6 +5591,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l256; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5608,7 +5609,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l256: /* end baseFrameReturn */; goto l255; } @@ -43474,9 +43475,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -43664,9 +43663,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -44689,8 +44686,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -44716,8 +44711,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -44838,8 +44831,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -47302,8 +47293,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -48896,8 +48885,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -50869,8 +50856,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -50878,13 +50863,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -59151,8 +59132,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -70783,9 +70762,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2347,7 +2347,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.980]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.986]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5600,6 +5600,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l256; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5617,7 +5618,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l256: /* end baseFrameReturn */; goto l255; } @@ -43483,9 +43484,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -43673,9 +43672,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -44698,8 +44695,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -44725,8 +44720,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -44847,8 +44840,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -47311,8 +47302,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -48905,8 +48894,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -50878,8 +50865,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -50887,13 +50872,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -59160,8 +59141,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -70792,9 +70771,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursrc/vm/cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2335,7 +2335,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.980]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.986]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5474,7 +5474,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l129; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5489,7 +5488,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l129: /* end baseFrameReturn */; goto l128; } @@ -8673,7 +8672,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8733,7 +8732,7 @@ null; goto l75; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24587,7 +24586,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24634,7 +24633,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -38380,9 +38379,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -38570,9 +38567,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -39595,8 +39590,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -39622,8 +39615,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -39744,8 +39735,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -42208,8 +42197,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -43795,8 +43782,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -45768,8 +45753,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -45777,13 +45760,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -54050,8 +54029,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -65668,9 +65645,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursrc/vm/cointerp.h 2014-12-15 20:44:57 UTC (rev 3185) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 + CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.980 uuid: 3d7d339f-6a22-4bd1-b959-cddf9c41cc60 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2338,7 +2338,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.980]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.986]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -5483,7 +5483,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l129; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5498,7 +5497,7 @@ /* begin fetchNextBytecode */ currentBytecode = byteAtPointer(++localIP); - null; + /* return self */ l129: /* end baseFrameReturn */; goto l128; } @@ -8682,7 +8681,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8742,7 +8741,7 @@ null; goto l75; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -24596,7 +24595,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24643,7 +24642,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -38389,9 +38388,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -38579,9 +38576,7 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(freeChunk - BaseHeaderSize, count); + longAtput(freeChunk - BaseHeaderSize, count); /* begin set:classIndexTo:formatTo: */ assert(((ClassArrayCompactIndex >= 0) && (ClassArrayCompactIndex <= (classIndexMask())))); assert(((2 >= 0) && (2 <= (formatMask())))); @@ -39604,8 +39599,6 @@ } longAtput((obj1 + BaseHeaderSize) + (0 << (shiftForWord())), clone2); if ((byteAt(obj1 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj1 + 7, 1); } /* begin forward:to: */ @@ -39631,8 +39624,6 @@ } longAtput((obj2 + BaseHeaderSize) + (0 << (shiftForWord())), clone1); if ((byteAt(obj2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj2 + 7, 1); } if (((isYoungObject(obj1)) != (isYoungObject(clone2))) @@ -39753,8 +39744,6 @@ } longAtput((obj11 + BaseHeaderSize) + (0 << (shiftForWord())), obj21); if ((byteAt(obj11 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(obj11 + 7, 1); } if (copyHashFlag) { @@ -42217,8 +42206,6 @@ if (firstOfFreeRun == 0) { /* begin setObjectFree: */ if ((byteAt(objOop3 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop3 + 7, 1); } /* begin setFree: */ @@ -43804,8 +43791,6 @@ here = here1; /* begin setObjectFree: */ if ((byteAt(here + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(here + 7, 1); } /* begin setFree: */ @@ -45777,8 +45762,6 @@ } longAtput((objOop2 + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop2 + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop2 + 7, 1); } } @@ -45786,13 +45769,9 @@ objOop2 = objectAfterlimit(objOop2, segmentLimit); } if ((byteAt(segmentWordArray + 7)) == 0xFF) { - /* begin setOverflowNumSlotsOf:to: */ - flag("endian"); - long32Atput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); + longAtput(segmentWordArray - BaseHeaderSize, 8 / BytesPerOop); } else { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(segmentWordArray + 7, 8 / BytesPerOop); } if ((checkForLeaks & 16) != 0) { @@ -54059,8 +54038,6 @@ } longAtput((objOop + BaseHeaderSize) + (0 << (shiftForWord())), oldClone); if ((byteAt(objOop + 7)) == 0) { - /* begin setRawNumSlotsOf:to: */ - flag("endian"); byteAtput(objOop + 7, 1); } } @@ -65677,9 +65654,11 @@ if (((longAt(oop)) & 0x3FFFFF) == 0) { print(" is a free chunk of size "); printNum(sizeOfFree(oop)); + print(" 0th: "); + printHex(longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))); + /* begin cr */ printf("\n"); - return; } if (((longAt(oop)) & (0x3FFFFF - 8)) == 0) { Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-15 17:43:51 UTC (rev 3184) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2014-12-15 20:44:57 UTC (rev 3185) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 from - StackInterpreter VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 + StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.984 uuid: 82523b67-016c-4327-b41e-658b54a99470 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.986 uuid: 62703abf-bfd4-4966-a13c-036fa3da9950 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2116,7 +2116,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.984]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.986]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -25182,9 +25182,10 @@ : freeChunk); freeChunkWithBytesat((limit - start) - bytes, start + bytes); GIV(totalFreeOldSpace) -= bytes; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.986.mcz
by commits＠source.squeak.org 15 Dec '14

15 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.986.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.986 Author: eem Time: 15 December 2014, 12:33:36.599 pm UUID: 62703abf-bfd4-4966-a13c-036fa3da9950 Ancestors: VMMaker.oscog-eem.985 Spur: Eliminate the erroneous and confusing setRawNumSlotsOf:to: and setOverflowNumSlotsOf:to:. Use rawNumSlotsOf:put: & rawOverflowSlotsOf:put: which match the getters. Hence fix 64-bit compaction. Simulator: Don't warn of MNU redirection in doits. =============== Diff against VMMaker.oscog-eem.985 =============== Item was changed: ----- Method: CogVMSimulator>>doesNotUnderstand: (in category 'error handling') ----- doesNotUnderstand: aMessage "If this is a doit and the objectMemory understands, pass it on." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #evaluate:in:to:notifying:ifFail:logged:]) ifNotNil: [(objectMemory class whichClassIncludesSelector: aMessage selector) ifNotNil: [:implementingClass| (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [thisContext sender selector ~~ #DoIt ifTrue: + [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to objectMemory'; cr; flush]. - [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to objectMemory'; cr; flush. aMessage lookupClass: nil. ^aMessage sentTo: objectMemory]]. (cogit class whichClassIncludesSelector: aMessage selector) ifNotNil: [:implementingClass| (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [thisContext sender selector ~~ #DoIt ifTrue: + [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to cogit'; cr; flush]. - [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to cogit'; cr; flush. aMessage lookupClass: nil. ^aMessage sentTo: cogit]]]. ^super doesNotUnderstand: aMessage! Item was changed: ----- Method: Spur64BitMemoryManager>>coalesce:and: (in category 'gc - global') ----- coalesce: obj1 and: obj2 | header1NumSlots header2NumSlots obj2slots newNumSlots | header1NumSlots := self rawNumSlotsOf: obj1. header2NumSlots := self rawNumSlotsOf: obj2. "compute total number of slots in obj2, including header" obj2slots := header2NumSlots = self numSlotsMask ifTrue: [(self rawOverflowSlotsOf: obj2) + (2 * self baseHeaderSize / self wordSize)] ifFalse: [(header2NumSlots = 0 ifTrue: [1] ifFalse: [header2NumSlots]) + (self baseHeaderSize / self wordSize)]. self assert: obj2slots * self wordSize = (self bytesInObject: obj2). "if obj1 already has a double header things are simple..." header1NumSlots = self numSlotsMask ifTrue: [self rawOverflowSlotsOf: obj1 put: obj2slots + (self rawOverflowSlotsOf: obj1). ^obj1]. "compute total number of slots in obj1, excluding header" header1NumSlots := header1NumSlots = 0 ifTrue: [1] ifFalse: [header1NumSlots]. self assert: header1NumSlots * self wordSize + self baseHeaderSize = (self bytesInObject: obj1). newNumSlots := obj2slots + header1NumSlots. "if obj1 still only requires a single header things are simple..." newNumSlots < self numSlotsMask ifTrue: [self rawNumSlotsOf: obj1 put: newNumSlots. ^obj1]. "convert from single to double header..." newNumSlots := newNumSlots - (self baseHeaderSize / self wordSize). self + rawNumSlotsOf: obj1 + self baseHeaderSize put: self numSlotsMask; + rawOverflowSlotsOf: obj1 + self baseHeaderSize put: newNumSlots. - setRawNumSlotsOf: obj1 + self baseHeaderSize to: self numSlotsMask; - setOverflowNumSlotsOf: obj1 + self baseHeaderSize to: newNumSlots. ^obj1 + self baseHeaderSize! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. classIndex = 0 ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. (self isClassAtUniqueIndex: aClass) ifTrue: [self uniqueIndex: classIndex allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]] ifFalse: [self ambiguousClass: aClass allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. + self rawOverflowSlotsOf: freeChunk put: count. - self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerOop]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. + self rawOverflowSlotsOf: freeChunk put: count. - self setOverflowNumSlotsOf: freeChunk to: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>forward:to: (in category 'become implementation') ----- forward: obj1 to: obj2 self set: obj1 classIndexTo: self isForwardedObjectClassIndexPun formatTo: self forwardedFormat. self storePointer: 0 ofForwarder: obj1 withValue: obj2. "For safety make sure the forwarder has a slot count that includes its contents." (self rawNumSlotsOf: obj1) = 0 ifTrue: + [self rawNumSlotsOf: obj1 put: 1]! - [self setRawNumSlotsOf: obj1 to: 1]! Item was changed: ----- Method: SpurMemoryManager>>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 one word, i.e. retaining the version stamp. 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?" <inline: false> | segmentLimit segmentStart segVersion errorCode | segmentLimit := self numSlotsOf: segmentWordArray. (self objectBytesForSlots: segmentLimit) < (self allocationUnit "version info" + self baseHeaderSize "one object header") ifTrue: [^PrimErrBadArgument]. "First thing is to verify format. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFF "low 2 bytes")) ifFalse: [self reverseBytesFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFF "low 2 bytes")) ifFalse: [self reverseBytesFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). ^PrimErrBadArgument]]. segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. segmentLimit := segmentLimit * self bytesPerOop + segmentWordArray + self baseHeaderSize. "Notionally reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." self flag: #endianness. (segVersion >> 16) ~= (self imageSegmentVersion >> 16) ifTrue: "Reverse the byte-type objects once" [true ifTrue: [^PrimErrBadArgument] ifFalse: [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) to: segmentLimit flipFloatsIf: false]]. "scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until a second pass." errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. errorCode ~= 0 ifTrue: [^errorCode]. "Scan for classes contained in the segment, entering them into the class table. Classes are at the front, after the root array and have the remembered bit set." errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. errorCode ~= 0 ifTrue: [^errorCode]. "Make a final pass, assigning class indices and/or pinning pinned objects" self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray. "Finally evaporate the container, leaving the newly loaded objects in place." (self hasOverflowHeader: segmentWordArray) + ifTrue: [self rawOverflowSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop] + ifFalse: [self rawNumSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]. - ifTrue: [self setOverflowNumSlotsOf: segmentWordArray to: self allocationUnit / self bytesPerOop] - ifFalse: [self setRawNumSlotsOf: segmentWordArray to: self allocationUnit / self bytesPerOop]. self leakCheckImageSegments ifTrue: [self runLeakCheckerForFullGC: true]. ^self objectStartingAt: segmentStart! Item was changed: ----- Method: SpurMemoryManager>>setObjectFree: (in category 'free space') ----- setObjectFree: objOop "Mark an object free, but do not add it to the free lists. The wrinkle here is that we don't tolerate a zero-slot count in a free object so that the (self long64At: objOop) ~= 0 assert in isEnumerableObject: isn't triggered." (self rawNumSlotsOf: objOop) = 0 ifTrue: + [self rawNumSlotsOf: objOop put: 1]. - [self setRawNumSlotsOf: objOop to: 1]. self setFree: objOop! Item was removed: - ----- Method: SpurMemoryManager>>setOverflowNumSlotsOf:to: (in category 'free space') ----- - setOverflowNumSlotsOf: objOop to: numSlots - self flag: #endian. - self long32At: objOop - self baseHeaderSize put: numSlots! Item was removed: - ----- Method: SpurMemoryManager>>setRawNumSlotsOf:to: (in category 'free space') ----- - setRawNumSlotsOf: objOop to: n - "Private to free space. See freeSmallObject:" - self flag: #endian. - self byteAt: objOop + 7 put: n! Item was changed: ----- Method: StackInterpreterSimulator>>doesNotUnderstand: (in category 'error handling') ----- doesNotUnderstand: aMessage "If this is a doit and the objectMemory understands, pass it on." (thisContext findContextSuchThat: [:ctxt| ctxt selector == #evaluate:in:to:notifying:ifFail:logged:]) ifNotNil: [(objectMemory class whichClassIncludesSelector: aMessage selector) ifNotNil: [:implementingClass| (implementingClass inheritsFrom: Object) ifTrue: "i.e. VMClass and below" + [thisContext sender selector ~~ #DoIt ifTrue: + [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to objectMemory'; cr; flush]. - [Transcript nextPutAll: 'warning: redirecting ', aMessage selector, ' in ', thisContext sender printString, ' to objectMemory'; cr; flush. aMessage lookupClass: nil. ^aMessage sentTo: objectMemory]]]. ^super doesNotUnderstand: aMessage!

1 0

CMakeVMMakerSqueak beta version ready for the confident.
by gettimothy 15 Dec '14

15 Dec '14

Hi folks. Porting an existing CMakeVMaker Configuration to a new platform was trivially easy on my flavor of linux. (I ported the Linux64x86w32BitSqueakCogV3Config to a Linux32x86SqueakCogV3Config) With this success, I am confident the architectural approach is a correct one and the community can now start porting to different *nix platforms: (BSD, Arm, SunOs, Ubuntu), buildTypes and [Language].[VM].[Memory Model] Consider this an initial release (albeit, very limited). I will be very happy to walk others through the process of developing their own configurations on *nix variants and get comfortable using the tool. My goal in this project is to make it easy for VM dev newbies to be up and running compiling their own VIrtual Machines. In the HelpBrowser the "Start Here" book and the (incomplete) "Developer Guide->Configurations->Example Workflow:New Configuration" topics are enough to get up and running. I will be spending the next several days/hours completing and editing the Help before getting back into Configurations development and platform porting. After the Help is done, my next tasks are: 1. Build out the remaining 9 build types for my existing 32 bit compat Configurations--build.assert, build.debug etc. after solving the NoDbgRegParms problem in autotools. 2. Build out the remaining [Language]. [VM]. [Memory Model] Configurations for my platform. 3. QA my bash shell scripts for getting a Newbie a completely configured image for VM/Cmake generation. 4. With my platform done, I will move to SunOs . 5. Hit Tim R. up for that cash. For Ubuntu folks, Slackware differs in the location of libraries. Slackware puts "normal" stuff in /lib64 and 32 bit compat libs in /lib while Ubuntu puts "normal" stuff in /lib and 32 bit stuff in /lib32. We can either mix in all the Ubuntu configurations with the existing, or break Ubuntu configurations into their own platform area (my preference). Like I say, I can walk you through it. For Mac and Dos machines, we need to discuss strategy. CMake offers the opportunity to generate build systems that are native to those platforms This potentially means generating files that work with Windows Visual Studio or whatever native doo-dads you mac guys work with. ALSO! CMake supports Packaging with CPack. I do not know how to use it, BUT, imagine a tool written in Squeak that writes the things that generate our releases for us and then packages them up for distinct platforms--(: Finally, a discussion of integration w/Pharo is needed. cheers. tty.

1 0

[commit][3184] CogVM source as per VMMaker.oscog-eem.985
by commits＠squeakvm.org 15 Dec '14

15 Dec '14

Revision: 3184 Author: eliot Date: 2014-12-15 09:43:51 -0800 (Mon, 15 Dec 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.985 Fix slip in unreachableMethods. Modified Paths: -------------- branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Dec 12 20:15:46 PST 2014 + Mon Dec 15 09:43:54 PST 2014 Modified: branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-12-13 04:32:50 UTC (rev 3183) +++ branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-12-15 17:43:51 UTC (rev 3184) @@ -1,5 +1,5 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscog-eem.985 uuid: f455e095-e61a-46a0-8994-c4bc33bb8a46 from UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 */ @@ -95,6 +95,7 @@ static sqInt maskForThisThreadAndResend(int sigNum); static sqInt maskSignalForThisThread(int sigNum); EXPORT(sqInt) moduleUnloaded(char *aModuleName); +static sqInt msg(char *s); static sqInt needSigaltstack(void); static sqInt newPthreadTypeByteArray(pthread_t aPthreadType); static sqInt newSQFileByteArray(void); @@ -1199,7 +1200,14 @@ { } +static sqInt +msg(char *s) +{ + fprintf(stderr, "\n%s: %s", moduleName, s); + return 0; +} + /* Answer if the plugin should use a signalstack to avoid delivering signals on the native stack, which can interfere with the JIT. As a side-effect, allocate one if one is not already available. We use GetAttributeString

1 0

VM Maker: VMMaker.oscog-eem.985.mcz
by commits＠source.squeak.org 15 Dec '14

15 Dec '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.985.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.985 Author: eem Time: 15 December 2014, 9:40:05.395 am UUID: f455e095-e61a-46a0-8994-c4bc33bb8a46 Ancestors: VMMaker.oscog-eem.984 Fix slip in unreachableMethods. Print first field of free chunks in printOop: if on Spur. =============== Diff against VMMaker.oscog-eem.984 =============== Item was changed: ----- Method: CCodeGenerator>>unreachableMethods (in category 'utilities') ----- unreachableMethods "Return a collection of methods that are never invoked." | neededSelectors previousSize visited | neededSelectors := Set new. "collect the exports" methods do: [:m| m export ifTrue: [neededSelectors add: m selector]]. "Now compute the transitive closure..." previousSize := neededSelectors size. visited := IdentitySet new: methods size. [neededSelectors do: [:s| (methods at: s ifAbsent: []) ifNotNil: [:m| (visited includes: m) ifFalse: [visited add: m. + neededSelectors + add: m selector; + addAll: m allCalls]]]. - m export ifTrue: - [neededSelectors - add: m selector; - addAll: m allCalls]]]]. neededSelectors size > previousSize] whileTrue: [previousSize := neededSelectors size]. ^methods reject: [:m| neededSelectors includes: m selector]! Item was changed: ----- Method: StackInterpreter>>printOop: (in category 'debug printing') ----- printOop: oop | cls fmt lastIndex startIP bytecodesPerLine column | <inline: false> (objectMemory isImmediate: oop) ifTrue: [^self shortPrintOop: oop]. self printHex: oop. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]); cr]. (objectMemory isFreeObject: oop) ifTrue: + [self print: ' is a free chunk of size '; printNum: (objectMemory sizeOfFree: oop). + objectMemory hasSpurMemoryManagerAPI ifTrue: + [self print: ' 0th: '; printHex: (objectMemory fetchPointer: 0 ofFreeChunk: oop)]. + ^self cr]. - [^self print: ' is a free chunk of size '; printNum: (objectMemory sizeOfFree: oop); cr]. (objectMemory isForwarded: oop) ifTrue: [^self print: ' is a forwarded object to '; printHex: (objectMemory followForwarded: oop); print: ' of slot size '; printNum: (objectMemory numSlotsOfAny: oop); cr]. self print: ': a(n) '. self printNameOfClass: (cls := objectMemory fetchClassOfNonImm: oop) count: 5. cls = (objectMemory splObj: ClassFloat) ifTrue: [^self cr; printFloat: (objectMemory dbgFloatValueOf: oop); cr]. fmt := objectMemory formatOf: oop. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory numBytesOf: oop)]. self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [self print: ' datasize '; printNum: (self sizeOfAlienData: oop). self print: ((self isIndirectAlien: oop) ifTrue: [' indirect @ '] ifFalse: [(self isPointerAlien: oop) ifTrue: [' pointer @ '] ifFalse: [' direct @ ']]). ^self printHex: (self startOfAlienData: oop) asUnsignedInteger; cr]. (objectMemory isWords: oop) ifTrue: [lastIndex := 64 min: ((objectMemory numBytesOf: oop) / objectMemory wordSize). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self space; printHex: (objectMemory fetchLong32: index - 1 ofObject: oop). (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. ^self]. ^self printStringOf: oop; cr]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self cCode: [self printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space] inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space. self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))]. (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+objectMemory baseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>shortPrint: (in category 'simulation') ----- shortPrint: oop <doNotGenerate> | name classOop | (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^(objectMemory characterValueOf: oop) < 256 ifTrue: ['=$', (objectMemory characterValueOf: oop) printString, ' (', (String with: (Character value: (objectMemory characterValueOf: oop))), ')'] ifFalse: ['=$', (objectMemory characterValueOf: oop) printString, '(???)']]. (objectMemory isIntegerObject: oop) ifTrue: [^'=', (objectMemory integerValueOf: oop) printString, ' (', (objectMemory integerValueOf: oop) hex, ')']. (objectMemory isImmediateFloat: oop) ifTrue: [^ '=', (objectMemory floatValueOf: oop) printString, ' (', oop hex, ')']. ^'= UNKNOWN IMMEDIATE', ' (', (objectMemory integerValueOf: oop) hex, ')']. (objectMemory addressCouldBeObj: oop) ifFalse: [^(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]]. (objectMemory isFreeObject: oop) ifTrue: + [^' is a free chunk of size ', (objectMemory sizeOfFree: oop) printString, + (objectMemory hasSpurMemoryManagerAPI + ifTrue: [' 0th: ', (objectMemory fetchPointer: 0 ofFreeChunk: oop) hex] + ifFalse: [''])]. - [^' is a free chunk of size ', (objectMemory sizeOfFree: oop) printString]. (objectMemory isForwarded: oop) ifTrue: [^' is a forwarded object to ', (objectMemory followForwarded: oop) hex, ' of slot size ', (objectMemory numSlotsOfAny: oop) printString]. (objectMemory isFloatInstance: oop) ifTrue: [^'=', (objectMemory dbgFloatValueOf: oop) printString]. oop = objectMemory nilObject ifTrue: [^'nil']. oop = objectMemory falseObject ifTrue: [^'false']. oop = objectMemory trueObject ifTrue: [^'true']. classOop := objectMemory fetchClassOfNonImm: oop. ((self objCouldBeClassObj: oop) and: [(objectMemory numSlotsOf: classOop) = metaclassNumSlots]) ifTrue: [^'class ', (self nameOfClass: oop)]. name := self nameOfClass: classOop. name size = 0 ifTrue: [name := '??']. (#('String' 'ByteString') includes: name) ifTrue: [^(self stringOf: oop) printString]. (#('Symbol' 'ByteSymbol') includes: name) ifTrue: [^'#', (self stringOf: oop)]. name = 'Character' ifTrue: "SpurMemoryManager has immediate Characters (see above); ObjectMemory does not" [^'=', (Character value: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))) printString]. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory isPointersNonImm: oop) and: [((objectMemory instanceSizeOf: classOop) between: ValueIndex + 1 and: ValueIndex + 2) and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: [| classLookupKey | classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). [classLookupKey = objectMemory nilObject ifTrue: [^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name]. (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: [classLookupKey := self superclassOf: classLookupKey]. (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: [^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name, ' ', (self shortPrint: (objectMemory fetchPointer: KeyIndex ofObject: oop)), ' -> ', (objectMemory fetchPointer: ValueIndex ofObject: oop) hex8]]. ^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name!

1 0

off-topic garbage
by Eliot Miranda 14 Dec '14

14 Dec '14

Hi All, I'm debugging the 64-bit variant of the Spur GC, having got the real 64-bit Spur Stack VM to start-up and progress to the first GC (albeit with the border of a window displayed in the wrong colour). In doing so I looked at the list of to-be-collected objects at the first full GC in the simulator. I'll list them here. What are they you wonder? These are the objects that are unreachable in a snapshotted image that has been converted to 64-bits. So they're objects that I suspect are always reclaimed on the first GC. They're the objects comprising the screen menu that was opened to save and quit the image. Here's ones I printed out to investigate: 16r9F3688: a(n) ByteString nbytes 10 4:23:58 pm 16rB2F510: a(n) Association (16r403=>16r866B98) format 16r1 hdr8 i.p.. hash 16r0 0 16r17F8B78 an Array 1 16r17F8B90 an Array 16r17F8B78: a(n) Array (16r33=>16r86A1F0) format 16r2 size 2 hdr8 i.p.. hash 16r0 0 16r371 =110 (16r6E) 1 16r41 =8 (16r8) 16r17F8B90: a(n) Array (16r33=>16r86A1F0) format 16r2 size 2 hdr8 i.p.. hash 16r0 0 16r371 =110 (16r6E) 1 16r41 =8 (16r8) 16r140B530: a(n) ByteString nbytes 83 ----QUIT----{1 December 2014 . 4:23:59 pm} trunk46-spur.image priorSource: 14985451 16r140CCD0: a(n) ByteString nbytes 55 save the current image on disk, and quit out of Squeak. 16r140CD58: a(n) ByteString nbytes 14 open a browser 16r140CD88: a(n) ByteString nbytes 16 open a workspace 16r140F6A0: a(n) ByteString nbytes 61 put up a list of all projects, letting me choose one to go to 16r17F5D18: a(n) ByteString nbytes 53 put up a menu offering many controls over appearance. 16r17FB430: a(n) ByteString nbytes 54 A tool for finding and obtaining many kinds of objects 16r17FCEA8: a(n) ByteString nbytes 46 Offers a variety of ways to create new objects 16r185E460: a(n) ByteString nbytes 5 World 16r1B5F6E8: a(n) ByteString nbytes 7 explore 16r1B5FCC8: a(n) ByteString nbytes 4 quit 16r1B67308: a(n) ByteString nbytes 22 go to previous project Here's the full list: 16r8C7448: a(n) Point 16r9F3688: a(n) ByteString 16rAD1088: a(n) StepMessage 16rAD6720: a(n) Point 16rB2F510: a(n) Association 16rB56B30: a(n) Association 16rBA0268: a(n) Point 16rBA0280: a(n) Point 16rC4F4E0: a(n) Rectangle 16rC51138: a(n) Rectangle 16rC51150: a(n) Association 16rE43610: a(n) Association 16r1058478: a(n) Association 16r1058490: a(n) Association 16r1155D78: a(n) Association 16r1155D90: a(n) Association 16r1158008: a(n) Association 16r11580D0: a(n) Association 16r1158370: a(n) Association 16r12D3EB0: a(n) Association 16r12D3EC8: a(n) Association 16r13EC868: a(n) IdentityDictionary 16r13EE570: a(n) DependentsArray 16r13EE720: a(n) Rectangle 16r13FFCD8: a(n) Association 16r1400018: a(n) OrderedCollection 16r1402768: a(n) Point 16r1403190: a(n) Point 16r14031A8: a(n) Point 16r14031C0: a(n) Point 16r1403210: a(n) Point 16r14034B8: a(n) MenuItemMorph 16r1403550: a(n) MenuMorph 16r14035C0: a(n) Array 16r1403618: a(n) UpdatingMenuItemMorph 16r14036D0: a(n) Array 16r1404FF8: a(n) IdentityDictionary 16r14065D0: a(n) Association 16r1406840: a(n) Association 16r1406B50: a(n) Association 16r1408570: a(n) Array 16r1408A10: a(n) MouseButtonEvent 16r1409AE0: a(n) Array 16r1409BA0: a(n) Array 16r1409BD0: a(n) Array 16r1409C08: a(n) Array 16r1409C38: a(n) Array 16r1409C98: a(n) Array 16r1409CC8: a(n) Array 16r1409CF8: a(n) Array 16r1409D28: a(n) Array 16r1409D58: a(n) Array 16r1409D88: a(n) Array 16r1409DB8: a(n) Array 16r1409DE8: a(n) Array 16r1409E18: a(n) Array 16r1409E48: a(n) Array 16r1409E78: a(n) Array 16r1409EA8: a(n) Array 16r1409ED8: a(n) Array 16r1409F08: a(n) Array 16r1409F38: a(n) Array 16r1409F68: a(n) Array 16r1409F98: a(n) Array 16r1409FC8: a(n) Array 16r1409FF8: a(n) Array 16r140A028: a(n) Array 16r140A058: a(n) Array 16r140A088: a(n) Array 16r140A0B8: a(n) Array 16r140A0E8: a(n) Array 16r140A118: a(n) Array 16r140A148: a(n) Array 16r140A178: a(n) Array 16r140A1A8: a(n) Array 16r140A1D8: a(n) Array 16r140A208: a(n) Array 16r140A238: a(n) Array 16r140A268: a(n) Array 16r140A298: a(n) Array 16r140A460: a(n) Array 16r140A490: a(n) Array 16r140A4C0: a(n) Array 16r140A4F0: a(n) Array 16r140A520: a(n) Array 16r140A550: a(n) Array 16r140A580: a(n) Array 16r140B478: a(n) MethodContext 16r140B530: a(n) ByteString 16r140B5E8: a(n) Point 16r140B600: a(n) Point 16r140BB68: a(n) Rectangle 16r140BB80: a(n) Rectangle 16r140BB98: a(n) TheWorldMenu 16r140BBB8: a(n) Array 16r140BBC8: a(n) Rectangle 16r140BBE0: a(n) Array 16r140BD20: a(n) Rectangle 16r140BD38: a(n) Color 16r140BD58: a(n) Rectangle 16r140BD70: a(n) Rectangle 16r140BD88: a(n) Association 16r140BDA0: a(n) Association 16r140BDB8: a(n) Association 16r140BDD0: a(n) Association 16r140BDE8: a(n) Association 16r140BE00: a(n) Association 16r140BE18: a(n) Association 16r140BE30: a(n) Association 16r140BE48: a(n) Association 16r140BE60: a(n) Association 16r140BE78: a(n) Association 16r140BE90: a(n) Association 16r140BEA8: a(n) Association 16r140BEC0: a(n) Association 16r140BED8: a(n) Association 16r140BEF0: a(n) Association 16r140BF08: a(n) Association 16r140BF20: a(n) Association 16r140BF38: a(n) Association 16r140BF50: a(n) Association 16r140BF68: a(n) Association 16r140BF80: a(n) Association 16r140BF98: a(n) Association 16r140BFB0: a(n) Association 16r140BFC8: a(n) Association 16r140BFE0: a(n) Association 16r140BFF8: a(n) Association 16r140C010: a(n) Association 16r140C028: a(n) Association 16r140C040: a(n) Association 16r140C058: a(n) Association 16r140C070: a(n) Association 16r140C088: a(n) Association 16r140C0A0: a(n) Association 16r140C0B8: a(n) Association 16r140C0D0: a(n) Association 16r140C0E8: a(n) Association 16r140C100: a(n) Association 16r140C118: a(n) Association 16r140C130: a(n) Association 16r140C148: a(n) Association 16r140C418: a(n) Association 16r140C430: a(n) Association 16r140C448: a(n) Association 16r140C460: a(n) Association 16r140C478: a(n) Association 16r140C490: a(n) Association 16r140C4A8: a(n) Association 16r140C4C0: a(n) Association 16r140C4D8: a(n) Association 16r140C4F0: a(n) Association 16r140C508: a(n) Association 16r140C520: a(n) Association 16r140C538: a(n) Association 16r140C550: a(n) Association 16r140C568: a(n) Association 16r140C580: a(n) Association 16r140C598: a(n) Association 16r140C5B0: a(n) Association 16r140C5C8: a(n) MethodContext 16r140CCD0: a(n) ByteString 16r140CD10: a(n) IdentityDictionary 16r140CD28: a(n) IdentityDictionary 16r140CD40: a(n) IdentityDictionary 16r140CD58: a(n) ByteString 16r140CD70: a(n) IdentityDictionary 16r140CD88: a(n) ByteString 16r140CDA0: a(n) IdentityDictionary 16r140CDB8: a(n) ByteString 16r140CDD8: a(n) IdentityDictionary 16r140CDF0: a(n) ByteString 16r140CE10: a(n) IdentityDictionary 16r140CE28: a(n) IdentityDictionary 16r140CE40: a(n) ByteString 16r140CE78: a(n) IdentityDictionary 16r140CEA8: a(n) Association 16r140D558: a(n) Association 16r140E5B0: a(n) Point 16r140E5C8: a(n) Point 16r140E5E0: a(n) Point 16r140E5F8: a(n) Point 16r140E610: a(n) Array 16r140E628: a(n) Point 16r140E640: a(n) Point 16r140E658: a(n) AlignmentMorph 16r140E6A0: a(n) MenuItemMorph 16r140E738: a(n) MenuItemMorph 16r140E7D0: a(n) MenuItemMorph 16r140E868: a(n) MenuItemMorph 16r140E900: a(n) MenuLineMorph 16r140E938: a(n) MenuItemMorph 16r140E9D0: a(n) MenuItemMorph 16r140EA68: a(n) MenuItemMorph 16r140EB00: a(n) MenuItemMorph 16r140EB98: a(n) MenuLineMorph 16r140EBD0: a(n) MenuLineMorph 16r140EC08: a(n) MenuItemMorph 16r140ECA0: a(n) MenuLineMorph 16r140ECD8: a(n) MenuItemMorph 16r140ED70: a(n) MenuItemMorph 16r140EE08: a(n) MenuItemMorph 16r140EEA0: a(n) MenuItemMorph 16r140EF38: a(n) MenuItemMorph 16r140EFD0: a(n) MenuItemMorph 16r140F068: a(n) MenuLineMorph 16r140F0A0: a(n) MenuItemMorph 16r140F138: a(n) MenuItemMorph 16r140F1D0: a(n) MenuLineMorph 16r140F208: a(n) MenuItemMorph 16r140F2A0: a(n) MenuItemMorph 16r140F338: a(n) MenuItemMorph 16r140F3D0: a(n) MenuItemMorph 16r140F468: a(n) MenuItemMorph 16r140F500: a(n) MenuLineMorph 16r140F538: a(n) MenuItemMorph 16r140F5D0: a(n) MenuItemMorph 16r140F668: a(n) MenuLineMorph 16r140F6A0: a(n) ByteString 16r140F6E8: a(n) IdentityDictionary 16r1412710: a(n) MenuItemMorph 16r14127A8: a(n) MenuItemMorph 16r1412840: a(n) MenuItemMorph 16r14128D8: a(n) MenuItemMorph 16r1412970: a(n) Point 16r1412988: a(n) Point 16r14129A0: a(n) Point 16r14129B8: a(n) Point 16r14129F8: a(n) Point 16r1412A10: a(n) Point 16r1412A28: a(n) Point 16r1412DD8: a(n) TableLayoutProperties 16r1412E60: a(n) TableLayout 16r1412E78: a(n) GradientFillStyle 16r1412EB8: a(n) SimpleBorder 16r1412ED8: a(n) TranslucentColor 16r1412F48: a(n) Point 16r1413010: a(n) Association 16r1413028: a(n) Association 16r14139B8: a(n) LayoutProperties 16r14139D8: a(n) LayoutProperties 16r14139F8: a(n) TableLayout 16r1413A10: a(n) GradientFillStyle 16r1413A50: a(n) TableLayoutProperties 16r1413AD8: a(n) LayoutProperties 16r1413AF8: a(n) LayoutProperties 16r1413B18: a(n) LayoutProperties 16r1413B38: a(n) LayoutProperties 16r1413B58: a(n) LayoutProperties 16r1413B78: a(n) LayoutProperties 16r1413B98: a(n) LayoutProperties 16r1413BB8: a(n) LayoutProperties 16r1413BD8: a(n) LayoutProperties 16r1413BF8: a(n) LayoutProperties 16r1413C18: a(n) LayoutProperties 16r1413C38: a(n) LayoutProperties 16r1413C58: a(n) LayoutProperties 16r1413C78: a(n) LayoutProperties 16r1413C98: a(n) LayoutProperties 16r1413CB8: a(n) LayoutProperties 16r1413CD8: a(n) LayoutProperties 16r1413CF8: a(n) LayoutProperties 16r1413D18: a(n) LayoutProperties 16r1413D38: a(n) LayoutProperties 16r1413D58: a(n) LayoutProperties 16r1413D78: a(n) LayoutProperties 16r1413D98: a(n) LayoutProperties 16r1413DB8: a(n) LayoutProperties 16r1413DD8: a(n) LayoutProperties 16r1413DF8: a(n) LayoutProperties 16r1413E18: a(n) LayoutProperties 16r1413E38: a(n) LayoutProperties 16r1413E58: a(n) LayoutProperties 16r1413E78: a(n) LayoutProperties 16r1413E98: a(n) LayoutProperties 16r1413EB8: a(n) LayoutProperties 16r1413ED8: a(n) LayoutProperties 16r1413EF8: a(n) LayoutProperties 16r1413F18: a(n) LayoutProperties 16r1413F38: a(n) LayoutProperties 16r1413F58: a(n) SimpleBorder 16r1413F78: a(n) TableLayoutProperties 16r1414000: a(n) TableLayout 16r1414018: a(n) SimpleBorder 16r1414038: a(n) Point 16r1414050: a(n) MethodContext 16r14166C0: a(n) Semaphore 16r1417ED0: a(n) MouseOverHandler 16r144C0C0: a(n) Rectangle 16r144C0D8: a(n) Array 16r144C0F8: a(n) Rectangle 16r144C110: a(n) Color 16r144C130: a(n) Rectangle 16r144C148: a(n) Rectangle 16r144C160: a(n) Array 16r144C170: a(n) Rectangle 16r144C188: a(n) Rectangle 16r144C1A0: a(n) Array 16r144C1B0: a(n) Rectangle 16r144C1C8: a(n) Rectangle 16r144C1E0: a(n) Array 16r144C1F0: a(n) Rectangle 16r144C208: a(n) Rectangle 16r144C220: a(n) Array 16r144C230: a(n) Rectangle 16r144C248: a(n) Rectangle 16r144C260: a(n) Rectangle 16r144C278: a(n) Rectangle 16r144C290: a(n) Array 16r144C2A0: a(n) Rectangle 16r144C2B8: a(n) Rectangle 16r144C2D0: a(n) Array 16r144C2E0: a(n) Rectangle 16r144C2F8: a(n) Rectangle 16r144C310: a(n) Array 16r144C320: a(n) Rectangle 16r144C338: a(n) Rectangle 16r144C350: a(n) Array 16r144C360: a(n) Rectangle 16r144C378: a(n) Rectangle 16r144C390: a(n) Rectangle 16r144C3A8: a(n) Rectangle 16r144C3C0: a(n) Rectangle 16r144C3D8: a(n) Rectangle 16r144C3F0: a(n) Array 16r144C400: a(n) Rectangle 16r144C418: a(n) Rectangle 16r144C430: a(n) Rectangle 16r144C448: a(n) Rectangle 16r144C460: a(n) Array 16r144C470: a(n) Rectangle 16r144C488: a(n) Rectangle 16r144C4A0: a(n) Array 16r144C4B0: a(n) Rectangle 16r144C4C8: a(n) Rectangle 16r144C4E0: a(n) Array 16r144C4F0: a(n) Rectangle 16r144C508: a(n) Rectangle 16r144C520: a(n) Array 16r144C530: a(n) Rectangle 16r144C548: a(n) Rectangle 16r144C560: a(n) Array 16r144C570: a(n) Rectangle 16r144C588: a(n) Rectangle 16r144C5A0: a(n) Array 16r144C5B0: a(n) Rectangle 16r144C5C8: a(n) Rectangle 16r144C5E0: a(n) Rectangle 16r144C5F8: a(n) Rectangle 16r144C610: a(n) Array 16r144C620: a(n) Point 16r144C638: a(n) Rectangle 16r144C650: a(n) Rectangle 16r144C668: a(n) Array 16r144C678: a(n) Rectangle 16r144C690: a(n) Rectangle 16r144C6A8: a(n) Rectangle 16r144C6C0: a(n) Rectangle 16r144C6D8: a(n) Array 16r144C6E8: a(n) Rectangle 16r144C700: a(n) Rectangle 16r144C718: a(n) Array 16r144C728: a(n) Point 16r144C740: a(n) Rectangle 16r144C758: a(n) Rectangle 16r144C770: a(n) Array 16r144C780: a(n) Rectangle 16r144C798: a(n) Rectangle 16r144C7B0: a(n) Array 16r144C7C0: a(n) Rectangle 16r144C7D8: a(n) Rectangle 16r144C7F0: a(n) Array 16r144C800: a(n) Point 16r144C818: a(n) Rectangle 16r144C830: a(n) Rectangle 16r144C848: a(n) Rectangle 16r144C860: a(n) Rectangle 16r144C878: a(n) Array 16r144C888: a(n) Point 16r144C8A0: a(n) Rectangle 16r144C8B8: a(n) Rectangle 16r144C8D0: a(n) Array 16r144C8E0: a(n) Point 16r144C8F8: a(n) Rectangle 16r144C910: a(n) Rectangle 16r144C928: a(n) Rectangle 16r144C940: a(n) Rectangle 16r144C958: a(n) Array 16r144C968: a(n) Point 16r144C980: a(n) Rectangle 16r144C998: a(n) Rectangle 16r144C9B0: a(n) Array 16r144C9C0: a(n) Point 16r144C9D8: a(n) Rectangle 16r144C9F0: a(n) Rectangle 16r144CA08: a(n) Array 16r144CA18: a(n) Point 16r144CA30: a(n) Rectangle 16r144CA48: a(n) Rectangle 16r144CA60: a(n) Array 16r144CA70: a(n) Point 16r144CA88: a(n) Point 16r144CAA0: a(n) Array 16r144CAB8: a(n) Bitmap 16r144CAC8: a(n) Point 16r144CAE0: a(n) Point 16r144CAF8: a(n) Point 16r144CB10: a(n) Point 16r144CB28: a(n) Array 16r144CB40: a(n) Point 16r144CB58: a(n) MethodContext 16r14521A0: a(n) Rectangle 16r14528E8: a(n) Semaphore 16r1452B60: a(n) Association 16r145F600: a(n) Association 16r146DC68: a(n) Association 16r147B688: a(n) ByteString 16r1492170: a(n) IdentityDictionary 16r1495C70: a(n) Association 16r1496478: a(n) Association 16r14964B0: a(n) Association 16r14964C8: a(n) Association 16r1496540: a(n) Association 16r1496558: a(n) Association 16r1496988: a(n) Association 16r1497360: a(n) Association 16r1497618: a(n) Association 16r14984D0: a(n) Association 16r1498870: a(n) Association 16r1499200: a(n) Association 16r149A1F0: a(n) Association 16r149DC48: a(n) Association 16r149E1B0: a(n) Association 16r14D7538: a(n) Association 16r14D8210: a(n) Association 16r14DC038: a(n) BlockClosure 16r14DECC8: a(n) Association 16r14DF928: a(n) Association 16r14E0118: a(n) Association 16r14E0B70: a(n) Association 16r14E4D48: a(n) Association 16r14E8770: a(n) Association 16r14E8788: a(n) Association 16r14F0148: a(n) Association 16r1503190: a(n) Association 16r15031C0: a(n) Association 16r1503728: a(n) Association 16r1511650: a(n) ByteString 16r1511A78: a(n) Association 16r1511A90: a(n) Association 16r1511E78: a(n) Association 16r1511E90: a(n) Association 16r15121D0: a(n) Association 16r15121E8: a(n) Association 16r15129A8: a(n) Association 16r15129C0: a(n) Association 16r15129D8: a(n) Association 16r1512AD0: a(n) Association 16r1512AE8: a(n) Association 16r1514A28: a(n) Association 16r1514E58: a(n) Association 16r15152A8: a(n) Association 16r15152C0: a(n) Association 16r15152D8: a(n) Association 16r15153B8: a(n) Association 16r15153D0: a(n) Association 16r153A7A8: a(n) Association 16r153A7C0: a(n) Association 16r153A7D8: a(n) Association 16r1547760: a(n) ByteString 16r1547CA8: a(n) IdentityDictionary 16r154B180: a(n) IdentityDictionary 16r154B5E8: a(n) Semaphore 16r154F5D8: a(n) IdentityDictionary 16r154F5F0: a(n) Association 16r1551698: a(n) Association 16r157BFD0: a(n) Association 16r157BFE8: a(n) Association 16r157C000: a(n) Association 16r157C170: a(n) Association 16r157C188: a(n) Association 16r157C1A0: a(n) Association 16r157C1F0: a(n) Association 16r157CFC0: a(n) BlockClosure 16r157E058: a(n) Association 16r157E070: a(n) Association 16r157EB10: a(n) Association 16r157EB28: a(n) Association 16r157EB40: a(n) Association 16r157EBE8: a(n) OrderedCollection 16r157F160: a(n) Association 16r1580548: a(n) Association 16r1581598: a(n) Association 16r167F000: a(n) Association 16r167F018: a(n) Association 16r167F030: a(n) Association 16r1686F28: a(n) Association 16r1693950: a(n) Association 16r1693968: a(n) Association 16r1693C80: a(n) Association 16r1693C98: a(n) Association 16r1693E00: a(n) Association 16r1693E18: a(n) Association 16r1694060: a(n) Association 16r1694078: a(n) Association 16r1694748: a(n) Association 16r1694760: a(n) Association 16r1694930: a(n) Association 16r1694948: a(n) Association 16r1694F78: a(n) Semaphore 16r1716930: a(n) Association 16r1716CA8: a(n) Association 16r1716E98: a(n) Association 16r1716EB0: a(n) Association 16r17170F0: a(n) Association 16r17171E0: a(n) Association 16r17171F8: a(n) Association 16r1717790: a(n) Association 16r17177A8: a(n) Association 16r17177C0: a(n) Association 16r171D000: a(n) Association 16r17233C8: a(n) Association 16r17233E0: a(n) Association 16r17233F8: a(n) Association 16r1759D38: a(n) Array 16r1759D80: a(n) Association 16r175AB40: a(n) Array 16r1760F18: a(n) Association 16r1762460: a(n) WriteStream 16r1762F38: a(n) Association 16r176AC80: a(n) Point 16r176AC98: a(n) SystemWindowButton 16r176AD30: a(n) AlignmentMorph 16r176AD78: a(n) SystemWindowButton 16r176AE10: a(n) Point 16r176AE28: a(n) Point 16r176AE40: a(n) Point 16r176AE58: a(n) Point 16r176AE70: a(n) Point 16r176AE88: a(n) Point 16r176AEA0: a(n) Array 16r176AEB8: a(n) Point 16r176AED0: a(n) Point 16r176AEE8: a(n) Point 16r176AF00: a(n) Point 16r176AF18: a(n) Array 16r176AF30: a(n) Point 16r176AF48: a(n) Point 16r176AF60: a(n) Point 16r176AF78: a(n) Point 16r176AF90: a(n) Array 16r176AFA8: a(n) Point 16r176AFC0: a(n) Point 16r176AFD8: a(n) Point 16r176AFF0: a(n) Point 16r176B008: a(n) Array 16r176B020: a(n) Point 16r176B038: a(n) Point 16r176B050: a(n) Point 16r176B068: a(n) Point 16r176B080: a(n) Point 16r176B098: a(n) Point 16r176B0B0: a(n) Point 16r176B0C8: a(n) Point 16r176B0E0: a(n) Array 16r176B0F8: a(n) Point 16r176B110: a(n) Point 16r176B128: a(n) Point 16r176B140: a(n) Point 16r176B158: a(n) Array 16r176B170: a(n) Point 16r176B188: a(n) Point 16r176B1A0: a(n) Point 16r176B1B8: a(n) Point 16r176B1D0: a(n) Array 16r176B1E8: a(n) Point 16r176B200: a(n) Point 16r176B218: a(n) Point 16r176B230: a(n) Point 16r176B248: a(n) Array 16r176B260: a(n) Point 16r176B278: a(n) Point 16r176B290: a(n) Point 16r176B2A8: a(n) Point 16r176B2C0: a(n) Point 16r176B2D8: a(n) Point 16r176B2F0: a(n) Point 16r176B308: a(n) Point 16r176B320: a(n) Point 16r176B338: a(n) Point 16r176B350: a(n) Point 16r176B368: a(n) Point 16r176B380: a(n) Array 16r176B398: a(n) Point 16r176B3B0: a(n) Point 16r176B3C8: a(n) Point 16r176B3E0: a(n) Point 16r176B3F8: a(n) Point 16r176B410: a(n) Point 16r176B428: a(n) Point 16r176B440: a(n) Point 16r176B458: a(n) Array 16r176B470: a(n) Point 16r176B488: a(n) Point 16r176B4A0: a(n) Point 16r176B4B8: a(n) Point 16r176B4D0: a(n) Array 16r176B4E8: a(n) Point 16r176B500: a(n) Point 16r176B518: a(n) Point 16r176B530: a(n) Point 16r176B548: a(n) Array 16r176B560: a(n) Point 16r176B578: a(n) Point 16r176B590: a(n) Point 16r176B5A8: a(n) Point 16r176B5C0: a(n) Array 16r176B5D8: a(n) Point 16r176B5F0: a(n) Point 16r176B608: a(n) Point 16r176B620: a(n) Point 16r176B638: a(n) Array 16r176B650: a(n) Point 16r176B668: a(n) Point 16r176B680: a(n) Point 16r176B698: a(n) Point 16r176B6B0: a(n) Array 16r176B6C8: a(n) Point 16r176B6E0: a(n) Point 16r176B6F8: a(n) Point 16r176B710: a(n) Point 16r176B728: a(n) Point 16r176B740: a(n) Point 16r176B758: a(n) Point 16r176B770: a(n) Point 16r176B788: a(n) Array 16r176B7A0: a(n) Point 16r176B7B8: a(n) Point 16r176B7D0: a(n) Point 16r176B7E8: a(n) Point 16r176B800: a(n) Array 16r176B818: a(n) Point 16r176B830: a(n) Point 16r176B848: a(n) Point 16r176B860: a(n) Point 16r176B878: a(n) Point 16r176B890: a(n) Point 16r176B8A8: a(n) Point 16r176B8C0: a(n) Point 16r176B8D8: a(n) Array 16r176B8F0: a(n) Point 16r176B908: a(n) Point 16r176B920: a(n) Point 16r176B938: a(n) Point 16r176B950: a(n) Array 16r176B968: a(n) Point 16r176B980: a(n) Point 16r176B998: a(n) Point 16r176B9B0: a(n) Point 16r176B9C8: a(n) Array 16r176B9E0: a(n) Point 16r176B9F8: a(n) Point 16r176BA10: a(n) Point 16r176BA28: a(n) Point 16r176BA40: a(n) Array 16r176BA58: a(n) Point 16r176BA70: a(n) Point 16r176BA88: a(n) Point 16r176BAA0: a(n) Point 16r176BAB8: a(n) Array 16r176BAD0: a(n) Point 16r176BAE8: a(n) Point 16r176BB00: a(n) Point 16r176BB18: a(n) Point 16r176BB30: a(n) Point 16r176BB48: a(n) Point 16r176BB60: a(n) Point 16r176BB78: a(n) Point 16r176BB90: a(n) Array 16r176BBA8: a(n) Point 16r176BBC0: a(n) Point 16r176BBD8: a(n) Point 16r176BBF0: a(n) Point 16r176BC08: a(n) Array 16r176BC20: a(n) Point 16r176BC38: a(n) Point 16r176BC50: a(n) Point 16r176BC68: a(n) Point 16r176BC80: a(n) Point 16r176BC98: a(n) Point 16r176E638: a(n) Point 16r176E650: a(n) Point 16r176E668: a(n) Array 16r176E680: a(n) Point 16r176E698: a(n) Point 16r176E6B0: a(n) Point 16r176E6C8: a(n) Point 16r176E6E0: a(n) Array 16r176E6F8: a(n) Point 16r176E710: a(n) Point 16r176E728: a(n) Point 16r176E740: a(n) Point 16r176E758: a(n) Array 16r176E770: a(n) Point 16r176E788: a(n) Point 16r176E7A0: a(n) Point 16r176E7E8: a(n) Point 16r176E800: a(n) Array 16r176E818: a(n) Association 16r176E830: a(n) Association 16r176E848: a(n) Association 16r176E860: a(n) Association 16r176E878: a(n) MethodContext 16r176E930: a(n) MouseButtonEvent 16r176EAD0: a(n) WriteStream 16r176EDD8: a(n) OrderedCollection 16r17E8538: a(n) ByteString 16r17E85A0: a(n) IdentityDictionary 16r17E8968: a(n) IdentityDictionary 16r17E8A78: a(n) IdentityDictionary 16r17E8B08: a(n) IdentityDictionary 16r17E8B98: a(n) IdentityDictionary 16r17E8C28: a(n) Association 16r17E8CB8: a(n) Association 16r17E8D48: a(n) Association 16r17E8E58: a(n) Association 16r17E8EE8: a(n) Association 16r17E8F78: a(n) Association 16r17E9008: a(n) Association 16r17E9098: a(n) Association 16r17E9128: a(n) Association 16r17E91B8: a(n) Association 16r17E9248: a(n) Association 16r17E92D8: a(n) Association 16r17E9368: a(n) Association 16r17E93F8: a(n) Association 16r17E9488: a(n) Association 16r17E9518: a(n) Association 16r17E95A8: a(n) Association 16r17E9638: a(n) Association 16r17E96C8: a(n) Association 16r17E9758: a(n) Association 16r17E9868: a(n) Association 16r17E98F8: a(n) Association 16r17E9988: a(n) Association 16r17E9A18: a(n) Association 16r17E9AA8: a(n) Association 16r17E9B38: a(n) Association 16r17E9BC8: a(n) Association 16r17E9C58: a(n) Association 16r17E9CE8: a(n) Association 16r17E9D78: a(n) Association 16r17E9E08: a(n) Association 16r17E9E98: a(n) Association 16r17E9F28: a(n) Association 16r17E9FB8: a(n) Association 16r17EA048: a(n) Association 16r17EA0D8: a(n) Association 16r17EA168: a(n) Association 16r17EA1F8: a(n) Association 16r17EA288: a(n) Association 16r17EA318: a(n) Association 16r17EA3A8: a(n) Association 16r17EA438: a(n) Association 16r17EA4C8: a(n) Association 16r17EA558: a(n) Association 16r17EA5E8: a(n) Association 16r17EA678: a(n) Association 16r17EA708: a(n) Association 16r17EA798: a(n) Association 16r17EA828: a(n) Association 16r17EA8B8: a(n) Association 16r17EA948: a(n) Association 16r17EA9D8: a(n) Association 16r17EAA68: a(n) Association 16r17EAB78: a(n) Association 16r17EAC08: a(n) Association 16r17EAC98: a(n) Association 16r17EAD28: a(n) Association 16r17EADB8: a(n) Association 16r17EAE48: a(n) Association 16r17EAED8: a(n) Association 16r17EB3F8: a(n) Array 16r17EB480: a(n) DamageRecorder 16r17EB960: a(n) BoxedFloat64 16r17EBA70: a(n) Dictionary 16r17EBB00: a(n) Rectangle 16r17EBB90: a(n) Rectangle 16r17EBC20: a(n) Rectangle 16r17EBCB0: a(n) Rectangle 16r17EBD40: a(n) Rectangle 16r17EBDD0: a(n) ExpandedSourceFileArray 16r17EC300: a(n) Association 16r17EC740: a(n) Rectangle 16r17EC7D0: a(n) Dictionary 16r17F3018: a(n) Point 16r17F30E8: a(n) Rectangle 16r17F3C38: a(n) ByteString 16r17F3DB0: a(n) Point 16r17F3DC8: a(n) Point 16r17F4118: a(n) Heap 16r17F4140: a(n) Point 16r17F4158: a(n) Point 16r17F4170: a(n) IdentityDictionary 16r17F4188: a(n) Association 16r17F41A0: a(n) Association 16r17F41B8: a(n) Association 16r17F4F78: a(n) ByteString 16r17F4FF0: a(n) IdentityDictionary 16r17F5D18: a(n) ByteString 16r17F5D58: a(n) Color 16r17F5F18: a(n) OrderedCollection 16r17F6410: a(n) IdentityDictionary 16r17F6428: a(n) ByteString 16r17F6488: a(n) IdentityDictionary 16r17F64A0: a(n) IdentityDictionary 16r17F8B78: a(n) Array 16r17F8B90: a(n) Array 16r17F8BA8: a(n) Array 16r17F8BC0: a(n) Array 16r17F8BD8: a(n) Array 16r17F8BF0: a(n) Array 16r17F8C08: a(n) Array 16r17F8C20: a(n) Array 16r17F8C38: a(n) Array 16r17F8C50: a(n) Array 16r17F8C68: a(n) Array 16r17F8C80: a(n) Array 16r17F8C98: a(n) Array 16r17F8CB0: a(n) Array 16r17F8CC8: a(n) Array 16r17F8CE0: a(n) Array 16r17F8CF8: a(n) Array 16r17F8D10: a(n) Array 16r17F8D28: a(n) Array 16r17F8D40: a(n) Array 16r17F8D58: a(n) Array 16r17F8D70: a(n) Array 16r17F8D88: a(n) Array 16r17F8DA0: a(n) Array 16r17F8DB8: a(n) Array 16r17F8DD0: a(n) Array 16r17F8DE8: a(n) Array 16r17F8E00: a(n) Array 16r17F8E18: a(n) Array 16r17F8E30: a(n) Array 16r17F8E48: a(n) Array 16r17F8E60: a(n) Array 16r17F8E78: a(n) Array 16r17F8E90: a(n) Array 16r17F8EA8: a(n) Array 16r17F8EC0: a(n) Array 16r17F8ED8: a(n) Array 16r17F8EF0: a(n) Array 16r17F8F08: a(n) Array 16r17F8F20: a(n) Array 16r17F8F38: a(n) Array 16r17F8F50: a(n) Array 16r17F8F68: a(n) Array 16r17F8F80: a(n) Array 16r17F8F98: a(n) Array 16r17F8FB0: a(n) Array 16r17F8FC8: a(n) Array 16r17F8FE0: a(n) Array 16r17F8FF8: a(n) Array 16r17F9010: a(n) Array 16r17F9028: a(n) Array 16r17F90D0: a(n) Array 16r17F90E8: a(n) Array 16r17F9128: a(n) Array 16r17F9140: a(n) Array 16r17F9158: a(n) Array 16r17F9170: a(n) Array 16r17F9188: a(n) Array 16r17F91A0: a(n) Array 16r17F91B8: a(n) Array 16r17F91D0: a(n) Array 16r17F91E8: a(n) Array 16r17F9200: a(n) Array 16r17F9218: a(n) Array 16r17F9230: a(n) Array 16r17F9248: a(n) Array 16r17F9260: a(n) Array 16r17F9278: a(n) Array 16r17F9290: a(n) Array 16r17F92A8: a(n) Array 16r17F92C0: a(n) Array 16r17F92D8: a(n) Array 16r17F92F0: a(n) Array 16r17F9308: a(n) Array 16r17F9320: a(n) Array 16r17F9338: a(n) Array 16r17F9350: a(n) Array 16r17F9368: a(n) Array 16r17F9380: a(n) Array 16r17F9398: a(n) Array 16r17F93B0: a(n) Array 16r17F93C8: a(n) Array 16r17F93E0: a(n) Array 16r17F93F8: a(n) Array 16r17F9410: a(n) Array 16r17F9428: a(n) Array 16r17F9440: a(n) Array 16r17F9458: a(n) Array 16r17F9470: a(n) Array 16r17F9488: a(n) Array 16r17F94A0: a(n) Array 16r17F94B8: a(n) Array 16r17F94D0: a(n) Array 16r17F94E8: a(n) Array 16r17F9500: a(n) Array 16r17F9518: a(n) Array 16r17F9530: a(n) Array 16r17F9548: a(n) Array 16r17F9560: a(n) Array 16r17F9578: a(n) Array 16r17F9590: a(n) Array 16r17F95A8: a(n) Array 16r17F95C0: a(n) Array 16r17F95D8: a(n) Array 16r17F95F0: a(n) Array 16r17F9608: a(n) Array 16r17F9620: a(n) Array 16r17F9638: a(n) Array 16r17F9650: a(n) Array 16r17F9668: a(n) Array 16r17F9680: a(n) Array 16r17F9698: a(n) Array 16r17F96B0: a(n) Array 16r17F96C8: a(n) Array 16r17F96E0: a(n) Array 16r17F96F8: a(n) Array 16r17F9710: a(n) Array 16r17F9728: a(n) Array 16r17F9740: a(n) Array 16r17F9758: a(n) Array 16r17F9770: a(n) Array 16r17F9788: a(n) Array 16r17F97A0: a(n) Array 16r17F97B8: a(n) Array 16r17F97D0: a(n) Array 16r17F97E8: a(n) Array 16r17F9800: a(n) Array 16r17F9818: a(n) Array 16r17F9830: a(n) Array 16r17F9848: a(n) Array 16r17F9860: a(n) Array 16r17F9878: a(n) Array 16r17F9890: a(n) Array 16r17F98A8: a(n) Array 16r17F98C0: a(n) Array 16r17F9B08: a(n) Array 16r17F9B20: a(n) Array 16r17F9B60: a(n) Array 16r17F9B78: a(n) Array 16r17F9B90: a(n) Array 16r17F9BA8: a(n) Array 16r17F9BC0: a(n) Array 16r17F9BD8: a(n) Array 16r17F9BF0: a(n) Array 16r17F9C08: a(n) Array 16r17F9C20: a(n) Array 16r17F9C38: a(n) Array 16r17F9C50: a(n) Array 16r17F9C68: a(n) Array 16r17F9C80: a(n) Array 16r17F9C98: a(n) Array 16r17F9CB0: a(n) Array 16r17F9CC8: a(n) Array 16r17F9CE0: a(n) Array 16r17F9CF8: a(n) Array 16r17F9D10: a(n) Array 16r17F9D28: a(n) Array 16r17F9D68: a(n) Array 16r17F9D80: a(n) Array 16r17F9D98: a(n) Array 16r17F9DB0: a(n) Array 16r17F9DC8: a(n) Array 16r17F9DE0: a(n) Array 16r17F9DF8: a(n) Array 16r17F9E10: a(n) Array 16r17F9E28: a(n) Array 16r17F9E40: a(n) Array 16r17F9E58: a(n) Array 16r17F9E70: a(n) Array 16r17F9E88: a(n) Array 16r17F9EA0: a(n) Array 16r17F9EB8: a(n) Array 16r17F9ED0: a(n) Array 16r17F9EE8: a(n) Array 16r17F9F00: a(n) Array 16r17F9F18: a(n) Array 16r17F9F30: a(n) Array 16r17F9F48: a(n) Array 16r17F9F60: a(n) Array 16r17F9F78: a(n) Array 16r17F9F90: a(n) Array 16r17F9FA8: a(n) Array 16r17F9FC0: a(n) Array 16r17F9FD8: a(n) Array 16r17F9FF0: a(n) Array 16r17FA008: a(n) Array 16r17FA020: a(n) Array 16r17FA038: a(n) Array 16r17FA050: a(n) Array 16r17FA068: a(n) Array 16r17FA080: a(n) Array 16r17FA098: a(n) Array 16r17FA0B0: a(n) Array 16r17FA0C8: a(n) Array 16r17FA0E0: a(n) Array 16r17FA0F8: a(n) Array 16r17FA110: a(n) Array 16r17FA128: a(n) Array 16r17FA140: a(n) Array 16r17FA158: a(n) Array 16r17FA170: a(n) Array 16r17FA188: a(n) Array 16r17FA1A0: a(n) Array 16r17FA1B8: a(n) Array 16r17FA1D0: a(n) Array 16r17FA1E8: a(n) Array 16r17FA200: a(n) Array 16r17FA218: a(n) Array 16r17FA230: a(n) Array 16r17FA248: a(n) Array 16r17FA260: a(n) Array 16r17FA278: a(n) Array 16r17FA290: a(n) Array 16r17FA2A8: a(n) Array 16r17FA2C0: a(n) Array 16r17FA2D8: a(n) Array 16r17FA2F0: a(n) Array 16r17FA308: a(n) Array 16r17FA320: a(n) Array 16r17FA3B8: a(n) Array 16r17FA3D0: a(n) Array 16r17FA410: a(n) Array 16r17FA428: a(n) Array 16r17FA440: a(n) Array 16r17FA458: a(n) Array 16r17FA470: a(n) Array 16r17FA488: a(n) Array 16r17FA4A0: a(n) Array 16r17FA4B8: a(n) Array 16r17FA4D0: a(n) Array 16r17FA4E8: a(n) Array 16r17FA500: a(n) Array 16r17FA518: a(n) Array 16r17FA530: a(n) Array 16r17FA548: a(n) Array 16r17FA560: a(n) Array 16r17FA578: a(n) Array 16r17FA590: a(n) Array 16r17FA5A8: a(n) Array 16r17FA5C0: a(n) Array 16r17FA5D8: a(n) Array 16r17FA5F0: a(n) Array 16r17FA608: a(n) Array 16r17FA620: a(n) Array 16r17FA638: a(n) Array 16r17FA650: a(n) Array 16r17FA668: a(n) Array 16r17FA680: a(n) Array 16r17FA698: a(n) Array 16r17FA6B0: a(n) Array 16r17FA6C8: a(n) Array 16r17FA6E0: a(n) Array 16r17FA6F8: a(n) Array 16r17FA710: a(n) Array 16r17FA728: a(n) Array 16r17FA740: a(n) Array 16r17FA758: a(n) Array 16r17FA770: a(n) Array 16r17FA788: a(n) Array 16r17FA7A0: a(n) Array 16r17FA7B8: a(n) Array 16r17FA7D0: a(n) Array 16r17FA7E8: a(n) Array 16r17FA800: a(n) Array 16r17FA818: a(n) Array 16r17FA830: a(n) Array 16r17FA848: a(n) Array 16r17FA860: a(n) Array 16r17FA878: a(n) Array 16r17FA890: a(n) Array 16r17FA8A8: a(n) Array 16r17FA8C0: a(n) Array 16r17FA8D8: a(n) Array 16r17FA8F0: a(n) Array 16r17FA908: a(n) Array 16r17FA920: a(n) Array 16r17FA938: a(n) Array 16r17FA950: a(n) Array 16r17FA968: a(n) Array 16r17FA980: a(n) Array 16r17FA998: a(n) Array 16r17FA9B0: a(n) Array 16r17FA9C8: a(n) Array 16r17FA9E0: a(n) Array 16r17FA9F8: a(n) Array 16r17FAA10: a(n) Array 16r17FAA28: a(n) Array 16r17FAA40: a(n) Array 16r17FAA58: a(n) Array 16r17FAA70: a(n) Array 16r17FAA88: a(n) Array 16r17FAAA0: a(n) Array 16r17FAAB8: a(n) Array 16r17FAAD0: a(n) Array 16r17FAAE8: a(n) Array 16r17FAB00: a(n) Array 16r17FAB18: a(n) Array 16r17FAB30: a(n) Array 16r17FAB48: a(n) Array 16r17FAB60: a(n) Array 16r17FAB78: a(n) Array 16r17FAB90: a(n) Array 16r17FABA8: a(n) Array 16r17FAC60: a(n) Array 16r17FAC78: a(n) Array 16r17FACB8: a(n) Array 16r17FACD0: a(n) Array 16r17FACE8: a(n) Array 16r17FAD00: a(n) Array 16r17FAD18: a(n) Array 16r17FAD30: a(n) Array 16r17FAD48: a(n) Array 16r17FAD60: a(n) Array 16r17FAD78: a(n) Array 16r17FAD90: a(n) Array 16r17FADA8: a(n) Array 16r17FADC0: a(n) Array 16r17FADD8: a(n) Array 16r17FADF0: a(n) Array 16r17FAE08: a(n) Array 16r17FAE20: a(n) Array 16r17FAE38: a(n) Array 16r17FAE50: a(n) Array 16r17FAE68: a(n) Array 16r17FAE80: a(n) Array 16r17FAE98: a(n) Array 16r17FAEB0: a(n) Array 16r17FAEC8: a(n) Array 16r17FAEE0: a(n) Array 16r17FAEF8: a(n) Array 16r17FAF10: a(n) Array 16r17FAF28: a(n) Array 16r17FAF40: a(n) Array 16r17FAF58: a(n) Array 16r17FAF70: a(n) Array 16r17FAF88: a(n) Array 16r17FAFA0: a(n) Array 16r17FAFB8: a(n) Array 16r17FAFD0: a(n) Array 16r17FAFE8: a(n) Array 16r17FB000: a(n) Array 16r17FB018: a(n) Array 16r17FB030: a(n) Array 16r17FB048: a(n) Array 16r17FB060: a(n) Array 16r17FB078: a(n) Array 16r17FB090: a(n) Array 16r17FB0A8: a(n) Array 16r17FB0C0: a(n) Array 16r17FB0D8: a(n) Array 16r17FB0F0: a(n) Array 16r17FB108: a(n) Array 16r17FB120: a(n) Array 16r17FB138: a(n) Array 16r17FB150: a(n) Array 16r17FB168: a(n) Array 16r17FB180: a(n) Array 16r17FB198: a(n) Array 16r17FB1B0: a(n) Array 16r17FB1C8: a(n) Array 16r17FB1E0: a(n) Array 16r17FB1F8: a(n) Array 16r17FB210: a(n) Array 16r17FB228: a(n) Array 16r17FB240: a(n) Array 16r17FB258: a(n) Array 16r17FB270: a(n) Array 16r17FB288: a(n) Array 16r17FB2A0: a(n) MethodContext 16r17FB358: a(n) MethodContext 16r17FB410: a(n) FilePath 16r17FB430: a(n) ByteString 16r17FB470: a(n) IdentityDictionary 16r17FB488: a(n) Array 16r17FB5A8: a(n) Array 16r17FB610: a(n) Array 16r17FB648: a(n) Array 16r17FBEB8: a(n) GrafPort 16r17FC160: a(n) Point 16r17FC178: a(n) Point 16r17FC190: a(n) Point 16r17FC1A8: a(n) Point 16r17FC1C0: a(n) Point 16r17FC1D8: a(n) Array 16r17FC208: a(n) Rectangle 16r17FC220: a(n) Array 16r17FC250: a(n) MorphExtension 16r17FC2B0: a(n) Color 16r17FC2D0: a(n) Point 16r17FC2E8: a(n) Point 16r17FC300: a(n) Array 16r17FC320: a(n) Point 16r17FC338: a(n) Point 16r17FC350: a(n) Point 16r17FC368: a(n) Point 16r17FC380: a(n) Point 16r17FC398: a(n) Point 16r17FC3B0: a(n) Point 16r17FC3C8: a(n) Point 16r17FC3E0: a(n) Point 16r17FC3F8: a(n) Point 16r17FC410: a(n) Point 16r17FC428: a(n) Point 16r17FC440: a(n) Point 16r17FC458: a(n) Point 16r17FC470: a(n) Point 16r17FC488: a(n) Point 16r17FC4A0: a(n) Point 16r17FC4B8: a(n) Point 16r17FC4D0: a(n) Point 16r17FC4E8: a(n) Point 16r17FC500: a(n) Point 16r17FC518: a(n) Point 16r17FC530: a(n) Point 16r17FC548: a(n) Point 16r17FC560: a(n) Point 16r17FC578: a(n) Point 16r17FC590: a(n) Point 16r17FC5A8: a(n) Point 16r17FC5C0: a(n) Point 16r17FC5D8: a(n) Point 16r17FC5F0: a(n) Point 16r17FC608: a(n) Point 16r17FC620: a(n) Point 16r17FC8D0: a(n) Array 16r17FCD90: a(n) ByteArray 16r17FCDB0: a(n) ByteArray 16r17FCDD0: a(n) ByteArray 16r17FCDF0: a(n) MethodContext 16r17FCEA8: a(n) ByteString 16r17FCEE0: a(n) IdentityDictionary 16r17FF030: a(n) IdentityDictionary 16r17FFE00: a(n) ByteString 16r17FFE30: a(n) IdentityDictionary 16r18023F0: a(n) ByteString 16r1802440: a(n) IdentityDictionary 16r1802458: a(n) ByteString 16r18024B0: a(n) IdentityDictionary 16r1802608: a(n) SharedQueue 16r1802C90: a(n) MorphExtension 16r1803AB8: a(n) MorphExtension 16r1803B18: a(n) MorphExtension 16r1803B78: a(n) MorphExtension 16r1803BD8: a(n) MorphExtension 16r1803C38: a(n) MorphExtension 16r1803C98: a(n) MorphExtension 16r1803CF8: a(n) MorphExtension 16r1803D58: a(n) MorphExtension 16r1803DB8: a(n) MorphExtension 16r1803E18: a(n) MorphExtension 16r1803E78: a(n) MorphExtension 16r1803ED8: a(n) MorphExtension 16r1803F38: a(n) MorphExtension 16r1803F98: a(n) MorphExtension 16r1803FF8: a(n) MorphExtension 16r1804058: a(n) MorphExtension 16r18040B8: a(n) MorphExtension 16r1804118: a(n) MorphExtension 16r1804178: a(n) MorphExtension 16r18041D8: a(n) MorphExtension 16r1804238: a(n) MorphExtension 16r1804298: a(n) MorphExtension 16r18042F8: a(n) MorphExtension 16r1804358: a(n) MorphExtension 16r18043B8: a(n) MorphExtension 16r1804418: a(n) MorphExtension 16r1804478: a(n) MorphExtension 16r18044D8: a(n) MorphExtension 16r1804538: a(n) MorphExtension 16r1804598: a(n) MorphExtension 16r18045F8: a(n) MorphExtension 16r1804658: a(n) MorphExtension 16r18046B8: a(n) MorphExtension 16r18361E0: a(n) ByteString 16r1836218: a(n) IdentityDictionary 16r18367D8: a(n) ByteString 16r1836820: a(n) IdentityDictionary 16r1836838: a(n) IdentityDictionary 16r1836DC0: a(n) ByteString 16r1836DF0: a(n) IdentityDictionary 16r1836E08: a(n) ByteString 16r1836E30: a(n) IdentityDictionary 16r1836E48: a(n) IdentityDictionary 16r1857A78: a(n) ByteString 16r1857AB0: a(n) IdentityDictionary 16r185AA20: a(n) Rectangle 16r185AA38: a(n) Array 16r185AA48: a(n) Rectangle 16r185AA60: a(n) Rectangle 16r185AA78: a(n) Array 16r185AA88: a(n) Rectangle 16r185AAA0: a(n) Rectangle 16r185AAB8: a(n) Array 16r185AAC8: a(n) Rectangle 16r185AAE0: a(n) Array 16r185AAF0: a(n) TranslucentColor 16r185AB18: a(n) TranslucentColor 16r185AB40: a(n) MethodContext 16r185ABF8: a(n) BlockClosure 16r185DF58: a(n) Point 16r185DF70: a(n) Point 16r185DF88: a(n) SketchMorph 16r185DFE8: a(n) Point 16r185E000: a(n) Point 16r185E018: a(n) Point 16r185E030: a(n) Point 16r185E048: a(n) StringMorph 16r185E0A0: a(n) Point 16r185E0B8: a(n) Point 16r185E0D0: a(n) Point 16r185E0E8: a(n) Point 16r185E100: a(n) SketchMorph 16r185E160: a(n) Point 16r185E178: a(n) Point 16r185E190: a(n) MethodContext 16r185E248: a(n) BlockClosure 16r185E270: a(n) MethodContext 16r185E3E8: a(n) Rectangle 16r185E400: a(n) Rectangle 16r185E418: a(n) Point 16r185E430: a(n) Rectangle 16r185E448: a(n) Rectangle 16r185E460: a(n) ByteString 16r185E470: a(n) Rectangle 16r185E488: a(n) Rectangle 16r185E4A0: a(n) Point 16r185E4B8: a(n) MethodContext 16r185E570: a(n) Point 16r185E588: a(n) Point 16r185E5A0: a(n) Point 16r185E5B8: a(n) Point 16r185E5D0: a(n) BoxedFloat64 16r185E5E0: a(n) BoxedFloat64 16r185E5F0: a(n) Point 16r185E608: a(n) Point 16r185E620: a(n) Point 16r185E638: a(n) Point 16r185E650: a(n) Point 16r185E668: a(n) Point 16r185E680: a(n) Point 16r185E698: a(n) Point 16r185E6B0: a(n) BoxedFloat64 16r185E6C0: a(n) BoxedFloat64 16r185E6D0: a(n) MethodContext 16r185E788: a(n) MethodContext 16r185E840: a(n) MethodContext 16r185E8F8: a(n) MethodContext 16r185E9B0: a(n) MethodContext 16r185EA68: a(n) MorphicEventDispatcher 16r185EA80: a(n) MethodContext 16r185EB38: a(n) MethodContext 16r185EBF0: a(n) MethodContext 16r185ECA8: a(n) MouseButtonEvent 16r185ECF0: a(n) MethodContext 16r185EDA8: a(n) MethodContext 16r185EE60: a(n) MethodContext 16r185EF18: a(n) MethodContext 16r185EFD0: a(n) MethodContext 16r185F088: a(n) BlockClosure 16r185F0C0: a(n) Array 16r185F0D0: a(n) MethodContext 16r185F188: a(n) BlockClosure 16r185F1C0: a(n) MethodContext 16r185F278: a(n) MouseEvent 16r185F2B8: a(n) MethodContext 16r185F370: a(n) BlockClosure 16r185F390: a(n) Point 16r185F3A8: a(n) MethodContext 16r185F460: a(n) MethodContext 16r185F518: a(n) MethodContext 16r185F5D0: a(n) MethodContext 16r185F688: a(n) MethodContext 16r185F740: a(n) BlockClosure 16r185F768: a(n) Array 16r185F778: a(n) MethodContext 16r185F830: a(n) MethodContext 16r185F8E8: a(n) MethodContext 16r185F9A0: a(n) MethodContext 16r18652A0: a(n) ByteString 16r18652E8: a(n) IdentityDictionary 16r1865300: a(n) ByteString 16r1865360: a(n) IdentityDictionary 16r1865378: a(n) ByteString 16r1865398: a(n) IdentityDictionary 16r18653B0: a(n) IdentityDictionary 16r18653C8: a(n) IdentityDictionary 16r18653E0: a(n) IdentityDictionary 16r18653F8: a(n) IdentityDictionary 16r1865410: a(n) MethodContext 16r1865B38: a(n) ByteArray 16r1867820: a(n) ByteArray 16r1867E58: a(n) ByteArray 16r1868148: a(n) ByteArray 16r1868438: a(n) ByteArray 16r1869D70: a(n) ByteArray 16r186A4D0: a(n) Array 16r186D8D0: a(n) ByteArray 16r1874DC8: a(n) MorphExtension 16r1874E28: a(n) MorphExtension 16r1874E88: a(n) MorphExtension 16r1874EE8: a(n) MorphExtension 16r1874F48: a(n) MorphExtension 16r1874FA8: a(n) MorphExtension 16r1875008: a(n) MorphExtension 16r1875068: a(n) MorphExtension 16r18750C8: a(n) MorphExtension 16r1875128: a(n) MorphExtension 16r1875188: a(n) MorphExtension 16r18B4298: a(n) ByteArray 16r18BC598: a(n) ByteArray 16r18E7658: a(n) SharedQueue 16r1972B10: a(n) Association 16r1973C18: a(n) WorldState 16r1973CF0: a(n) Array 16r1973D98: a(n) Array 16r1973DF8: a(n) Point 16r1973E10: a(n) Point 16r1973E28: a(n) Array 16r1973E80: a(n) Semaphore 16r1973EA0: a(n) Semaphore 16r1973EC0: a(n) Array 16r1973F18: a(n) Semaphore 16r1973F38: a(n) Semaphore 16r19740E0: a(n) GradientFillStyle 16r1974178: a(n) Set 16r1974190: a(n) WeakFinalizerItem 16r19741B8: a(n) PasteUpMorph 16r1974268: a(n) GradientFillStyle 16r19742A8: a(n) Color 16r19742C8: a(n) Rectangle 16r19742E0: a(n) Rectangle 16r19742F8: a(n) Rectangle 16r1974310: a(n) Rectangle 16r1974328: a(n) Rectangle 16r1974340: a(n) Rectangle 16r1974358: a(n) Rectangle 16r1974370: a(n) Rectangle 16r1974388: a(n) Rectangle 16r19743A0: a(n) Rectangle 16r19743B8: a(n) Rectangle 16r19743D0: a(n) Rectangle 16r19743E8: a(n) Point 16r1974400: a(n) Rectangle 16r1974418: a(n) Rectangle 16r1974430: a(n) Rectangle 16r1974448: a(n) Rectangle 16r1974460: a(n) FormCanvas 16r19744A0: a(n) Process 16r19744F0: a(n) Process 16r1974540: a(n) UnixFileDirectory 16r1974550: a(n) Array 16r19745F8: a(n) OrderedCollection 16r1974618: a(n) IdentityDictionary 16r1974630: a(n) Rectangle 16r1974648: a(n) ByteArray 16r1974750: a(n) Dictionary 16r1974768: a(n) Array 16r19747C8: a(n) HandMorph 16r1975310: a(n) MouseEvent 16r1975350: a(n) Array 16r1975398: a(n) Array 16r1975418: a(n) MethodContext 16r19767B8: a(n) Point 16r19767D0: a(n) Point 16r19767E8: a(n) Point 16r1976800: a(n) Point 16r1976818: a(n) OrderedCollection 16r1976838: a(n) Rectangle 16r19782F8: a(n) Array 16r1978378: a(n) Point 16r1978390: a(n) Point 16r19785F8: a(n) Association 16r1978610: a(n) Association 16r1978628: a(n) Association 16r1978640: a(n) Association 16r1978658: a(n) Association 16r1978670: a(n) Association 16r1978688: a(n) Association 16r19786A0: a(n) Association 16r19786B8: a(n) Association 16r19786D0: a(n) Association 16r19786E8: a(n) Association 16r1978700: a(n) Association 16r1978718: a(n) Association 16r1978730: a(n) Association 16r1978748: a(n) Association 16r1978760: a(n) Association 16r1978778: a(n) Association 16r1978790: a(n) Association 16r19787A8: a(n) Association 16r19787C0: a(n) Association 16r19787D8: a(n) Association 16r19787F0: a(n) Association 16r1978808: a(n) Association 16r1978820: a(n) Association 16r1978838: a(n) Association 16r1978850: a(n) Association 16r1978868: a(n) Association 16r1978880: a(n) Association 16r1978898: a(n) Association 16r19788B0: a(n) Association 16r19788C8: a(n) Association 16r19788E0: a(n) Association 16r19788F8: a(n) Association 16r1978910: a(n) Association 16r1978928: a(n) Association 16r1978940: a(n) Association 16r1978958: a(n) Association 16r1978970: a(n) Association 16r1978988: a(n) Association 16r19789A0: a(n) Association 16r19789B8: a(n) Association 16r19789D0: a(n) Association 16r19789E8: a(n) Association 16r1978A00: a(n) Association 16r1978A18: a(n) Association 16r1978A30: a(n) Association 16r1978A48: a(n) Association 16r1978A60: a(n) Association 16r1978A78: a(n) Association 16r1978A90: a(n) Association 16r1978AA8: a(n) Association 16r1978AC0: a(n) Association 16r1978AD8: a(n) Association 16r1978AF0: a(n) Association 16r1978B08: a(n) Association 16r1978B20: a(n) Association 16r1978B38: a(n) Association 16r1978B50: a(n) Association 16r1978B68: a(n) Association 16r1978B80: a(n) Association 16r1978B98: a(n) Association 16r1978BB0: a(n) Association 16r1978BC8: a(n) Association 16r1978BE0: a(n) Association 16r1978BF8: a(n) Association 16r1978C10: a(n) Association 16r1978C28: a(n) Association 16r1978C40: a(n) Association 16r1978C58: a(n) Association 16r1978C70: a(n) Association 16r1978C88: a(n) Association 16r1978CA0: a(n) Association 16r1978CB8: a(n) Association 16r1978CD0: a(n) Association 16r1978CE8: a(n) Association 16r1978D00: a(n) Association 16r1978D18: a(n) Association 16r1978D30: a(n) Association 16r1978D48: a(n) Association 16r1978D60: a(n) Association 16r1978D78: a(n) Association 16r1978D90: a(n) MethodContext 16r1978E48: a(n) BlockClosure 16r1978E68: a(n) MethodContext 16r1978F20: a(n) BlockClosure 16r1978F40: a(n) MethodContext 16r1978FF8: a(n) BlockClosure 16r1979018: a(n) MethodContext 16r19790D0: a(n) BlockClosure 16r19790F0: a(n) MethodContext 16r19791A8: a(n) MethodContext 16r1979260: a(n) MethodContext 16r1979D58: a(n) MethodContext 16r1979E10: a(n) MethodContext 16r1979EC8: a(n) MethodContext 16r1981770: a(n) Process 16r199DFF0: a(n) MethodContext 16r199F990: a(n) MethodContext 16r199FD18: a(n) MethodContext 16r19B38B8: a(n) Bitmap 16r1A17F90: a(n) ByteString 16r1AB4B28: a(n) ByteString 16r1AB4B50: a(n) UTF8TextConverter 16r1B5F6E8: a(n) ByteString 16r1B5FCC8: a(n) ByteString 16r1B60398: a(n) ByteString 16r1B604C0: a(n) ByteString 16r1B60C28: a(n) ByteString 16r1B60D58: a(n) ByteString 16r1B60DE8: a(n) ByteString 16r1B61038: a(n) ByteString 16r1B61140: a(n) ByteString 16r1B61298: a(n) ByteString 16r1B61450: a(n) ByteString 16r1B61600: a(n) Color 16r1B61690: a(n) Color 16r1B617E8: a(n) BlockClosure 16r1B618E8: a(n) OrderedCollection 16r1B63010: a(n) Association 16r1B63028: a(n) Association 16r1B63040: a(n) Association 16r1B63230: a(n) Association 16r1B63248: a(n) Association 16r1B63260: a(n) Rectangle 16r1B633F8: a(n) DamageRecorder 16r1B64D40: a(n) ByteString 16r1B64E10: a(n) ByteString 16r1B64E98: a(n) ByteString 16r1B64EB0: a(n) ByteString 16r1B64F10: a(n) ByteString 16r1B64F28: a(n) ByteString 16r1B64F88: a(n) ByteString 16r1B64FA0: a(n) ByteString 16r1B651A8: a(n) ByteString 16r1B651C8: a(n) ByteString 16r1B65210: a(n) ByteString 16r1B65228: a(n) ByteString 16r1B652E0: a(n) ByteString 16r1B652F8: a(n) ByteString 16r1B65310: a(n) ByteString 16r1B65360: a(n) ByteString 16r1B65380: a(n) ByteString 16r1B653C0: a(n) ByteString 16r1B653D8: a(n) ByteString 16r1B65490: a(n) ByteString 16r1B654B0: a(n) ByteString 16r1B65518: a(n) ByteString 16r1B65540: a(n) ByteString 16r1B65B80: a(n) ByteString 16r1B65BA8: a(n) ByteString 16r1B65C48: a(n) ByteString 16r1B65C60: a(n) ByteString 16r1B65C78: a(n) ByteString 16r1B65D18: a(n) ByteString 16r1B65D30: a(n) ByteString 16r1B65D48: a(n) ByteString 16r1B65DA8: a(n) ByteString 16r1B65DC0: a(n) ByteString 16r1B65DD8: a(n) ByteString 16r1B65E20: a(n) ByteString 16r1B65E40: a(n) ByteString 16r1B66150: a(n) ByteString 16r1B66168: a(n) ByteString 16r1B661E0: a(n) ByteString 16r1B661F8: a(n) ByteString 16r1B66210: a(n) ByteString 16r1B662C8: a(n) ByteString 16r1B662E0: a(n) ByteString 16r1B662F8: a(n) ByteString 16r1B66358: a(n) ByteString 16r1B66370: a(n) ByteString 16r1B66388: a(n) ByteString 16r1B665D8: a(n) ByteString 16r1B665F8: a(n) ByteString 16r1B66688: a(n) ByteString 16r1B666A0: a(n) ByteString 16r1B666B8: a(n) ByteString 16r1B66760: a(n) ByteString 16r1B66778: a(n) ByteString 16r1B66790: a(n) ByteString 16r1B66A40: a(n) ByteString 16r1B66A68: a(n) ByteString 16r1B66BF8: a(n) ByteString 16r1B66C18: a(n) ByteString 16r1B66CA0: a(n) ByteString 16r1B66CB8: a(n) ByteString 16r1B66CD0: a(n) ByteString 16r1B66D08: a(n) ByteString 16r1B66D20: a(n) ByteString 16r1B66D38: a(n) ByteString 16r1B66D98: a(n) ByteString 16r1B66DB0: a(n) ByteString 16r1B66DC8: a(n) ByteString 16r1B672E8: a(n) ByteString 16r1B67308: a(n) ByteString 16r1B67418: a(n) Array 16r1D274D0: a(n) MorphExtension -- best, Eliot

5 12

VM Maker: CMakeVMMakerSqueak-tty.107.mcz
by commits＠source.squeak.org 13 Dec '14

13 Dec '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.107.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.107 Author: tty Time: 13 December 2014, 3:28:14.016 pm UUID: cab88c6d-4a10-434c-905b-771a3a182598 Ancestors: CMakeVMMakerSqueak-tty.106 Linux32x86SqueakCogV3Config generates its CMake tree and is ready to be customized on my 32 bit machine. HelpBrowser openOn: CMakeVMMakerSqueakStepByStepNewConfigurationHelp gives step-by-step instructions on porting an existing configuration up to the customization step. I will be writing on how to methodologically customize a concrete customization as I do that for this new configuration. I will do that tomorrow. Removed an obsolete linkLibs methods as these have been normalized into CFLags, Definitions , external Libraries and linkerFlags methods that mimic the mvm files in the autotools build. Next up:: Go through each Platform Abstract Base Class and make sure it uses the CMake Templates Finish the pure 32 bit config Announce the first release of the tool. build out the buildTypes after figuring out he noDbgRegParms issue in gcc =============== Diff against CMakeVMMakerSqueak-tty.106 =============== Item was changed: ----- Method: CMakeVMMakerSqueakDesignPatternsHelp class>>redirectPatternImplementation (in category 'pages') ----- redirectPatternImplementation ^HelpTopic title: 'Method Redirect Implementation' contents: 'Implementation is very straight forward. + Pictorially it looks like this: + #buildITimerHeartbeat #buildMultiThreaded + --are redirected to---> #build - For ''Release'' type buildTypes the default is to return setGlobalOptionsBuild: aMaker. + And this: + #buildAssert #buildAssertITimerHeartbeat #buildDebugITimerHeartbeat#buildMultiThreadedAssert #buildMultiThreadedDebug + -- are redirected to---> #buldDebug - Example: - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - For "Debug" type buildTypes the default is to return setGlobalOptionsBuild: aMaker + In code: - Example: + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker <----redirect to #build + + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuildDebug: aMaker <----redirect to #buildDebug - ^self setGlobalOptionsBuildDebug: aMaker Any Configuration in the CPlatformConfigForSqueak heirarchy can override any of these Redirect Methods to provide custom results for any build type at any step in the generate process. + The Implementation is a bit of over-kill in many instances. However, I find the idea of boiler-plate consistency is easier to code and comprehend for newbie coders. + Getting newbie-coders comfortable writing configurations is a goal of this project. - '! Item was changed: ----- Method: CMakeVMMakerSqueakDesignPatternsHelp class>>redirectPatternMotivation (in category 'pages') ----- redirectPatternMotivation ^HelpTopic title: 'Method Redirect Pattern Motivation' contents: 'The motivation for the Redirect Pattern is to reduce the number of concrete configurations by encapsulating every possible build type in one concrete configuration + If you look at the pharo CMakeVMMaker package, under the CMakeVMMaker-Unix class category, note the existence of StackUnixConfig and its child class StackUnixDebugConfig. It is the "Debug" that is the problem. The pharo team supports two build types: Release and Debug, while the Squeak team supports (currently) 10 build types. By adopting the pharo strategy of creating a new sub-class for each buildType the number of Concrete Configurations becomes--in my view--too many. - If you look at the pharo CMakeVMMaker package, under the CMakeVMMaker-Unix class category, note the existence of StackUnixDebugConfig. It is the "Debug" that is the problem. The pharo team supports two build types: Release and Debug, while the Squeak team supports (currently) 10 build types. The number of Concrete Configurations becomes--in my view--too many. Here is the math: + A configurations [PLATFORM]x[Language]x[VM]x[Memory Manager]x[buildType] form expands to: + [BSD32x64. | .....| SunOS32x86] x [Newspeak | Squeak ]. [Cog | Stack ] [V3 | Spur] [#build | #build.debug| ...| #buildMultiThreadedDebug] - A configurations [PLATFORM].[Language].[VM].[Memory Manager] [buildType] form expands to: - [BSD32x64. | .....| SunOS32x86].[Newspeak | Squeak ].Cog | Stack ].[V3 | Spur] [#build | #build.debug| ...| #buildMultiThreadedDebug] which in combination yeilds (as of today) [10 platforms] x [2 languages] x [2 VM''s] x [2 Memory Managers] x [10 buildTypes] = 600 concrete configurations. By implementing the redirect pattern, the buildType is handled within a single concrete implementation. and math becomes a much more manageable [10 platforms] x [2 languages] x [2 VM''s] x [2 Memory Managers] = 60 concrete configurations. It is for this reason that I implemented this design pattern. An explanation of the naming convention is available by evaluating HelpBrowser openOn: CMakeVMMakerSqueakOverviewHelp'! Item was changed: ----- Method: CMakeVMMakerSqueakDesignPatternsHelp class>>redirectPatternSummary (in category 'pages') ----- redirectPatternSummary ^HelpTopic title: 'Method Redirect Summary' contents: 'The motivation for the Redirect Pattern is to reduce the number of concrete configurations by encapsulating every possible build type in one concrete configuration. This is accomplished by redirecting sends to a single method to a method appropriate for that build type. A fair critique is to ask "Why the overkill with all the methods when you only use a subset and it is doubtful that a particular one will need to be over-ridden?" The answer is that I find it easier to understand--and I believe easier for newbies to understand--the source code when it is consistently applied. Secondly, adding new redirect methods is straighforward boilerplate--just a matter of copy-n-paste-rename. Thirdly it reduces brain-cycles when debugging. - - - - - - I hope this tutorial has made things clear. - ' ! Item was removed: - ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testLinkFlags (in category 'as yet unclassified') ----- - testLinkFlags - #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o buildTypes| - o:= configuration basicNew. - (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - ifTrue:[ - buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). - buildTypes do:[:buildType | - o configureForBuildType: buildType. - self assert:(o linkFlags isString)]]]].! Item was changed: ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>firstCMakeGeneration (in category 'pages') ----- firstCMakeGeneration ^HelpTopic title:'First CMake Generation' contents: 'For didactic purposes I am going to do a sanity check and generate CMake code from the configuration for the first time. If you are not familiar with the CMakeVMMakerSqueak naming conventions, please evaluate: HelpBrowser openOn: CMakeVMMakerSqueakOverviewHelp On my system the Cog svn tree is located under my Squeak install directory in the folder ''oscogvm". Opening an X-term and navigating there it looks like this: bash-4.2$ pwd /home/tty/usr/src/smalltalk/CMake.oscog/cogVMMaker/oscogvm The contents of the directory look something like this. Note the subdirectory that starts with ""cmake."" bash-4.2$ ls --width=1 CHANGES LICENSE README README.old build build.linux32ARM build.linux32x86 build.macos32x86 build.macos64x64 build.win32x86 cmake.build.linux64x86w32BitCompatibility <-----created by CMakeVMMakerSqueak for the Linux64x86w32BitSqueakCogV3Config history image ..... That cmake.build.linux64x86w32BitCompatibility directory was generated by a previous cmake generation for the Linux64X86-32BitCompatibility Platform. + For demonstration sake, I remove the directory. + bash-4.2$ rm -Rf cmake.* + Now, I ask the Builder to configure my new configuration for a buildType and output its contents. I do so by evaluating: SqueakLinux32x86Builder configureA: #Linux32x86SqueakCogV3Config forBuildType:#build; enableMessageTracking: true; generateByTemplate. + (Note: if you get errors during the generatation, shut down squeak and restart. I think it has something to do with open file handles): + and look again - and look again : bash-4.2$ ls cmake.build.linux64x86w32BitCompatibility/ squeak.cog.v3 bash-4.2$ tree cmake.build.linux64x86w32BitCompatibility/ `-- squeak.cog.v3 `-- build |-- ADPCMCodecPlugin | `-- CMakeLists.txt ...etc We see that the configuration has generated its build heirarchy. - Note, however that the cmake.build.linux64x86w32BitCompatibility directory is for a different Platform!! Since we copied an existing Configuration from a different platform, this make sense. + To change it, we go to our Abstract Base Class and modify + Linux32x86Config>>dirBuildPlatform + ^self dirLinux32x86 + Then regenerate our CMake + SqueakLinux32x86Builder + configureA: #Linux32x86SqueakCogV3Config forBuildType:#build; + enableMessageTracking: true; + generateByTemplate. + And examine our directory: - dirBuildPlatform - "the directory for the platform. example: build.linux32x86" - ^self dirLinux32x86 + bash-4.2$ ls cmake.build.linux* + cmake.build.linux32x86: <dirLinux32X86 + squeak.cog.v3 + and examining the heirarchy we see: + bash-4.2$ tree -d cmake.build.linux32x86/ + cmake.build.linux32x86/ + `-- squeak.cog.v3 + `-- build + |-- ADPCMCodecPlugin + |-- AsynchFilePlugin + |-- B2DPlugin + |-- BMPReadWriterPlugin + |-- BitBltPlugin + |-- CroquetPlugin + |-- DSAPrims + |-- DropPlugin + |-- FFTPlugin + |-- FileCopyPlugin + |-- FilePlugin + |-- FloatArrayPlugin + |-- FloatMathPlugin + |-- JoystickTabletPlugin + |-- Klatt + |-- LargeIntegers + |-- LocalePlugin + |-- MIDIPlugin + |-- Matrix2x3Plugin + |-- MiscPrimitivePlugin + |-- Mpeg3Plugin + |-- SecurityPlugin + |-- SerialPlugin + |-- SocketPlugin + |-- SoundCodecPrims + |-- SoundGenerationPlugin + |-- SoundPlugin + |-- StarSqueakPlugin + |-- SurfacePlugin + |-- ZipPlugin + |-- vm-display-X11 + |-- vm-display-null + |-- vm-sound-ALSA + `-- vm-sound-nul + + Congratulations. You are almost done. + + From here on out your only task is to correctly customize your Concrete Configuration such that it correctly builds for your [platform][language][vm][memorymodel][buildType] + + + ' ! Item was changed: ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>pages (in category 'accessing') ----- pages ^#(overview tests identifyPlatform identifyPlatformAbstractBaseClass identifyBuilder createTheConfiguration excludingConfigFromBuilds setAvailableBuildTypes firstCMakeGeneration + takingStock setOutputPath settingPlugins aNoteOnFoo )! Item was added: + ----- Method: CMakeVMMakerSqueakStepByStepNewConfigurationHelp class>>takingStock (in category 'pages') ----- + takingStock + ^HelpTopic + title:'Where You Are Now' + contents: + ' If your Concrete Builder has successfully generate the CMake tree in the correct folder structure then you are almost done. + + The rest of the process from here on out is tweaking the Concrete Configuration so that it generates valid CMake for your platform and buildTypes. + + If you have not generated CMake output at this point, go back and try until you can. + + At this point, please evaluate: + HelpBrowser openOn: CMakeVMMakerSqueakDesignPatternsHelp + + And read the secion on the Method Redirect Pattern before continuing. + ' + + ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlags (in category 'cmake buildType redirects') ----- - linkFlags - " - cmake --help-property LINK_FLAGS - LINK_FLAGS - ---------- - - Additional flags to use when linking this target. - - The LINK_FLAGS property can be used to add extra flags to the link - step of a target. LINK_FLAGS_<CONFIG> will add to the configuration - <CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. - - '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..." - |d flags| - self flag:'tty'. "is a link_flag really something like -lX11 or is it something else?" - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self linkFlagsBuild]; - at: #buildAssert put: [self linkFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self linkFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self linkFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self linkFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self linkFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self linkFlagsBuildMultiThreaded ]; - at: #buildMultiThreadedAssert put: [self linkFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self linkFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self linkFlagsNoBuildType]. - flags := String - streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set) - asStringOn: stream - delimiter: ' ']. - ^flags. - - - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuild (in category 'cmake buildType redirects') ----- - linkFlagsBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'linkFlagsBuild' - - ^ { - '-lpthread' - . '-luuid' - } - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssert - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssertITimerHeartbeat - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebug - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebugITimerHeartbeat - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildITimerHeartbeat - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreaded - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedAssert - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedDebug - "override this if you need to customize for this build type" - ^ self linkFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>linkFlagsNoBuildType (in category 'cmake buildType redirects') ----- - linkFlagsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>linkerFlags (in category 'compiling') ----- linkerFlags self flag:'tty'. "Does this need to be ported to the redirect design pattern with linkerFlagsBuild, linkerFlagsDebug etc?" + " + linkerFlags + ^#( '-Wl' + '-z' + 'now' + ) + " + + - "-Wl -z now define these in your concrete CPlatformConfigForSqueak and feed them to cmakeSharedLinkerFlags" self subclassResponsibility! Item was removed: - ----- Method: Linux32ARMv6Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- - linkFlagsBuild - "Answer array of libraries to link to - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'" - ^ { - '-lpthread' - . '-luuid' - }! Item was changed: SqueakUnixConfig subclass: #Linux32x86Config instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Linux32x86'! + !Linux32x86Config commentStamp: '<historical>' prior: 0! + A Linux64x86w32BitConfig is an Abstract base class that provides common information for my subclasses. - !Linux32x86Config commentStamp: 'tty 12/8/2014 11:24' prior: 0! - A Linux32x86Config is an Abstract base class that provides common information for my subclasses. I am not meant to be built. + I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf + SqueakLinux64x86w32CompatBuilder - SqueakLinux32x86Builder configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; enableMessageTracking: true; generateByTemplate. + HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp + ! Item was changed: ----- Method: Linux32x86Config>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- addVMPluginsBuild: aMaker |temp o| self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" enabledebugmessages ifTrue: [templates "this message will go to the top level CMakeLists.txt file" addLast: (CMakeMessage new message: self class name , 'addVMPluginsBuild: aMaker')]. vmplugins do:[ :vmp | o := String new writeStream. "each VMPlugin gets its own CMakeLists.txt file in its own directory" temp := OrderedCollection new. temp addAllLast:((CMakePluginVm new) "this is the CMakeCompositTemplate" config: self definitions: (vmp compilerdefinitions) module: (vmp module) sources: (vmp sources) includedirectories: (vmp includedirectories)). temp do: [:each | o nextPutAll: (each content); cr]. ((self buildDir) directoryExists: (vmp module)) ifFalse:[ (self buildDir) createDirectory: (vmp module)]. self write: (o contents) toFile: vmp module , FileDirectory slash , aMaker outputFileName. templates "this will go to the top level CMakeLists.txt file" addLast: ((CMakeAddSubDirectory new) sourcedir: (vmp module)) ]. ! Item was changed: ----- Method: Linux32x86Config>>availableBuildTypes (in category 'cmake') ----- availableBuildTypes + ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes + " - self flag:'tty'. "Should this be pushed up? I am guessing yes" - ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes - " subclasses should use + subclasses should use + + ^super allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " - ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was changed: ----- Method: Linux32x86Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- coreSourcesBuild "files to include from src/vm dir" ^ #( 'cogit.c' + 'gcc3x-cointerp.c' - 'cointerp.c' )! Item was changed: ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- coreSourcesBuildMultiThreaded "files to include from src/vm dir" ^ #( 'cogit.c' 'cointerpmt.c' )! Item was changed: ----- Method: Linux32x86Config>>customizeCMakeVMDisplayNull (in category 'plugins') ----- customizeCMakeVMDisplayNull |module| module := vmplugins detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" module sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: #(); linkerflags: (self linkerFlags); includedirectories:(OrderedCollection with:'${crossDir}/plugins/FilePlugin' with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' with: '${crossDir}/plugins/B3DAcceleratorPlugin'). self flag:'tty'. "I don't think includedirectories is correct. revisit" + + + + + ! Item was changed: ----- Method: Linux32x86Config>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- customizeCMakeVMDisplayX11 |module| module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" module sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories:(OrderedCollection with:'${crossDir}/plugins/FilePlugin' with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' with: '${crossDir}/plugins/B3DAcceleratorPlugin'). ! Item was changed: ----- Method: Linux32x86Config>>customizeCMakeVMSoundALSA (in category 'plugins') ----- customizeCMakeVMSoundALSA |module| module := vmplugins detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" module sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories: #(). ! Item was changed: ----- Method: Linux32x86Config>>customizeCMakeVMSoundNull (in category 'plugins') ----- customizeCMakeVMSoundNull |module| module := vmplugins detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" module sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories:#() ! Item was changed: ----- Method: Linux32x86Config>>customizeVMPlugins (in category 'plugins') ----- customizeVMPlugins |mysubset iwantonly| "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use on this OS/platform" iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). mysubset := vmplugins select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. vmplugins := mysubset. self customizeCMakeVMDisplayNull; customizeCMakeVMDisplayX11; customizeCMakeVMSoundALSA; customizeCMakeVMSoundNull. + ! Item was changed: ----- Method: Linux32x86Config>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins + ^ #( + B3DAcceleratorPlugin + ThreadedIA32FFIPlugin "SqueakFFIPrims" + "UUIDPlugin" + "UnixOSProcessPlugin ?? " + JPEGReaderPlugin + JPEGReadWriter2Plugin + RePlugin + InternetConfigPlugin + ) - " tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.ext" - ^ #(B3DAcceleratorPlugin - BochsIA32Plugin - ThreadedFFIPlugin "moduleName->SqueakFFIPrims " - "FFIPlugin" "moduleName->SqueakFFIPrims " - SqueakSSLPlugin "moduleName->SqueakSSL" - LocalePlugin - UnixOSProcessPlugin - UUIDPlugin) + "debug"! - - "N.B. Regarding ThreadedFFIPlugin and FFIPlugin from eem: - - Use ThreadedFFIPlugin. The FFIPlugin is obsolete (it requires assembler support files, and is non-reentrant). This should generate in src/plugins/SqueakFFIPrims/{SqueakFFIPrims.c,ARM32FFIPlugin.c,IA32FFIPlugin.c} and you should compile only src/plugins/SqueakFFIPrims/SqueakFFIPrims.c. src/plugins/SqueakFFIPrims/SqueakFFIPrims.c is a simple wrapper that includes ARM32FFIPlugin.c or IA32FFIPlugin.c as appropriate (and others can be added as they are developed). - - - "! Item was changed: ----- Method: Linux32x86Config>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins + " took from unixbuild/bld/plugins.int" - " tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int - N.B. moduleName->XYZ means XYZ appears in the GNU-Build's plugins.int/ext. However, Smalltalk requires the class name. - XYZSmalltalkClass moduleName->XYZ as it appears in plugins.int/ext - " ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "B2DPlugin" + BitBltSimulation "BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "ZipPlugin" + DropPlugin + DSAPlugin "DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + JoystickTabletPlugin + KlattSynthesizerPlugin "Klatt" + LargeIntegersPlugin "LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + LocalePlugin + )! - ADPCMCodecPlugin - AsynchFilePlugin - BalloonEnginePlugin "moduleName -->B2DPlugin" - BitBltSimulation "moduleName->BitBltPlugin" - BMPReadWriterPlugin - CroquetPlugin - DeflatePlugin "moduleName->ZipPlugin" - DropPlugin - DSAPlugin "moduleName->DSAPrims" - FFTPlugin - FileCopyPlugin - FilePlugin - FloatArrayPlugin - FloatMathPlugin - IA32ABIPlugin "moduleName->IA32ABI" - " InflatePlugin" "moduleName->ZipPlugin" "already included with the DeflatePlugin" - JoystickTabletPlugin - JPEGReaderPlugin - JPEGReadWriter2Plugin - KlattSynthesizerPlugin "moduleName->Klatt" - LargeIntegersPlugin "moduleName->LargeIntegers" - Matrix2x3Plugin - MIDIPlugin - MiscPrimitivePlugin - Mpeg3Plugin - RePlugin - SecurityPlugin - SerialPlugin - SocketPlugin - SoundCodecPlugin "moduleName->SoundCodecPrims" - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - VMProfileLinuxSupportPlugin)! Item was changed: ----- Method: Linux32x86Config>>dirBuildPlatform (in category 'cmake') ----- dirBuildPlatform - "the directory for the platform. example: build.linux32x86" ^self dirLinux32x86! Item was changed: ----- Method: Linux32x86Config>>excludeFromBuild (in category 'cmake') ----- excludeFromBuild + "over-ride to exclude yourself from a build or not" - "over-ride to exclude yourself from a build" ^true! Item was changed: ----- Method: Linux32x86Config>>executableName (in category 'cmake') ----- executableName "AbstractBaseClass configurations are not meant to be executable" ^ self vmIShouldNotBeHereExecutableName! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- externalPluginsBuild ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- extraPluginSettingsBuild: aMaker aMaker isExternal ifTrue:[aMaker templates addLast:((CMakeSet new) variable:'LIBRARY_OUTPUT_PATH' value:'${outputDir}')]. + aMaker templates addLast:((CMakeSet new) variable:'linkFlags' quotedValue:'${linkFlags} -m32'). + + " maker isExternal ifTrue: [ + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + maker set: #linkFlags toString: '${linkFlags} -m32'"! - ! Item was changed: ----- Method: Linux32x86Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- internalPluginsBuild ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- - linkFlagsBuild - "Answer array of libraries to link to - SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'" - ^ { - '-lpthread' - . '-luuid' - }! Item was changed: ----- Method: Linux32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'" + (aMaker config enabledebugmessages) + ifTrue:[ + aMaker config templates + addLast: ((CMakeMessage new) message: (self class name), ' postBuildActionsBuild' ) + ]. + aMaker config templates + addLast: ((CMakeMessage new) message: 'postBuildActionsBuild: aMaker' ); + addLast:((CMakeCommand new) command:'include' params:'config.cmake'); "cmake --help-command include " + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_DUPLICATES config_vars'); "cmake --help-command LIST" + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.in ""'); "cmake --help-command FILE" + addLast:(CMakeAppendConfigHIn new); + addLast:((CMakeCommand new) command:'CONFIGURE_FILE' params:'${CMAKE_BINARY_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h'); + addLast:((CMakeCommand new) command:'GET_CMAKE_PROPERTY' params:'tmp VARIABLES'); + addLast:((CMakeCommand new) command:'LIST' params:'REMOVE_ITEM tmp tmp'); + addLast:((CMakeCommand new) command:'LIST' params:'SORT tmp'); + addLast:((CMakeCommand new) command:'FILE' params:'WRITE ${CMAKE_BINARY_DIR}/config.h.status ""'); + addLast:(CMakeAppendConfigStatus new). + + ! - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was changed: ----- Method: Linux32x86Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- preferredIncludesBuild (enabledebugmessages) ifTrue:[ templates addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) ]. templates addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). + (enabledebugmessages) - (enabledebugmessages) ifTrue:[ templates addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].! - ]. - - - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- - linkFlagsBuild - "Answer array of libraries to link to" - ^ { '-L/usr/lib' - . '-L/usr/lib/X11' - . '-luuid' - . 'lSM' - . '-lICE' - . '-ldl' - . '-lGL' - . '-lpthread' - . '-lm' - . '-lnsl' - . '-lX11' - } - ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') ----- cmakeAddDefinitionsBuild - |c d o| (enabledebugmessages) ifTrue:[ templates addLast:((CMakeMessage new) message: (self class name) , 'cmakeAddDefinitionsBuild') ] . - c := self compilerFlags asOrderedCollection. - d := self compilerDefinitions asOrderedCollection. - o:= OrderedCollection new. - o addAllLast: c; addAllLast: d. templates + addLast:((CMakeAddDefinitions new) definitions: (self compilerDefinitions asOrderedCollection)). - addLast:((CMakeAddDefinitions new) definitions: (self compilerDefinitions asOrderedCollection)). "see my self flag below" ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuild (in category 'cmake buildType redirects') ----- externalLibsBuild ^self externalLibraries asOrderedCollection. ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- - linkFlagsBuild - "Answer array of libraries to link to" - ^ { '-L/usr/lib' - . '-L/usr/lib/X11' - . '-luuid' - . 'lSM' - . '-lICE' - . '-ldl' - . '-lGL' - . '-lpthread' - . '-lm' - . '-lnsl' - . '-lX11' - } - !

1 0

[commit][3183] Fix clearHeapMap in 64-bits.
by commits＠squeakvm.org 13 Dec '14

13 Dec '14

Revision: 3183 Author: eliot Date: 2014-12-12 20:32:50 -0800 (Fri, 12 Dec 2014) Log Message: ----------- Fix clearHeapMap in 64-bits. Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqHeapMap.c Modified: branches/Cog/platforms/Cross/vm/sqHeapMap.c =================================================================== --- branches/Cog/platforms/Cross/vm/sqHeapMap.c 2014-12-13 04:15:40 UTC (rev 3182) +++ branches/Cog/platforms/Cross/vm/sqHeapMap.c 2014-12-13 04:32:50 UTC (rev 3183) @@ -189,7 +189,7 @@ for (i = 0; i < NUMROOTPAGES; i++) if ((directory = mapPages[i])) - for (j = 0; j < DIRECTORYSIZE; j++) + for (j = 0; j < DIRECTORYSIZE / sizeof(void *); j++) if ((page = directory[j])) memset(page,0,PAGESIZE); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev December 2014