Vm-dev May 2015

vm-dev@lists.squeakfoundation.org

28 participants
153 discussions

VM Maker: Cog-eem.263.mcz
by commits＠source.squeak.org 07 May '15

07 May '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.263.mcz ==================== Summary ==================== Name: Cog-eem.263 Author: eem Time: 7 May 2015, 10:15:56.515 am UUID: f308cadc-bc13-46e4-8ac7-16c638330867 Ancestors: Cog-eem.262 Spur Bootstrap: Don't use the standard instance creation protocol for MCMethod/ClassDefinition instances which uses instanceLike:, sicne this could create unintended sharing. =============== Diff against Cog-eem.262 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>classDefinitionFor:type:from:comment:stamp: (in category 'private-accessing') ----- classDefinitionFor: className type: typeSymbol from: definitions comment: commentString stamp: stampString | classDef | classDef := definitions detect: [:d| d isClassDefinition and: [d className = className]] ifNone: [self assert: (#(BoxedFloat64 SmallFloat64) includes: className). + MCClassDefinition new + initializeWithName: className - MCClassDefinition - name: className superclassName: #Float traitComposition: '{}' classTraitComposition: '{}' category: 'Kernel-Numbers' instVarNames: #() classVarNames: #() poolDictionaryNames: #() classInstVarNames: #() type: typeSymbol comment: commentString asString commentStamp: stampString]. className == #Character ifTrue: [classDef variables removeAllSuchThat: [:varDef| varDef isInstanceVariable and: [varDef name = 'value']]]. classDef instVarNamed: 'type' put: typeSymbol. commentString ifNotNil: [classDef instVarNamed: 'comment' put: commentString; instVarNamed: 'commentStamp' put: stampString]. ^MCAddition of: classDef! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>compiledMethodClassDefinition (in category 'private-accessing') ----- compiledMethodClassDefinition ^MCAddition of: + (MCClassDefinition new + initializeWithName: #CompiledMethod - (MCClassDefinition name: #CompiledMethod superclassName: #ByteArray category: #'Kernel-Methods' instVarNames: #() classVarNames: #(LargeFrame PrimaryBytecodeSetEncoderClass SecondaryBytecodeSetEncoderClass SmallFrame) poolDictionaryNames: #() classInstVarNames: #() type: #compiledMethod comment: 'CompiledMethod instances are methods suitable for interpretation by the virtual machine. Instances of CompiledMethod and its subclasses are the only objects in the system that have both indexable pointer fields and indexable 8-bit integer fields. The first part of a CompiledMethod is pointers, the second part is bytes. CompiledMethod inherits from ByteArray to avoid duplicating some of ByteArray''s methods, not because a CompiledMethod is-a ByteArray. Class variables: SmallFrame - the number of stack slots in a small frame Context LargeFrame - the number of stack slots in a large frame Context PrimaryBytecodeSetEncoderClass - the encoder class that defines the primary instruction set SecondaryBytecodeSetEncoderClass - the encoder class that defines the secondary instruction set The current format of a CompiledMethod is as follows: header (4 or 8 bytes, SmallInteger) literals (4 or 8 bytes each, Object, see "The last literal..." below) bytecodes (variable, bytes) trailer (variable, bytes) The header is a SmallInteger (which in the 32-bit system has 31 bits, and in the 64-bit system, 61 bits) in the following format: (index 0) 15 bits: number of literals (#numLiterals) (index 15) 1 bit: is optimized - reserved for methods that have been optimized by Sista (index 16) 1 bit: has primitive (index 17) 1 bit: whether a large frame size is needed (#frameSize => either SmallFrame or LargeFrame) (index 18) 6 bits: number of temporary variables (#numTemps) (index 24) 4 bits: number of arguments to the method (#numArgs) (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public), although accessors for bit 29 exist (see #flag). sign bit: 1 bit: selects the instruction set, >= 0 Primary, < 0 Secondary (#signFlag) If the method has a primitive then the first bytecode of the method must be a callPrimitive: bytecode that encodes the primitive index. The trailer is an encoding of an instance of CompiledMethodTrailer. It is typically used to encode the index into the source files array of the method''s source, but may be used to encode other values, e.g. tempNames, source as a string, etc. See the class CompiledMethodTrailer. The last literal in a CompiledMethod must be its methodClassAssociation, a binding whose value is the class the method is installed in. The methodClassAssociation is used to implement super sends. If a method contains no super send then its methodClassAssociation may be nil (as would be the case for example of methods providing a pool of inst var accessors). By convention the penultimate literal of a method is either its selector or an instance of AdditionalMethodState. AdditionalMethodState holds any pragmas and properties of a method, but may also be used to add instance variables to a method, albeit ones held in the method''s AdditionalMethodState. Subclasses of CompiledMethod that want to add state should subclass AdditionalMethodState to add the state they want, and implement methodPropertiesClass on the class side of the CompiledMethod subclass to answer the specialized subclass of AdditionalMethodState.' commentStamp: 'eem 1/22/2015 15:47')! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>modifiedFloatDefinitionsIn: (in category 'private-accessing') ----- modifiedFloatDefinitionsIn: definitions "Delete the non-accessing primitives in Float (prims 41 through 59), and copy them to BoxedFloat64, and create corresponding ones in SmallFloat64 with primtiive numbers + 500." | floatPrims | floatPrims := definitions select: [:d| | index | d isMethodDefinition and: [d fullClassName = #Float and: [(index := d source indexOfSubCollection: '<primitive: ') > 0 and: [(Integer readFrom: (ReadStream on: d source from: index + '<primitive: ' size to: index + '<primitive: ' size + 4)) between: 41 and: 59]]]]. ^(floatPrims collect: [:d| + MCMethodDefinition new + initializeWithClassName: d className - MCMethodDefinition - className: d className classIsMeta: false selector: d selector category: d category timeStamp: d timeStamp source: d source, 'DELETEME']), (floatPrims collect: [:d| + MCMethodDefinition new + initializeWithClassName: #BoxedFloat64 - MCMethodDefinition - className: #BoxedFloat64 classIsMeta: false selector: d selector category: d category timeStamp: d timeStamp source: d source]), (floatPrims collect: [:d| + MCMethodDefinition new + initializeWithClassName: #SmallFloat64 - MCMethodDefinition - className: #SmallFloat64 classIsMeta: false selector: d selector category: d category timeStamp: 'eem 11/25/2014 07:54' source: (d source copyReplaceAll: '<primitive: ' with: '<primitive: 5')])! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- packagesAndPatches "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" | spurBootstrap | packagesAndPatches ifNotNil: [^packagesAndPatches]. packagesAndPatches := Dictionary new. spurBootstrap := SpurBootstrap new. imageTypes ifNotNil: [spurBootstrap imageTypes: imageTypes]. spurBootstrap prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | package category source definition | (Smalltalk classNamed: className) ifNil: [package := self packageForMissingClassNamed: className] ifNotNil: [:behavior| | class methodReference | class := isMeta ifTrue: [behavior class] ifFalse: [behavior]. (class includesSelector: selector) ifTrue: [methodReference := (class >> selector) methodReference. category := methodReference category]. package := (methodReference isNil or: [methodReference category = Categorizer default]) ifTrue: [PackageOrganizer default packageOfClass: class] ifFalse: [PackageOrganizer default packageOfMethod: methodReference]]. source := method getSourceFromFile asString allButFirst: method selector size - selector size. source first ~= selector first ifTrue: [source replaceFrom: 1 to: selector size with: selector startingAt: 1]. + definition := MCAddition of: (MCMethodDefinition new + initializeWithClassName: className - definition := MCAddition of: (MCMethodDefinition - className: className classIsMeta: isMeta selector: selector category: (category ifNil: [SpurBootstrap categoryForClass: className meta: isMeta selector: selector]) timeStamp: method timeStamp source: source). (method pragmaAt: #remove) ifNotNil: [definition := definition inverse]. (packagesAndPatches at: package ifAbsentPut: [OrderedCollection new]) add: definition]. ^packagesAndPatches! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchDefinition:withRewriter: (in category 'patching') ----- patchDefinition: aMCMethodDefinition withRewriter: aRBParseTreeRewriter | parseTree | parseTree := RBParser parseMethod: aMCMethodDefinition source onError: [:str :pos | self halt]. aRBParseTreeRewriter executeTree: parseTree. + ^MCMethodDefinition new + initializeWithClassName: aMCMethodDefinition className - ^MCMethodDefinition - className: aMCMethodDefinition className classIsMeta:aMCMethodDefinition classIsMeta selector: aMCMethodDefinition selector category: aMCMethodDefinition category timeStamp: aMCMethodDefinition timeStamp source: aRBParseTreeRewriter tree newSource!

1 0

Camp Smalltalk Portland 2015
by Andres Valloud 07 May '15

07 May '15

1 0

[commit][3323] CogVM source as per VMMaker.oscogglue-eem.1037
by commits＠squeakvm.org 07 May '15

07 May '15

Revision: 3323 Author: eliot Date: 2015-05-06 18:47:30 -0700 (Wed, 06 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscogglue-eem.1037 Back port regression fix from VMMaker.oscog-eem.1292 Fix a regression in externalInstVar:ofContext:. The head frame pointers must be written back if we're going to map a machince code pc to a bytecode pc in case of code reclamation. Add asserts to the stack page enumerators to check that the head frame pointers have been written back. Modified Paths: -------------- branches/Glue/nscogsrc/vm/cointerp.c branches/Glue/nscogsrc/vm/cointerp.h branches/Glue/nscogsrc/vm/gcc3x-cointerp.c branches/Glue/nsspursrc/vm/cointerp.c branches/Glue/nsspursrc/vm/cointerp.h branches/Glue/nsspursrc/vm/gcc3x-cointerp.c branches/Glue/nsspurstacksrc/vm/gcc3x-interp.c branches/Glue/nsspurstacksrc/vm/interp.c branches/Glue/sistasrc/vm/cointerp.c branches/Glue/sistasrc/vm/cointerp.h branches/Glue/sistasrc/vm/gcc3x-cointerp.c branches/Glue/spursistasrc/vm/cointerp.c branches/Glue/spursistasrc/vm/cointerp.h branches/Glue/spursistasrc/vm/gcc3x-cointerp.c branches/Glue/spursrc/vm/cointerp.c branches/Glue/spursrc/vm/cointerp.h branches/Glue/spursrc/vm/gcc3x-cointerp.c branches/Glue/spurstack64src/vm/gcc3x-interp.c branches/Glue/spurstack64src/vm/interp.c branches/Glue/spurstacksrc/vm/gcc3x-interp.c branches/Glue/spurstacksrc/vm/interp.c branches/Glue/src/vm/cointerp.c branches/Glue/src/vm/cointerp.h branches/Glue/src/vm/cointerpmt.c branches/Glue/src/vm/cointerpmt.h branches/Glue/src/vm/gcc3x-cointerp.c branches/Glue/src/vm/gcc3x-cointerpmt.c branches/Glue/stacksrc/vm/gcc3x-interp.c branches/Glue/stacksrc/vm/interp.c Property Changed: ---------------- branches/Glue/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Glue/nscogsrc/vm/cointerp.c =================================================================== --- branches/Glue/nscogsrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nscogsrc/vm/cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1104,6 +1104,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2097,7 +2098,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16231,7 +16232,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17284,6 +17297,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -17466,6 +17480,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -17567,6 +17582,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -46471,6 +46487,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/nscogsrc/vm/cointerp.h =================================================================== --- branches/Glue/nscogsrc/vm/cointerp.h 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nscogsrc/vm/cointerp.h 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ Modified: branches/Glue/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/nscogsrc/vm/gcc3x-cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nscogsrc/vm/gcc3x-cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1107,6 +1107,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2100,7 +2101,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16240,7 +16241,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17293,6 +17306,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -17475,6 +17489,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -17576,6 +17591,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -46480,6 +46496,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/nsspursrc/vm/cointerp.c =================================================================== --- branches/Glue/nsspursrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nsspursrc/vm/cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1303,6 +1303,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2358,7 +2359,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17620,7 +17621,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17854,6 +17867,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19048,6 +19062,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19909,6 +19924,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -21966,6 +21982,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -66202,6 +66219,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/nsspursrc/vm/cointerp.h =================================================================== --- branches/Glue/nsspursrc/vm/cointerp.h 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nsspursrc/vm/cointerp.h 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ Modified: branches/Glue/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/nsspursrc/vm/gcc3x-cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nsspursrc/vm/gcc3x-cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1306,6 +1306,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2361,7 +2362,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17629,7 +17630,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17863,6 +17876,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19057,6 +19071,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19918,6 +19933,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -21975,6 +21991,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -66211,6 +66228,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Glue/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - StackInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + StackInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1072,6 +1072,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; void ifValidWriteBackStackPointersSaveTo(void *theCFP, void *theCSP, char **savedFPP, char **savedSPP); static sqInt imageFormatVersion(void); @@ -2109,7 +2110,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52225,6 +52226,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -52880,6 +52882,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { @@ -54911,6 +54940,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -55130,6 +55160,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); Modified: branches/Glue/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Glue/nsspurstacksrc/vm/interp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/nsspurstacksrc/vm/interp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - StackInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + StackInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1069,6 +1069,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; void ifValidWriteBackStackPointersSaveTo(void *theCFP, void *theCSP, char **savedFPP, char **savedSPP); static sqInt imageFormatVersion(void); @@ -2106,7 +2107,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscogglue-eem.1037"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -52216,6 +52217,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -52871,6 +52873,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { @@ -54902,6 +54931,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -55121,6 +55151,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); Property changes on: branches/Glue/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed May 6 14:10:12 PDT 2015 + Wed May 6 18:46:44 PDT 2015 Modified: branches/Glue/sistasrc/vm/cointerp.c =================================================================== --- branches/Glue/sistasrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/sistasrc/vm/cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1104,6 +1104,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2098,7 +2099,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1036]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1037]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16402,7 +16403,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17314,6 +17327,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -17496,6 +17510,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -17597,6 +17612,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -46495,6 +46511,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/sistasrc/vm/cointerp.h =================================================================== --- branches/Glue/sistasrc/vm/cointerp.h 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/sistasrc/vm/cointerp.h 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ Modified: branches/Glue/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/sistasrc/vm/gcc3x-cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/sistasrc/vm/gcc3x-cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1107,6 +1107,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2101,7 +2102,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1036]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1037]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -16411,7 +16412,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17323,6 +17336,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -17505,6 +17519,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -17606,6 +17621,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -46504,6 +46520,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/spursistasrc/vm/cointerp.c =================================================================== --- branches/Glue/spursistasrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/spursistasrc/vm/cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1303,6 +1303,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2359,7 +2360,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1036]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1037]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17932,7 +17933,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -18166,6 +18179,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19122,6 +19136,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19983,6 +19998,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -22040,6 +22056,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -66219,6 +66236,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/spursistasrc/vm/cointerp.h =================================================================== --- branches/Glue/spursistasrc/vm/cointerp.h 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/spursistasrc/vm/cointerp.h 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ Modified: branches/Glue/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/spursistasrc/vm/gcc3x-cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/spursistasrc/vm/gcc3x-cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1306,6 +1306,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2362,7 +2363,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1036]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1037]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -17941,7 +17942,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -18175,6 +18188,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19131,6 +19145,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19992,6 +20007,7 @@ char *theSP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -22049,6 +22065,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -66228,6 +66245,33 @@ return bitNo + shifted; } + +/* If thePage is the stackPage and the stackPointer and/or the framePointer + are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and + framePointer respectively. + */ + +static sqInt +ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + if (thePage == GIV(stackPage)) { + if ((((thePage->lastAddress)) < GIV(framePointer)) + && (GIV(framePointer) < ((thePage->baseAddress)))) { + if (((thePage->headFP)) != GIV(framePointer)) { + return 0; + } + } + if ((((thePage->lastAddress)) < GIV(stackPointer)) + && (GIV(stackPointer) < ((thePage->baseAddress)))) { + if (((thePage->headSP)) != GIV(stackPointer)) { + return 0; + } + } + } + return 1; +} + static usqInt iframeMethod(char *theFP) { Modified: branches/Glue/spursrc/vm/cointerp.c =================================================================== --- branches/Glue/spursrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) +++ branches/Glue/spursrc/vm/cointerp.c 2015-05-07 01:47:30 UTC (rev 3323) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef from - CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1037 uuid: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1294,6 +1294,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -2348,7 +2349,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1036]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscogglue-eem.1037]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -12921,7 +12922,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -13155,6 +13168,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3322] CogVM source as per VMMaker.oscog-eem.1292
by commits＠squeakvm.org 07 May '15

07 May '15

Revision: 3322 Author: eliot Date: 2015-05-06 18:37:40 -0700 (Wed, 06 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1292 Fix a regression in externalInstVar:ofContext:. The head frame pointers must be written back if we're going to map a machince code pc to a bytecode pc in case of code reclamation. Add asserts to the stack page enumerators to check that the head frame pointers have been written back. Use macros for the oop comparisons, avoiding cCoerce:, to get faster simulation and avoid the inliner not always inlining in conditionals. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c 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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-06 21:11:38 UTC (rev 3321) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-07 01:37:40 UTC (rev 3322) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + CCodeGenerator VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-06 21:11:38 UTC (rev 3321) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-07 01:37:40 UTC (rev 3322) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + CCodeGenerator VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + StackToRegisterMappingCogit VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1175,10 +1175,6 @@ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; static sqInt v3or4PushNilSizenumInitialNils(sqInt aMethodObj, sqInt numInitialNils) NoDbgRegParms; static sqInt v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) NoDbgRegParms; -static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; /*** Variables ***/ @@ -1940,6 +1936,13 @@ #define traceSpill(ign) 0 #define allocatype(numElements, elementType) alloca((numElements)*sizeof(elementType)) #define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0])) +#define oopisGreaterThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) >= (usqInt)(otherOop)) +#define oopisGreaterThanOrEqualToandLessThanOrEqualTo(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) <= (usqInt)(limitOop)) +#define oopisGreaterThanOrEqualToandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisGreaterThan(anOop,otherOop) ((usqInt)(anOop) > (usqInt)(otherOop)) +#define oopisGreaterThanandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) > (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisLessThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) <= (usqInt)(otherOop)) +#define oopisLessThan(anOop,otherOop) ((usqInt)(anOop) < (usqInt)(otherOop)) static AbstractInstruction * @@ -9603,7 +9606,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -14985,10 +14988,10 @@ if (oopisLessThan(anOop, minCogMethodAddress())) { return " is in generated runtime"; } - if ((((usqInt) anOop)) < (((usqInt) mzFreeStart))) { + if (oopisLessThan(anOop, mzFreeStart)) { return " is in generated methods"; } - if ((((usqInt) anOop)) < (((usqInt) youngReferrers))) { + if (oopisLessThan(anOop, youngReferrers)) { return " is in code zone"; } return " is in young referrers"; @@ -24380,6 +24383,7 @@ genTrinaryInlinePrimitive(sqInt prim) { sqInt adjust; + sqInt needsStoreCheck; sqInt ra1; sqInt ra2; sqInt rNext; @@ -24439,6 +24443,7 @@ assert((rr != ra1) && ((rr != ra2) && (ra1 != ra2))); + needsStoreCheck = !(isUnannotatableConstant(ssTop())); popToReg(ssTop(), ra2); ssPop(1); popToReg(ssTop(), ra1); @@ -24459,7 +24464,10 @@ } /* begin MoveR:Xwr:R: */ genoperandoperandoperand(MoveRXwrR, ra2, ra1, rr); - genStoreCheckReceiverRegvalueRegscratchReginFrame(rr, ra2, TempReg, 1); + if (needsStoreCheck) { + assert(needsFrame); + genStoreCheckReceiverRegvalueRegscratchReginFrame(rr, ra2, TempReg, 1); + } break; case 1: genConvertSmallIntegerToIntegerInReg(ra2); @@ -25611,48 +25619,3 @@ ? 1 : 0)); } - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) >= (((usqInt) otherOop)); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) -{ - return ((((usqInt) anOop)) >= (((usqInt) baseOop))) - && ((((usqInt) anOop)) < (((usqInt) limitOop))); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThan(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) > (((usqInt) otherOop)); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisLessThan(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) < (((usqInt) otherOop)); -} Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-06 21:11:38 UTC (rev 3321) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-07 01:37:40 UTC (rev 3322) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + CCodeGenerator VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e from - StackToRegisterMappingCogit VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + StackToRegisterMappingCogit VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1119,10 +1119,6 @@ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; static sqInt v3or4PushNilSizenumInitialNils(sqInt aMethodObj, sqInt numInitialNils) NoDbgRegParms; static sqInt v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) NoDbgRegParms; -static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; /*** Variables ***/ @@ -1886,6 +1882,13 @@ #define traceSpill(ign) 0 #define allocatype(numElements, elementType) alloca((numElements)*sizeof(elementType)) #define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0])) +#define oopisGreaterThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) >= (usqInt)(otherOop)) +#define oopisGreaterThanOrEqualToandLessThanOrEqualTo(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) <= (usqInt)(limitOop)) +#define oopisGreaterThanOrEqualToandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisGreaterThan(anOop,otherOop) ((usqInt)(anOop) > (usqInt)(otherOop)) +#define oopisGreaterThanandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) > (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisLessThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) <= (usqInt)(otherOop)) +#define oopisLessThan(anOop,otherOop) ((usqInt)(anOop) < (usqInt)(otherOop)) static sqInt @@ -13761,10 +13764,10 @@ if (oopisLessThan(anOop, minCogMethodAddress())) { return " is in generated runtime"; } - if ((((usqInt) anOop)) < (((usqInt) mzFreeStart))) { + if (oopisLessThan(anOop, mzFreeStart)) { return " is in generated methods"; } - if ((((usqInt) anOop)) < (((usqInt) youngReferrers))) { + if (oopisLessThan(anOop, youngReferrers)) { return " is in code zone"; } return " is in young referrers"; @@ -23123,6 +23126,7 @@ genTrinaryInlinePrimitive(sqInt prim) { sqInt adjust; + sqInt needsStoreCheck; sqInt ra1; sqInt ra2; sqInt rNext; @@ -23182,6 +23186,7 @@ assert((rr != ra1) && ((rr != ra2) && (ra1 != ra2))); + needsStoreCheck = !(isUnannotatableConstant(ssTop())); popToReg(ssTop(), ra2); ssPop(1); popToReg(ssTop(), ra1); @@ -23202,7 +23207,10 @@ } /* begin MoveR:Xwr:R: */ genoperandoperandoperand(MoveRXwrR, ra2, ra1, rr); - genStoreCheckReceiverRegvalueRegscratchReginFrame(rr, ra2, TempReg, 1); + if (needsStoreCheck) { + assert(needsFrame); + genStoreCheckReceiverRegvalueRegscratchReginFrame(rr, ra2, TempReg, 1); + } break; case 1: genConvertSmallIntegerToIntegerInReg(ra2); @@ -24352,48 +24360,3 @@ ? 1 : 0)); } - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) >= (((usqInt) otherOop)); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) -{ - return ((((usqInt) anOop)) >= (((usqInt) baseOop))) - && ((((usqInt) anOop)) < (((usqInt) limitOop))); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisGreaterThan(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) > (((usqInt) otherOop)); -} - - -/* Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation. */ - -static sqInt -oopisLessThan(sqInt anOop, sqInt otherOop) -{ - return (((usqInt) anOop)) < (((usqInt) otherOop)); -} Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-05-06 21:11:38 UTC (rev 3321) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-05-07 01:37:40 UTC (rev 3322) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e from - CoInterpreter VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e + CoInterpreter VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1288 uuid: 909625f0-4d63-4a3b-84e1-1f2753923d7e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1292 uuid: 0cde527f-cdb5-4345-adad-7dd496ef023e " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1327,6 +1327,7 @@ static sqInt handleStackOverflowOrEventAllowContextSwitch(sqInt mayContextSwitch) NoDbgRegParms; sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); sqInt highBit(usqInt anUnsignedValue); +static sqInt ifCurrentStackPageHasValidHeadPointers(StackPage *thePage) NoDbgRegParms; static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -1539,11 +1540,6 @@ EXPORT(void) primitiveVoidReceiver(void); static void pruneStackstackp(sqInt stack, sqInt stackp) NoDbgRegParms; static void unmarkAfterPathTo(void); -static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualToandLessThanOrEqualTo(sqInt anOop, sqInt baseOop, sqInt limitOop) NoDbgRegParms; -static sqInt oopisGreaterThanOrEqualToandLessThan(sqInt anOop, sqInt baseOop, sqInt limitOop) NoDbgRegParms; -static sqInt oopisLessThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; -static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; /*** Variables ***/ #if SQ_USE_GLOBAL_STRUCT @@ -1583,12 +1579,12 @@ _iss usqInt pastSpaceStart; _iss sqInt numSegments; _iss sqInt traceLogIndex; -_iss sqInt rememberedSetSize; _iss sqInt classTableFirstPage; _iss sqInt * freeLists; +_iss sqInt rememberedSetSize; _iss char * stackLimit; -_iss sqInt * rememberedSet; _iss sqInt tempOop; +_iss sqInt * rememberedSet; _iss sqInt remapBufferCount; _iss usqInt freeListsMask; _iss sqInt profileProcess; @@ -2382,7 +2378,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1288"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1292"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2442,6 +2438,13 @@ #define printFloat(f) printf("%g", f) #define allocatype(numElements, elementType) alloca((numElements)*sizeof(elementType)) #define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0])) +#define oopisGreaterThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) >= (usqInt)(otherOop)) +#define oopisGreaterThanOrEqualToandLessThanOrEqualTo(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) <= (usqInt)(limitOop)) +#define oopisGreaterThanOrEqualToandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisGreaterThan(anOop,otherOop) ((usqInt)(anOop) > (usqInt)(otherOop)) +#define oopisGreaterThanandLessThan(anOop,baseOop,limitOop) ((usqInt)(anOop) > (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop)) +#define oopisLessThanOrEqualTo(anOop,otherOop) ((usqInt)(anOop) <= (usqInt)(otherOop)) +#define oopisLessThan(anOop,otherOop) ((usqInt)(anOop) < (usqInt)(otherOop)) @@ -4820,7 +4823,7 @@ /* most stores into young objects */ if (((top & 3) == 0) - && ((((usqInt) top)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(top, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -5843,7 +5846,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(objOop))) >> 29) & 1) != 0)) { remember(objOop); @@ -5884,7 +5887,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> 29) & 1) != 0)) { remember(litVar); @@ -5926,7 +5929,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(objOop))) >> 29) & 1) != 0)) { remember(objOop); @@ -5967,7 +5970,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> 29) & 1) != 0)) { remember(litVar); @@ -6624,7 +6627,7 @@ /* most stores into young objects */ if (((top & 3) == 0) - && ((((usqInt) top)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(top, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> 29) & 1) != 0)) { remember(litVar); @@ -6665,7 +6668,7 @@ /* most stores into young objects */ if (((top & 3) == 0) - && ((((usqInt) top)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(top, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -6717,7 +6720,7 @@ /* most stores into young objects */ if (((top & 3) == 0) - && ((((usqInt) top)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(top, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -6745,7 +6748,7 @@ /* most stores into young objects */ if (((top & 3) == 0) - && ((((usqInt) top)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(top, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -7065,7 +7068,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(tempVector))) >> 29) & 1) != 0)) { remember(tempVector); @@ -7102,7 +7105,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(tempVector))) >> 29) & 1) != 0)) { remember(tempVector); @@ -9098,8 +9101,8 @@ /* begin commonVariable:at:cacheIndex: */ index1 = (index >> 1); stSize = GIV(atCache)[atIx + AtCacheSize]; - if (((((usqInt) index1)) >= (((usqInt) 1))) - && ((((usqInt) index1)) <= (((usqInt) stSize)))) { + if ((oopisGreaterThanOrEqualTo(index1, 1)) + && (oopisLessThanOrEqualTo(index1, stSize))) { fmt2 = GIV(atCache)[atIx + AtCacheFmt]; if (fmt2 <= 4) { assert(!(isContextNonImm(rcvr))); @@ -9398,8 +9401,8 @@ if (!GIV(primFailCode)) { /* begin commonVariable:at:put:cacheIndex: */ stSize = GIV(atCache)[atIx + AtCacheSize]; - if (((((usqInt) ((index >> 1)))) >= (((usqInt) 1))) - && ((((usqInt) ((index >> 1)))) <= (((usqInt) stSize)))) { + if ((oopisGreaterThanOrEqualTo((index >> 1), 1)) + && (oopisLessThanOrEqualTo((index >> 1), stSize))) { fmt = GIV(atCache)[atIx + AtCacheFmt]; if (fmt <= 4) { assert(!(isContextNonImm(rcvr))); @@ -9411,7 +9414,7 @@ /* most stores into young objects */ if (((value & 3) == 0) - && ((((usqInt) value)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(value, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -11720,8 +11723,8 @@ /* begin commonVariable:at:cacheIndex: */ index1 = (index >> 1); stSize = GIV(atCache)[atIx + AtCacheSize]; - if (((((usqInt) index1)) >= (((usqInt) 1))) - && ((((usqInt) index1)) <= (((usqInt) stSize)))) { + if ((oopisGreaterThanOrEqualTo(index1, 1)) + && (oopisLessThanOrEqualTo(index1, stSize))) { fmt2 = GIV(atCache)[atIx + AtCacheFmt]; if (fmt2 <= 4) { assert(!(isContextNonImm(rcvr))); @@ -12020,8 +12023,8 @@ if (!GIV(primFailCode)) { /* begin commonVariable:at:put:cacheIndex: */ stSize = GIV(atCache)[atIx + AtCacheSize]; - if (((((usqInt) ((index >> 1)))) >= (((usqInt) 1))) - && ((((usqInt) ((index >> 1)))) <= (((usqInt) stSize)))) { + if ((oopisGreaterThanOrEqualTo((index >> 1), 1)) + && (oopisLessThanOrEqualTo((index >> 1), stSize))) { fmt = GIV(atCache)[atIx + AtCacheFmt]; if (fmt <= 4) { assert(!(isContextNonImm(rcvr))); @@ -12033,7 +12036,7 @@ /* most stores into young objects */ if (((value & 3) == 0) - && ((((usqInt) value)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(value, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -12979,7 +12982,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13031,7 +13034,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13059,7 +13062,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13104,7 +13107,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> 29) & 1) != 0)) { remember(litVar); @@ -13180,7 +13183,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13232,7 +13235,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13260,7 +13263,7 @@ /* most stores into young objects */ if (((anObject & 3) == 0) - && ((((usqInt) anObject)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anObject, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -13308,7 +13311,7 @@ /* most stores into young objects */ if ((((longAtPointer(localSP)) & 3) == 0) - && ((((usqInt) (longAtPointer(localSP)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAtPointer(localSP), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(litVar))) >> 29) & 1) != 0)) { remember(litVar); @@ -14219,7 +14222,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - sqInt theIP; + usqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -14950,7 +14953,7 @@ /* most stores into young objects */ if (((anOop & 3) == 0) - && ((((usqInt) anOop)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(anOop, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(maybeMarriedContext))) >> 29) & 1) != 0)) { remember(maybeMarriedContext); @@ -16597,7 +16600,7 @@ else { hasYoung = hasYoung || (((fieldOop & 3) == 0) - && ((((usqInt) fieldOop)) < (((usqInt) GIV(newSpaceLimit))))); + && (oopisLessThan(fieldOop, GIV(newSpaceLimit)))); if (!(checkOkayOop(fieldOop))) { return 0; } @@ -16610,7 +16613,7 @@ } if (hasYoung) { /* begin checkOkayYoungReferrer: */ - if ((((usqInt) oop)) < (((usqInt) GIV(newSpaceLimit)))) { + if (oopisLessThan(oop, GIV(newSpaceLimit))) { return 1; } if (!(((((usqInt) (longAt(oop))) >> 29) & 1) != 0)) { @@ -17317,7 +17320,19 @@ return ((offset == InstructionPointerIndex) && (((value & 1)) && ((((sqInt) value)) < 0)) - ? mustMapMachineCodePCcontext((value >> 1), aContext) + ? (/* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < (LargeContextSlots * BytesPerOop)), + assert(GIV(stackPage) == (mostRecentlyUsedPage())), + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)), + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - (LargeContextSlots * BytesPerOop)))), + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - ((LargeContextSlots * BytesPerOop) / 2)))), + (GIV(stackPage)->headFP = GIV(framePointer)), + (GIV(stackPage)->headSP = GIV(stackPointer)), + assert(pageListIsWellFormed()), + mustMapMachineCodePCcontext((value >> 1), aContext)) : value); } /* begin externalWriteBackHeadFramePointers */ @@ -17568,6 +17583,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theFP = (thePage->headFP); theIPPtr = (thePage == GIV(stackPage) ? 0 @@ -18740,6 +18756,7 @@ /* begin stackPageAt: */ thePage = stackPageAtpages(i, GIV(pages)); if (!(((thePage->baseFP)) == 0)) { + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); theSP = (thePage->headSP); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -19558,6 +19575,7 @@ numStrongSlots3 = 0; numStrongSlots4 = 0; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); assert(((thePage->trace)) != StackPageTraced); (thePage->trace = StackPageTraced); theSP = (thePage->headSP); @@ -21482,6 +21500,7 @@ char *theFP; assert(!(isFree(thePage))); + assert(ifCurrentStackPageHasValidHeadPointers(thePage)); /* Skip the instruction pointer on top of stack of inactive pages. */ @@ -22529,7 +22548,7 @@ int index; sqInt methodField; usqInt numArgs; - sqInt numTemps; + usqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -22638,8 +22657,7 @@ } printFrameOopat("receiver", rcvrAddress); topThing = longAt(theSP); - if (((((usqInt) topThing)) >= (((usqInt) theMethod))) - && ((((usqInt) topThing)) < (((usqInt) theMethodEnd)))) { + if (oopisGreaterThanOrEqualToandLessThan(topThing, theMethod, theMethodEnd)) { for (addr = (rcvrAddress - BytesPerWord); addr >= (theSP + BytesPerWord); addr += (-BytesPerWord)) { index = ((rcvrAddress - addr) / BytesPerWord) + numArgs; if (index <= numTemps) { @@ -24848,7 +24866,7 @@ /* most stores into young objects */ if (((ctxt & 3) == 0) - && ((((usqInt) ctxt)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(ctxt, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(proc))) >> 29) & 1) != 0)) { remember(proc); @@ -24892,7 +24910,7 @@ /* most stores into young objects */ if (((contextToReturnTo & 3) == 0) - && ((((usqInt) contextToReturnTo)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(contextToReturnTo, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(contextToReturnFrom))) >> 29) & 1) != 0)) { remember(contextToReturnFrom); @@ -24907,7 +24925,7 @@ /* most stores into young objects */ if (((HasBeenReturnedFromMCPC & 3) == 0) - && ((((usqInt) HasBeenReturnedFromMCPC)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(HasBeenReturnedFromMCPC, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(contextToReturnFrom))) >> 29) & 1) != 0)) { remember(contextToReturnFrom); @@ -25004,7 +25022,7 @@ /* most stores into young objects */ if (((activeContext & 3) == 0) - && ((((usqInt) activeContext)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(activeContext, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(oldProc))) >> 29) & 1) != 0)) { remember(oldProc); @@ -25019,7 +25037,7 @@ /* most stores into young objects */ if (((newProc & 3) == 0) - && ((((usqInt) newProc)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(newProc, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(sched))) >> 29) & 1) != 0)) { remember(sched); @@ -25201,7 +25219,7 @@ /* most stores into young objects */ if ((((longAt(argsPointer)) & 3) == 0) - && ((((usqInt) (longAt(argsPointer)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAt(argsPointer), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(theContext))) >> 29) & 1) != 0)) { remember(theContext); @@ -25220,7 +25238,7 @@ /* most stores into young objects */ if ((((longAt(pointer)) & 3) == 0) - && ((((usqInt) (longAt(pointer)))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(longAt(pointer), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(theContext))) >> 29) & 1) != 0)) { remember(theContext); @@ -25381,7 +25399,7 @@ ? address + BaseHeaderSize : address); limit = GIV(pastSpaceStart); - while ((((usqInt) objOop1)) < (((usqInt) limit))) { + while (oopisLessThan(objOop1, limit)) { assert(isEnumerableObjectNoAssert(objOop1)); fmt = (((usqInt) (longAt(objOop1))) >> 24) & 0x1F; if ((fmt == 3) @@ -25438,7 +25456,7 @@ objOop1 = (numSlots1 == 0xFF ? address1 + BaseHeaderSize : address1); - while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { + while (oopisLessThan(objOop1, GIV(freeStart))) { assert(isEnumerableObjectNoAssert(objOop1)); fmt = (((usqInt) (longAt(objOop1))) >> 24) & 0x1F; if ((fmt == 3) @@ -25499,7 +25517,7 @@ objOop11 = GIV(nilObj); while (1) { assert((objOop11 % (allocationUnit())) == 0); - if (!((((usqInt) objOop11)) < (((usqInt) GIV(endOfMemory))))) break; + if (!(oopisLessThan(objOop11, GIV(endOfMemory)))) break; assert((long64At(objOop11)) != 0); if (isEnumerableObject(objOop11)) { fmt = (((usqInt) (longAt(objOop11))) >> 24) & 0x1F; @@ -25570,47 +25588,43 @@ return somewhere; } /* begin whereIsMaybeHeapThing: */ - if (((((usqInt) anOop)) < (((usqInt) GIV(newSpaceLimit)))) - && ((((usqInt) anOop)) >= (((usqInt) GIV(newSpaceStart))))) { - if (((((usqInt) anOop)) >= (((usqInt) (((eden()).start))))) - && ((((usqInt) anOop)) < (((usqInt) GIV(freeStart))))) { + if ((oopisLessThan(anOop, GIV(newSpaceLimit))) + && (oopisGreaterThanOrEqualTo(anOop, GIV(newSpaceStart)))) { + if (oopisGreaterThanOrEqualToandLessThan(anOop, ((eden()).start), GIV(freeStart))) { where = " is in eden"; - goto l1; + goto l2; } if (oopisGreaterThanOrEqualToandLessThan(anOop, ((futureSpace()).start), futureSurvivorStart())) { where = " is in future space"; - goto l1; + goto l2; } - if (((((usqInt) anOop)) >= (((usqInt) (((pastSpace()).start))))) - && ((((usqInt) anOop)) < (((usqInt) GIV(pastSpaceStart))))) { + if (oopisGreaterThanOrEqualToandLessThan(anOop, ((pastSpace()).start), GIV(pastSpaceStart))) { where = " is in past space"; - goto l1; + goto l2; } where = " is in new space"; - goto l1; + goto l2; } - if (((((usqInt) anOop)) >= (((usqInt) GIV(oldSpaceStart)))) - && ((((usqInt) anOop)) < (((usqInt) GIV(endOfMemory))))) { + if (oopisGreaterThanOrEqualToandLessThan(anOop, GIV(oldSpaceStart), GIV(endOfMemory))) { if (!((segmentContainingObj(anOop)) == null)) { where = " is in old space"; - goto l1; + goto l2; } where = " is between old space segments"; - goto l1; + goto l2; } where = null; -l1: /* end whereIsMaybeHeapThing: */; +l2: /* end whereIsMaybeHeapThing: */; if (!(where == null)) { return where; } /* begin whereIsMaybeStackThing: */ - if (((((usqInt) anOop)) >= (((usqInt) (GIV(stackBasePlus1) - 1)))) - && ((((usqInt) anOop)) < (((usqInt) GIV(pages))))) { + if (oopisGreaterThanOrEqualToandLessThan(anOop, GIV(stackBasePlus1) - 1, GIV(pages))) { where = " is in the stack zone"; - goto l2; + goto l1; } where = null; -l2: /* end whereIsMaybeStackThing: */; +l1: /* end whereIsMaybeStackThing: */; if (!(where == null)) { return where; } @@ -25774,7 +25788,7 @@ /* most stores into young objects */ if (((activeProc & 3) == 0) - && ((((usqInt) activeProc)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(activeProc, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(criticalSection))) >> 29) & 1) != 0)) { remember(criticalSection); @@ -26211,7 +26225,7 @@ /* most stores into young objects */ if (((newValue & 3) == 0) - && ((((usqInt) newValue)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(newValue, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(thisReceiver))) >> 29) & 1) != 0)) { remember(thisReceiver); @@ -26450,7 +26464,7 @@ /* most stores into young objects */ if (((myList & 3) == 0) - && ((((usqInt) myList)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(myList, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(process))) >> 29) & 1) != 0)) { remember(process); @@ -26472,7 +26486,7 @@ /* most stores into young objects */ if (((nextLink & 3) == 0) - && ((((usqInt) nextLink)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(nextLink, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(myList))) >> 29) & 1) != 0)) { remember(myList); @@ -26488,7 +26502,7 @@ /* most stores into young objects */ if (((GIV(nilObj) & 3) == 0) - && ((((usqInt) GIV(nilObj))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(myList))) >> 29) & 1) != 0)) { remember(myList); @@ -26525,7 +26539,7 @@ /* most stores into young objects */ if (((nextLink & 3) == 0) - && ((((usqInt) nextLink)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(nextLink, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(tempLink))) >> 29) & 1) != 0)) { remember(tempLink); @@ -26541,7 +26555,7 @@ /* most stores into young objects */ if (((tempLink & 3) == 0) - && ((((usqInt) tempLink)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(tempLink, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(myList))) >> 29) & 1) != 0)) { remember(myList); @@ -26558,7 +26572,7 @@ /* most stores into young objects */ if (((GIV(nilObj) & 3) == 0) - && ((((usqInt) GIV(nilObj))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(process))) >> 29) & 1) != 0)) { remember(process); @@ -26575,7 +26589,7 @@ /* most stores into young objects */ if (((GIV(nilObj) & 3) == 0) - && ((((usqInt) GIV(nilObj))) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(GIV(nilObj), GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(process))) >> 29) & 1) != 0)) { remember(process); @@ -26963,7 +26977,7 @@ /* most stores into young objects */ if (((aContextOrNil & 3) == 0) - && ((((usqInt) aContextOrNil)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(aContextOrNil, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(thisCtx))) >> 29) & 1) != 0)) { remember(thisCtx); @@ -27038,6 +27052,8 @@ sqInt oldMethod; sqInt oop; sqInt pc; + sqInt pc1; + sqInt pc2; sqInt prevObj; sqInt prevObj1; sqInt prevPrevObj; @@ -27166,7 +27182,7 @@ ? address + BaseHeaderSize : address); limit = GIV(pastSpaceStart); - while ((((usqInt) objOop1)) < (((usqInt) limit))) { + while (oopisLessThan(objOop1, limit)) { assert(isEnumerableObjectNoAssert(objOop1)); if ((((longAt(objOop1)) & 0x3FFFFF) == ClassMethodContextCompactIndex) && ((longAt((objOop1 + BaseHeaderSize) + (MethodIndex << (shiftForWord())))) == methodObj)) { @@ -27200,7 +27216,7 @@ objOop1 = (numSlots1 == 0xFF ? address1 + BaseHeaderSize : address1); - while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { + while (oopisLessThan(objOop1, GIV(freeStart))) { assert(isEnumerableObjectNoAssert(objOop1)); if ((((longAt(objOop1)) & 0x3FFFFF) == ClassMethodContextCompactIndex) && ((longAt((objOop1 + BaseHeaderSize) + (MethodIndex << (shiftForWord())))) == methodObj)) { @@ -27212,13 +27228,13 @@ else { /* begin ensureContextHasBytecodePC: */ assert(!(isMarriedOrWidowedContext(objOop1))); - pc = longAt((objOop1 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); - if (((pc & 1)) - && (((pc = (pc >> 1))) < 0)) { - pc = mustMapMachineCodePCcontext(pc, objOop1); + pc1 = longAt((objOop1 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); + if (((pc1 & 1)) + && (((pc1 = (pc1 >> 1))) < 0)) { + pc1 = mustMapMachineCodePCcontext(pc1, objOop1); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop1))); - longAtput((objOop1 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), pc); + longAtput((objOop1 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), pc1); } } } @@ -27238,7 +27254,7 @@ objOop11 = GIV(nilObj); while (1) { assert((objOop11 % (allocationUnit())) == 0); - if (!((((usqInt) objOop11)) < (((usqInt) GIV(endOfMemory))))) break; + if (!(oopisLessThan(objOop11, GIV(endOfMemory)))) break; assert((long64At(objOop11)) != 0); if (isEnumerableObject(objOop11)) { if ((((longAt(objOop11)) & 0x3FFFFF) == ClassMethodContextCompactIndex) @@ -27251,13 +27267,13 @@ else { /* begin ensureContextHasBytecodePC: */ assert(!(isMarriedOrWidowedContext(objOop11))); - pc = longAt((objOop11 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); - if (((pc & 1)) - && (((pc = (pc >> 1))) < 0)) { - pc = mustMapMachineCodePCcontext(pc, objOop11); + pc2 = longAt((objOop11 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord()))); + if (((pc2 & 1)) + && (((pc2 = (pc2 >> 1))) < 0)) { + pc2 = mustMapMachineCodePCcontext(pc2, objOop11); /* begin storePointerUnchecked:ofObject:withValue: */ assert(!(isForwarded(objOop11))); - longAtput((objOop11 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), pc); + longAtput((objOop11 + BaseHeaderSize) + (InstructionPointerIndex << (shiftForWord())), pc2); } } } @@ -28721,8 +28737,8 @@ assert((ReceiverIndex + ((sp1 >> 1))) < (lengthOf(rcvr))); stSize = (sp1 >> 1); l2: /* end stackPointerForMaybeMarriedContext: */; - if (((((usqInt) index)) >= (((usqInt) 1))) - && (((((usqInt) index)) <= (((usqInt) stSize))) + if ((oopisGreaterThanOrEqualTo(index, 1)) + && ((oopisLessThanOrEqualTo(index, stSize)) && ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) && (!(isWidowedContext(rcvr)))))) { result = noInlineTemporaryin(index - 1, frameOfMarriedContext(rcvr)); @@ -28735,7 +28751,7 @@ if ((oopisGreaterThanOrEqualTo(index, (fmt >= 24 ? (((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1 : 1))) - && ((((usqInt) index)) <= (((usqInt) stSize)))) { + && (oopisLessThanOrEqualTo(index, stSize))) { /* begin subscript:with:format: */ if (fmt <= 5) { result = longAt((rcvr + BaseHeaderSize) + (((index + fixedFields) - 1) << (shiftForWord()))); @@ -28844,8 +28860,8 @@ sqInt totalLength1; sqInt value; sqInt value1; - sqInt valueToStore; - sqInt valueToStore1; + usqInt valueToStore; + usqInt valueToStore1; /* begin commonAtPut: */ value = longAt(GIV(stackPointer)); @@ -28932,8 +28948,8 @@ assert((ReceiverIndex + ((sp11 >> 1))) < (lengthOf(rcvr))); stSize1 = (sp11 >> 1); l8: /* end stackPointerForMaybeMarriedContext: */; - if (((((usqInt) index)) >= (((usqInt) 1))) - && (((((usqInt) index)) <= (((usqInt) stSize1))) + if ((oopisGreaterThanOrEqualTo(index, 1)) + && ((oopisLessThanOrEqualTo(index, stSize1)) && ((((longAt((rcvr + BaseHeaderSize) + (SenderIndex << (shiftForWord())))) & 1)) && (!(isWidowedContext(rcvr)))))) { noInlineTemporaryinput(index - 1, frameOfMarriedContext(rcvr), value); @@ -28946,7 +28962,7 @@ if ((oopisGreaterThanOrEqualTo(index, (fmt1 >= 24 ? (((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1 : 1))) - && ((((usqInt) index)) <= (((usqInt) stSize1)))) { + && (oopisLessThanOrEqualTo(index, stSize1))) { /* begin subscript:with:storing:format: */ if (fmt1 <= 5) { /* begin storePointer:ofObject:withValue: */ @@ -28956,7 +28972,7 @@ /* most stores into young objects */ if (((value & 3) == 0) - && ((((usqInt) value)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(value, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -29315,7 +29331,7 @@ /* most stores into young objects */ if (((rcvr & 3) == 0) - && ((((usqInt) rcvr)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(rcvr, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(GIV(specialObjectsOop)))) >> 29) & 1) != 0)) { remember(GIV(specialObjectsOop)); @@ -30389,7 +30405,7 @@ /* most stores into young objects */ if (((v1 & 3) == 0) - && ((((usqInt) v1)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(v1, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(objOop3))) >> 29) & 1) != 0)) { remember(objOop3); @@ -30409,7 +30425,7 @@ /* most stores into young objects */ if (((v2 & 3) == 0) - && ((((usqInt) v2)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(v2, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(objOop4))) >> 29) & 1) != 0)) { remember(objOop4); @@ -31565,7 +31581,7 @@ /* most stores into young objects */ if (((valuePointer & 3) == 0) - && ((((usqInt) valuePointer)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(valuePointer, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(rcvr))) >> 29) & 1) != 0)) { remember(rcvr); @@ -32987,12 +33003,18 @@ sqInt address; sqInt address1; sqInt firstBytecode; + sqInt firstBytecode1; + sqInt firstBytecode2; sqInt header; + sqInt header1; + sqInt header2; sqInt i; sqInt i1; sqInt i2; usqInt limit; sqInt methodHeader; + sqInt methodHeader1; + sqInt methodHeader2; usqInt numSlots; usqInt numSlots1; sqInt objOop; @@ -33005,6 +33027,8 @@ sqInt prevPrevObj; sqInt prevPrevObj1; sqInt primBits; + sqInt primBits1; + sqInt primBits2; sqInt primIdx; /* begin flushExternalPrimitives */ @@ -33024,7 +33048,7 @@ ? address + BaseHeaderSize : address); limit = GIV(pastSpaceStart); - while ((((usqInt) objOop1)) < (((usqInt) limit))) { + while (oopisLessThan(objOop1, limit)) { assert(isEnumerableObjectNoAssert(objOop1)); if (!(((longAt(objOop1)) & 0x3FFFFF) == 0)) { if (((((usqInt) (longAt(objOop1))) >> 24) & 0x1F) >= 24) { @@ -33071,7 +33095,7 @@ objOop1 = (numSlots1 == 0xFF ? address1 + BaseHeaderSize : address1); - while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { + while (oopisLessThan(objOop1, GIV(freeStart))) { assert(isEnumerableObjectNoAssert(objOop1)); if (!(((longAt(objOop1)) & 0x3FFFFF) == 0)) { if (((((usqInt) (longAt(objOop1))) >> 24) & 0x1F) >= 24) { @@ -33081,18 +33105,18 @@ /* begin primitiveIndexOfMethod:header: */ /* begin methodHeaderOf: */ assert(isCompiledMethod(objOop1)); - header = longAt((objOop1 + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); - if ((header & 1)) { - methodHeader = header; + header1 = longAt((objOop1 + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); + if ((header1 & 1)) { + methodHeader1 = header1; } else { - assert((((usqInt)header)) < GIV(newSpaceStart)); - assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())); - methodHeader = ((((CogMethod *) header))->methodHeader); + assert((((usqInt)header1)) < GIV(newSpaceStart)); + assert((((((CogMethod *) header1))->objectHeader)) == (nullHeaderForMachineCodeMethod())); + methodHeader1 = ((((CogMethod *) header1))->methodHeader); } - if (methodHeader & AlternateHeaderHasPrimFlag) { - firstBytecode = (objOop1 + ((LiteralStart + (((methodHeader >> 1)) & AlternateHeaderNumLiteralsMask)) * BytesPerOop)) + BaseHeaderSize; - primIdx = (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8); + if (methodHeader1 & AlternateHeaderHasPrimFlag) { + firstBytecode1 = (objOop1 + ((LiteralStart + (((methodHeader1 >> 1)) & AlternateHeaderNumLiteralsMask)) * BytesPerOop)) + BaseHeaderSize; + primIdx = (byteAt(firstBytecode1 + 1)) + ((byteAt(firstBytecode1 + 2)) << 8); } else { primIdx = 0; @@ -33122,7 +33146,7 @@ objOop11 = GIV(nilObj); while (1) { assert((objOop11 % (allocationUnit())) == 0); - if (!((((usqInt) objOop11)) < (((usqInt) GIV(endOfMemory))))) break; + if (!(oopisLessThan(objOop11, GIV(endOfMemory)))) break; assert((long64At(objOop11)) != 0); if (isEnumerableObject(objOop11)) { if (!(((longAt(objOop11)) & 0x3FFFFF) == 0)) { @@ -33133,18 +33157,18 @@ /* begin primitiveIndexOfMethod:header: */ /* begin methodHeaderOf: */ assert(isCompiledMethod(objOop11)); - header = longAt((objOop11 + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); - if ((header & 1)) { - methodHeader = header; + header2 = longAt((objOop11 + BaseHeaderSize) + (HeaderIndex << (shiftForWord()))); + if ((header2 & 1)) { + methodHeader2 = header2; } else { - assert((((usqInt)header)) < GIV(newSpaceStart)); - assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())); - methodHeader = ((((CogMethod *) header))->methodHeader); + assert((((usqInt)header2)) < GIV(newSpaceStart)); + assert((((((CogMethod *) header2))->objectHeader)) == (nullHeaderForMachineCodeMethod())); + methodHeader2 = ((((CogMethod *) header2))->methodHeader); } - if (methodHeader & AlternateHeaderHasPrimFlag) { - firstBytecode = (objOop11 + ((LiteralStart + (((methodHeader >> 1)) & AlternateHeaderNumLiteralsMask)) * BytesPerOop)) + BaseHeaderSize; - primIdx = (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8); + if (methodHeader2 & AlternateHeaderHasPrimFlag) { + firstBytecode2 = (objOop11 + ((LiteralStart + (((methodHeader2 >> 1)) & AlternateHeaderNumLiteralsMask)) * BytesPerOop)) + BaseHeaderSize; + primIdx = (byteAt(firstBytecode2 + 1)) + ((byteAt(firstBytecode2 + 2)) << 8); } else { primIdx = 0; @@ -33648,7 +33672,7 @@ /* most stores into young objects */ if (((value & 3) == 0) - && ((((usqInt) value)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(value, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ if (!(((((usqInt) (longAt(arg))) >> 29) & 1) != 0)) { remember(arg); @@ -34222,7 +34246,7 @@ /* most stores into young objects */ if (((arg & 3) == 0) - && ((((usqInt) arg)) < (((usqInt) GIV(newSpaceLimit))))) { + && (oopisLessThan(arg, GIV(newSpaceLimit)))) { /* begin possibleRootStoreInto: */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscogglue-eem.1037.mcz
by commits＠source.squeak.org 07 May '15

07 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogglue-eem.1037.mcz ==================== Summary ==================== Name: VMMaker.oscogglue-eem.1037 Author: eem Time: 6 May 2015, 6:34:36.361 pm UUID: 0260edd4-b9e9-48c5-9aa9-4c40339de2ef Ancestors: VMMaker.oscogglue-eem.1036 Back port regression fix from VMMaker.oscog-eem.1292 Fix a regression in externalInstVar:ofContext:. The head frame pointers must be written back if we're going to map a machince code pc to a bytecode pc in case of code reclamation. Add asserts to the stack page enumerators to check that the head frame pointers have been written back. =============== Diff against VMMaker.oscogglue-eem.1036 =============== Item was changed: ----- Method: CoInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state. If the context is single but has a negative instruction pointer recognise that the instruction pointer is actually into machine code and convert it to the corresponding bytecode pc." <inline: false> | value | self assert: (objectMemory isContext: aContext). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." ((self isReadMediatedContextInstVarIndex: offset) and: [self isMarriedOrWidowedContext: aContext]) ifFalse: [value := objectMemory fetchPointer: offset ofObject: aContext. ^(offset = InstructionPointerIndex and: [(objectMemory isIntegerObject: value) and: [value signedIntFromLong < 0]]) + ifTrue: [self externalWriteBackHeadFramePointers. + self mustMapMachineCodePC: (objectMemory integerValueOf: value) - ifTrue: [self mustMapMachineCodePC: (objectMemory integerValueOf: value) context: aContext] ifFalse: [value]]. self externalWriteBackHeadFramePointers. ^(self isStillMarriedContext: aContext) ifTrue: [self fetchPointer: offset ofMarriedContext: aContext] ifFalse: [objectMemory fetchPointer: offset ofObject: aContext]! Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on inst var fetch we scan the receivers in the stack zone and follow any forwarded ones. This is way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). offset := self frameStackedReceiverOffset: theFP. oop := stackPages longAt: theFP + offset. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + offset put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. oop := (self mframeHomeMethod: theFP) methodObject. self assert: (objectMemory isForwarded: oop) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. delta := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: #never> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := ((self isMachineCodeFrame: theFP) or: [(self iframeSavedIP: theFP) = 0]) ifTrue: [0] ifFalse: [theFP + FoxIFSavedIP]] ifFalse: [theIPPtr := theSP. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. "forwarding scheme in SqueakV3 obj rep makes this hard to check." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. (self isMachineCodeFrame: theFP) ifFalse: [(objectMemory shouldRemapObj: (self iframeMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [theIP := stackPages longAt: theIPPtr. theIP = cogit ceReturnToInterpreterPC ifTrue: [self assert: (self iframeSavedIP: theFP) > (self iframeMethod: theFP). theIPPtr := theFP + FoxIFSavedIP. theIP := stackPages longAt: theIPPtr] ifFalse: [self assert: theIP > (self iframeMethod: theFP)]. theIP := theIP - (self iframeMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self iframeMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self iframeMethod: theFP)]]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. (self isMachineCodeFrame: theFP) ifTrue: [self markAndTraceMachineCodeMethod: (self mframeCogMethod: theFP)] ifFalse: [objectMemory markAndTrace: (self iframeMethod: theFP)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. "caller ip is ceBaseReturnPC" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]! Item was changed: ----- Method: CoInterpreter>>markCogMethodsAndReferentsOnPage: (in category 'frame access') ----- markCogMethodsAndReferentsOnPage: thePage <var: #thePage type: #'StackPage *'> | theFP callerFP | <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." [(self isMachineCodeFrame: theFP) ifTrue: [cogit markMethodAndReferents: (self mframeCogMethod: theFP)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theFP := callerFP]! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch we scan the receivers and methods in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. theIP := (theFP + (self frameStackedReceiverOffset: theFP)) asInteger. "reuse theIP; its just an offset here" oop := stackPages longAt: theIP. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theIP put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asInteger. theFP := callerFP]. "And finally follow the caller context." self assert: theFP = thePage baseFP. oop := self frameCallerContext: theFP. (objectMemory isForwarded: oop) ifTrue: [self frameCallerContext: theFP put: (objectMemory followForwarded: oop)]]]! Item was added: + ----- Method: StackInterpreter>>ifCurrentStackPageHasValidHeadPointers: (in category 'stack pages') ----- + ifCurrentStackPageHasValidHeadPointers: thePage + "If thePage is the stackPage and the stackPointer and/or the framePointer are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and framePointer respectively." + <var: #thePage type: #'StackPage *'> + thePage = stackPage ifTrue: + [(thePage addressIsInPage: framePointer) ifTrue: + [thePage headFP ~= framePointer ifTrue: + [^false]]. + (thePage addressIsInPage: stackPointer) ifTrue: + [thePage headSP ~= stackPointer ifTrue: + [^false]]]. + ^true! Item was changed: ----- Method: StackInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: #never> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). [theSP <= (theFP + FoxReceiver)] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. "With SqueakV3 objectMemory can't assert since object body is yet to move." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. (objectMemory shouldRemapObj: (self frameMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). theIP := (stackPages longAt: theIPPtr) - (self frameMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self frameMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self frameMethod: theFP)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerContext. "a.k.a. FoxCallerSavedIP" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: StackInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. [frameRcvrOffset := self frameReceiverOffset: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. objectMemory markAndTrace: (self iframeMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP. "caller ip is frameCallerContext in a base frame" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]!

1 0

VM Maker: VMMaker.oscog-eem.1292.mcz
by commits＠source.squeak.org 07 May '15

07 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1292.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1292 Author: eem Time: 6 May 2015, 6:01:52.857 pm UUID: 0cde527f-cdb5-4345-adad-7dd496ef023e Ancestors: VMMaker.oscog-eem.1291 Fix a regression in externalInstVar:ofContext:. The head frame pointers must be written back if we're going to map a machince code pc to a bytecode pc in case of code reclamation. Add asserts to the stack page enumerators to check that the head frame pointers have been written back. Use macros for the oop comparisons, avoiding cCoerce:, to get faster simulation and avoid the inliner not inlining in conditionals. =============== Diff against VMMaker.oscog-eem.1291 =============== Item was changed: ----- Method: CoInterpreter>>externalInstVar:ofContext: (in category 'frame access') ----- externalInstVar: offset ofContext: aContext "Fetch an instance variable from a maybe married context. If the context is still married compute the value of the relevant inst var from the spouse frame's state. If the context is single but has a negative instruction pointer recognise that the instruction pointer is actually into machine code and convert it to the corresponding bytecode pc." <inline: false> | value | self assert: (objectMemory isContext: aContext). "method, closureOrNil & receiver need no special handling; only sender, pc & stackp have to be computed for married contexts." ((self isReadMediatedContextInstVarIndex: offset) and: [self isMarriedOrWidowedContext: aContext]) ifFalse: [value := objectMemory fetchPointer: offset ofObject: aContext. ^(offset = InstructionPointerIndex and: [(objectMemory isIntegerObject: value) and: [value signedIntFromLong < 0]]) + ifTrue: [self externalWriteBackHeadFramePointers. + self mustMapMachineCodePC: (objectMemory integerValueOf: value) - ifTrue: [self mustMapMachineCodePC: (objectMemory integerValueOf: value) context: aContext] ifFalse: [value]]. self externalWriteBackHeadFramePointers. ^(self isStillMarriedContext: aContext) ifTrue: [self fetchPointer: offset ofMarriedContext: aContext] ifFalse: [objectMemory fetchPointer: offset ofObject: aContext]! Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become. Override to handle machine code frames" | theIPPtr | <inline: false> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #theIPPtr type: #usqInt> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theFP := thePage headFP. - [theFP := thePage headFP. theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). + (self isMachineCodeFrame: theFP) - (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. self assert: (objectMemory isForwarded: (self mframeHomeMethod: theFP) methodObject) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop | newOop := objectMemory followForwarded: oop. offset := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + offset]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + offset. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. offset := self frameStackedReceiverOffset: theFP. oop := stackPages longAt: theFP + offset. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + offset put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: #never> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP frameRcvrOffset callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := ((self isMachineCodeFrame: theFP) or: [(self iframeSavedIP: theFP) = 0]) ifTrue: [0] ifFalse: [theFP + FoxIFSavedIP]] ifFalse: [theIPPtr := theSP. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). frameRcvrOffset := self frameReceiverLocation: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. "forwarding scheme in SqueakV3 obj rep makes this hard to check." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. (self isMachineCodeFrame: theFP) ifFalse: [(objectMemory shouldRemapObj: (self iframeMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [theIP := stackPages longAt: theIPPtr. theIP = cogit ceReturnToInterpreterPC ifTrue: [self assert: (self iframeSavedIP: theFP) > (self iframeMethod: theFP). theIPPtr := theFP + FoxIFSavedIP. theIP := stackPages longAt: theIPPtr] ifFalse: [self assert: theIP > (self iframeMethod: theFP)]. theIP := theIP - (self iframeMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self iframeMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self iframeMethod: theFP)]]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. [frameRcvrOffset := self frameReceiverLocation: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. (self isMachineCodeFrame: theFP) ifTrue: [self markAndTraceMachineCodeMethod: (self mframeCogMethod: theFP)] ifFalse: [objectMemory markAndTrace: (self iframeMethod: theFP)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. "caller ip is ceBaseReturnPC" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]! Item was changed: ----- Method: CoInterpreter>>markCogMethodsAndReferentsOnPage: (in category 'frame access') ----- markCogMethodsAndReferentsOnPage: thePage <var: #thePage type: #'StackPage *'> | theFP callerFP | <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." [(self isMachineCodeFrame: theFP) ifTrue: [cogit markMethodAndReferents: (self mframeCogMethod: theFP)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theFP := callerFP]! Item was changed: ----- Method: StackInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on bytecode, literal and inst var fetch and non-local return, we scan the receivers (including the stacked receiver for non-local return) and method references in the stack zone and follow any forwarded ones. This is of course way cheaper than scanning all of memory as in the old become." | theIPPtr | <inline: false> <var: #theFP type: #'char *'> <var: #theIPPtr type: #usqInt> <var: #callerFP type: #'char *'> <var: #thePage type: #'StackPage *'> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theFP callerFP ptr oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theFP := thePage headFP. - [theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." theIPPtr := thePage = stackPage ifTrue: [0] ifFalse: [thePage headSP asUnsignedInteger]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). oop := stackPages longAt: theFP + FoxReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxReceiver put: (objectMemory followForwarded: oop)]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. oop := self frameMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). delta := newOop - oop. stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]. ptr := (theFP + (self frameStackedReceiverOffset: theFP)) asInteger. oop := stackPages longAt: ptr. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asInteger. theFP := callerFP]. "And finally follow the caller context." self assert: theFP = thePage baseFP. oop := self frameCallerContext: theFP. (objectMemory isForwarded: oop) ifTrue: [self frameCallerContext: theFP put: (objectMemory followForwarded: oop)]]]! Item was added: + ----- Method: StackInterpreter>>ifCurrentStackPageHasValidHeadPointers: (in category 'stack pages') ----- + ifCurrentStackPageHasValidHeadPointers: thePage + "If thePage is the stackPage and the stackPointer and/or the framePointer are pointing within it, + answer if thePage's heapSP and headFP are equal to the stackPointer and framePointer respectively." + <var: #thePage type: #'StackPage *'> + thePage = stackPage ifTrue: + [(thePage addressIsInPage: framePointer) ifTrue: + [thePage headFP ~= framePointer ifTrue: + [^false]]. + (thePage addressIsInPage: stackPointer) ifTrue: + [thePage headSP ~= stackPointer ifTrue: + [^false]]]. + ^true! Item was changed: ----- Method: StackInterpreter>>mapStackPages (in category 'object memory support') ----- mapStackPages <inline: #never> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #'char *'> 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP theIPPtr theIP oop | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: + [self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). + theSP := thePage headSP. - [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (thePage addressIsInPage: theSP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr]). [theSP <= (theFP + FoxReceiver)] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [(objectMemory shouldRemapObj: (self frameContext: theFP)) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory remapObj: (self frameContext: theFP))]. "With SqueakV3 objectMemory can't assert since object body is yet to move." objectMemory hasSpurMemoryManagerAPI ifTrue: [self assert: ((self isMarriedOrWidowedContext: (self frameContext: theFP)) and: [(self frameOfMarriedContext: (self frameContext: theFP)) = theFP])]]. (objectMemory shouldRemapObj: (self frameMethod: theFP)) ifTrue: [theIPPtr ~= 0 ifTrue: [self assert: (stackPages longAt: theIPPtr) > (self frameMethod: theFP). theIP := (stackPages longAt: theIPPtr) - (self frameMethod: theFP)]. stackPages longAt: theFP + FoxMethod put: (objectMemory remapObj: (self frameMethod: theFP)). theIPPtr ~= 0 ifTrue: [stackPages longAt: theIPPtr put: theIP + (self frameMethod: theFP)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := (theIPPtr := theFP + FoxCallerSavedIP) + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerContext. "a.k.a. FoxCallerSavedIP" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory shouldRemapOop: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory remapObj: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: StackInterpreter>>markAndTraceStackPage: (in category 'object memory support') ----- markAndTraceStackPage: thePage | theSP theFP frameRcvrOffset callerFP oop | <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> <var: #frameRcvrOffset type: #'char *'> <var: #callerFP type: #'char *'> <inline: false> self assert: (stackPages isFree: thePage) not. + self assert: (self ifCurrentStackPageHasValidHeadPointers: thePage). self assert: thePage trace ~= StackPageTraced. thePage trace: StackPageTraced. theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifFalse: [theSP := theSP + objectMemory wordSize]. [frameRcvrOffset := self frameReceiverLocation: theFP. [theSP <= frameRcvrOffset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isContext: (self frameContext: theFP)). objectMemory markAndTrace: (self frameContext: theFP)]. objectMemory markAndTrace: (self iframeMethod: theFP). (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theSP := theFP + FoxCallerSavedIP + objectMemory wordSize. theFP := callerFP]. theSP := theFP + FoxCallerSavedIP. "caller ip is frameCallerContext in a base frame" [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [oop := objectMemory followForwarded: oop. stackPages longAt: theSP put: oop]. (objectMemory isImmediate: oop) ifFalse: [objectMemory markAndTrace: oop]. theSP := theSP + objectMemory wordSize]! Item was changed: ----- Method: VMClass>>oop:isGreaterThan: (in category 'oop comparison') ----- oop: anOop isGreaterThan: otherOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,otherOop) ((usqInt)(anOop) > (usqInt)(otherOop))'> + ^anOop > otherOop! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) - > (self cCoerce: otherOop to: #usqInt)! Item was changed: ----- Method: VMClass>>oop:isGreaterThan:andLessThan: (in category 'oop comparison') ----- oop: anOop isGreaterThan: baseOop andLessThan: limitOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,baseOop,limitOop) ((usqInt)(anOop) > (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop))'> + ^anOop > baseOop and: [anOop < limitOop]! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) > (self cCoerce: baseOop to: #usqInt) - and: [(self cCoerce: anOop to: #usqInt) < (self cCoerce: limitOop to: #usqInt)]! Item was changed: ----- Method: VMClass>>oop:isGreaterThanOrEqualTo: (in category 'oop comparison') ----- oop: anOop isGreaterThanOrEqualTo: otherOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,otherOop) ((usqInt)(anOop) >= (usqInt)(otherOop))'> + ^anOop >= otherOop! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) - >= (self cCoerce: otherOop to: #usqInt)! Item was changed: ----- Method: VMClass>>oop:isGreaterThanOrEqualTo:andLessThan: (in category 'oop comparison') ----- oop: anOop isGreaterThanOrEqualTo: baseOop andLessThan: limitOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) < (usqInt)(limitOop))'> + ^anOop >= baseOop and: [anOop < limitOop]! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) >= (self cCoerce: baseOop to: #usqInt) - and: [(self cCoerce: anOop to: #usqInt) < (self cCoerce: limitOop to: #usqInt)]! Item was changed: ----- Method: VMClass>>oop:isGreaterThanOrEqualTo:andLessThanOrEqualTo: (in category 'oop comparison') ----- oop: anOop isGreaterThanOrEqualTo: baseOop andLessThanOrEqualTo: limitOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,baseOop,limitOop) ((usqInt)(anOop) >= (usqInt)(baseOop) && (usqInt)(anOop) <= (usqInt)(limitOop))'> + ^anOop >= baseOop and: [anOop <= limitOop]! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) >= (self cCoerce: baseOop to: #usqInt) - and: [(self cCoerce: anOop to: #usqInt) <= (self cCoerce: limitOop to: #usqInt)]! Item was changed: ----- Method: VMClass>>oop:isLessThan: (in category 'oop comparison') ----- oop: anOop isLessThan: otherOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,otherOop) ((usqInt)(anOop) < (usqInt)(otherOop))'> + ^anOop < otherOop! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) < (self cCoerce: otherOop to: #usqInt)! Item was changed: ----- Method: VMClass>>oop:isLessThanOrEqualTo: (in category 'oop comparison') ----- oop: anOop isLessThanOrEqualTo: otherOop + "Compare two oop values, treating them as object memory locations; i.e. use unsigned comparisons. + Use a macro, instead of #cCoerce:to: to provide fast simulation and inline code in conditionals, + since the inliner doesn't inline in condtionals." + <cmacro: '(anOop,otherOop) ((usqInt)(anOop) <= (usqInt)(otherOop))'> + ^anOop <= otherOop! - "Compare two oop values, treating them as object memory locations. - Use #cCoerce:to: to ensure comparison of unsigned magnitudes. This - method will be inlined during C translation." - <inline: true> - ^(self cCoerce: anOop to: #usqInt) - <= (self cCoerce: otherOop to: #usqInt)!

1 0

[commit][3321] Fork from VMMaker.oscog-eem.1034 for stable Glue.
by commits＠squeakvm.org 06 May '15

06 May '15

Revision: 3321 Author: eliot Date: 2015-05-06 14:11:38 -0700 (Wed, 06 May 2015) Log Message: ----------- Fork from VMMaker.oscog-eem.1034 for stable Glue. Changes from VMMaker.oscog-eem.1288 & VMMaker.oscog-eem.1291: Implement remembered table pruning via ref counts. The algorithm selectively tenures objects to reduce the remembered table, instead of merely tenuring everything. Be selective about remembering tenured objects; actually scan their contents before remembering willy-nilly. Nuke obsolete copyToOldSpace: methods. Change computeRefCountToShrinkRT to - compute the ref counts and population in a single pass over the RT - determine the ref count for tenuring based on half the population of remembered objects, /not/ half the size of the RT. Modified Paths: -------------- branches/Glue/README branches/Glue/nscogsrc/plugins/AioPlugin/AioPlugin.c branches/Glue/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Glue/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Glue/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Glue/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Glue/nscogsrc/vm/cointerp.c branches/Glue/nscogsrc/vm/cointerp.h branches/Glue/nscogsrc/vm/gcc3x-cointerp.c branches/Glue/nsspursrc/vm/cointerp.c branches/Glue/nsspursrc/vm/cointerp.h branches/Glue/nsspursrc/vm/gcc3x-cointerp.c branches/Glue/nsspurstacksrc/vm/gcc3x-interp.c branches/Glue/nsspurstacksrc/vm/interp.c branches/Glue/sistasrc/vm/cointerp.c branches/Glue/sistasrc/vm/cointerp.h branches/Glue/sistasrc/vm/gcc3x-cointerp.c branches/Glue/spursistasrc/vm/cointerp.c branches/Glue/spursistasrc/vm/cointerp.h branches/Glue/spursistasrc/vm/gcc3x-cointerp.c branches/Glue/spursrc/vm/cointerp.c branches/Glue/spursrc/vm/cointerp.h branches/Glue/spursrc/vm/gcc3x-cointerp.c branches/Glue/spurstack64src/vm/gcc3x-interp.c branches/Glue/spurstack64src/vm/interp.c branches/Glue/spurstacksrc/vm/gcc3x-interp.c branches/Glue/spurstacksrc/vm/interp.c branches/Glue/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Glue/src/plugins/AioPlugin/AioPlugin.c branches/Glue/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Glue/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Glue/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Glue/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Glue/src/vm/cointerp.c branches/Glue/src/vm/cointerp.h branches/Glue/src/vm/cointerpmt.c branches/Glue/src/vm/cointerpmt.h branches/Glue/src/vm/gcc3x-cointerp.c branches/Glue/src/vm/gcc3x-cointerpmt.c branches/Glue/stacksrc/vm/gcc3x-interp.c branches/Glue/stacksrc/vm/interp.c Property Changed: ---------------- branches/Glue/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Glue/README =================================================================== --- branches/Glue/README 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/README 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,4 +1,4 @@ -The Cog VM source tree +Branch of the Cog VM source tree for Cadence Glue Emergencies. --------------------- This is the README for the Cog subversion source tree: http://www.squeakvm.org/svn/squeak/branches/Cog Modified: branches/Glue/nscogsrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Glue/nscogsrc/plugins/AioPlugin/AioPlugin.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/plugins/AioPlugin/AioPlugin.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 + UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f */ -static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ; +static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f " __DATE__ ; @@ -120,9 +120,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (i)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (i)" #else - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (e)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (e)" #endif ; @@ -256,7 +256,7 @@ sqSocketBytes = arrayValueOf(objectPointer); idx = 0; - while (idx < (socketRecordSize())) { + while (idx < (sizeof(SQSocket))) { if ((sqSocketBytes[idx]) != 0) { return 0; } @@ -291,7 +291,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(objectPointer))); } @@ -523,7 +523,7 @@ sqSocketOop = stackValue(0); if (!(((isBytes(sqSocketOop)) - && ((byteSizeOf(sqSocketOop)) == (socketRecordSize()))) + && ((byteSizeOf(sqSocketOop)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(sqSocketOop))))) { return primitiveFail(); } Modified: branches/Glue/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c =================================================================== --- branches/Glue/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + SmartSyntaxPluginCodeGenerator VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - AsynchFilePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + AsynchFilePlugin VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ -static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d " __DATE__ ; +static char __buildInfo[] = "AsynchFilePlugin VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; @@ -102,9 +102,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AsynchFilePlugin VMMaker.oscog-eem.983 (i)" + "AsynchFilePlugin VMMaker.oscogglue-eem.1036 (i)" #else - "AsynchFilePlugin VMMaker.oscog-eem.983 (e)" + "AsynchFilePlugin VMMaker.oscogglue-eem.1036 (e)" #endif ; static void * sCOAFfn; @@ -182,6 +182,9 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; + if (failed()) { + return null; + } asyncFileClose(f); if (failed()) { return null; @@ -287,13 +290,11 @@ } success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - - /* adjust for zero-origin indexing */ - + if (failed()) { + return null; + } bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; - if (!(failed())) { - r = asyncFileReadResult(f, bufferPtr, count); - } + r = asyncFileReadResult(f, ((void *)bufferPtr), count); _return_value = integerObjectOf(r); if (failed()) { return null; @@ -325,6 +326,9 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; + if (failed()) { + return null; + } asyncFileReadStart(f, fPosition, count); if (failed()) { return null; @@ -354,7 +358,10 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; - r = asyncFileWriteResult(f); + if (failed()) { + return null; + } + r = asyncFileWriteResult(f); _return_value = integerObjectOf(r); if (failed()) { return null; @@ -394,9 +401,6 @@ primitiveFailFor(PrimErrBadArgument); f = null; l1: /* end asyncFileValueOf: */; - if (failed()) { - return null; - } count = num; startIndex = start; @@ -413,13 +417,11 @@ } success((startIndex >= 1) && (((startIndex + count) - 1) <= bufferSize)); - - /* adjust for zero-origin indexing */ - + if (failed()) { + return null; + } bufferPtr = ((((sqInt) (firstIndexableField(buffer)))) + startIndex) - 1; - if (!(failed())) { - asyncFileWriteStart(f, fPosition, bufferPtr, count); - } + asyncFileWriteStart(f, fPosition, ((void *)bufferPtr), count); if (failed()) { return null; } Modified: branches/Glue/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Glue/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,17 +1,17 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - MiscPrimitivePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d - Bitmap * Graphics-bf.303 uuid: 59c75040-7563-4061-8425-81f4467d3eb8 - ByteArray * Collections.spur-bf.588 uuid: 80ef5d3c-140e-4225-98f4-354435f1372e - ByteString * Collections.spur-bf.588 uuid: 80ef5d3c-140e-4225-98f4-354435f1372e - SampledSound Sound-bf.42 uuid: 01b2784a-0ad7-4a6b-a996-3388ab820acd + MiscPrimitivePlugin VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba + Bitmap * Graphics-mt.312 uuid: ad5f17db-6eed-a44f-a07c-cbfb9d4e09ee + ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 + ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028 + SampledSound Sound-topa.43 uuid: c1c2b948-6c86-4cf8-877d-1620433f558e */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d\n\ -Bitmap * Graphics-bf.303 uuid: 59c75040-7563-4061-8425-81f4467d3eb8\n\ -ByteArray * Collections.spur-bf.588 uuid: 80ef5d3c-140e-4225-98f4-354435f1372e\n\ -ByteString * Collections.spur-bf.588 uuid: 80ef5d3c-140e-4225-98f4-354435f1372e\n\ -SampledSound Sound-bf.42 uuid: 01b2784a-0ad7-4a6b-a996-3388ab820acd " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba\n\ +Bitmap * Graphics-mt.312 uuid: ad5f17db-6eed-a44f-a07c-cbfb9d4e09ee\n\ +ByteArray * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ +ByteString * Collections.spur-ul.610, Collections.spur-ul.627, Collections.spur-mt.631 uuid: 3448b17a-1361-47a8-af38-4c26b42dc028\n\ +SampledSound Sound-topa.43 uuid: c1c2b948-6c86-4cf8-877d-1620433f558e " __DATE__ ; @@ -94,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.983 (i)" + "MiscPrimitivePlugin VMMaker.oscogglue-eem.1036 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.983 (e)" + "MiscPrimitivePlugin VMMaker.oscogglue-eem.1036 (e)" #endif ; @@ -764,7 +764,7 @@ pushInteger(0); return null; } - for (startIndex = start, startIndexLimiT = (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex <= startIndexLimiT; startIndex += 1) { + for (startIndex = (((start < 1) ? 1 : start)), startIndexLimiT = (((sizeOfSTArrayFromCPrimitive(body + 1)) - (sizeOfSTArrayFromCPrimitive(key + 1))) + 1); startIndex <= startIndexLimiT; startIndex += 1) { index = 1; while ((matchTable[(asciiValue(body[(startIndex + index) - 1])) + 1]) == (matchTable[(asciiValue(key[index])) + 1])) { if (index == (sizeOfSTArrayFromCPrimitive(key + 1))) { Modified: branches/Glue/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Glue/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.985 uuid: f455e095-e61a-46a0-8994-c4bc33bb8a46 + VMPluginCodeGenerator VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -316,9 +316,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -1070,7 +1070,7 @@ sqSocketBytes = arrayValueOf(objectPointer); idx = 0; - while (idx < (socketRecordSize())) { + while (idx < (sizeof(SQSocket))) { if ((sqSocketBytes[idx]) != 0) { return 0; } @@ -1105,7 +1105,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(objectPointer))); } @@ -1302,7 +1302,7 @@ static sqInt newSQSocketByteArray(void) { - return instantiateClassindexableSize(classByteArray(), socketRecordSize()); + return instantiateClassindexableSize(classByteArray(), sizeof(SQSocket)); } @@ -1329,12 +1329,12 @@ unsigned char *ptr; if (!((isBytes(aByteArray)) - && ((stSizeOf(aByteArray)) == (sizeOfPointer())))) { + && ((stSizeOf(aByteArray)) == (sizeof(void *))))) { return null; } ptr = arrayValueOf(aByteArray); idx = 0; - while (idx < (sizeOfPointer())) { + while (idx < (sizeof(void *))) { pointerUnion.bytes[idx] = ptr[idx]; idx += 1; } @@ -1962,11 +1962,11 @@ if (handler == (sigErrorNumber())) { return primitiveFail(); } - priorHandlerObject = instantiateClassindexableSize(classByteArray(), sizeOfPointer()); + priorHandlerObject = instantiateClassindexableSize(classByteArray(), sizeof(void *)); hPtr = arrayValueOf(priorHandlerObject); priorHandler.handler = handler; idx = 0; - while (idx < (sizeOfPointer())) { + while (idx < (sizeof(void *))) { hPtr[idx] = priorHandler.bytes[idx]; idx += 1; } @@ -3336,7 +3336,7 @@ primitiveSizeOfInt(void) { pop(1); - pushInteger(sizeOfInt()); + pushInteger(sizeof(int)); } @@ -3346,7 +3346,7 @@ primitiveSizeOfPointer(void) { pop(1); - pushInteger(sizeOfPointer()); + pushInteger(sizeof(void *)); } Modified: branches/Glue/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Glue/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d + VMPluginCodeGenerator VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 + Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 */ -static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 uuid: dbbde2e2-9103-4ba8-96a9-33c29e7ee7e4 " __DATE__ ; +static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 uuid: 67b1e805-4efd-476c-8cf3-b4a5e14e22a9 " __DATE__ ; /* D T Lewis - Win32OSProcessPlugin.c translated from class Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -222,9 +222,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (i)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 (i)" #else - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.49 (e)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.50 (e)" #endif ; static int osprocessSandboxSecurity; @@ -560,7 +560,7 @@ sqSocketBytes = arrayValueOf(objectPointer); idx = 0; - while (idx < (socketRecordSize())) { + while (idx < (sizeof(SQSocket))) { if ((sqSocketBytes[idx]) != 0) { return 0; } @@ -595,7 +595,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(objectPointer))); } @@ -644,7 +644,7 @@ static sqInt newSQSocketByteArray(void) { - return instantiateClassindexableSize(classByteArray(), socketRecordSize()); + return instantiateClassindexableSize(classByteArray(), sizeof(SQSocket)); } @@ -658,12 +658,12 @@ unsigned char *ptr; if (!((isBytes(aByteArray)) - && ((stSizeOf(aByteArray)) == (sizeOfPointer())))) { + && ((stSizeOf(aByteArray)) == (sizeof(void *))))) { return null; } ptr = arrayValueOf(aByteArray); idx = 0; - while (idx < (sizeOfPointer())) { + while (idx < (sizeof(void *))) { pointerUnion.bytes[idx] = ptr[idx]; idx += 1; } @@ -1750,7 +1750,7 @@ primitiveSizeOfInt(void) { pop(1); - pushInteger(sizeOfInt()); + pushInteger(sizeof(int)); } @@ -1760,7 +1760,7 @@ primitiveSizeOfPointer(void) { pop(1); - pushInteger(sizeOfPointer()); + pushInteger(sizeof(void *)); } Modified: branches/Glue/nscogsrc/vm/cointerp.c =================================================================== --- branches/Glue/nscogsrc/vm/cointerp.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/vm/cointerp.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - CoInterpreter VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 + CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2097,7 +2097,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1029"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Glue/nscogsrc/vm/cointerp.h =================================================================== --- branches/Glue/nscogsrc/vm/cointerp.h 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/vm/cointerp.h 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ Modified: branches/Glue/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/nscogsrc/vm/gcc3x-cointerp.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nscogsrc/vm/gcc3x-cointerp.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - CoInterpreter VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 + CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1029 uuid: a2c6da7a-d111-4184-bf10-039ed2bea424 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2100,7 +2100,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1029"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; Modified: branches/Glue/nsspursrc/vm/cointerp.c =================================================================== --- branches/Glue/nsspursrc/vm/cointerp.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nsspursrc/vm/cointerp.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - CoInterpreter VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 + CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -209,7 +209,6 @@ #define CSWait 10 #define CSYield 11 #define CtxtTempFrameStart 6 -#define DontTenureButDoUnmark 4 #define DumpStackOnLowSpace 0 #define EnclosingMixinIndex 3 #define EnclosingObjectIndex 4 @@ -252,6 +251,7 @@ #define MaxLiteralCountForCompile 60 #define MaxPrimitiveIndex 575 #define MaxQuickPrimitiveIndex 519 +#define MaxRTRefCount 7 #define MessageArgumentsIndex 1 #define MessageLookupClassIndex 2 #define MessageSelectorIndex 0 @@ -343,6 +343,7 @@ #define SuspendedContextIndex 1 #define TenureByAge 1 #define TenureByClass 2 +#define TenureToShrinkRT 3 #define TheDisplay 14 #define TheFinalizationSemaphore 41 #define TheInputSemaphore null @@ -837,8 +838,11 @@ static sqInt wordIndexableFormat(void); static void addToEphemeronList(sqInt ephemeronCorpse) NoDbgRegParms; static void addToWeakList(sqInt weakCorpse) NoDbgRegParms; +static sqInt allNewSpaceObjectsHaveZeroRTRefCount(void); static sqInt allWeakSurvivorsOnWeakList(void); +static void computeRefCountToShrinkRT(void) NeverInline; static sqInt copyAndForward(sqInt survivor) NoDbgRegParms; +static sqInt copyToOldSpacebytesformat(sqInt survivor, sqInt bytesInObject, sqInt formatOfSurvivor) NoDbgRegParms NeverInline; static sqInt firstCorpse(sqInt headOfCorpseList) NoDbgRegParms; static void growRememberedSet(void); static sqInt isInRememberedSet(sqInt objOop) NoDbgRegParms; @@ -1557,8 +1561,8 @@ _iss usqInt scavengeThreshold; _iss sqInt remapBufferCount; _iss sqInt * freeLists; +_iss sqInt rememberedSetSize; _iss char * stackLimit; -_iss sqInt rememberedSetSize; _iss sqInt tempOop; _iss sqInt * rememberedSet; _iss sqInt classTableFirstPage; @@ -1582,10 +1586,10 @@ _iss sqLong nextProfileTick; _iss sqInt numRememberedEphemerons; _iss sqInt jmpDepth; +_iss SpurNewSpaceSpace eden; _iss sqInt futureSurvivorStart; _iss char * objStackInvalidBecause; _iss usqInt lastFreeChunk; -_iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; @@ -1596,6 +1600,7 @@ _iss sqInt classNameIndex; _iss sqInt growHeadroom; _iss sqInt ephemeronQueue; +_iss sqInt tenureCriterion; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss sqInt preemptionYields; @@ -1622,6 +1627,7 @@ _iss sqInt noThreadingOfGUIThread; _iss sqInt pendingFinalizationSignals; _iss sqInt processHasThreadId; +_iss sqInt rememberedSetLimit; _iss sqInt shrinkThreshold; _iss usqLong statIOProcessEvents; _iss sqInt lastHash; @@ -1629,9 +1635,7 @@ _iss sqInt marking; _iss usqInt memory; _iss sqInt numCompactionPasses; -_iss sqInt rememberedSetLimit; _iss sqInt scavengeInProgress; -_iss sqInt tenureCriterion; _iss sqInt fullScreenFlag; _iss float heapGrowthToSizeGCRatio; _iss usqInt heapSizeAtPreviousGC; @@ -1639,6 +1643,7 @@ _iss sqInt interruptPending; _iss sqInt methodDictLinearSearchLimit; _iss usqLong nextPollUsecs; +_iss sqInt rememberedSetRedZone; _iss sqInt statCompactPassCount; _iss usqLong statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -1658,7 +1663,6 @@ _iss sqInt imageFloatsBigEndian; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss sqInt maxExtSemTabSizeSet; -_iss sqInt rememberedSetRedZone; _iss sqInt savedWindowSize; _iss sqInt signalLowSpace; _iss sqInt statCodeCompactionCount; @@ -1672,6 +1676,7 @@ _iss usqLong longRunningPrimitiveGCUsecs; _iss sqInt overflowLimit; _iss StackPage * overflowedPage; +_iss sqInt refCountToShrinkRT; _iss sqInt statCoalesces; _iss usqLong statIGCDeltaUsecs; _iss usqLong statIncrGCUsecs; @@ -2353,7 +2358,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1034"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2396,6 +2401,7 @@ #define futureSpace() GIV(futureSpace) #define futureSurvivorStart() GIV(futureSurvivorStart) #define pastSpace() GIV(pastSpace) +#define rememberedSetLimit() GIV(rememberedSetLimit) #define rememberedSetSize() GIV(rememberedSetSize) #define endOfMemory() GIV(endOfMemory) #define freeStart() GIV(freeStart) @@ -2403,6 +2409,8 @@ #define newSpaceLimit() GIV(newSpaceLimit) #define oldSpaceStart() GIV(oldSpaceStart) #define remapBufferCount() GIV(remapBufferCount) +#define rootTableCapacity() GIV(rememberedSetLimit) +#define rootTableCount() GIV(rememberedSetSize) #define numSegments() GIV(numSegments) #define checkAllocFiller() GIV(checkAllocFiller) #define dispatchFunctionPointer(aFunctionPointer) (aFunctionPointer)() @@ -41270,6 +41278,68 @@ } static sqInt +allNewSpaceObjectsHaveZeroRTRefCount(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt address; + sqInt address1; + sqInt limit; + usqInt numSlots; + usqInt numSlots1; + sqInt obj; + sqInt objOop; + sqInt objOop1; + sqInt prevObj; + sqInt prevPrevObj; + + /* begin allNewSpaceObjectsDo: */ + /* begin allNewSpaceEntitiesDo: */ + + /* After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are + in pastSpace. Objects are allocated in eden. So enumerate only pastSpace and eden. */ + + prevPrevObj = (prevObj = null); + assert((((pastSpace()).start)) < (((eden()).start))); + /* begin objectStartingAt: */ + address = ((pastSpace()).start); + numSlots = byteAt(address + 7); + objOop1 = (numSlots == 0xFF + ? address + BaseHeaderSize + : address); + limit = GIV(pastSpaceStart); + while ((((usqInt) objOop1)) < (((usqInt) limit))) { + assert(isEnumerableObjectNoAssert(objOop1)); + if (((((usqInt) (longAt(objOop1))) >> 29) & MaxRTRefCount) > 0) { + return 0; + } + + + prevPrevObj = prevObj; + prevObj = objOop1; + objOop1 = objectAfterlimit(objOop1, limit); + } + /* begin objectStartingAt: */ + address1 = ((eden()).start); + numSlots1 = byteAt(address1 + 7); + objOop1 = (numSlots1 == 0xFF + ? address1 + BaseHeaderSize + : address1); + while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { + assert(isEnumerableObjectNoAssert(objOop1)); + if (((((usqInt) (longAt(objOop1))) >> 29) & MaxRTRefCount) > 0) { + return 0; + } + + + prevPrevObj = prevObj; + prevObj = objOop1; + objOop1 = objectAfterlimit(objOop1, GIV(freeStart)); + } + + + return 1; +} + +static sqInt allWeakSurvivorsOnWeakList(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; @@ -41304,6 +41374,97 @@ } +/* Some time in every scavenger's life there may come a time when someone + writes code that stresses + the remembered table. One might conclude that if the remembered table is + full, then the right thing + to do is simply to tenure everything, emptying the remembered table. Bt in + some circumstances this + can be counter-productive, and result in the same situation arising soon + after tenuring everything. + Instead, we can try and selectively prune the remembered table, tenuring + only those objects that + are referenced by many objects in the remembered table. That's what this + algorithm does. It + reference counts young objects referenced from the remembered set, and + then sets a threshold + used to tenure objects oft referenced from the remembered set, thereby + allowing the remembered + set to shrink, while not tenuring everything. + + Once in a network monitoring application in a galaxy not dissimilar from + the one this code inhabits, + a tree of nodes referring to large integers was in precisely this + situation. The nodes were old, and + the integers were in new space. Some of the nodes referred to shared + numbers, some their own + unique numbers. The numbers were updated frequently. Were new space simply + tenured when the + remembered table was full, the remembered table would soon fill up as new + numbers were computed. + Only by selectively pruning the remembered table of nodes that shared + data, was a balance achieved + whereby the remembered table population was kept small, and tenuring rates + were low. */ + +static void +computeRefCountToShrinkRT(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt count; + sqInt elephant; + sqInt entirePopulation; + sqInt header; + sqInt i; + sqInt i1; + sqInt j; + sqInt j1; + sqInt jLimiT; + long population[MaxRTRefCount + 1]; + sqInt refCount; + sqInt referent; + + memset(population, 0, (sizeof(long)) * (MaxRTRefCount + 1)); + assert(allNewSpaceObjectsHaveZeroRTRefCount()); + /* begin referenceCountRememberedReferents: */ + for (i1 = 0; i1 < GIV(rememberedSetSize); i1 += 1) { + elephant = GIV(rememberedSet)[i1]; + for (j1 = 0, jLimiT = ((numPointerSlotsOf(elephant)) - 1); j1 <= jLimiT; j1 += 1) { + referent = longAt((elephant + BaseHeaderSize) + (j1 << (shiftForWord()))); + if (((referent & 3) == 0) + && (isReallyYoungObject(referent))) { + refCount = (((usqInt) (longAt(referent))) >> 29) & MaxRTRefCount; + if (refCount < MaxRTRefCount) { + if (refCount > 0) { + population[refCount] = ((population[refCount]) - 1); + } + refCount += 1; + /* begin rtRefCountOf:put: */ + assert(((refCount >= 0) && (refCount <= MaxRTRefCount))); + header = longAt(referent); + header = header & ((unsigned int)~(7 << 29)); + header += refCount << 29; + longAtput(referent, header); + population[refCount] = ((population[refCount]) + 1); + } + } + } + } + /* begin setRefCountToShrinkRT: */ + assert((population[0]) == 0); + entirePopulation = 0; + for (j = 1; j <= MaxRTRefCount; j += 1) { + entirePopulation += population[j]; + } + count = 0; + i = MaxRTRefCount + 1; + while ((count < (entirePopulation / 2)) + && (((i -= 1)) >= 0)) { + count += population[i]; + } + GIV(refCountToShrinkRT) = ((i < 0) ? 0 : i); +} + + /* copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak @@ -41314,13 +41475,10 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqInt bytesInObj; sqInt format; + sqInt header; sqInt newLocation; - sqInt newOop; sqInt newStart; - sqInt newStart1; - sqInt nTenures; sqInt startOfSurvivor; - sqInt startOfSurvivor1; sqInt tenure; assert((isInEden(survivor)) @@ -41340,9 +41498,8 @@ tenure = ((longAt(survivor)) & 0x3FFFFF) == GIV(tenuringClassIndex); break; - case DontTenureButDoUnmark: - setIsMarkedOfto(survivor, 0); - tenure = 0; + case TenureToShrinkRT: + tenure = ((((usqInt) (longAt(survivor))) >> 29) & MaxRTRefCount) >= GIV(refCountToShrinkRT); break; default: @@ -41351,46 +41508,26 @@ } if (tenure || ((GIV(futureSurvivorStart) + bytesInObj) > ((GIV(futureSpace).limit)))) { - /* begin copyToOldSpace:bytes:format: */ - assert((format == (formatOf(survivor))) - && (((!(isMarked(survivor))) - || (GIV(tenureCriterion) == MarkOnTenure)) - && ((!(isPinned(survivor))) - && (!(isRemembered(survivor)))))); - nTenures = GIV(statTenures); - startOfSurvivor = ((byteAt(survivor + 7)) == 0xFF - ? survivor - BaseHeaderSize - : survivor); - newStart = allocateOldSpaceChunkOfBytes(bytesInObj); - if (!(newStart)) { - growOldSpaceByAtLeast(0); - newStart = allocateOldSpaceChunkOfBytes(bytesInObj); - if (!(newStart)) { - error("out of memory"); - } - } - memcpy(((void *)newStart), ((void *)startOfSurvivor), bytesInObj); - newOop = newStart + (survivor - startOfSurvivor); - if ((format <= 5) - || (format >= 24)) { - remember(newOop); - } - if (GIV(tenureCriterion) == MarkOnTenure) { - setIsMarkedOfto(newOop, 1); - } - GIV(statTenures) = nTenures + 1; - newLocation = newOop; + newLocation = copyToOldSpacebytesformat(survivor, bytesInObj, format); } else { /* begin copyToFutureSpace:bytes: */ assert((GIV(futureSurvivorStart) + bytesInObj) <= ((GIV(futureSpace).limit))); - startOfSurvivor1 = ((byteAt(survivor + 7)) == 0xFF + startOfSurvivor = ((byteAt(survivor + 7)) == 0xFF ? survivor - BaseHeaderSize : survivor); - newStart1 = GIV(futureSurvivorStart); + newStart = GIV(futureSurvivorStart); GIV(futureSurvivorStart) += bytesInObj; - memcpy(((void *)newStart1), ((void *)startOfSurvivor1), bytesInObj); - newLocation = newStart1 + (survivor - startOfSurvivor1); + memcpy(((void *)newStart), ((void *)startOfSurvivor), bytesInObj); + if (GIV(tenureCriterion) == TenureToShrinkRT) { + /* begin rtRefCountOf:put: */ + assert(((0 >= 0) && (0 <= MaxRTRefCount))); + header = longAt(newStart + (survivor - startOfSurvivor)); + header = header & ((unsigned int)~(7 << 29)); + header += 0 << 29; + longAtput(newStart + (survivor - startOfSurvivor), header); + } + newLocation = newStart + (survivor - startOfSurvivor); } /* begin forwardSurvivor:to: */ assert(isInNewSpace(survivor)); @@ -41414,7 +41551,77 @@ return newLocation; } + +/* Copy survivor to oldSpace. Answer the new oop of the object. */ +/* Should be too infrequent to lower icache density of copyAndForward: */ + static sqInt +copyToOldSpacebytesformat(sqInt survivor, sqInt bytesInObject, sqInt formatOfSurvivor) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt field; + sqInt header; + sqInt newOop; + sqInt newStart; + sqInt nTenures; + sqInt p; + sqInt startOfSurvivor; + + assert((formatOfSurvivor == (formatOf(survivor))) + && (((!(isMarked(survivor))) + || (GIV(tenureCriterion) == MarkOnTenure)) + && ((GIV(tenureCriterion) == TenureToShrinkRT) + || ((!(isPinned(survivor))) + && (!(isRemembered(survivor))))))); + nTenures = GIV(statTenures); + startOfSurvivor = ((byteAt(survivor + 7)) == 0xFF + ? survivor - BaseHeaderSize + : survivor); + newStart = allocateOldSpaceChunkOfBytes(bytesInObject); + if (!(newStart)) { + growOldSpaceByAtLeast(0); + newStart = allocateOldSpaceChunkOfBytes(bytesInObject); + if (!(newStart)) { + error("out of memory"); + } + } + memcpy(((void *)newStart), ((void *)startOfSurvivor), bytesInObject); + newOop = newStart + (survivor - startOfSurvivor); + if (GIV(tenureCriterion) >= (((TenureToShrinkRT < MarkOnTenure) ? TenureToShrinkRT : MarkOnTenure))) { + if (GIV(tenureCriterion) == TenureToShrinkRT) { + /* begin rtRefCountOf:put: */ + assert(((0 >= 0) && (0 <= MaxRTRefCount))); + header = longAt(newOop); + header = header & ((unsigned int)~(7 << 29)); + header += 0 << 29; + longAtput(newOop, header); + } + if (GIV(tenureCriterion) == MarkOnTenure) { + setIsMarkedOfto(newOop, 1); + } + } + GIV(statTenures) = nTenures + 1; + if ((formatOfSurvivor <= 5) + || (formatOfSurvivor >= 24)) { + + /* A very quick and dirty scan to find young referents. If we misidentify bytes + in a CompiledMethod as young we don't care; it's unlikely, and a subsequent + scan of the rt will filter the object out. But it's good to filter here because + otherwise an attempt to shrink the RT may simply fill it up with new objects, + and here the data is likely in the cache. */ + + for (p = BaseHeaderSize; p <= ((bytesInObject - (survivor - startOfSurvivor)) - BytesPerWord); p += BytesPerWord) { + field = longAt(survivor + p); + if (((field & 3) == 0) + && (isReallyYoungObject(field))) { + remember(newOop); + return newOop; + } + } + } + return newOop; +} + +static sqInt firstCorpse(sqInt headOfCorpseList) { DECL_MAYBE_SQ_GLOBAL_STRUCT return ((headOfCorpseList - 1) << 3) + GIV(newSpaceStart); @@ -41424,10 +41631,12 @@ growRememberedSet(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt *base; + sqInt fudge; sqInt i; sqInt newObj; usqInt numSlots; usqInt numSlots1; + usqInt numSlots2; sqInt obj; sqInt obj1; sqInt obj2; @@ -41496,8 +41705,16 @@ } freeObject(obj); GIV(rememberedSet) = base; - GIV(rememberedSetLimit) = numSlots * 2; - GIV(rememberedSetRedZone) = ((GIV(rememberedSetLimit) * 3) + 3) / 4; + /* begin numSlotsOf: */ + flag("endianness"); + assert((classIndexOf(newObj)) > (isForwardedObjectClassIndexPun())); + numSlots2 = byteAt(newObj + 7); + GIV(rememberedSetLimit) = ((usqInt) ((numSlots2 == 0xFF + ? longAt(newObj - BaseHeaderSize) + : numSlots2))); + /* begin setRememberedSetRedZone */ + fudge = ((((GIV(eden).limit)) - ((GIV(eden).start))) / BytesPerWord) / 1024; + GIV(rememberedSetRedZone) = ((((GIV(rememberedSetLimit) * 3) / 4) < fudge) ? fudge : ((GIV(rememberedSetLimit) * 3) / 4)); } static sqInt @@ -46377,6 +46594,12 @@ GIV(scavengeInProgress) = 1; /* begin scavenge: */ GIV(tenureCriterion) = tenuringCriterion; + /* begin strategizeToLimitRememberedTable */ + if ((GIV(tenureCriterion) == TenureByAge) + && (GIV(rememberedSetSize) >= GIV(rememberedSetRedZone))) { + GIV(tenureCriterion) = TenureToShrinkRT; + computeRefCountToShrinkRT(); + } scavengeLoop(); processWeaklings(); /* begin computeTenuringThreshold */ @@ -48701,6 +48924,7 @@ sqInt freeChunk; sqInt freeListObj; usqLong freeOldStart; + sqInt fudge; sqInt i; sqInt i1; sqInt i2; @@ -48910,7 +49134,9 @@ GIV(rememberedSetLimit) = ((usqInt) ((numSlots == 0xFF ? longAt(obj - BaseHeaderSize) : numSlots))); - GIV(rememberedSetRedZone) = ((GIV(rememberedSetLimit) * 3) + 3) / 4; + /* begin setRememberedSetRedZone */ + fudge = ((((GIV(eden).limit)) - ((GIV(eden).start))) / BytesPerWord) / 1024; + GIV(rememberedSetRedZone) = ((((GIV(rememberedSetLimit) * 3) / 4) < fudge) ? fudge : ((GIV(rememberedSetLimit) * 3) / 4)); checkSegments(); /* These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi. */ @@ -77965,7 +78191,7 @@ longAtput((result + BaseHeaderSize) + (i << (shiftForWord())), ConstZero); } /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer9 = (((rememberedSetSize()) << 1) | 1); + valuePointer9 = (((rootTableCount()) << 1) | 1); assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (20 << (shiftForWord())), valuePointer9); /* begin storePointerUnchecked:ofObject:withValue: */ @@ -78065,7 +78291,7 @@ assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (48 << (shiftForWord())), valuePointer16); /* begin storePointerUnchecked:ofObject:withValue: */ - valuePointer17 = (((numSlotsOf(longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (RememberedSetRootIndex << (shiftForWord()))))) << 1) | 1); + valuePointer17 = (((rootTableCapacity()) << 1) | 1); assert(!(isForwarded(result))); longAtput((result + BaseHeaderSize) + (51 << (shiftForWord())), valuePointer17); /* begin storePointerUnchecked:ofObject:withValue: */ @@ -78282,7 +78508,7 @@ result = ConstZero; } if (arg == 21) { - result = (((rememberedSetSize()) << 1) | 1); + result = (((rootTableCount()) << 1) | 1); } if (arg == 22) { result = ((GIV(statRootTableOverflows) << 1) | 1); @@ -78380,7 +78606,7 @@ result = (((ioGetMaxExtSemTableSize()) << 1) | 1); } if (arg == 52) { - result = (((numSlotsOf(longAt((GIV(hiddenRootsObj) + BaseHeaderSize) + (RememberedSetRootIndex << (shiftForWord()))))) << 1) | 1); + result = (((rootTableCapacity()) << 1) | 1); } if ((arg == 53) && (1)) { Modified: branches/Glue/nsspursrc/vm/cointerp.h =================================================================== --- branches/Glue/nsspursrc/vm/cointerp.h 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nsspursrc/vm/cointerp.h 2015-05-06 21:11:38 UTC (rev 3321) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ Modified: branches/Glue/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Glue/nsspursrc/vm/gcc3x-cointerp.c 2015-05-06 19:25:17 UTC (rev 3320) +++ branches/Glue/nsspursrc/vm/gcc3x-cointerp.c 2015-05-06 21:11:38 UTC (rev 3321) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 + CCodeGeneratorGlobalStructure VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba from - CoInterpreter VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 + CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1034 uuid: 1a93b31c-cf2c-4a2c-b53f-9eae1d7863c7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscogglue-eem.1036 uuid: 054ce1b0-7472-4245-98f8-cb91bbcf5cba " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -212,7 +212,6 @@ #define CSWait 10 #define CSYield 11 #define CtxtTempFrameStart 6 -#define DontTenureButDoUnmark 4 #define DumpStackOnLowSpace 0 #define EnclosingMixinIndex 3 #define EnclosingObjectIndex 4 @@ -255,6 +254,7 @@ #define MaxLiteralCountForCompile 60 #define MaxPrimitiveIndex 575 #define MaxQuickPrimitiveIndex 519 +#define MaxRTRefCount 7 #define MessageArgumentsIndex 1 #define MessageLookupClassIndex 2 #define MessageSelectorIndex 0 @@ -346,6 +346,7 @@ #define SuspendedContextIndex 1 #define TenureByAge 1 #define TenureByClass 2 +#define TenureToShrinkRT 3 #define TheDisplay 14 #define TheFinalizationSemaphore 41 #define TheInputSemaphore null @@ -840,8 +841,11 @@ static sqInt wordIndexableFormat(void); static void addToEphemeronList(sqInt ephemeronCorpse) NoDbgRegParms; static void addToWeakList(sqInt weakCorpse) NoDbgRegParms; +static sqInt allNewSpaceObjectsHaveZeroRTRefCount(void); static sqInt allWeakSurvivorsOnWeakList(void); +static void computeRefCountToShrinkRT(void) NeverInline; static sqInt copyAndForward(sqInt survivor) NoDbgRegParms; +static sqInt copyToOldSpacebytesformat(sqInt survivor, sqInt bytesInObject, sqInt formatOfSurvivor) NoDbgRegParms NeverInline; static sqInt firstCorpse(sqInt headOfCorpseList) NoDbgRegParms; static void growRememberedSet(void); static sqInt isInRememberedSet(sqInt objOop) NoDbgRegParms; @@ -1560,8 +1564,8 @@ _iss usqInt scavengeThreshold; _iss sqInt remapBufferCount; _iss sqInt * freeLists; +_iss sqInt rememberedSetSize; _iss char * stackLimit; -_iss sqInt rememberedSetSize; _iss sqInt tempOop; _iss sqInt * rememberedSet; _iss sqInt classTableFirstPage; @@ -1585,10 +1589,10 @@ _iss sqLong nextProfileTick; _iss sqInt numRememberedEphemerons; _iss sqInt jmpDepth; +_iss SpurNewSpaceSpace eden; _iss sqInt futureSurvivorStart; _iss char * objStackInvalidBecause; _iss usqInt lastFreeChunk; -_iss SpurNewSpaceSpace eden; _iss sqInt ephemeronList; _iss usqInt freeOldSpaceStart; _iss sqInt tenureThreshold; @@ -1599,6 +1603,7 @@ _iss sqInt classNameIndex; _iss sqInt growHeadroom; _iss sqInt ephemeronQueue; +_iss sqInt tenureCriterion; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss sqInt preemptionYields; @@ -1625,6 +1630,7 @@ _iss sqInt noThreadingOfGUIThread; _iss sqInt pendingFinalizationSignals; _iss sqInt processHasThreadId; +_iss sqInt rememberedSetLimit; _iss sqInt shrinkThreshold; _iss usqLong statIOProcessEvents; _iss sqInt lastHash; @@ -1632,9 +1638,7 @@ _iss sqInt marking; _iss usqInt memory; _iss sqInt numCompactionPasses; -_iss sqInt rememberedSetLimit; _iss sqInt scavengeInProgress; -_iss sqInt tenureCriterion; _iss sqInt fullScreenFlag; _iss float heapGrowthToSizeGCRatio; _iss usqInt heapSizeAtPreviousGC; @@ -1642,6 +1646,7 @@ _iss sqInt interruptPending; _iss sqInt methodDictLinearSearchLimit; _iss usqLong nextPollUsecs; +_iss sqInt rememberedSetRedZone; _iss sqInt statCompactPassCount; _iss usqLong statForceInterruptCheck; _iss usqLong statFullGCUsecs; @@ -1661,7 +1666,6 @@ _iss sqInt imageFloatsBigEndian; _iss sqInt longRunningPrimitiveSignalUndelivered; _iss sqInt maxExtSemTabSizeSet; -_iss sqInt rememberedSetRedZone; _iss sqInt savedWindowSize; _iss sqInt signalLowSpace; _iss sqInt statCodeCompactionCount; @@ -1675,6 +1679,7 @@ _iss usqLong longRunningPrimitiveGCUsecs; _iss sqInt overflowLimit; _iss StackPage * overflowedPage; +_iss sqInt refCountToShrinkRT; _iss sqInt statCoalesces; _iss usqLong statIGCDeltaUsecs; _iss usqLong statIncrGCUsecs; @@ -2356,7 +2361,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1034"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogglue-eem.1036"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2399,6 +2404,7 @@ #define futureSpace() GIV(futureSpace) #define futureSurvivorStart() GIV(futureSurvivorStart) #define pastSpace() GIV(pastSpace) +#define rememberedSetLimit() GIV(rememberedSetLimit) #define rememberedSetSize() GIV(rememberedSetSize) #define endOfMemory() GIV(endOfMemory) #define freeStart() GIV(freeStart) @@ -2406,6 +2412,8 @@ #define newSpaceLimit() GIV(newSpaceLimit) #define oldSpaceStart() GIV(oldSpaceStart) #define remapBufferCount() GIV(remapBufferCount) +#define rootTableCapacity() GIV(rememberedSetLimit) +#define rootTableCount() GIV(rememberedSetSize) #define numSegments() GIV(numSegments) #define checkAllocFiller() GIV(checkAllocFiller) #define dispatchFunctionPointer(aFunctionPointer) (aFunctionPointer)() @@ -41279,6 +41287,68 @@ } static sqInt +allNewSpaceObjectsHaveZeroRTRefCount(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt address; + sqInt address1; + sqInt limit; + usqInt numSlots; + usqInt numSlots1; + sqInt obj; + sqInt objOop; + sqInt objOop1; + sqInt prevObj; + sqInt prevPrevObj; + + /* begin allNewSpaceObjectsDo: */ + /* begin allNewSpaceEntitiesDo: */ + + /* After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are + in pastSpace. Objects are allocated in eden. So enumerate only pastSpace and eden. */ + + prevPrevObj = (prevObj = null); + assert((((pastSpace()).start)) < (((eden()).start))); + /* begin objectStartingAt: */ + address = ((pastSpace()).start); + numSlots = byteAt(address + 7); + objOop1 = (numSlots == 0xFF + ? address + BaseHeaderSize + : address); + limit = GIV(pastSpaceStart); + while ((((usqInt) objOop1)) < (((usqInt) limit))) { + assert(isEnumerableObjectNoAssert(objOop1)); + if (((((usqInt) (longAt(objOop1))) >> 29) & MaxRTRefCount) > 0) { + return 0; + } + + + prevPrevObj = prevObj; + prevObj = objOop1; + objOop1 = objectAfterlimit(objOop1, limit); + } + /* begin objectStartingAt: */ + address1 = ((eden()).start); + numSlots1 = byteAt(address1 + 7); + objOop1 = (numSlots1 == 0xFF + ? address1 + BaseHeaderSize + : address1); + while ((((usqInt) objOop1)) < (((usqInt) GIV(freeStart)))) { + assert(isEnumerableObjectNoAssert(objOop1)); + if (((((usqInt) (longAt(objOop1))) >> 29) & MaxRTRefCount) > 0) { + return 0; + } + + + prevPrevObj = prevObj; + prevObj = objOop1; + objOop1 = objectAfterlimit(objOop1, GIV(freeStart)); + } + + + return 1; +} + +static sqInt allWeakSurvivorsOnWeakList(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt address; @@ -41313,6 +41383,97 @@ } +/* Some time in every scavenger's life there may come a time when someone + writes code that stresses + the remembered table. One might conclude that if the remembered table is + full, then the right thing + to do is simply to tenure everything, emptying the remembered table. Bt in + some circumstances this + can be counter-productive, and result in the same situation arising soon + after tenuring everything. + Instead, we can try and selectively prune the remembered table, tenuring + only those objects that + are referenced by many objects in the remembered table. That's what this + algorithm does. It + reference counts young objects referenced from the remembered set, and + then sets a threshold + used to tenure objects oft referenced from the remembered set, thereby + allowing the remembered + set to shrink, while not tenuring everything. + + Once in a network monitoring application in a galaxy not dissimilar from + the one this code inhabits, + a tree of nodes referring to large integers was in precisely this + situation. The nodes were old, and + the integers were in new space. Some of the nodes referred to shared + numbers, some their own + unique numbers. The numbers were updated frequently. Were new space simply + tenured when the + remembered table was full, the remembered table would soon fill up as new + numbers were computed. + Only by selectively pruning the remembered table of nodes that shared + data, was a balance achieved + whereby the remembered table population was kept small, and tenuring rates + were low. */ + +static void +computeRefCountToShrinkRT(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt count; + sqInt elephant; + sqInt entirePopulation; + sqInt header; + sqInt i; + sqInt i1; + sqInt j; + sqInt j1; + sqInt jLimiT; + long population[MaxRTRefCount + 1]; + sqInt refCount; + sqInt referent; + + memset(population, 0, (sizeof(long)) * (MaxRTRefCount + 1)); + assert(allNewSpaceObjectsHaveZeroRTRefCount()); + /* begin referenceCountRememberedReferents: */ + for (i1 = 0; i1 < GIV(rememberedSetSize); i1 += 1) { + elephant = GIV(rememberedSet)[i1]; + for (j1 = 0, jLimiT = ((numPointerSlotsOf(elephant)) - 1); j1 <= jLimiT; j1 += 1) { + referent = longAt((elephant + BaseHeaderSize) + (j1 << (shiftForWord()))); + if (((referent & 3) == 0) + && (isReallyYoungObject(referent))) { + refCount = (((usqInt) (longAt(referent))) >> 29) & MaxRTRefCount; + if (refCount < MaxRTRefCount) { + if (refCount > 0) { + population[refCount] = ((population[refCount]) - 1); + } + refCount += 1; + /* begin rtRefCountOf:put: */ + assert(((refCount >= 0) && (refCount <= MaxRTRefCount))); + header = longAt(referent); + header = header & ((unsigned int)~(7 << 29)); + header += refCount << 29; + longAtput(referent, header); + population[refCount] = ((population[refCount]) + 1); + } + } + } + } + /* begin setRefCountToShrinkRT: */ + assert((population[0]) == 0); + entirePopulation = 0; + for (j = 1; j <= MaxRTRefCount; j += 1) { + entirePopulation += population[j]; + } + count = 0; + i = MaxRTRefCount + 1; + while ((count < (entirePopulation / 2)) + && (((i -= 1)) >= 0)) { + count += population[i]; + } + GIV(refCountToShrinkRT) = ((i < 0) ? 0 : i); +} + + /* copyAndForward: survivor copies a survivor object either to @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscogglue-eem.1036.mcz
by commits＠source.squeak.org 06 May '15

06 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogglue-eem.1036.mcz ==================== Summary ==================== Name: VMMaker.oscogglue-eem.1036 Author: eem Time: 6 May 2015, 1:45:25.429 pm UUID: 054ce1b0-7472-4245-98f8-cb91bbcf5cba Ancestors: VMMaker.oscogglue-eem.1035 Hacks to get the VM generated. Fix Smalltalk=>TMethod time issues with CogARMCompiler. =============== Diff against VMMaker.oscogglue-eem.1035 =============== Item was changed: ----- Method: CogARMCompiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- callTargetFromReturnAddress: callSiteReturnAddress + "Answer the address that the call immediately preceeding callSiteReturnAddress will jump to." + "this is also used by #jumpLongTargetBeforeFollowingAddress:." - "Answer the address the call immediately preceeding callSiteReturnAddress will jump to." - "this is also used by #jumpLongTargetBeforeFOllowingAddress: and so we check for both call and jump related instructions; later on we can use simpler tests once it feels safe to assume we get here always with a call/jump in the proper place" | callDistance call | call := self instructionBeforeAddress: callSiteReturnAddress. + self assert: ((self instructionIsB: call) or: [self instructionIsBL: call]). + callDistance := self extractOffsetFromBL: call. + ^callSiteReturnAddress + 4 + callDistance signedIntFromLong! - self assert: call ~= 0. "andeq r0, r0 will not be generated, not even as nops" - ((self instructionIsB: call) or:[self instructionIsBL: call]) - ifTrue: [ "a short call/jump" callDistance := self extractOffsetFromBL: call. - ^callSiteReturnAddress + 4 + callDistance signedIntFromLong]. - - ((self instructionIsBX: call) or:[self instructionIsBLX: call]) - ifTrue:["A Long Call/Jump. Extract the value saved to RISCTempReg from all the instructions before." - ^self extractOffsetFromBXAt: callSiteReturnAddress - 4]. - self halt - ! Item was changed: ----- Method: CogARMCompiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize + "Because we don't use Thumb, each ARM instruction has 4 bytes. Some abstract opcodes need more than one instruction. We only handle those in this caseOf: and let the default return 4" - "Because we don't use Thumb, each ARM instruction has 4 bytes. Some abstract opcodes need more than one instruction." - | rotateableAt0then4or20Block | - rotateableAt0then4or20Block := [^self rotateable8bitImmediate: (operands at: 0) - ifTrue: [:r :i| maxSize := 4] - ifFalse: [maxSize := 20]]. - - (opcode between: FirstShortJump and: LastJump) ifTrue: [^maxSize := 16]. - opcode caseOf: { + "Noops & Pseudo Ops" + [Label] -> [^maxSize := 0]. + [AlignmentNops] -> [^maxSize := (operands at: 0) - 4]. + [Fill16] -> [^maxSize := 4]. + [Fill32] -> [^maxSize := 4]. + [FillFromWord] -> [^maxSize := 4]. + [Nop] -> [^maxSize := 4]. + "ARM Specific Control/Data Movement" + [BICCqR] -> [^self rotateable8bitImmediate: (operands at: 0) - [Label] -> [^maxSize := 0]. - [AlignmentNops] -> [^maxSize := (operands at: 0) - 1]. - [MoveAwR] -> [^maxSize := 20]. - [MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [TstCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [SMULL] -> [^maxSize := 4]. + [MSR] -> [^maxSize := 4]. + [CMPSMULL] -> [^maxSize := 4]. "special compare for genMulR:R: usage" + "Control" + [Call] -> [^maxSize := 4]. + [CallFull] -> [^maxSize := 20]. + [JumpR] -> [^maxSize := 4]. + [Jump] -> [^maxSize := 4]. + [JumpFull] -> [^maxSize := 20]. + [JumpLong] -> [^maxSize := 4]. + [JumpZero] -> [^maxSize := 4]. + [JumpNonZero] -> [^maxSize := 4]. + [JumpNegative] -> [^maxSize := 4]. + [JumpNonNegative] -> [^maxSize := 4]. + [JumpOverflow] -> [^maxSize := 4]. + [JumpNoOverflow] -> [^maxSize := 4]. + [JumpCarry] -> [^maxSize := 4]. + [JumpNoCarry] -> [^maxSize := 4]. + [JumpLess] -> [^maxSize := 4]. + [JumpGreaterOrEqual] -> [^maxSize := 4]. + [JumpGreater] -> [^maxSize := 4]. + [JumpLessOrEqual] -> [^maxSize := 4]. + [JumpBelow] -> [^maxSize := 4]. + [JumpAboveOrEqual] -> [^maxSize := 4]. + [JumpAbove] -> [^maxSize := 4]. + [JumpBelowOrEqual] -> [^maxSize := 4]. + [JumpLongZero] -> [^maxSize := 4]. + [JumpLongNonZero] -> [^maxSize := 4]. + [JumpFPEqual] -> [^maxSize := 8]. + [JumpFPNotEqual] -> [^maxSize := 8]. + [JumpFPLess] -> [^maxSize := 8]. + [JumpFPGreaterOrEqual]-> [^maxSize := 8]. + [JumpFPGreater] -> [^maxSize := 8]. + [JumpFPLessOrEqual] -> [^maxSize := 8]. + [JumpFPOrdered] -> [^maxSize := 8]. + [JumpFPUnordered] -> [^maxSize := 8]. + [RetN] -> [^(operands at: 0) = 0 + ifTrue: [maxSize := 4] + ifFalse: [maxSize := 8]]. + [Stop] -> [^maxSize := 4]. + + "Arithmetic" + [AddCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [AndCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [AndCqRR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [CmpCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [OrCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [SubCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [XorCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [AddCwR] -> [^maxSize := 20]. + [AndCwR] -> [^maxSize := 20]. + [CmpCwR] -> [^maxSize := 20]. + [OrCwR] -> [^maxSize := 20]. + [SubCwR] -> [^maxSize := 20]. + [XorCwR] -> [^maxSize := 20]. + [AddRR] -> [^maxSize := 4]. + [AndRR] -> [^maxSize := 4]. + [CmpRR] -> [^maxSize := 4]. + [OrRR] -> [^maxSize := 4]. + [XorRR] -> [^maxSize := 4]. + [SubRR] -> [^maxSize := 4]. + [NegateR] -> [^maxSize := 4]. + [LoadEffectiveAddressMwrR] + -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + + [LogicalShiftLeftCqR] -> [^maxSize := 4]. + [LogicalShiftRightCqR] -> [^maxSize := 4]. + [ArithmeticShiftRightCqR] -> [^maxSize := 4]. + [LogicalShiftLeftRR] -> [^maxSize := 4]. + [LogicalShiftRightRR] -> [^maxSize := 4]. + [ArithmeticShiftRightRR] -> [^maxSize := 4]. + [AddRdRd] -> [^maxSize := 4]. + [CmpRdRd] -> [^maxSize := 4]. + [SubRdRd] -> [^maxSize := 4]. + [MulRdRd] -> [^maxSize := 4]. + [DivRdRd] -> [^maxSize := 4]. + [SqrtRd] -> [^maxSize := 4]. + "Data Movement" + [MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 16]]. + [MoveCwR] -> [^maxSize := 16]. + [MoveRR] -> [^maxSize := 4]. + [MoveRdRd] -> [^maxSize := 4]. + [MoveAwR] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 0)) + ifTrue: [4] + ifFalse: [20]]. + [MoveRAw] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 1)) + ifTrue: [4] + ifFalse: [20]]. + [MoveRMwr] -> [self is12BitValue: (operands at: 1) + ifTrue: [ :u :i | ^maxSize := 4] + ifFalse: [ ^maxSize := 20 ]]. + [MoveRdM64r] -> [^maxSize := 20]. + [MoveMbrR] -> [self is12BitValue: (operands at: 0) + ifTrue: [ :u :i | ^maxSize := 4] + ifFalse: [ ^maxSize := 20 ]]. + [MoveRMbr] -> [self is12BitValue: (operands at: 1) + ifTrue: [ :u :i | ^maxSize := 4] + ifFalse: [ ^maxSize := 20 ]]. + [MoveM16rR] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 4] + ifFalse: [maxSize := 20]]. + [MoveM64rRd] -> [^maxSize := 20]. + [MoveMwrR] -> [self is12BitValue: (operands at: 0) + ifTrue: [ :u :i | ^maxSize := 4] + ifFalse: [ ^maxSize := 20 ]]. + [MoveXbrRR] -> [^maxSize := 4]. + [MoveRXbrR] -> [^maxSize := 4]. + [MoveXwrRR] -> [^maxSize := 4]. + [MoveRXwrR] -> [^maxSize := 4]. + [PopR] -> [^maxSize := 4]. + [PushR] -> [^maxSize := 4]. + [PushCw] -> [^maxSize := 20]. + [PushCq] -> [^self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:r :i| maxSize := 8] + ifFalse: [maxSize := 20]]. + [PrefetchAw] -> [^maxSize := (self isAddressRelativeToVarBase: (operands at: 1)) + ifTrue: [4] + ifFalse: [20]]. + "Conversion" + [ConvertRRd] -> [^maxSize := 4]. + + + }. + ^0 "to keep C compiler quiet" - ifFalse: [maxSize := 16]]. - [MoveCwR] -> [^maxSize := 16]. - [MoveRAw] -> [^maxSize := 20]. - [MoveRMwr] -> [self is12BitValue: (operands at: 1) - ifTrue: [ :u :i | ^maxSize := 4] - ifFalse: [ ^maxSize := 20 ]]. - [MoveRMbr] -> [self is12BitValue: (operands at: 1) - ifTrue: [ :u :i | ^maxSize := 4] - ifFalse: [ ^maxSize := 20 ]]. - [MoveMwrR] -> [self is12BitValue: (operands at: 0) - ifTrue: [ :u :i | ^maxSize := 4] - ifFalse: [ ^maxSize := 20 ]]. - [MoveMbrR] -> [self is12BitValue: (operands at: 0) - ifTrue: [ :u :i | ^maxSize := 4] - ifFalse: [ ^maxSize := 20 ]]. - [PrefetchAw] -> [^maxSize := 20]. - [Call] -> [^maxSize := 20 "recomputed in #sizePCDependentInstruction."]. - [RetN] -> [^(operands at: 0) = 0 - ifTrue: [maxSize := 4] - ifFalse: [maxSize := 8]]. - [CmpCqR] -> [rotateableAt0then4or20Block value]. - [AddCqR] -> [rotateableAt0then4or20Block value]. - [BICCqR] -> [rotateableAt0then4or20Block value]. - [SubCqR] -> [rotateableAt0then4or20Block value]. - [AndCqR] -> [rotateableAt0then4or20Block value]. - [OrCqR] -> [rotateableAt0then4or20Block value]. - [XorCqR] -> [rotateableAt0then4or20Block value]. - [CmpCwR] -> [^maxSize := 20]. - [AddCwR] -> [^maxSize := 20]. - [SubCwR] -> [^maxSize := 20]. - [AndCwR] -> [^maxSize := 20]. - [OrCwR] -> [^maxSize := 20]. - [XorCwR] -> [^maxSize := 20]. - [JumpR] -> [^maxSize := 4]. - [JumpFPEqual] -> [^maxSize := 8]. - [JumpFPNotEqual] -> [^maxSize := 8]. - [JumpFPLess] -> [^maxSize := 8]. - [JumpFPGreaterOrEqual]-> [^maxSize := 8]. - [JumpFPGreater] -> [^maxSize := 8]. - [JumpFPLessOrEqual] -> [^maxSize := 8]. - [JumpFPOrdered] -> [^maxSize := 8]. - [JumpFPUnordered] -> [^maxSize := 8]. - [JumpLong] -> [^maxSize := 20]. - [JumpLongZero] -> [^maxSize := 20]. - [JumpLongNonZero] -> [^maxSize := 20]. - [LoadEffectiveAddressMwrR] -> [rotateableAt0then4or20Block value]. - [PushCw] -> [^maxSize := 20]. - } - otherwise: [^maxSize := 4]. - ^4 "to keep C compiler quiet" ! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationCqR: (in category 'generate machine code - concretize') ----- + concretizeDataOperationCqR: armOpcode - concretizeDataOperationCqR: opcode "Will get inlined into concretizeAt: switch." "4 == Add, 2 == Sub, Xor == 1, And == 0, Or == 12, Bic == 14" <inline: true> + |val rd rn | + val := operands at: 0. + rn := self concreteRegister: (operands at: 1). + rd := opcode = CmpOpcode ifTrue: [0] ifFalse:[rn]. "Extra note - if ever a version of this code wants to NOT set the Set flag - Cmp must always have it set or it will pretend to be a SMALALBT and Very Bad Things might happen" + + self rotateable8bitImmediate: val + ifTrue: [:rot :immediate | + self machineCodeAt: 0 put: (self type: 1 op: armOpcode set: 1 rn: rn rd: rd shifterOperand: ((rot>>1)"in this usage we have to halve the rot value" << 8 bitOr: immediate)). - self - rotateable8bitImmediate: (operands at: 0) - ifTrue: [:rot :immediate | | reg | - reg := self concreteRegister: (operands at: 1). - self machineCodeAt: 0 put: (self type: 1 op: opcode set: 1 rn: reg rd: reg shifterOperand: ((rot>>1)"in this usage we have to halve the rot value" << 8 bitOr: immediate)). ^machineCodeSize := 4] + ifFalse: ["let's try to see if the constant can be made from a simple shift of 0xFFFFFFFF" + val > 0 ifTrue: [ + |hb | + hb := val highBit. + 1 << hb = (val +1) + ifTrue: [ "MVN temp, #0, making 0xffffffff" + self machineCodeAt: 0 put:(self mvn: ConcreteIPReg imm: 0 ror: 0). + "Then armOpcode reg, temp reg, lsr #(32-hb)" + self machineCodeAt: 4 put:(self dataOpType: armOpcode rd: rd rn: rn rm: ConcreteIPReg lsr: (32-hb)). + ^machineCodeSize :=8]]. + ^self concretizeDataOperationCwR: armOpcode]. + ^0 "to keep Slang happy" - ifFalse: [^self concretizeDataOperationCwR: opcode]. ! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationCwR: (in category 'generate machine code - concretize') ----- + concretizeDataOperationCwR: armOpcode - concretizeDataOperationCwR: opcode "Will get inlined into concretizeAt: switch." "Load the word into the RISCTempReg, then cmp R, RISCTempReg" <inline: true> + | constant rn rd instrOffset| - | constant srcDestReg instrOffset| constant := operands at: 0. + rn := (self concreteRegister: (operands at: 1)). + rd := armOpcode = CmpOpcode ifTrue: [0] ifFalse:[rn]. + instrOffset := self at: 0 moveCw: constant intoR: ConcreteIPReg. - srcDestReg := (self concreteRegister: (operands at: 1)). - instrOffset := self at: 0 moveCw: constant intoR: RISCTempReg. self machineCodeAt: instrOffset + put: (self type: 0 op: armOpcode set: 1 rn: rn rd: rd shifterOperand: ConcreteIPReg). - put: (self type: 0 op: opcode set: 1 rn: srcDestReg rd: srcDestReg shifterOperand: RISCTempReg). ^machineCodeSize := instrOffset + 4! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationRR: (in category 'generate machine code - concretize') ----- + concretizeDataOperationRR: armOpcode - concretizeDataOperationRR: opcode "Will get inlined into concretizeAt: switch." + "Load the word into the RISCTempReg, then op R, RISCTempReg" - "Load the word into the RISCTempReg, then cmp R, RISCTempReg" <inline: true> + | rn rd srcReg | - | destReg srcReg | srcReg := self concreteRegister: (operands at: 0). + rn := (self concreteRegister: (operands at: 1)). + rd := armOpcode = CmpOpcode ifTrue: [0] ifFalse: [rn]. - destReg := (self concreteRegister: (operands at: 1)). self machineCodeAt: 0 + put: (self type: 0 op: armOpcode set: 1 rn: rn rd: rd shifterOperand: srcReg). - put: (self type: 0 op: opcode set: 1 rn: destReg rd: destReg shifterOperand: srcReg). ^machineCodeSize := 4.! Item was changed: ----- Method: CogARMCompiler>>extractOffsetFromBL: (in category 'testing') ----- extractOffsetFromBL: instr + "we are told this is a BL <offset> instruction, so work out the offset it encodes" + <inline: true> - "we are told this is a BL <offset> instruction, so work out the offset it encodes" | relativeJump | relativeJump := instr bitAnd: 16r00FFFFFF. + relativeJump := (relativeJump anyMask: 1<<23) - relativeJump := (relativeJump bitAt: 24) = 1 ifTrue: [((relativeJump bitOr: 16r3F000000) << 2) signedIntFromLong] ifFalse: [relativeJump << 2]. ^relativeJump! Item was removed: - ----- Method: CogARMCompiler>>extractOffsetFromBXAt: (in category 'testing') ----- - extractOffsetFromBXAt: address - "this should return the long call/jump target" - ^(objectMemory byteAt: address -4) - + ((objectMemory byteAt: address - 8) << 8) - + ((objectMemory byteAt: address - 12) << 16) - + ((objectMemory byteAt: address - 16) << 24)! Item was removed: - ----- Method: CogARMCompiler>>minimalRightRingRotationFor:initialRotation: (in category 'encoding') ----- - minimalRightRingRotationFor: constant initialRotation: iniRightRingRotation - "Given a constant and some initial rotation, tries to minimize that rotation in an effort to encode the according byte in constant. This is used, to encode the last 12bit of many operations, for which a 8bit immediate rotated by (2*)4bit is available. That immediate need be encoded with minimal rotation." - | byte rightRingRotation | - rightRingRotation := iniRightRingRotation. - "Counter rotation to get the according byte. Because Smalltalk does not have left ring shift, shift further right." - rightRingRotation ~= 0 ifTrue: [ - byte := constant >> (-2 * rightRingRotation + 32) bitAnd: 16rFF. - "For 0, the shift has to be 0. For other immediates, the encoding with minimal rightRingRotation should be choosen." - byte = 0 - ifTrue: [ rightRingRotation := 0] - ifFalse: [ - 0 to: 2 do: [ :j | - (byte bitAnd: 16r03) = 0 - ifTrue: [ rightRingRotation := rightRingRotation - 1. - byte := byte >> 2 ]]]] - ifFalse: [ byte := constant bitAnd: 16rFF]. - ^{rightRingRotation. byte}!

1 0

VM Maker: VMMaker.oscogglue-eem.1035.mcz
by commits＠source.squeak.org 06 May '15

06 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogglue-eem.1035.mcz ==================== Summary ==================== Name: VMMaker.oscogglue-eem.1035 Author: eem Time: 6 May 2015, 12:51:20.423 pm UUID: c241c497-2aea-44e9-8391-336ce99167f1 Ancestors: VMMaker.oscog-eem.1034 Fork from VMMaker.oscog-eem.1034 for stable Glue. Changes from VMMaker.oscog-eem.1288 & VMMaker.oscog-eem.1291: Implement remembered table pruning via ref counts. The algorithm selectively tenures objects to reduce the remembered table, instead of merely tenuring everything. Be selective about remembering tenured objects; actually scan their contents before remembering willy-nilly. Nuke obsolete copyToOldSpace: methods. Change computeRefCountToShrinkRT to - compute the ref counts and population in a single pass over the RT - determine the ref count for tenuring based on half the population of remembered objects, /not/ half the size of the RT. =============== Diff against VMMaker.oscog-eem.1034 =============== Item was added: + ----- Method: Spur32BitMemoryManager>>rtRefCountOf:put: (in category 'header access') ----- + rtRefCountOf: obj put: refCount + "Set the rt reference count of obj; this is the three bit field comprised + of isGrey,isPinned,isRemembered. See computeRefCountToShrinkRT." + | header | + self assert: (refCount between: 0 and: MaxRTRefCount). + header := self longAt: obj. + header := header bitAnd: (7 << self rememberedBitShift) bitInvert32. + header := header + (refCount << self rememberedBitShift). + self longAt: obj put: header! Item was added: + ----- Method: Spur64BitMemoryManager>>rtRefCountOf:put: (in category 'header access') ----- + rtRefCountOf: obj put: refCount + "Set the rt reference count of obj; this is the three bit field comprised + of isGrey,isPinned,isRemembered. See computeRefCountToShrinkRT." + | header | + self assert: (refCount between: 0 and: MaxRTRefCount). + header := self longAt: obj. + header := header bitAnd: (7 << self rememberedBitShift) bitInvert64. + header := header + (refCount << self rememberedBitShift). + self longAt: obj put: header! Item was changed: CogClass subclass: #SpurGenerationScavenger + instanceVariableNames: 'coInterpreter manager eden futureSpace pastSpace futureSurvivorStart rememberedSet rememberedSetSize previousRememberedSetSize rememberedSetRedZone rememberedSetLimit refCountToShrinkRT weakList ephemeronList tenureCriterion tenureThreshold tenuringClassIndex tenuringProportion numRememberedEphemerons statTenures' - instanceVariableNames: 'coInterpreter manager eden futureSpace pastSpace futureSurvivorStart rememberedSet rememberedSetSize previousRememberedSetSize rememberedSetRedZone rememberedSetLimit weakList ephemeronList tenureCriterion tenureThreshold tenuringClassIndex tenuringProportion numRememberedEphemerons statTenures' classVariableNames: '' poolDictionaries: 'SpurMemoryManagementConstants' category: 'VMMaker-SpurMemoryManager'! !SpurGenerationScavenger commentStamp: 'eem 9/30/2013 11:05' prior: 0! SpurGenerationScavenger is an implementation of David Ungar's Generation Scavenging garbage collection algorithm. See Generation Scavenging, A Non-disruptive, High-Performance Storage Reclamation Algorithm David Ungar Proceeding SDE 1 Proceedings of the first ACM SIGSOFT/SIGPLAN software engineering symposium on Practical software development environments Pages 157 - 167 ACM New York, NY, USA ©1984 Also relevant are An adaptive tenuring policy for generation scavengers David Ungar & Frank Jackson ACM Transactions on Programming Languages and Systems (TOPLAS) TOPLAS Homepage archive Volume 14 Issue 1, Jan. 1992 Pages 1 - 27 ACM New York, NY, USA ©1992 and Ephemerons: a new finalization mechanism Barry Hayes Proceedings of the 12th ACM SIGPLAN conference on Object-oriented programming, systems, languages, and applications Pages 176-183 ACM New York, NY, USA ©1997 See text below the variable definitions and explanation below for a full explanation of weak and ephemeron processing. Instance Variables coInterpreter: <StackInterpreterSimulator|CogVMSimulator> eden: <SpurNewSpaceSpace> ephemeronList: <Integer|nil> futureSpace: <SpurNewSpaceSpace> futureSurvivorStart: <Integer address> manager: <SpurMemoryManager|Spur32BitMMLESimulator et al> numRememberedEphemerons: <Integer> pastSpace: <SpurNewSpaceSpace> previousRememberedSetSize: <Integer> rememberedSet: <CArrayAccessor on: Array> rememberedSetSize: <Integer> tenuringProportion: <Float> tenuringThreshold: <Integer address> weakList: <Integer|nil> coInterpreter - the interpreter/vm, in this context, the mutator manager - the Spur memory manager eden - the space containing newly created objects futureSpace - the space to which surviving objects are copied during a scavenge futureSurvivorStart - the allocation pointer into futureSpace pastSpace - the space surviving objects live in until the next scavenge rememberedSet - the root old space objects that refer to objects in new space; a scavenge starts form these roots and the interpreter's stack rememberedSetSize - the size of the remembered set, also the first unused index in the rememberedSet previousRememberedSetSize: - the size of the remembered set before scavenging objects in future space. numRememberedEphemerons - the number of unscavenged ephemerons at the front of the rememberedSet. ephemeronList - the head of the list of corpses of unscavenged ephemerons reached in the current phase weakList - the head of the list of corpses of weak arrays reached during the scavenge. tenuringProportion - the amount of pastSpace below which the system will not tenure unless futureSpace fills up, and above which it will eagerly tenure tenuringThreshold - the pointer into pastSpace below which objects will be tenured Weakness and Ephemerality in the Scavenger. Weak arrays should not hold onto their referents (except from their strong fileds, their named inst vars). Ephemerons are objects that implement instance-based finalization; attaching an ephemeron to an object keeps that object alive and causes the ephemeron to "fire" when the object is only reachable from the ephemeron (or other ephemerons & weak arrays). They are a special kind of Associations that detect when their keys are about to die, i.e. when an ephemeron's key is not reachable from the roots except from weak arrays and other ephemerons with about-to-die keys. Note that if an ephemeron's key is not about to die then references from the rest of the ephemeron can indeed prevent ephemeron keys from dying. The scavenger is concerned with collecting objects in new space, therefore it ony deals with weak arrays and ephemerons that are either in the remembered set or in new space. By deferring scanning these objects until other reachable objects have been scavenged, the scavenger can detect dead or dying references. Weak Array Processing In the case of weak arrays this is simple. The scavenger refuses to scavenge the referents of weak arrays in scavengeReferentsOf: until the entire scavenge is over. It then scans the weak arrays in the remembered set and in future space and nils all fields in them that are referring to unforwarded objects in eden and past space, because these objects have not survived the scavenge. The root weak arrays remaining to be scavenged are in the remembered table. Surviving weak arrays in future space are collected on a list. The list is threaded through the corpses of weak arrays in eden and/or past space. weakList holds the slot offset of the first weak array found in eden and/or past space. The next offset is stored in the weak array corpse's identityHash and format fields (22 bits & 5 bits of allocationUnits, for a max new space size of 2^28 bytes, 256Mb). The list is threaded throguh corpses, but the surviving arrays are pointed to by the corpses' forwarding pointers. Ephemeron Processing The case of ephemerons is a little more complicated because an ephemeron's key should survive. The scavenger is cyclical. It scavenges the remembered set, which may copy and forward surviving objects in past and/or eden spaces to future space. It then scavenges those promoted objects in future space until no more are promoted, which may in turn remember more objects. The cycles continue until no more objects get promoted to future space and no more objects get remembered. At this point all surviving objecta are in futureSpace. So if the scavenger does not scan ephemerons in the remembered set or in future space until the scavenger finishes cycling, it can detect ephemerons whose keys are about to die because these will be unforwarded objects in eden and/or past space. Ephemerons encountered in the remembered set are either processed like ordinary objects if their keys have been promoted to futureSpace, or are moved to the front of the rememberedSet (because, dear reader, it is a sequence) if their keys have not been promoted. Ephemerons encountered in scavengeReferentsOf: are either scanned like normal objects if their keys have been promoted, or added to the ephemeronList, organized identically to the weakList, if their keys are yet to be promoted. Since references from other ephemerons with surviving keys to ephemeron keys can and should prevent the ephemerons whose keys they are from firing the scavenger does not fire ephemerons unless all unscavenged ephemerons have unscavenged keys. So the unscavenged ephemerons (the will be at the beginning of the remembered set and on the ephemeronList) are scanned and any that have promoted keys are scavenged. But if no unscavenged ephemerons have surviving keys then all the unscavenged ephemerons are fired and then scavenged. This in turn may remember more objects and promote more objects to future space, and encounter more unscavenged ephemerons. So the scavenger continues until no more objects are remembered, no more objects are promoted to future space and no more unscavenged ephemerons exist.! Item was changed: ----- Method: SpurGenerationScavenger class>>initialize (in category 'class initialization') ----- initialize "SpurGenerationScavenger initialize" TenureByAge := 1. TenureByClass := 2. + TenureToShrinkRT := 3. + DontTenure := 4. + MarkOnTenure := 5. + MaxRTRefCount := 7 "The field comprised of {isGrey,isPinned,isRemembered}"! - DontTenure := 3. - DontTenureButDoUnmark := 4. - MarkOnTenure := 5! Item was added: + ----- Method: SpurGenerationScavenger>>allNewSpaceObjectsHaveZeroRTRefCount (in category 'remembered set') ----- + allNewSpaceObjectsHaveZeroRTRefCount + manager allNewSpaceObjectsDo: + [:obj| + (manager rtRefCountOf: obj) > 0 ifTrue: + [^false]]. + ^true! Item was added: + ----- Method: SpurGenerationScavenger>>computeRefCountToShrinkRT (in category 'remembered set') ----- + computeRefCountToShrinkRT + "Some time in every scavenger's life there may come a time when someone writes code that stresses + the remembered table. One might conclude that if the remembered table is full, then the right thing + to do is simply to tenure everything, emptying the remembered table. Bt in some circumstances this + can be counter-productive, and result in the same situation arising soon after tenuring everything. + Instead, we can try and selectively prune the remembered table, tenuring only those objects that + are referenced by many objects in the remembered table. That's what this algorithm does. It + reference counts young objects referenced from the remembered set, and then sets a threshold + used to tenure objects oft referenced from the remembered set, thereby allowing the remembered + set to shrink, while not tenuring everything. + + Once in a network monitoring application in a galaxy not dissimilar from the one this code inhabits, + a tree of nodes referring to large integers was in precisely this situation. The nodes were old, and + the integers were in new space. Some of the nodes referred to shared numbers, some their own + unique numbers. The numbers were updated frequently. Were new space simply tenured when the + remembered table was full, the remembered table would soon fill up as new numbers were computed. + Only by selectively pruning the remembered table of nodes that shared data, was a balance achieved + whereby the remembered table population was kept small, and tenuring rates were low." + <inline: #never> + | population | + <var: 'population' declareC: 'long population[MaxRTRefCount + 1]'> + self cCode: [self me: population ms: 0 et: (self sizeof: #long) * (MaxRTRefCount + 1)] + inSmalltalk: [population := CArrayAccessor on: (Array new: MaxRTRefCount + 1 withAll: 0)]. + self assert: self allNewSpaceObjectsHaveZeroRTRefCount. + self referenceCountRememberedReferents: population. + self setRefCountToShrinkRT: population + + "For debugging: + (manager allNewSpaceObjectsDo: [:o| manager rtRefCountOf: o put: 0])"! Item was changed: ----- Method: SpurGenerationScavenger>>copyToFutureSpace:bytes: (in category 'scavenger') ----- copyToFutureSpace: survivor bytes: bytesInObject "Copy survivor to futureSpace. Assume it will fit (checked by sender). Answer the new oop of the object (it may have an overflow size field)." <inline: true> | startOfSurvivor newStart | self assert: futureSurvivorStart + bytesInObject <= futureSpace limit. startOfSurvivor := manager startOfObject: survivor. newStart := futureSurvivorStart. futureSurvivorStart := futureSurvivorStart + bytesInObject. manager mem: newStart asVoidPointer cp: startOfSurvivor asVoidPointer y: bytesInObject. + tenureCriterion = TenureToShrinkRT ifTrue: + [manager rtRefCountOf: newStart + (survivor - startOfSurvivor) put: 0]. ^newStart + (survivor - startOfSurvivor)! Item was removed: - ----- Method: SpurGenerationScavenger>>copyToOldSpace: (in category 'scavenger') ----- - copyToOldSpace: survivor - "Copy survivor to oldSpace. Answer the new oop of the object." - <inline: true> - | nTenures numSlots hash newOop | - nTenures := statTenures. - self flag: 'why not just pass header??'. - numSlots := manager numSlotsOf: survivor. - hash := manager rawHashBitsOf: survivor. - newOop := manager - allocateSlotsInOldSpace: numSlots - format: (manager formatOf: survivor) - classIndex: (manager classIndexOf: survivor). - newOop ifNil: - [manager growOldSpaceByAtLeast: 0. "grow by growHeadroom" - newOop := manager - allocateSlotsInOldSpace: numSlots - format: (manager formatOf: survivor) - classIndex: (manager classIndexOf: survivor). - newOop ifNil: - [self error: 'out of memory']]. - manager - mem: (newOop + manager baseHeaderSize) asVoidPointer - cp: (survivor + manager baseHeaderSize) asVoidPointer - y: numSlots * manager wordSize. - (manager hasPointerFields: survivor) ifTrue: - [self remember: newOop]. - hash ~= 0 ifTrue: - [manager setHashBitsOf: newOop to: hash]. - statTenures := nTenures + 1. - ^newOop! Item was removed: - ----- Method: SpurGenerationScavenger>>copyToOldSpace:bytes: (in category 'scavenger') ----- - copyToOldSpace: survivor bytes: bytesInObject - "Copy survivor to oldSpace. Answer the new oop of the object." - <inline: true> - | nTenures startOfSurvivor newStart newOop | - nTenures := statTenures. - startOfSurvivor := manager startOfObject: survivor. - newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. - newStart ifNil: - [manager growOldSpaceByAtLeast: 0. "grow by growHeadroom" - newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. - newStart ifNil: - [self error: 'out of memory']]. - manager checkFreeSpace. - manager mem: newStart asVoidPointer cp: startOfSurvivor asVoidPointer y: bytesInObject. - newOop := newStart + (survivor - startOfSurvivor). - (manager hasPointerFields: survivor) ifTrue: - [self remember: newOop]. - statTenures := nTenures + 1. - ^newOop! Item was changed: ----- Method: SpurGenerationScavenger>>copyToOldSpace:bytes:format: (in category 'scavenger') ----- copyToOldSpace: survivor bytes: bytesInObject format: formatOfSurvivor "Copy survivor to oldSpace. Answer the new oop of the object." + <inline: #never> "Should be too infrequent to lower icache density of copyAndForward:" - <inline: true> | nTenures startOfSurvivor newStart newOop | self assert: (formatOfSurvivor = (manager formatOf: survivor) and: [((manager isMarked: survivor) not or: [tenureCriterion = MarkOnTenure]) + and: [tenureCriterion = TenureToShrinkRT + or: [(manager isPinned: survivor) not + and: [(manager isRemembered: survivor) not]]]]). - and: [(manager isPinned: survivor) not - and: [(manager isRemembered: survivor) not]]]). nTenures := statTenures. startOfSurvivor := manager startOfObject: survivor. newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. newStart ifNil: [manager growOldSpaceByAtLeast: 0. "grow by growHeadroom" newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. newStart ifNil: [self error: 'out of memory']]. "manager checkFreeSpace." manager mem: newStart asVoidPointer cp: startOfSurvivor asVoidPointer y: bytesInObject. newOop := newStart + (survivor - startOfSurvivor). + tenureCriterion >= (TenureToShrinkRT min: MarkOnTenure) ifTrue: + [tenureCriterion = TenureToShrinkRT ifTrue: + [manager rtRefCountOf: newOop put: 0]. + tenureCriterion = MarkOnTenure ifTrue: + [manager setIsMarkedOf: newOop to: true]]. - (manager isAnyPointerFormat: formatOfSurvivor) ifTrue: - [self remember: newOop]. - tenureCriterion = MarkOnTenure ifTrue: - [manager setIsMarkedOf: newOop to: true]. statTenures := nTenures + 1. + (manager isAnyPointerFormat: formatOfSurvivor) ifTrue: + ["A very quick and dirty scan to find young referents. If we misidentify bytes + in a CompiledMethod as young we don't care; it's unlikely, and a subsequent + scan of the rt will filter the object out. But it's good to filter here because + otherwise an attempt to shrink the RT may simply fill it up with new objects, + and here the data is likely in the cache." + manager baseHeaderSize to: bytesInObject - (survivor - startOfSurvivor) - manager wordSize by: manager wordSize do: + [:p| | field | + field := manager longAt: survivor + p. + (manager isReallyYoung: field) ifTrue: + [self remember: newOop. + ^newOop]]]. ^newOop! Item was changed: + ----- Method: SpurGenerationScavenger>>growRememberedSet (in category 'remembered set') ----- - ----- Method: SpurGenerationScavenger>>growRememberedSet (in category 'store check') ----- growRememberedSet | obj numSlots newObj base | <inline: false> "Don't ruin locality in remember:" <var: #base type: #'sqInt *'> obj := manager rememberedSetObj. numSlots := manager numSlotsOf: obj. self assert: numSlots >= 1024. newObj := manager allocatePinnedSlots: numSlots * 2. newObj ifNil: [newObj := manager allocatePinnedSlots: numSlots + 1024. newObj ifNil: [self error: 'could not grow remembered set']]. manager rememberedSetObj: newObj. base := manager firstIndexableField: newObj. 0 to: rememberedSetSize - 1 do: [:i| base at: i put: (rememberedSet at: i)]. "if growing in the middle of a GC, need to preserve marked status." (manager isMarked: obj) ifTrue: [manager setIsMarkedOf: newObj to: true; setIsMarkedOf: obj to: false]. manager freeObject: obj. rememberedSet := base. + rememberedSetLimit := manager numSlotsOf: newObj. + self setRememberedSetRedZone! - rememberedSetLimit := numSlots * 2. - rememberedSetRedZone := rememberedSetLimit * 3 + 3 // 4! Item was changed: ----- Method: SpurGenerationScavenger>>initializeRememberedSet (in category 'initialization') ----- initializeRememberedSet | obj | obj := manager rememberedSetObj. obj = manager nilObject ifTrue: [obj := manager allocatePinnedSlots: 1024. manager rememberedSetObj: obj]. rememberedSet := manager firstIndexableField: obj. rememberedSetSize := 0. rememberedSetLimit := manager numSlotsOf: obj. + self setRememberedSetRedZone! - rememberedSetRedZone := rememberedSetLimit * 3 + 3 // 4! Item was added: + ----- Method: SpurGenerationScavenger>>referenceCountRememberedReferents: (in category 'remembered set') ----- + referenceCountRememberedReferents: population + "Both reference count young objects reachable from the RT, + and count the populations of each ref count, in a single pass." + <var: 'population' declareC: 'long population[MaxRTRefCount + 1]'> + <inline: true> + 0 to: rememberedSetSize - 1 do: + [:i| | elephant | + elephant := rememberedSet at: i. + 0 to: (manager numPointerSlotsOf: elephant) - 1 do: + [:j| | referent refCount | + referent := manager fetchPointer: j ofObject: elephant. + (manager isReallyYoung: referent) ifTrue: + [refCount := manager rtRefCountOf: referent. + refCount < MaxRTRefCount ifTrue: + [refCount > 0 ifTrue: + [population at: refCount put: (population at: refCount) - 1]. + refCount := refCount + 1. + manager rtRefCountOf: referent put: refCount. + population at: refCount put: (population at: refCount) + 1]]]].! Item was added: + ----- Method: SpurGenerationScavenger>>rememberedSetLimit (in category 'accessing') ----- + rememberedSetLimit + <cmacro: '() GIV(rememberedSetLimit)'> + ^rememberedSetLimit! Item was changed: ----- Method: SpurGenerationScavenger>>scavenge: (in category 'scavenger') ----- scavenge: tenuringCriterion "The main routine, scavenge, scavenges young objects reachable from the roots (the stack zone and the rememberedTable). It first scavenges the new objects immediately reachable from old ones (all in the remembered table), then the stack zone. Then it scavenges those that are transitively reachable. If this results in a promotion, the promotee gets remembered, and it first scavenges objects adjacent to the promotee, then scavenges the ones reachable from the promoted. This loop continues until no more reachable objects are left. At that point, pastSurvivorSpace is exchanged with futureSurvivorSpace. Then any surviving weakArrays and weakArrays in the remembered set can be processed and their dead elements nilled. By default promotion (tenuring) is based on age and ammount of objects scavenged. But tenuring can be based on e.g. a particular class. The argument selects the tenuring criterion. Answer the limit of pastSpace, to allow the memory manager to bounds check survivors." tenureCriterion := tenuringCriterion. + self strategizeToLimitRememberedTable. self scavengeLoop. self processWeaklings. self computeTenuringThreshold. self exchangeSurvivorSpaces. ^self initFutureSpaceStart! Item was added: + ----- Method: SpurGenerationScavenger>>setRefCountToShrinkRT: (in category 'remembered set') ----- + setRefCountToShrinkRT: population + "Choose a refCount that should shrink the rt by at least half. + i.e. find the maximum reference count that half the population have at least." + <var: 'population' declareC: 'long population[MaxRTRefCount + 1]'> + <inline: true> + | entirePopulation i count | + self assert: (population at: 0) = 0. + entirePopulation := 0. + 1 to: MaxRTRefCount do: + [:j| entirePopulation := entirePopulation + (population at: j)]. + count := 0. + i := MaxRTRefCount + 1. + [count < (entirePopulation // 2) and: [(i := i - 1) >= 0]] whileTrue: + [count := count + (population at: i)]. + refCountToShrinkRT := i max: 0! Item was added: + ----- Method: SpurGenerationScavenger>>setRememberedSetRedZone (in category 'remembered set') ----- + setRememberedSetRedZone + | fudge | + <inline: true> + "fudge is a minimum below which we don't care about growing the RT. + It is chosen so that with a default 4Mb new space, the RT is not considered + full until it has from 512 to 1024 entries." + fudge := eden limit - eden start / manager wordSize // 1024. + rememberedSetRedZone := rememberedSetLimit * 3 // 4 max: fudge! Item was changed: ----- Method: SpurGenerationScavenger>>shouldBeTenured: (in category 'scavenger') ----- shouldBeTenured: survivor "Answer if an object should be tenured. The default policy tenuring policy is to use the tenuringThreshold to decide. If the survivors (measured in bytes) are above some fraction of the survivor space then objects below the threshold (older objects, since allocation grows upwards and hence new objects are later than old) are scavenged. Otherwise, the threshold is set to 0 and no objects are tenured. e.g. see An adaptive tenuring policy for generation scavengers, David Ungar & Frank Jackson. ACM TOPLAS, Volume 14 Issue 1, Jan. 1992, pp 1 - 27. The other policies are for special purposes." ^tenureCriterion caseOf: { [TenureByAge] -> [survivor < tenureThreshold]. [TenureByClass] -> [(manager classIndexOf: survivor) = tenuringClassIndex]. + [TenureToShrinkRT] -> + [(manager rtRefCountOf: survivor) >= refCountToShrinkRT] } - [DontTenureButDoUnmark] -> - [manager setIsMarkedOf: survivor to: false. - false] } otherwise: [false]! Item was added: + ----- Method: SpurGenerationScavenger>>strategizeToLimitRememberedTable (in category 'remembered set') ----- + strategizeToLimitRememberedTable + <inline: true> + (tenureCriterion = TenureByAge + and: [rememberedSetSize >= rememberedSetRedZone]) ifTrue: + [tenureCriterion := TenureToShrinkRT. + self computeRefCountToShrinkRT]! Item was added: + ----- Method: SpurGenerationScavengerSimulator>>computeRefCountToShrinkRT (in category 'remembered set') ----- + computeRefCountToShrinkRT + self halt. + ^super computeRefCountToShrinkRT! Item was removed: - ----- Method: SpurGenerationScavengerSimulator>>remember: (in category 'store check') ----- - remember: objOop - (rememberedSetSize > 0 - and: [(rememberedSet at: rememberedSetSize - 1) = objOop]) ifTrue: - [self halt]. - ^super remember: objOop! Item was changed: SharedPool subclass: #SpurMemoryManagementConstants instanceVariableNames: '' + classVariableNames: 'DontTenure MarkOnTenure MaxRTRefCount TenureByAge TenureByClass TenureToShrinkRT' - classVariableNames: 'DontTenure DontTenureButDoUnmark MarkOnTenure TenureByAge TenureByClass' poolDictionaries: '' category: 'VMMaker-SpurMemoryManager'! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory at al are initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. endOfMemory is assumed to point to the end of the last object in the image. Assume: image reader also initializes the following variables: specialObjectsOop lastHash" <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: self baseHeaderSize = self baseHeaderSize. self assert: (self maxSlotsForAlloc * self wordSize) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self setHiddenRootsObj: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart, free space" + self initializeNewSpaceVariables. + scavenger initializeRememberedSet. - "self bootstrapping ifFalse: - ["self initializeNewSpaceVariables. - scavenger initializeRememberedSet"]". segmentManager checkSegments. numCompactionPasses := CompactionPassesForGC. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was changed: ----- Method: SpurMemoryManager>>rootTableCapacity (in category 'scavenger') ----- rootTableCapacity + <cmacro: '() GIV(rememberedSetLimit)'> + ^scavenger rememberedSetLimit! - ^self numSlotsOf: self rememberedSetObj! Item was changed: ----- Method: SpurMemoryManager>>rootTableCount (in category 'accessing') ----- rootTableCount + <cmacro: '() GIV(rememberedSetSize)'> ^scavenger rememberedSetSize! Item was added: + ----- Method: SpurMemoryManager>>rtRefCountOf: (in category 'gc - scavenging') ----- + rtRefCountOf: obj + "Answer the rt reference count of obj; this is the three bit field comprised + of isGrey,isPinned,isRemembered. See computeRefCountToShrinkRT." + ^(self longAt: obj) >> self rememberedBitShift bitAnd: MaxRTRefCount! Item was added: + ----- Method: SpurMemoryManager>>rtRefCountOf:put: (in category 'gc - scavenging') ----- + rtRefCountOf: obj put: refCount + "Set the rt reference count of obj; this is the three bit field comprised + of isGrey,isPinned,isRemembered. See computeRefCountToShrinkRT." + self subclassResponsibility! Item was added: + ----- Method: StackInterpreterSimulator>>primitiveVMParameter (in category 'system control primitives') ----- + primitiveVMParameter + (self stackTop = (objectMemory integerObjectOf: 9) + or: [self stackTop = (objectMemory integerObjectOf: 52)]) ifTrue: + [self halt]. + ^super primitiveVMParameter! Item was changed: ----- Method: VMMaker class>>initialize (in category 'initialisation') ----- initialize "VMMaker initialize" DirNames := Dictionary new. DirNames at: #coreVMDir put: 'vm'; at: #platformsDir put: 'platforms'; at: #pluginsDir put: 'plugins'; at: #sourceDir put: 'src'. "Try and decide where the Cog source tree is. Two configurations are likely. One is that the VMMaker image is running in the image directory in the source tree and hence everything will be at '..'. Another is where the source tree is at the same level as the VMMaker image, in which case it is likely called oscogvm or Cog." + #('oscogvm.glue/platforms' '../platforms' 'oscogvm/platforms' 'Cog/platforms') + with: #('oscogvm.glue' '../' 'oscogvm' 'Cog') - #('../platforms' 'oscogvm/platforms' 'Cog/platforms') - with: #('../' 'oscogvm' 'Cog') do: [:dir :path| (FileDirectory default directoryExists: dir) ifTrue: [DirNames at: #sourceTree put: path. ^self]]!

1 0

[commit][3320] Creating a stable branch for Cadence's Glue.
by commits＠squeakvm.org 06 May '15

06 May '15

Revision: 3320 Author: eliot Date: 2015-05-06 12:25:17 -0700 (Wed, 06 May 2015) Log Message: ----------- Creating a stable branch for Cadence's Glue. Added Paths: ----------- branches/Glue/

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2015