Vm-dev September 2011

vm-dev@lists.squeakfoundation.org

35 participants
70 discussions

Announcements/Seaside continuations collision in newer cog vm's
by Esteban Lorenzano 08 Sep '11

08 Sep '11

Hi, (yep, I'm copying tree lists because I think is a vm problem, but can be a seaside problem, or a pharo problem) (yes, it can be MY problem too... but I don't think so... ;) I'm having this really, really strange problem (because it was working before, and I do not change anything... so, maybe a change in latest changes on pharo 1.3, the version I'm using, is the cause)... This is the problem: I'm creating an application who sends an announcement, to edit something... this announcement ends in a WAComponent>>#call: message... The problem is: continuation execution fires a notification (WARenderNotification), and SubscriptionRegistry>>deliver:to: process the announcement this way: deliver: anAnnouncement to: subs subs do: [:each | [each deliver: anAnnouncement] "each is always in subs, so error will be due to each being last element. So return, nothing more to process" ifCurtailed: [self deliver: anAnnouncement to: ([subs after: each] on: NotFound do: [^self])]] ...and curtailedBlock is being executed... and that throws an error. This was working on older versions of VM, so maybe this is a recent change? this error was confirmed in my builds, and also in latest Eliot build. Also... is confirmed NOT being there in older cogs or interpret and btw... self deliver: anAnnouncement to: ([subs after: each] on: NotFound do: [^self]) shouldn't be self deliver: anAnnouncement to: ([Array with: (subs after: each)] on: NotFound do: [^self]) (because #deliver:to: is expecting a collection, not a registry? thanks, Esteban

1 0

Announcements/Seaside continuations collision in newer cog vm's
by Esteban Lorenzano 08 Sep '11

08 Sep '11

Hi, (yep, I'm copying tree lists because I think is a vm problem, but can be a seaside problem, or a pharo problem) (yes, it can be MY problem too... but I don't think so... ;) I'm having this really, really strange problem (because it was working before, and I do not change anything... so, maybe a change in latest changes on pharo 1.3, the version I'm using, is the cause)... This is the problem: I'm creating an application who sends an announcement, to edit something... this announcement ends in a WAComponent>>#call: message... The problem is: continuation execution fires a notification (WARenderNotification), and SubscriptionRegistry>>deliver:to: process the announcement this way: deliver: anAnnouncement to: subs subs do: [:each | [each deliver: anAnnouncement] "each is always in subs, so error will be due to each being last element. So return, nothing more to process" ifCurtailed: [self deliver: anAnnouncement to: ([subs after: each] on: NotFound do: [^self])]] ...and curtailedBlock is being executed... and that throws an error. This was working on older versions of VM, so maybe this is a recent change? this error was confirmed in my builds, and also in latest Eliot build. Also... is confirmed NOT being there in older cogs or interpreter. and btw... self deliver: anAnnouncement to: ([subs after: each] on: NotFound do: [^self]) shouldn't be self deliver: anAnnouncement to: ([Array with: (subs after: each)] on: NotFound do: [^self]) because #deliver:to: is expecting a collection, not a registry? thanks, Esteban

1 0

VM Maker: VMMaker-dtl.254.mcz
by commits＠source.squeak.org 08 Sep '11

08 Sep '11

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.254.mcz ==================== Summary ==================== Name: VMMaker-dtl.254 Author: dtl Time: 8 September 2011, 7:48:45.243 am UUID: 0461a946-5eed-4517-adda-62122f66f2a2 Ancestors: VMMaker-dtl.253 VMMaker 4.7.11 A minor cleanup, bytesPerWord and baseHeaderSize are implemented in the C translation dictionary, so do not use cCode:inSmalltalk: (which was redundant and therefore confusing). n.g. Implementing these in the translation dictionary makes them available to plugins that use the self bytesPerWord idiom. The oscog and trunk branches can implement the translations as required to support plugins such as FreetypePlugin, which are externally maintained and must work for both oscog and trunk. =============== Diff against VMMaker-dtl.253 =============== Item was added: + ----- Method: InterpreterSimulator>>baseHeaderSize (in category 'memory access') ----- + baseHeaderSize + "Answer the size of an object memory header word in bytes." + + ^self bytesPerWord! Item was changed: ----- Method: ObjectMemory>>baseHeaderSize (in category 'constants') ----- baseHeaderSize + "Answer the size of an object memory header word in bytes. This selector is + handled in the C translation dictionary." - "Answer the size of an object memory header word in bytes." + self subclassResponsibility "InterpreterSimulator" - <inline: true> - ^self cCode: 'BASE_HEADER_SIZE' inSmalltalk: [self bytesPerWord] ! Item was changed: ----- Method: ObjectMemory>>bytesPerWord (in category 'constants') ----- bytesPerWord + "Answer the size of an object memory word in bytes. This selector is + handled in the C translation dictionary." - "Answer the size of an object memory word in bytes." + self subclassResponsibility "InterpreterSimulator" - <inline: true> - ^self - cCode: 'BYTES_PER_WORD' - inSmalltalk: [self subclassResponsibility "InterpreterSimulator"] ! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.7.11'! - ^'4.7.10'!

1 0

About Freetype plugin and BYTES_PER_WORD
by Igor Stasenko 07 Sep '11

07 Sep '11

Hi, Dave, your changes are not working well with Cog builds, since this macro is not defined anywhere. Do you know, what/where it should be defined? Name: Freetype-Plugin-dtl.62 Author: dtl Time: 21 August 2011, 12:03:54.438 pm UUID: 0bae20f0-a128-4120-9276-252374a8a5ae Ancestors: Freetype-Plugin-IgorStasenko.61 Update bytesPerWord for compatibility with VMMaker trunk. Background: VMM trunk generates code for 32/64 bit object memories as compile time option. The code generator emits required macros, and many class variables (e.g. BYTES_PER_WORD) no longer exist in the image. The trunk ObjectMemory>>bytesPerWord will work for both oscog and trunk, so copy this method into FT2Plugin. -- Best regards, Igor Stasenko AKA sig.

3 10

FT2Plugin for Freetype: Freetype-Plugin-dtl.63.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 07 Sep '11

07 Sep '11

Dave Lewis uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-dtl.63.mcz ==================== Summary ==================== Name: Freetype-Plugin-dtl.63 Author: dtl Time: 7 September 2011, 7:53:44 am UUID: 7e64947b-cb20-4f1d-9ced-f7c55965371f Ancestors: Freetype-Plugin-dtl.62 Do not implement #bytesPerWord in FreetypePlugin because it should be implemented in the C translation dictionary instead. See http://lists.squeakfoundation.org/pipermail/vm-dev/2011-September/009318.ht… for a patch that provides this for oscog (also in VMMaker-oscog-dtl.124 in the VMMaker repository). This reverts the change from Freetype-Plugin-IgorStasenko.60 which added the #bytesPerWord implementation, and from Freetype-Plugin-dtl.62 which incorrectly attempted to fix it.

1 0

VM Maker: VMMaker-oscog-dtl.124.mcz
by commits＠source.squeak.org 07 Sep '11

07 Sep '11

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-dtl.124.mcz ==================== Summary ==================== Name: VMMaker-oscog-dtl.124 Author: dtl Time: 7 September 2011, 7:47:23.321 am UUID: 22506b93-842d-45e3-b57d-42b84f1657ae Ancestors: VMMaker.oscog-eem.123 Support plugins (e.g FreetypePlugin) that use #bytesPerWord or #baseHeaderSize by adding these selectors to the C translation dictionary. These changes produce no change to generated code for the VM except for the case of 'self bytesPerWord' which is now translated to the expected 'BytesPerWord' on oscog. Class variables BytesPerWord and BaseHeaderSize (and others) do not exist in trunk VMMaker. These are now controlled at compile time rather than at C code generation time to support support a single generated code base for 32/64 bit object memory VMs. =============== Diff against VMMaker.oscog-eem.123 =============== Item was added: + ----- Method: CCodeGenerator>>generateBaseHeaderSize:on:indent: (in category 'C translation') ----- + generateBaseHeaderSize: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: 'BaseHeaderSize' + + ! Item was added: + ----- Method: CCodeGenerator>>generateBytesPerWord:on:indent: (in category 'C translation') ----- + generateBytesPerWord: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + aStream nextPutAll: 'BytesPerWord' + ! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asSymbol #generateAsSymbol:on:indent: #anyMask: #generateBitAnd:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: + #bytesPerWord #generateBytesPerWord:on:indent: + #baseHeaderSize #generateBaseHeaderSize:on:indent: + #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: + ----- Method: InterpreterSimulatorLSB64>>long32At: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorLSB64>>long32At: (in category 'as yet unclassified') ----- long32At: byteAddress "Return the 32-bit word at byteAddress which must be 0 mod 4." | lowBits long | lowBits := byteAddress bitAnd: 4. long := self longAt: byteAddress - lowBits. ^ lowBits = 4 ifTrue: [ long bitShift: -32 ] ifFalse: [ long bitAnd: 16rFFFFFFFF ]. ! Item was changed: + ----- Method: InterpreterSimulatorLSB64>>long32At:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorLSB64>>long32At:put: (in category 'as yet unclassified') ----- long32At: byteAddress put: a32BitValue "Store the 32-bit value at byteAddress which must be 0 mod 4." | lowBits long64 longAddress | lowBits := byteAddress bitAnd: 4. lowBits = 0 ifTrue: [ "storing into LS word" long64 := self longAt: byteAddress. self longAt: byteAddress put: ((long64 bitAnd: 16rFFFFFFFF00000000) bitOr: a32BitValue) ] ifFalse: [longAddress := byteAddress - 4. long64 := self longAt: longAddress. self longAt: longAddress put: ((long64 bitAnd: 16rFFFFFFFF) bitOr: (a32BitValue bitShift: 32)) ]! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>byteSwapped: (in category 'as yet unclassified') ----- byteSwapped: w "Return the given integer with its bytes in the reverse order." ^ (super byteSwapped: ((w bitShift: -32) bitAnd: 16rFFFFFFFF)) + ((super byteSwapped: (w bitAnd: 16rFFFFFFFF)) bitShift: 32)! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>long32At: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>long32At: (in category 'as yet unclassified') ----- long32At: byteAddress "Return the 32-bit word at byteAddress which must be 0 mod 4." ^ super longAt: byteAddress! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>long32At:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>long32At:put: (in category 'as yet unclassified') ----- long32At: byteAddress put: a32BitValue "Store the 32-bit value at byteAddress which must be 0 mod 4." super longAt: byteAddress put: a32BitValue! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>longAt: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>longAt: (in category 'as yet unclassified') ----- longAt: byteAddress "Note: Adjusted for Smalltalk's 1-based array indexing." ^ ((super longAt: byteAddress) bitShift: 32) bitOr: (super longAt: byteAddress + 4)! Item was changed: + ----- Method: InterpreterSimulatorMSB64>>longAt:put: (in category 'memory access') ----- - ----- Method: InterpreterSimulatorMSB64>>longAt:put: (in category 'as yet unclassified') ----- longAt: byteAddress put: a64BitValue "Note: Adjusted for Smalltalk's 1-based array indexing." super longAt: byteAddress put: (a64BitValue bitShift: -32). super longAt: byteAddress + 4 put: (a64BitValue bitAnd: 16rFFFFFFFF). ^ a64BitValue! Item was changed: Object subclass: #TMethod instanceVariableNames: 'selector returnType args locals declarations primitive parseTree labels writtenToGlobalVarsCache complete export static sharedLabel sharedCase comment definingClass globalStructureBuildMethodHasFoo canAsmLabel mustAsmLabel properties typedByPropagation cascadeVariableNumber' classVariableNames: 'CaseStatements' poolDictionaries: '' category: 'VMMaker-Translation to C'! + + !TMethod commentStamp: 'dtl 9/15/2008 09:06' prior: 0! + A TMethod is a translation method, representing a MethodNode that is to be translated to C source. It has a parseTree of translation nodes that mirrors the parse tree of the corresponding Smalltalk method.! Item was changed: Object subclass: #TParseNode instanceVariableNames: 'comment' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Translation to C'! + + !TParseNode commentStamp: 'dtl 9/15/2008 09:05' prior: 0! + A TParseNode is node in the parse tree of a TMethod. Subclasses correspond to different types of nodes in a method parse tree. The tree of translation parse nodes mirrors the parse tree of a Smalltalk method, and is used for translating a Smalltalk method to C source.!

1 0

[commit] r2491 - CogVM source as per VMMaker.oscog-eem.122. Fix the 1Gb allocation bug.
by commits＠squeakvm.org 07 Sep '11

07 Sep '11

Author: eliot Date: 2011-09-06 16:44:23 -0700 (Tue, 06 Sep 2011) New Revision: 2491 Modified: branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Log: CogVM source as per VMMaker.oscog-eem.122. Fix the 1Gb allocation bug. Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/nscogsrc/vm/cointerp.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -217,6 +217,7 @@ #define LastLinkIndex 1 #define LiteralStart 1 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1891,7 +1892,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.121"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.123"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -17203,7 +17204,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -32510,7 +32511,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -32524,32 +32525,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -32640,7 +32640,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -32663,32 +32663,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -39494,7 +39493,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/nscogsrc/vm/cointerp.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -220,6 +220,7 @@ #define LastLinkIndex 1 #define LiteralStart 1 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1894,7 +1895,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.121"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.123"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -17207,7 +17208,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -32514,7 +32515,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -32528,32 +32529,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -32644,7 +32644,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -32667,32 +32667,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -39498,7 +39497,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/nscogsrc/vm/interp.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 22 17:21:13 PDT 2011 + Tue Sep 6 16:43:59 PDT 2011 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/cointerp.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -215,6 +215,7 @@ #define LastLinkIndex 1 #define LiteralStart 1 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1882,7 +1883,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.121]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.123]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -16742,7 +16743,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -31828,7 +31829,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -31842,32 +31843,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -31958,7 +31958,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -31981,32 +31981,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -38812,7 +38811,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/cointerp.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/cointerpmt.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreterMT VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreterMT VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -246,6 +246,7 @@ #define LiteralStart 1 #define LockGUIThreadFlag 0x10000 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1982,7 +1983,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.121]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.123]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -17362,7 +17363,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -33037,7 +33038,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -33051,32 +33052,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -33167,7 +33167,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -33190,32 +33190,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -40163,7 +40162,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/cointerpmt.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -218,6 +218,7 @@ #define LastLinkIndex 1 #define LiteralStart 1 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1885,7 +1886,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.121]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.123]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -16746,7 +16747,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -31832,7 +31833,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -31846,32 +31847,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -31962,7 +31962,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -31985,32 +31985,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -38816,7 +38815,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2011-09-06 23:44:23 UTC (rev 2491) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 from - CoInterpreterMT VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CoInterpreterMT VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -249,6 +249,7 @@ #define LiteralStart 1 #define LockGUIThreadFlag 0x10000 #define LongSizeMask 0xFFFFFFFCUL +#define LongSizeNumBits 30 #define MarkBit 0x80000000UL #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -1985,7 +1986,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.121]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.123]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -17366,7 +17367,7 @@ sqInt * getStackPointer(void) { - return GIV(stackPointer); + return ((sqInt *) GIV(stackPointer)); } @@ -33041,7 +33042,7 @@ static void primitiveNew(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -33055,32 +33056,31 @@ class = longAt(GIV(stackPointer)); /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(0sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) 0)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (0 != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) 0) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = 0 * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) 0) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = 0; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (0 * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -33171,7 +33171,7 @@ static void primitiveNewWithArg(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt atomSize; + sqInt allocSize; sqInt class; sqInt format; sqInt minFree; @@ -33194,32 +33194,31 @@ if (!GIV(primFailCode)) { /* begin sufficientSpaceToInstantiate:indexableSize: */ VM_LABEL(1sufficientSpaceToInstantiateindexableSize); - - /* fail if attempting to call new: on non-indexable class */ - - format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15; - if (((((usqInt ) size)) > 0) - && (format < 2)) { - spaceOkay = 0; - goto l1; + if (((format = (((usqInt) ((longAt((class + BaseHeaderSize) + (InstanceSpecificationIndex << ShiftForWord))) - 1)) >> 8) & 15)) < 8) { + if (size != 0) { + if (format < 2) { + spaceOkay = 0; + goto l1; + } + if ((((usqInt) size) >> (LongSizeNumBits - BytesPerWord)) > 0) { + spaceOkay = 0; + goto l1; + } + } + allocSize = size * BytesPerWord; } - if (format < 8) { - - /* indexable fields are words or pointers */ - - atomSize = BytesPerWord; - } else { - - /* indexable fields are bytes */ - - atomSize = 1; + if ((((usqInt) size) >> LongSizeNumBits) > 0) { + spaceOkay = 0; + goto l1; + } + allocSize = size; } /* begin sufficientSpaceToAllocate: */ /* check for low-space */ - minFree = ((((GIV(lowSpaceThreshold) + (2500 + (size * atomSize))) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); + minFree = ((((GIV(lowSpaceThreshold) + (2500 + allocSize)) + BaseHeaderSize) + BytesPerWord) - 1) & (~(BytesPerWord - 1)); if ((((usqInt) (GIV(freeStart) + minFree))) <= (((usqInt) GIV(reserveStart)))) { spaceOkay = 1; goto l1; @@ -40167,7 +40166,7 @@ : ((longAt(oop + BaseHeaderSize)) == 0 ? " pointer @ " : " direct @ "))); - printHex(startOfAlienData(oop)); + printHex(((usqInt)(startOfAlienData(oop)))); /* begin cr */ printf("\n"); return; Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/interp.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2011-09-05 17:27:38 UTC (rev 2490) +++ branches/Cog/src/vm/vmCallback.h 2011-09-06 23:44:23 UTC (rev 2491) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.121 uuid: 8561f7f7-973d-4e7a-bf2d-5ae21509b2c5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.123 uuid: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.123.mcz
by commits＠source.squeak.org 07 Sep '11

07 Sep '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.123.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.123 Author: eem Time: 6 September 2011, 4:36:50.618 pm UUID: 9c524903-b0c7-46a8-a37a-5dfda6fcd1f3 Ancestors: VMMaker.oscog-eem.122 Cog: Refactor, moving isContextNonInt:, instSpecOfClass: and sufficientSpaceToInstantiate:indexableSize: to ObjectMemory. Fix the 1Gb allocation bug, Use formatOfHeader: instead of raw foo >> 8 bitAnd: 15. Fix gcc compiler warnings in getStackPointer and printOop. =============== Diff against VMMaker.oscog-eem.122 =============== Item was changed: ----- Method: CoInterpreter>>ceContext:instVar: (in category 'trampolines') ----- ceContext: maybeContext instVar: slotIndex <api> | result | + (objectMemory isContextNonInt: maybeContext) - (self isContextNonInt: maybeContext) ifTrue: [instructionPointer := self popStack. result := self externalInstVar: slotIndex ofContext: maybeContext. self push: instructionPointer] ifFalse: [result := objectMemory fetchPointer: slotIndex ofObject: maybeContext]. ^result! Item was changed: ----- Method: CoInterpreter>>ceContext:instVar:value: (in category 'trampolines') ----- ceContext: maybeMarriedContext instVar: slotIndex value: anOop <api> "genStorePop:MaybeContextReceiverVariable: filters out unmarried contexts but not arbitrary objects in subclasses. It answers maybeMarriedContext so that the StackToRegisterMappingCogit can keep ReceiverResultReg live." + (objectMemory isContextNonInt: maybeMarriedContext) - (self isContextNonInt: maybeMarriedContext) ifTrue: [self assert: (self isMarriedOrWidowedContext: maybeMarriedContext). instructionPointer := self popStack. self externalInstVar: slotIndex ofContext: maybeMarriedContext put: anOop. self push: instructionPointer] ifFalse: [objectMemory storePointer: slotIndex ofObject: maybeMarriedContext withValue: anOop]. ^maybeMarriedContext! Item was changed: ----- Method: CoInterpreter>>ensureAllContextsHaveBytecodePCsOrAreBereaved (in category 'frame access') ----- ensureAllContextsHaveBytecodePCsOrAreBereaved "Enumerate all contexts preparing them for a snapshot. Map all native pcs to bytecoded pcs. Convert widowed contexts to single contexts so that the snapshot contains only single contexts. This allows the being married test to avoid checking for a context's frame pointer being in bounds since all frame pointers must have been created in the current system and so be in bounds. Thanks to Greg Nuyens for this idea." | oop decodedIP | oop := objectMemory firstObject. [oop < objectMemory freeStart] whileTrue: [((objectMemory isFreeObject: oop) not + and: [objectMemory isContextNonInt: oop]) ifTrue: - and: [self isContextNonInt: oop]) ifTrue: [(self isMarriedOrWidowedContext: oop) ifTrue: "The stack pages have already been discarded. Any remaining married contexts are actually widows." [self markContextAsDead: oop] ifFalse: [decodedIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: oop. ((objectMemory isIntegerObject: decodedIP) and: [decodedIP signedIntFromLong < 0]) ifTrue: [decodedIP := self mustMapMachineCodePC: (objectMemory integerValueOf: decodedIP) context: oop. objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: oop withValue: decodedIP]]]. oop := objectMemory objectAfter: oop]! Item was removed: - ----- Method: Interpreter>>isContextNonInt: (in category 'contexts') ----- - isContextNonInt: oop - <inline: true> - ^self isContextHeader: (self baseHeader: oop)! Item was removed: - ----- Method: Interpreter>>sufficientSpaceToInstantiate:indexableSize: (in category 'object access primitives') ----- - sufficientSpaceToInstantiate: classOop indexableSize: size - "Return the number of bytes required to allocate an instance of the given class with the given number of indexable fields." - "Details: For speed, over-estimate space needed for fixed fields or literals; the low space threshold is a blurry line." - | format atomSize| - <inline: true> - format := (self formatOfClass: classOop) >> 8 bitAnd: 15. - - "fail if attempting to call new: on non-indexable class" - ((self cCoerce: size to: 'usqInt ') > 0 and: [format < 2]) - ifTrue: [^ false]. - - format < 8 - ifTrue: ["indexable fields are words or pointers" atomSize := BytesPerWord] - ifFalse: ["indexable fields are bytes" atomSize := 1]. - ^self sufficientSpaceToAllocate: 2500 + (size * atomSize)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNew (in category 'object access primitives') ----- primitiveNew "Allocate a new fixed-size instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free. May cause a GC" | class spaceOkay | class := self stackTop. "The following may cause GC!!" + spaceOkay := objectMemory sufficientSpaceToInstantiate: class indexableSize: 0. - spaceOkay := self sufficientSpaceToInstantiate: class indexableSize: 0. self success: spaceOkay. + self successful ifTrue: + [self push: (objectMemory instantiateClass: self popStack indexableSize: 0)]! - self successful ifTrue: [ self push: (objectMemory instantiateClass: self popStack indexableSize: 0) ]! Item was changed: ----- Method: InterpreterPrimitives>>primitiveNewWithArg (in category 'object access primitives') ----- primitiveNewWithArg "Allocate a new indexable instance. Fail if the allocation would leave less than lowSpaceThreshold bytes free." | size class spaceOkay | size := self positive32BitValueOf: self stackTop. class := self stackValue: 1. self success: size >= 0. + self successful ifTrue: + ["The following may cause GC!!" + spaceOkay := objectMemory sufficientSpaceToInstantiate: class indexableSize: size. + self success: spaceOkay. + class := self stackValue: 1]. + self successful ifTrue: + [self pop: 2 thenPush: (objectMemory instantiateClass: class indexableSize: size)]! - self successful - ifTrue: ["The following may cause GC!!" - spaceOkay := self sufficientSpaceToInstantiate: class indexableSize: size. - self success: spaceOkay. - class := self stackValue: 1]. - self successful ifTrue: [self pop: 2 thenPush: (objectMemory instantiateClass: class indexableSize: size)]! Item was changed: ----- Method: NewObjectMemory>>eeInstantiateAndInitializeClass:indexableSize: (in category 'interpreter access') ----- eeInstantiateAndInitializeClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change. Will *not* cause a GC. The instantiated object is initialized." | hash header1 header2 cClass byteSize format binc header3 hdrSize sizeHiBits bm1 classFormat | <inline: false> "cannot have a negative indexable field count" self assert: size >= 0. hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash bitAnd: HashMaskUnshifted) << HashBitsOffset. header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" byteSize := (classFormat bitAnd: SizeMask + Size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (ShiftForWord-2). + format := self formatOfHeader: classFormat. - format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := BytesPerWord-1. byteSize := byteSize + (size * 4) + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * BytesPerWord) "Arrays and 64-bit bitmaps"] ] ifFalse: ["Strings and Methods" bm1 := BytesPerWord-1. byteSize := byteSize + size + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. header3 > 0 ifTrue: ["requires full header" hdrSize := 3] ifFalse: [cClass = 0 ifTrue: [hdrSize := 2] ifFalse: [hdrSize := 1]]. ^self eeAllocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3 doFill: true format: format! Item was changed: ----- Method: NewObjectMemory>>eeInstantiateClass:indexableSize: (in category 'interpreter access') ----- eeInstantiateClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change. Will *not* cause a GC. Note that the instantiated object IS NOT FILLED and must be completed before returning it to Smalltalk. Since this call is used in routines that do just that we are safe. Break this rule and die." <api> | hash header1 header2 cClass byteSize format binc header3 hdrSize sizeHiBits bm1 classFormat | <inline: false> "cannot have a negative indexable field count" self assert: size >= 0. hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash bitAnd: HashMaskUnshifted) << HashBitsOffset. header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" byteSize := (classFormat bitAnd: SizeMask + Size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (ShiftForWord-2). + format := self formatOfHeader: classFormat. - format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := BytesPerWord-1. byteSize := byteSize + (size * 4) + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * BytesPerWord) "Arrays and 64-bit bitmaps"] ] ifFalse: ["Strings and Methods" bm1 := BytesPerWord-1. byteSize := byteSize + size + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. header3 > 0 ifTrue: ["requires full header" hdrSize := 3] ifFalse: [cClass = 0 ifTrue: [hdrSize := 2] ifFalse: [hdrSize := 1]]. ^self eeAllocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3! Item was removed: - ----- Method: NewspeakInterpreter>>sufficientSpaceToInstantiate:indexableSize: (in category 'object access primitives') ----- - sufficientSpaceToInstantiate: classOop indexableSize: size - "Return the number of bytes required to allocate an instance of the given class with the given number of indexable fields." - "Details: For speed, over-estimate space needed for fixed fields or literals; the low space threshold is a blurry line." - | format atomSize| - <inline: true> - format := (self formatOfClass: classOop) >> 8 bitAnd: 15. - - "fail if attempting to call new: on non-indexable class" - ((self cCoerce: size to: 'usqInt ') > 0 and: [format < 2]) - ifTrue: [^ false]. - - format < 8 - ifTrue: ["indexable fields are words or pointers" atomSize := BytesPerWord] - ifFalse: ["indexable fields are bytes" atomSize := 1]. - ^self sufficientSpaceToAllocate: 2500 + (size * atomSize)! Item was changed: VMClass subclass: #ObjectMemory instanceVariableNames: 'memory youngStart endOfMemory memoryLimit nilObj falseObj trueObj specialObjectsOop rootTable rootTableCount extraRoots extraRootCount weakRoots weakRootCount child field parentField freeBlock lastHash allocationCount lowSpaceThreshold signalLowSpace compStart compEnd fwdTableNext fwdTableLast remapBuffer remapBufferCount allocationsBetweenGCs tenuringThreshold gcBiasToGrow gcBiasToGrowGCLimit gcBiasToGrowThreshold statFullGCs statIncrGCs statFullGCUsecs statIncrGCUsecs statGCEndTime statIGCDeltaUsecs statTenures statRootTableOverflows freeContexts freeLargeContexts interruptCheckCounter totalObjectCount shrinkThreshold growHeadroom headerTypeBytes youngStartLocal statMarkCount statMarkCountLocal statSweepCount statMkFwdCount statCompMoveCount statGrowMemory statShrinkMemory statRootTableCount statAllocationCount statSurvivorCount statSpecialMarkCount forceTenureFlag gcStartUsecs' + classVariableNames: 'AllButHashBits AllButImmutabilityBit AllButMarkBit AllButMarkBitAndTypeMask AllButRootBit Done ExtraRootSize GCTopMarker HashBits HeaderTypeClass HeaderTypeExtraBytes HeaderTypeFree HeaderTypeGC LongSizeNumBits NilContext RemapBufferSize RootTableRedZone RootTableSize StartField StartObj Upward WeakRootTableSize WordMask' - classVariableNames: 'AllButHashBits AllButImmutabilityBit AllButMarkBit AllButMarkBitAndTypeMask AllButRootBit Done ExtraRootSize GCTopMarker HashBits HeaderTypeClass HeaderTypeExtraBytes HeaderTypeFree HeaderTypeGC NilContext RemapBufferSize RootTableRedZone RootTableSize StartField StartObj Upward WeakRootTableSize WordMask' poolDictionaries: 'VMBasicConstants VMObjectIndices VMSqueakV3BytecodeConstants VMSqueakV3ObjectRepresentationConstants' category: 'VMMaker-Interpreter'! !ObjectMemory commentStamp: '<historical>' prior: 0! This class describes a 32-bit direct-pointer object memory for Smalltalk. The model is very simple in principle: a pointer is either a SmallInteger or a 32-bit direct object pointer. SmallIntegers are tagged with a low-order bit equal to 1, and an immediate 31-bit 2s-complement signed value in the rest of the word. All object pointers point to a header, which may be followed by a number of data fields. This object memory achieves considerable compactness by using a variable header size (the one complexity of the design). The format of the 0th header word is as follows: 3 bits reserved for gc (mark, root, unused) 12 bits object hash (for HashSets) 5 bits compact class index 4 bits object format 6 bits object size in 32-bit words 2 bits header type (0: 3-word, 1: 2-word, 2: forbidden, 3: 1-word) If a class is in the compact class table, then this is the only header information needed. If it is not, then it will have another header word at offset -4 bytes with its class in the high 30 bits, and the header type repeated in its low 2 bits. It the objects size is greater than 255 bytes, then it will have yet another header word at offset -8 bytes with its full word size in the high 30 bits and its header type repeated in the low two bits. The object format field provides the remaining information as given in the formatOf: method (including isPointers, isVariable, isBytes, and the low 2 size bits of byte-sized objects). This implementation includes incremental (2-generation) and full garbage collection, each with compaction and rectification of direct pointers. It also supports a bulk-become (exchange object identity) feature that allows many objects to be becomed at once, as when all instances of a class must be grown or shrunk. There is now a simple 64-bit version of the object memory. It is the simplest possible change that could work. It merely sign-extends all integer oops, and extends all object headers and oops by adding 32 zeroes in the high bits. The format of the base header word is changed in one minor, not especially elegant, way. Consider the old 32-bit header: ggghhhhhhhhhhhhcccccffffsssssstt The 64-bit header is almost identical, except that the size field (now being in units of 8 bytes, has a zero in its low-order bit. At the same time, the byte-size residue bits for byte objects, which are in the low order bits of formats 8-11 and 12-15, are now in need of another bit of residue. So, the change is as follows: ggghhhhhhhhhhhhcccccffffsssssrtt where bit r supplies the 4's bit of the byte size residue for byte objects. Oh, yes, this is also needed now for 'variableWord' objects, since their size in 32-bit words requires a low-order bit. See the comment in formatOf: for the change allowing for 64-bit wide bitmaps, now dubbed 'variableLong'.! Item was changed: ----- Method: ObjectMemory class>>initializeObjectHeaderConstants (in category 'initialization') ----- initializeObjectHeaderConstants BytesPerWord ifNil: [BytesPerWord := 4]. "May get called on fileIn, so supply default" BaseHeaderSize := BytesPerWord. WordMask := (1 bitShift: BytesPerWord*8) - 1. "masks for type field" TypeMask := 3. AllButTypeMask := WordMask - TypeMask. "type field values" HeaderTypeSizeAndClass := 0. HeaderTypeClass := 1. HeaderTypeFree := 2. HeaderTypeShort := 3. HeaderTypeExtraBytes := { BytesPerWord * 2. BytesPerWord. 0. 0 }. "type field values used during the mark phase of GC" HeaderTypeGC := 2. GCTopMarker := 3. "neither an oop, nor an oop+1, this value signals that we have crawled back up to the top of the marking phase." "Base header word bit fields" HashBits := 16r1FFE0000. HashBitsOffset := 17. HashMaskUnshifted := 16rFFF. self assert: (HashMaskUnshifted bitShift: HashBitsOffset) = HashBits. AllButHashBits := WordMask - HashBits. SizeMask := 16rFC. Size4Bit := 0. BytesPerWord = 8 ifTrue: [SizeMask := 16rF8. "Lose the 4 bit in temp 64-bit chunk format" Size4Bit := 4]. "But need it for ST size" "Note SizeMask + Size4Bit gives the mask needed for size fits of format word in classes. This is used in instantiateClass:indexableSize: " LongSizeMask := WordMask - 16rFF + SizeMask. + LongSizeNumBits := 30. "30 bits of size info in long size filed." CompactClassMask := 16r1F000. "masks for root and mark bits" MarkBit := 1 bitShift: BytesPerWord*8 - 1. "Top bit" RootBit := 1 bitShift: BytesPerWord*8 - 2. "Next-to-Top bit" AllButMarkBit := WordMask - MarkBit. AllButRootBit := WordMask - RootBit. AllButMarkBitAndTypeMask := AllButTypeMask - MarkBit. ImmutabilityBit := 1 bitShift: BytesPerWord*8 - 3. "Next-to-Next-To-Top bit" AllButImmutabilityBit := WordMask - ImmutabilityBit! Item was added: + ----- Method: ObjectMemory>>instSpecOfClass: (in category 'object format') ----- + instSpecOfClass: classPointer + "This is the same as the field stored in every object header" + + ^self formatOfHeader: (self formatOfClass: classPointer)! Item was changed: ----- Method: ObjectMemory>>instantiateClass:indexableSize: (in category 'interpreter access') ----- instantiateClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change." <api> | hash header1 header2 cClass byteSize format binc header3 hdrSize newObj sizeHiBits bm1 classFormat | <inline: false> self assert: size >= 0. "'cannot have a negative indexable field count" hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash bitAnd: HashMaskUnshifted) << HashBitsOffset. header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" byteSize := (classFormat bitAnd: SizeMask + Size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (ShiftForWord-2). + format := self formatOfHeader: classFormat. - format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := BytesPerWord-1. byteSize := byteSize + (size * 4) + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * BytesPerWord) "Arrays and 64-bit bitmaps"]] ifFalse: ["Strings and Methods" bm1 := BytesPerWord-1. byteSize := byteSize + size + bm1 bitAnd: LongSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. hdrSize := header3 > 0 ifTrue: [3 "requires full header"] ifFalse: [cClass = 0 ifTrue: [2] ifFalse: [1]]. newObj := self allocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3 doFill: true format: format. ^ newObj! Item was added: + ----- Method: ObjectMemory>>isContextNonInt: (in category 'contexts') ----- + isContextNonInt: oop + <inline: true> + ^self isContextHeader: (self baseHeader: oop)! Item was changed: ----- Method: ObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots "Currently this works for pointer objects only, and is almost certainly wrong for 64 bits." | deltaBytes desiredLength fixedFields fmt hdr totalLength | (self isPointers: obj) ifFalse: [^obj]. hdr := self baseHeader: obj. + fmt := self formatOfHeader: hdr. - fmt := (hdr >> 8) bitAnd: 16rF. totalLength := self lengthOf: obj baseHeader: hdr format: fmt. fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. desiredLength := fixedFields + nSlots. deltaBytes := (totalLength - desiredLength) * BytesPerWord. self setSizeOfFree: obj + BaseHeaderSize + (desiredLength * BytesPerWord) to: deltaBytes. (self headerType: obj) caseOf: { [HeaderTypeSizeAndClass] -> [self longAt: obj put: hdr - deltaBytes]. [HeaderTypeClass] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)]. [HeaderTypeShort] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)] }. ^obj! Item was added: + ----- Method: ObjectMemory>>sufficientSpaceToInstantiate:indexableSize: (in category 'allocation') ----- + sufficientSpaceToInstantiate: classOop indexableSize: size + "Return the number of bytes required to allocate an instance of the given class with the given number of indexable fields." + "Details: For speed, over-estimate space needed for fixed fields or literals; the low space threshold is a blurry line." + <var: #size type: #usqInt> + | format allocSize | + <inline: true> + (format := self instSpecOfClass: classOop) < 8 + ifTrue: + ["indexable fields are words or pointers" + size ~= 0 ifTrue: + ["fail if attempting to call new: on non-indexable class" + format < 2 ifTrue: + [^false]. + "fail if attempting to allocate over 2 Gb, since this overflows 32-bit arithmetic" + size >> (LongSizeNumBits - BytesPerWord) > 0 ifTrue: + [^false]]. + allocSize := size * BytesPerWord] + ifFalse: + ["indexable fields are bytes" + "fail if attempting to allocate over 2 Gb, since this overflows 32-bit arithmetic" + size >> LongSizeNumBits > 0 ifTrue: + [^false]. + allocSize := size]. + ^self sufficientSpaceToAllocate: 2500 + allocSize! Item was changed: ----- Method: StackInterpreter>>bereaveAllMarriedContexts (in category 'frame access') ----- bereaveAllMarriedContexts "Enumerate all contexts and convert married contexts to widowed contexts so that the snapshot contains only single contexts. This allows the test for being married to avoid checking for a context's frame pointer being in bounds. Thanks to Greg Nuyens for this idea." | oop | <asmLabel: false> oop := objectMemory firstObject. [oop < objectMemory freeStart] whileTrue: [((objectMemory isFreeObject: oop) not + and: [(objectMemory isContextNonInt: oop) - and: [(self isContextNonInt: oop) and: [self isMarriedOrWidowedContext: oop]]) ifTrue: [self markContextAsDead: oop]. oop := objectMemory objectAfter: oop]! Item was changed: ----- Method: StackInterpreter>>getStackPointer (in category 'primitive support') ----- getStackPointer "For Alien FFI" <api> <returnTypeC: #'sqInt *'> + ^self cCoerceSimple: stackPointer to: #'sqInt *'! - ^stackPointer! Item was removed: - ----- Method: StackInterpreter>>instSpecOfClass: (in category 'object format') ----- - instSpecOfClass: classPointer - "This is the same as the field stored in every object header" - - ^(objectMemory formatOfClass: classPointer) >> 8 bitAnd: 16rF! Item was removed: - ----- Method: StackInterpreter>>isContextNonInt: (in category 'internal interpreter access') ----- - isContextNonInt: oop - <inline: true> - ^objectMemory isContextHeader: (objectMemory baseHeader: oop)! Item was changed: ----- Method: StackInterpreter>>printOop: (in category 'debug printing') ----- printOop: oop | cls fmt lastIndex startIP bytecodesPerLine | <inline: false> self printHex: oop. (objectMemory isIntegerObject: oop) ifTrue: [^self cCode: 'printf("=%ld\n", integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. (oop between: objectMemory startOfMemory and: objectMemory freeStart) ifFalse: [self printHex: oop; print: ' is not on the heap'; cr. ^nil]. (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: [self printHex: oop; print: ' is misaligned'; cr. ^nil]. (objectMemory isFreeObject: oop) ifTrue: [self print: ' free chunk of size '; printNum: (objectMemory sizeOfFree: oop); cr. ^nil]. self print: ': a(n) '. self printNameOfClass: (cls := objectMemory fetchClassOfNonInt: oop) count: 5. cls = (objectMemory splObj: ClassFloat) ifTrue: [self cr; printFloat: (self dbgFloatValueOf: oop); cr. ^nil]. fmt := objectMemory formatOf: oop. fmt > 4 ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteSizeOf: oop)]. self cr. (fmt > 4 and: [fmt < 12]) 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. - self printHex: (self startOfAlienData: oop); cr. ^nil]. (objectMemory isWords: oop) ifTrue: [lastIndex := 64 min: ((objectMemory byteSizeOf: oop) / BytesPerWord). 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]]. ^nil]. ^self printStringOf: oop; cr]. lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / BytesPerWord). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self cCode: 'printHex(fetchPointerofObject(index - 1, oop)); putchar('' '')' 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 * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 10. startIP to: lastIndex do: [:index| | byte | byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. ((index - startIP + 1) \\ bytecodesPerLine) = 0 ifTrue: [self cr]]. ((lastIndex - startIP + 1) \\ bytecodesPerLine) = 0 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>pushMaybeContextReceiverVariable: (in category 'stack bytecodes') ----- pushMaybeContextReceiverVariable: fieldIndex "Must trap accesses to married and widowed contexts. But don't want to check on all inst var accesses. This method is only used by the long-form bytecodes, evading the cost. Note that the method, closure and receiver fields of married contexts are correctly initialized so they don't need special treatment on read. Only sender, instruction pointer and stack pointer need to be intercepted on reads." | rcvr | <inline: true> rcvr := self receiver. (fieldIndex < MethodIndex + and: [objectMemory isContextNonInt: rcvr]) - and: [self isContextNonInt: rcvr]) ifTrue: [self internalPush: (self instVar: fieldIndex ofContext: rcvr)] ifFalse: [self internalPush: (objectMemory fetchPointer: fieldIndex ofObject: rcvr)]! Item was changed: ----- Method: StackInterpreter>>stObject:at: (in category 'indexing primitive support') ----- stObject: array at: index "Return what ST would return for <obj> at: index." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. + (fmt = 3 and: [objectMemory isContextHeader: hdr]) - (fmt = 3 and: [self isContextHeader: hdr]) ifTrue: [stSize := self fetchStackPointerOf: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [^self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array)]] ifFalse: [stSize := totalLength - fixedFields]. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [^self subscript: array with: (index + fixedFields) format: fmt] ifFalse: [self primitiveFailFor: PrimErrBadIndex. ^ 0]! Item was changed: ----- Method: StackInterpreter>>stObject:at:put: (in category 'indexing primitive support') ----- stObject: array at: index put: value "Do what ST would return for <obj> at: index put: value." | hdr fmt totalLength fixedFields stSize | <inline: false> hdr := objectMemory baseHeader: array. fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: array baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: array format: fmt length: totalLength. + (fmt = 3 + and: [objectMemory isContextHeader: hdr]) - (fmt = 3 and: [self isContextHeader: hdr]) ifTrue: [stSize := self fetchStackPointerOf: array. ((self oop: index isGreaterThanOrEqualTo: 1) and: [(self oop: index isLessThanOrEqualTo: stSize) and: [self isStillMarriedContext: array]]) ifTrue: [self noInlineTemporary: index - 1 in: (self frameOfMarriedContext: array) put: value. ^self]] ifFalse: [stSize := totalLength - fixedFields]. ((self oop: index isGreaterThanOrEqualTo: 1) and: [self oop: index isLessThanOrEqualTo: stSize]) ifTrue: [self subscript: array with: (index + fixedFields) storing: value format: fmt] ifFalse: [self primitiveFailFor: PrimErrBadIndex]! Item was changed: ----- Method: StackInterpreter>>storeMaybeContextReceiverVariable:withValue: (in category 'stack bytecodes') ----- storeMaybeContextReceiverVariable: fieldIndex withValue: anObject "Must trap accesses to married and widowed contexts. But don't want to check on all inst var accesses. This method is only used by the long-form bytecodes, evading the cost." | rcvr | rcvr := self receiver. (fieldIndex <= ReceiverIndex + and: [(objectMemory isContextNonInt: rcvr) - and: [(self isContextNonInt: rcvr) and: [self isMarriedOrWidowedContext: rcvr]]) ifTrue: [self instVar: fieldIndex ofContext: rcvr put: anObject] ifFalse: [objectMemory storePointer: fieldIndex ofObject: rcvr withValue: anObject] ! Item was removed: - ----- Method: StackInterpreter>>sufficientSpaceToInstantiate:indexableSize: (in category 'object access primitives') ----- - sufficientSpaceToInstantiate: classOop indexableSize: size - "Return the number of bytes required to allocate an instance of the given class with the given number of indexable fields." - "Details: For speed, over-estimate space needed for fixed fields or literals; the low space threshold is a blurry line." - | format atomSize| - <inline: true> - format := self instSpecOfClass: classOop. - - "fail if attempting to call new: on non-indexable class" - ((self cCoerce: size to: 'usqInt ') > 0 and: [format < 2]) - ifTrue: [^ false]. - - format < 8 - ifTrue: ["indexable fields are words or pointers" atomSize := BytesPerWord] - ifFalse: ["indexable fields are bytes" atomSize := 1]. - ^objectMemory sufficientSpaceToAllocate: 2500 + (size * atomSize)! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveClone (in category 'object access primitives') ----- primitiveClone "Return a shallow copy of the receiver. Special-case non-single contexts (because of context-to-stack mapping). Can't fail for contexts cuz of image context instantiation code (sigh)." | rcvr newCopy | rcvr := self stackTop. (objectMemory isIntegerObject: rcvr) ifTrue: [newCopy := rcvr] ifFalse: + [(objectMemory isContextNonInt: rcvr) - [(self isContextNonInt: rcvr) ifTrue: [newCopy := self cloneContext: rcvr] ifFalse: [newCopy := objectMemory clone: rcvr]. newCopy = 0 ifTrue: [^self primitiveFailFor: PrimErrNoMemory]]. self pop: 1 thenPush: newCopy! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveCopyObject (in category 'object access primitives') ----- primitiveCopyObject "Primitive. Copy the state of the receiver from the argument. Fail if receiver and argument are of a different class. Fail if the receiver or argument are non-pointer objects. Fail if the receiver or argument are contexts (because of context-to-stack mapping). Fail if receiver and argument have different lengths (for indexable objects). " | rcvr arg length | self methodArgumentCount = 1 ifFalse: [^self primitiveFail]. arg := self stackObjectValue: 0. rcvr := self stackObjectValue: 1. self failed ifTrue:[^nil]. (objectMemory isPointers: rcvr) ifFalse: [^self primitiveFail]. + ((objectMemory isContextNonInt: rcvr) + or: [objectMemory isContextNonInt: arg]) ifTrue: - ((self isContextNonInt: rcvr) - or: [self isContextNonInt: arg]) ifTrue: [^self primitiveFail]. (objectMemory fetchClassOfNonInt: rcvr) = (objectMemory fetchClassOfNonInt: arg) ifFalse: [^self primitiveFail]. length := objectMemory lengthOf: rcvr. length = (objectMemory lengthOf: arg) ifFalse: [^self primitiveFail]. "Now copy the elements" + 0 to: length-1 do: + [:i| - 0 to: length-1 do:[:i| objectMemory storePointer: i ofObject: rcvr withValue: (objectMemory fetchPointer: i ofObject: arg)]. "Note: The above could be faster for young receivers but I don't think it'll matter" + self pop: 1 "pop arg; answer receiver" - self pop: 1. "pop arg; answer receiver" !

1 0

request for cr => lf lineendings...
by Eliot Miranda 06 Sep '11

06 Sep '11

...in these two files: platforms/iOS/plugins/FT2Plugin/FT2Plugin.xcodeproj/project.pbxproj platforms/iOS/vm/src/vm/interp.c so that greps etc are comprehensible. Pretty please. -- best, Eliot

2 3

CogDroid: first public alpha available for testing
by Dimitry Golubovsky 06 Sep '11

06 Sep '11

Hi, I am pleased to announce that the Android port of Stack Cog has reached the public alpha stage, and the first pre-built apk file is available for downloading: http://squeakvm-tablet.googlecode.com/files/CogDroid-alpha-20110903.apk This is a debug-signed Android package. When installed, it uses the Pharo icon (to distinguish from the Squeak package in case it is installed). In the future, I'll change the icon to something different. It was tested mostly with one of recent Pharo Core images, and this kind of image is suggested for experiments, but information about any other images is also welcome. Place the image, changes, and sources files in a directory under the root of your tablet's SD card mount point. When the application is launched, it will show list of all image files available. Information provided in the Wiki pages of the Google Code project for the classic VM port is valid for the Cog port as well. http://code.google.com/p/squeakvm-tablet/w/list See the CogNotes page http://code.google.com/p/squeakvm-tablet/wiki/CogNotes for information about location of sources, and (very sketchy at the moment) building procedure. As usual, please send your feedback to this mailing list, or to the Google code project issues page: http://code.google.com/p/squeakvm-tablet/issues/list Try running the tinyBenchmark (Cog gives slightly better results than the Classic VM). You may also try the Test Runner. Please let me know if your favorite tests failed, and any ideas why they might fail ;) >From my experience running tests amount of failures is not much higher than same tests run on PC Cog/Pharo. Have fun and share your experience ;) Thanks. -- Dimitry Golubovsky Anywhere on the Web

7 7

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2011