Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

VM Maker: VMMaker.oscog-eem.748.mcz
by commits＠source.squeak.org 02 Jun '14

02 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.748.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.748 Author: eem Time: 2 June 2014, 10:05:28.29 am UUID: 097187de-f65d-42ff-b6a7-91f0fd069cea Ancestors: VMMaker.oscog-eem.747 Fix in-image compilation for the current VM. =============== Diff against VMMaker.oscog-eem.747 =============== Item was changed: ----- Method: Cogit class>>cog:selector:options: (in category 'in-image compilation') ----- cog: aCompiledMethod selector: aSelector options: optionsDictionaryOrArray "StackToRegisterMappingCogit cog: (Integer >> #benchFib) selector: #benchFib options: #(COGMTVM false)" | coInterpreter cogit | self initializeWithOptions: (self asOptionsDictionary: optionsDictionaryOrArray). CoInterpreter initializeWithOptions: initializationOptions. + CoInterpreter objectMemoryClass initializeWithOptions: initializationOptions. coInterpreter := CurrentImageCoInterpreterFacade forCogit: (cogit := self new). [cogit setInterpreter: coInterpreter; singleStep: true; initializeCodeZoneFrom: 1024 upTo: coInterpreter memory size / 2. "leave space for rump C stack" cogit methodZone freeStart: (cogit methodZone freeStart roundUpTo: 1024)] on: Notification do: [:ex| (ex messageText beginsWith: 'cannot find receiver for') ifTrue: [ex resume: coInterpreter]. ex pass]. ^{ coInterpreter. cogit. cogit cog: (coInterpreter oopForObject: aCompiledMethod) selector: (coInterpreter oopForObject: aSelector) }! Item was changed: ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectMemoryClass (in category 'accessing') ----- objectMemoryClass + ^NewCoObjectMemory! - ^NewObjectMemory!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.746.mcz
by Clément Bera 02 Jun '14

02 Jun '14

Eliot, Recent commits are very exciting. Context and closure creations are now inlined in machine code :-) Have you already done at:put: and stringAt:put: or is it your next step ? Please tell us about the new bench results with these features. Clément 2014-06-02 16:14 GMT+02:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.746.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-eem.746 > Author: eem > Time: 1 June 2014, 6:05:30.694 pm > UUID: cc4961d3-e629-4e28-b308-88eab314a8c9 > Ancestors: VMMaker.oscog-eem.745 > > Implement a peephole in the Spur Cogit for an indirection > vector initialized with a single value Avoid initializing the > slot in the array to nil and instead initialize it with the value. > > Refactor setting byte1, byte2 & byte3 into > loadSubsequentBytesForDescriptor:at: for the peephole > tryCollapseTempVectorInitializationOfSize:. > > No loner inline CoInterpreter>>pre/postGCAction: for VM profiling. > > Increase the number of trampoline table slots. > > Simulator: > Fix CurrentImageCoInterpreterFacade for the new Spur > inline instantiation code. > > =============== Diff against VMMaker.oscog-eem.745 =============== > > Item was changed: > ----- Method: CoInterpreter>>postGCAction: (in category 'object memory > support') ----- > postGCAction: gcModeArg > "Attempt to shrink free memory, signal the gc semaphore and let > the Cogit do its post GC thang" > + <inline: false> > self assert: gcModeArg = gcMode. > super postGCAction: gcModeArg. > cogit cogitPostGCAction: gcModeArg. > lastCoggableInterpretedBlockMethod := > lastUncoggableInterpretedBlockMethod := nil. > gcMode := 0! > > Item was changed: > ----- Method: CoInterpreter>>preGCAction: (in category 'object memory > support') ----- > preGCAction: gcModeArg > + <inline: false> > - <inline: true> > "Need to write back the frame pointers unless all pages are free > (as in snapshot). > Need to set gcMode var (to avoid passing the flag through a lot > of the updating code)" > super preGCAction: gcModeArg. > > gcMode := gcModeArg. > > cogit recordEventTrace ifTrue: > [| traceType | > traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] > ifFalse: [TraceIncrementalGC]. > self recordTrace: traceType thing: traceType source: 0]. > > cogit recordPrimTrace ifTrue: > [| traceType | > traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] > ifFalse: [TraceIncrementalGC]. > self fastLogPrim: traceType]! > > Item was added: > + ----- Method: CogObjectRepresentation>>createsArraysInline (in category > 'bytecode generator support') ----- > + createsArraysInline > + "Answer if the object representation allocates arrays inline. By > + default answer false. Better code can be generated when creating > + arrays inline if values are /not/ flushed to the stack." > + ^false! > > Item was removed: > - ----- Method: CogObjectRepresentationFor32BitSpur>>createsClosuresInline > (in category 'bytecode generator support') ----- > - createsClosuresInline > - "Answer if the object representation allocates closures inline. By > - default answer false. Better code can be generated when creating > - closures inline if copied values are /not/ flushed to the stack." > - ^true! > > Item was added: > + ----- Method: CogObjectRepresentationForSpur>>createsArraysInline (in > category 'bytecode generator support') ----- > + createsArraysInline > + "Answer if the object representation allocates arrays inline. By > + default answer false. Better code can be generated when creating > + arrays inline if values are /not/ flushed to the stack." > + ^true! > > Item was added: > + ----- Method: CogObjectRepresentationForSpur>>createsClosuresInline (in > category 'bytecode generator support') ----- > + createsClosuresInline > + "Answer if the object representation allocates closures inline. By > + default answer false. Better code can be generated when creating > + closures inline if copied values are /not/ flushed to the stack." > + ^true! > > Item was changed: > ----- Method: Cogit>>compileAbstractInstructionsFrom:through: (in > category 'compile abstract instructions') ----- > compileAbstractInstructionsFrom: start through: end > "Loop over bytecodes, dispatching to the generator for each > bytecode, handling fixups in due course." > | nextOpcodeIndex descriptor fixup result nExts | > <var: #descriptor type: #'BytecodeDescriptor *'> > <var: #fixup type: #'BytecodeFixup *'> > bytecodePC := start. > nExts := 0. > [byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) > + bytecodeSetOffset. > descriptor := self generatorAt: byte0. > + self loadSubsequentBytesForDescriptor: descriptor at: bytecodePC. > - descriptor numBytes > 1 ifTrue: > - [byte1 := objectMemory fetchByte: bytecodePC + 1 ofObject: > methodObj. > - descriptor numBytes > 2 ifTrue: > - [byte2 := objectMemory fetchByte: bytecodePC + 2 > ofObject: methodObj. > - descriptor numBytes > 3 ifTrue: > - [byte3 := objectMemory fetchByte: > bytecodePC + 3 ofObject: methodObj. > - descriptor numBytes > 4 ifTrue: > - [self notYetImplemented]]]]. > nextOpcodeIndex := opcodeIndex. > result := self perform: descriptor generator. > descriptor isExtension ifFalse: "extended bytecodes must consume > their extensions" > [self assert: (extA = 0 and: [extB = 0])]. > fixup := self fixupAt: bytecodePC - initialPC. > fixup targetInstruction ~= 0 ifTrue: > ["There is a fixup for this bytecode. It must point to > the first generated > instruction for this bytecode. If there isn't one we > need to add a label." > opcodeIndex = nextOpcodeIndex ifTrue: > [self Label]. > fixup targetInstruction: (self abstractInstructionAt: > nextOpcodeIndex)]. > bytecodePC := self nextBytecodePCFor: descriptor at: bytecodePC > exts: nExts in: methodObj. > result = 0 and: [bytecodePC <= end]] > whileTrue: > [nExts := descriptor isExtension ifTrue: [nExts + > 1] ifFalse: [0]]. > self checkEnoughOpcodes. > ^result! > > Item was added: > + ----- Method: Cogit>>loadSubsequentBytesForDescriptor:at: (in category > 'compile abstract instructions') ----- > + loadSubsequentBytesForDescriptor: descriptor at: pc > + <var: #descriptor type: #'BytecodeDescriptor *'> > + descriptor numBytes > 1 ifTrue: > + [byte1 := objectMemory fetchByte: pc + 1 ofObject: > methodObj. > + descriptor numBytes > 2 ifTrue: > + [byte2 := objectMemory fetchByte: pc + 2 ofObject: > methodObj. > + descriptor numBytes > 3 ifTrue: > + [byte3 := objectMemory fetchByte: pc + 3 > ofObject: methodObj. > + descriptor numBytes > 4 ifTrue: > + [self notYetImplemented]]]]! > > Item was added: > + ----- Method: CurrentImageCoInterpreterFacade class>>objectMemoryClass > (in category 'accessing') ----- > + objectMemoryClass > + ^self subclassResponsibility! > > Item was changed: > ----- Method: CurrentImageCoInterpreterFacade>>cogit: (in category > 'initialize-release') ----- > cogit: aCogit > cogit := aCogit. > coInterpreter cogit: aCogit. > + (objectMemory respondsTo: #cogit:) ifTrue: > + [objectMemory cogit: aCogit]! > - objectMemory cogit: aCogit! > > Item was added: > + ----- Method: CurrentImageCoInterpreterFacade>>indexablePointersFormat > (in category 'accessing') ----- > + indexablePointersFormat > + ^objectMemory indexablePointersFormat! > > Item was changed: > ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category > 'initialize-release') ----- > initialize > memory := ByteArray new: 262144. > + objectMemory := self class objectMemoryClass new. > - objectMemory := NewCoObjectMemory new. > coInterpreter := CoInterpreter new. > coInterpreter > instVarNamed: 'objectMemory' > put: objectMemory; > instVarNamed: 'primitiveTable' > put: (CArrayAccessor on: CoInterpreter > primitiveTable copy). > variables := Dictionary new. > #('stackLimit') do: > [:l| self addressForLabel: l]. > self initializeObjectMap! > > Item was added: > + ----- Method: CurrentImageCoInterpreterFacade>>methodNeedsLargeContext: > (in category 'accessing') ----- > + methodNeedsLargeContext: aMethodOop > + ^(self objectForOop: aMethodOop) frameSize > CompiledMethod > smallFrameSize! > > Item was added: > + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation > class>>objectMemoryClass (in category 'accessing') ----- > + objectMemoryClass > + ^Spur32BitCoMemoryManager! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>arrayFormat (in > category 'accessing') ----- > + arrayFormat > + ^objectMemory arrayFormat! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>getScavengeThreshold > (in category 'accessing') ----- > + getScavengeThreshold > + ^objectMemory getScavengeThreshold ifNil: [16r24680]! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>headerForSlots:format:classIndex: > (in category 'accessing') ----- > + headerForSlots: numSlots format: formatField classIndex: classIndex > + ^objectMemory headerForSlots: numSlots format: formatField > classIndex: classIndex! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>numSlotsMask > (in category 'accessing') ----- > + numSlotsMask > + ^objectMemory numSlotsMask! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>rememberedBitShift > (in category 'accessing') ----- > + rememberedBitShift > + ^objectMemory rememberedBitShift! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>smallObjectBytesForSlots: > (in category 'accessing') ----- > + smallObjectBytesForSlots: numSlots > + ^objectMemory smallObjectBytesForSlots: numSlots! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>storeCheckBoundary > (in category 'accessing') ----- > + storeCheckBoundary > + ^objectMemory storeCheckBoundary ifNil: [16r12345678]! > > Item was added: > + ----- Method: > CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation > class>>objectMemoryClass (in category 'accessing') ----- > + objectMemoryClass > + ^NewObjectMemory! > > Item was changed: > ----- Method: SimpleStackBasedCogit class>>initializeMiscConstants (in > category 'class initialization') ----- > initializeMiscConstants > super initializeMiscConstants. > MaxLiteralCountForCompile := initializationOptions at: > #MaxLiteralCountForCompile ifAbsent: [60]. > NumTrampolines := NewspeakVM > + ifTrue: [50] > + ifFalse: [42]! > - ifTrue: [46] > - ifFalse: [38]! > > Item was changed: > ----- Method: StackToRegisterMappingCogit class>>initializeMiscConstants > (in category 'class initialization') ----- > initializeMiscConstants > super initializeMiscConstants. > NumTrampolines := NewspeakVM > + ifTrue: [60] > + ifFalse: [52]! > - ifTrue: [58] > - ifFalse: [50]! > > Item was changed: > ----- Method: > StackToRegisterMappingCogit>>compileAbstractInstructionsFrom:through: (in > category 'compile abstract instructions') ----- > compileAbstractInstructionsFrom: start through: end > "Loop over bytecodes, dispatching to the generator for each > bytecode, handling fixups in due course." > | nextOpcodeIndex descriptor nExts fixup result | > <var: #descriptor type: #'BytecodeDescriptor *'> > <var: #fixup type: #'BytecodeFixup *'> > self traceSimStack. > bytecodePC := start. > nExts := 0. > descriptor := nil. > deadCode := false. > [self cCode: '' inSmalltalk: > [(debugBytecodePointers includes: bytecodePC) ifTrue: > [self halt]]. > fixup := self fixupAt: bytecodePC - initialPC. > fixup targetInstruction asUnsignedInteger > 0 > ifTrue: > [deadCode := false. > fixup targetInstruction asUnsignedInteger >= 2 > ifTrue: > [self merge: fixup > afterContinuation: (descriptor > notNil > > and: [descriptor isUnconditionalBranch > > or: [descriptor isReturn]]) not]] > ifFalse: "If there's no fixup following a return there's > no jump to that code and it is dead." > [(descriptor notNil and: [descriptor isReturn]) > ifTrue: > [deadCode := true]]. > self cCode: '' inSmalltalk: > [deadCode ifFalse: > [self assert: simStackPtr + (needsFrame ifTrue: > [0] ifFalse: [1]) > = (self > debugStackPointerFor: bytecodePC)]]. > byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) > + bytecodeSetOffset. > descriptor := self generatorAt: byte0. > + self loadSubsequentBytesForDescriptor: descriptor at: bytecodePC. > - descriptor numBytes > 1 ifTrue: > - [byte1 := objectMemory fetchByte: bytecodePC + 1 ofObject: > methodObj. > - descriptor numBytes > 2 ifTrue: > - [byte2 := objectMemory fetchByte: bytecodePC + 2 > ofObject: methodObj. > - descriptor numBytes > 3 ifTrue: > - [byte3 := objectMemory fetchByte: > bytecodePC + 3 ofObject: methodObj. > - descriptor numBytes > 4 ifTrue: > - [self notYetImplemented]]]]. > nextOpcodeIndex := opcodeIndex. > result := deadCode > ifTrue: "insert nops for dead code that is > mapped so that bc to mc mapping is not many to one" > [(descriptor isMapped > or: [inBlock and: [descriptor > isMappedInBlock]]) ifTrue: > [self annotateBytecode: > self Nop]. > 0] > ifFalse: > [self perform: descriptor > generator]. > descriptor isExtension ifFalse: "extended bytecodes must consume > their extensions" > [self assert: (extA = 0 and: [extB = 0])]. > self traceDescriptor: descriptor; traceSimStack. > (fixup targetInstruction asUnsignedInteger between: 1 and: 2) > ifTrue: > ["There is a fixup for this bytecode. It must point to > the first generated > instruction for this bytecode. If there isn't one we > need to add a label." > opcodeIndex = nextOpcodeIndex ifTrue: > [self Label]. > fixup targetInstruction: (self abstractInstructionAt: > nextOpcodeIndex)]. > bytecodePC := self nextBytecodePCFor: descriptor at: bytecodePC > exts: nExts in: methodObj. > result = 0 and: [bytecodePC <= end]] whileTrue: > [nExts := descriptor isExtension ifTrue: [nExts + 1] > ifFalse: [0]]. > self checkEnoughOpcodes. > ^result! > > Item was added: > + ----- Method: StackToRegisterMappingCogit>>evaluate:at: (in category > 'peephole optimizations') ----- > + evaluate: descriptor at: pc > + <var: #descriptor type: #'BytecodeDescriptor *'> > + byte0 := objectMemory fetchByte: pc ofObject: methodObj. > + self assert: descriptor = (self generatorAt: bytecodeSetOffset + > byte0). > + self loadSubsequentBytesForDescriptor: descriptor at: pc. > + self perform: descriptor generator! > > Item was changed: > ----- Method: StackToRegisterMappingCogit>>genPushNewArrayBytecode (in > category 'bytecode generators') ----- > genPushNewArrayBytecode > | size popValues | > self assert: needsFrame. > optStatus isReceiverResultRegLive: false. > (popValues := byte1 > 127) > ifTrue: [self ssFlushTo: simStackPtr] > ifFalse: [self ssAllocateCallReg: SendNumArgsReg and: > ReceiverResultReg]. > size := byte1 bitAnd: 127. > + popValues ifFalse: > + [(self tryCollapseTempVectorInitializationOfSize: size) > ifTrue: > + [^0]]. > objectRepresentation genNewArrayOfSize: size initialized: > popValues not. > popValues ifTrue: > [size - 1 to: 0 by: -1 do: > [:i| > self PopR: TempReg. > objectRepresentation > genStoreSourceReg: TempReg > slotIndex: i > intoNewObjectInDestReg: ReceiverResultReg]. > self ssPop: size]. > ^self ssPushRegister: ReceiverResultReg! > > Item was added: > + ----- Method: > StackToRegisterMappingCogit>>tryCollapseTempVectorInitializationOfSize: (in > category 'peephole optimizations') ----- > + tryCollapseTempVectorInitializationOfSize: slots > + "Try and collapse > + push: (Array new: 1) > + popIntoTemp: tempIndex > + pushConstant: const or pushTemp: n > + popIntoTemp: 0 inVectorAt: tempIndex > + into > + tempAt: tempIndex put: {const}. > + One might think that we should look for a sequence of more than > + one pushes and pops but this is extremely rare." > + | pushArrayDesc storeArrayDesc pushValueDesc storeValueDesc reg | > + <var: #pushArrayDesc type: #'BytecodeDescriptor *'> > + <var: #pushValueDesc type: #'BytecodeDescriptor *'> > + <var: #storeArrayDesc type: #'BytecodeDescriptor *'> > + <var: #storeValueDesc type: #'BytecodeDescriptor *'> > + slots ~= 1 ifTrue: > + [^false]. > + pushArrayDesc := self generatorAt: bytecodeSetOffset > + > + (objectMemory > + > fetchByte: bytecodePC > + > ofObject: methodObj). > + self assert: pushArrayDesc generator == #genPushNewArrayBytecode. > + storeArrayDesc := self generatorAt: bytecodeSetOffset > + > + (objectMemory > + > fetchByte: bytecodePC > + > + pushArrayDesc numBytes > + > ofObject: methodObj). > + storeArrayDesc generator ~~ > #genStoreAndPopTemporaryVariableBytecode ifTrue: > + [^false]. > + pushValueDesc := self generatorAt: bytecodeSetOffset > + > + (objectMemory > + > fetchByte: bytecodePC > + > + pushArrayDesc numBytes > + > + storeArrayDesc numBytes > + > ofObject: methodObj). > + (pushValueDesc generator ~~ #genPushLiteralConstantBytecode > + and: [pushValueDesc generator ~~ > #genPushQuickIntegerConstantBytecode > + and: [pushValueDesc generator ~~ > #genPushTemporaryVariableBytecode]]) ifTrue: > + [^false]. > + storeValueDesc := self generatorAt: bytecodeSetOffset > + > + (objectMemory > + > fetchByte: bytecodePC > + > + pushArrayDesc numBytes > + > + storeArrayDesc numBytes > + > + pushValueDesc numBytes > + > ofObject: methodObj). > + storeValueDesc generator ~~ #genStoreAndPopRemoteTempLongBytecode > ifTrue: > + [^false]. > + > + objectRepresentation genNewArrayOfSize: 1 initialized: false. > + self evaluate: pushValueDesc at: bytecodePC + pushArrayDesc > numBytes + storeArrayDesc numBytes. > + reg := self ssStorePop: true toPreferredReg: TempReg. > + objectRepresentation > + genStoreSourceReg: reg > + slotIndex: 0 > + intoNewObjectInDestReg: ReceiverResultReg. > + self ssPushRegister: ReceiverResultReg. > + self evaluate: storeArrayDesc at: bytecodePC + pushArrayDesc > numBytes. > + bytecodePC := bytecodePC > + "+ pushArrayDesc numBytes this > gets added by nextBytecodePCFor:at:exts:in:" > + + storeArrayDesc numBytes > + + pushValueDesc numBytes > + + storeValueDesc numBytes. > + ^true! > >

2 1

[commit][2939] CogVM source as per VMMaker.oscog-eem.747
by commits＠squeakvm.org 02 Jun '14

02 Jun '14

Revision: 2939 Author: eliot Date: 2014-06-02 08:09:52 -0700 (Mon, 02 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.747 In the indirection vector initialization peephole check that the store temp index matches the indirect temp store index and accept long store temp bytecodes. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -21593,15 +21593,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -21609,8 +21612,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -21618,17 +21623,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22958,15 +22958,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -22974,8 +22977,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -22983,17 +22988,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Jun 1 18:10:48 PDT 2014 + Mon Jun 2 08:09:12 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/sistasrc/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -670,6 +670,7 @@ static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms; static sqInt genLongJumpIfFalse(void); static sqInt genLongJumpIfTrue(void); +static sqInt genLongStoreAndPopTemporaryVariableBytecode(void); static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; @@ -12710,7 +12711,16 @@ return genJumpIfto(trueObject(), target); } + +/* 237 11101101 i i i i i i i i Pop and Store Temporary Variable #iiiiiiii */ + static sqInt +genLongStoreAndPopTemporaryVariableBytecode(void) +{ + return genStorePopTemporaryVariable(1, byte1); +} + +static sqInt genLongUnconditionalBackwardJump(void) { sqInt distance; @@ -20847,15 +20857,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -20863,8 +20876,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -20872,17 +20887,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/sistasrc/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -674,6 +674,7 @@ static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms; static sqInt genLongJumpIfFalse(void); static sqInt genLongJumpIfTrue(void); +static sqInt genLongStoreAndPopTemporaryVariableBytecode(void); static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; @@ -13773,7 +13774,16 @@ return genJumpIfto(trueObject(), target); } + +/* 237 11101101 i i i i i i i i Pop and Store Temporary Variable #iiiiiiii */ + static sqInt +genLongStoreAndPopTemporaryVariableBytecode(void) +{ + return genStorePopTemporaryVariable(1, byte1); +} + +static sqInt genLongUnconditionalBackwardJump(void) { sqInt distance; @@ -21814,15 +21824,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -21830,8 +21843,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -21839,17 +21854,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct { Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursrc/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -669,6 +669,7 @@ static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms; static sqInt genLongJumpIfFalse(void); static sqInt genLongJumpIfTrue(void); +static sqInt genLongStoreAndPopTemporaryVariableBytecode(void); static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; @@ -13716,7 +13717,16 @@ return genJumpIfto(trueObject(), target); } + +/* 237 11101101 i i i i i i i i Pop and Store Temporary Variable #iiiiiiii */ + static sqInt +genLongStoreAndPopTemporaryVariableBytecode(void) +{ + return genStorePopTemporaryVariable(1, byte1); +} + +static sqInt genLongUnconditionalBackwardJump(void) { sqInt distance; @@ -21151,15 +21161,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -21167,8 +21180,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -21176,17 +21191,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursrc/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct { Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/src/vm/cogit.c 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 from - StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -664,6 +664,7 @@ static sqInt genLoadStackPointers(AbstractInstruction * self_in_genLoadStackPointers) NoDbgRegParms; static sqInt genLongJumpIfFalse(void); static sqInt genLongJumpIfTrue(void); +static sqInt genLongStoreAndPopTemporaryVariableBytecode(void); static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; @@ -12646,7 +12647,16 @@ return genJumpIfto(trueObject(), target); } + +/* 237 11101101 i i i i i i i i Pop and Store Temporary Variable #iiiiiiii */ + static sqInt +genLongStoreAndPopTemporaryVariableBytecode(void) +{ + return genStorePopTemporaryVariable(1, byte1); +} + +static sqInt genLongUnconditionalBackwardJump(void) { sqInt distance; @@ -20173,15 +20183,18 @@ } -/* Try and collapse +/* If the sequence of bytecodes is push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex - into - tempAt: tempIndex put: {const}. + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. One might think that we should look for a sequence of more than - one pushes and pops but this is extremely rare. */ + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst + vars. */ static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) @@ -20189,8 +20202,10 @@ BytecodeDescriptor *pushArrayDesc; BytecodeDescriptor *pushValueDesc; sqInt reg; + sqInt remoteTempIndex; BytecodeDescriptor *storeArrayDesc; BytecodeDescriptor *storeValueDesc; + sqInt tempIndex; if (slots != 1) { return 0; @@ -20198,17 +20213,25 @@ pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); - if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { - return 0; + if (((storeArrayDesc->generator)) == genStoreAndPopTemporaryVariableBytecode) { + tempIndex = (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj)) & 7; } + else { + if (!(((storeArrayDesc->generator)) == genLongStoreAndPopTemporaryVariableBytecode)) { + return 0; + } + tempIndex = fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + 1, methodObj); + } pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); - if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) - && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) - && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + if (!((((pushValueDesc->generator)) == genPushLiteralConstantBytecode) + || ((((pushValueDesc->generator)) == genPushQuickIntegerConstantBytecode) + || (((pushValueDesc->generator)) == genPushTemporaryVariableBytecode)))) { return 0; } storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); - if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + remoteTempIndex = fetchByteofObject((((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + 2, methodObj); + if (!((((storeValueDesc->generator)) == genStoreAndPopRemoteTempLongBytecode) + && (tempIndex == remoteTempIndex))) { return 0; } genNewArrayOfSizeinitialized(1, 0); Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/src/vm/cogit.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) +++ branches/Cog/src/vm/cogmethod.h 2014-06-02 15:09:52 UTC (rev 2939) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 + CCodeGenerator VMMaker.oscog-eem.747 uuid: 488671d9-ac3b-4b24-8102-9a2623c7ce72 */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.747.mcz
by commits＠source.squeak.org 02 Jun '14

02 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.747.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.747 Author: eem Time: 2 June 2014, 8:04:31.883 am UUID: 488671d9-ac3b-4b24-8102-9a2623c7ce72 Ancestors: VMMaker.oscog-eem.746 In the indirection vector initialization peephole check that the store temp index matches the indirect temp store index and accept long store temp bytecodes. =============== Diff against VMMaker.oscog-eem.746 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>tryCollapseTempVectorInitializationOfSize: (in category 'peephole optimizations') ----- tryCollapseTempVectorInitializationOfSize: slots + "If the sequence of bytecodes is - "Try and collapse push: (Array new: 1) popIntoTemp: tempIndex pushConstant: const or pushTemp: n popIntoTemp: 0 inVectorAt: tempIndex + collapse this into + tempAt: tempIndex put: {const or temp} + and answer true, otherwise answer false. - into - tempAt: tempIndex put: {const}. One might think that we should look for a sequence of more than + one pushes and pops but this is extremely rare. + Exclude pushRcvr: n to avoid potential complications with context inst vars." + | pushArrayDesc storeArrayDesc pushValueDesc storeValueDesc tempIndex remoteTempIndex reg | - one pushes and pops but this is extremely rare." - | pushArrayDesc storeArrayDesc pushValueDesc storeValueDesc reg | <var: #pushArrayDesc type: #'BytecodeDescriptor *'> <var: #pushValueDesc type: #'BytecodeDescriptor *'> <var: #storeArrayDesc type: #'BytecodeDescriptor *'> <var: #storeValueDesc type: #'BytecodeDescriptor *'> slots ~= 1 ifTrue: [^false]. pushArrayDesc := self generatorAt: bytecodeSetOffset + (objectMemory fetchByte: bytecodePC ofObject: methodObj). self assert: pushArrayDesc generator == #genPushNewArrayBytecode. storeArrayDesc := self generatorAt: bytecodeSetOffset + (objectMemory fetchByte: bytecodePC + pushArrayDesc numBytes ofObject: methodObj). + storeArrayDesc generator == #genStoreAndPopTemporaryVariableBytecode + ifTrue: + [tempIndex := (objectMemory + fetchByte: bytecodePC + pushArrayDesc numBytes + ofObject: methodObj) bitAnd: 16r7] + ifFalse: + [storeArrayDesc generator == #genLongStoreAndPopTemporaryVariableBytecode ifFalse: + [^false]. + tempIndex := objectMemory + fetchByte: bytecodePC + pushArrayDesc numBytes + 1 + ofObject: methodObj]. - storeArrayDesc generator ~~ #genStoreAndPopTemporaryVariableBytecode ifTrue: - [^false]. pushValueDesc := self generatorAt: bytecodeSetOffset + (objectMemory fetchByte: bytecodePC + pushArrayDesc numBytes + storeArrayDesc numBytes ofObject: methodObj). + (pushValueDesc generator == #genPushLiteralConstantBytecode + or: [pushValueDesc generator == #genPushQuickIntegerConstantBytecode + or: [pushValueDesc generator == #genPushTemporaryVariableBytecode]]) ifFalse: - (pushValueDesc generator ~~ #genPushLiteralConstantBytecode - and: [pushValueDesc generator ~~ #genPushQuickIntegerConstantBytecode - and: [pushValueDesc generator ~~ #genPushTemporaryVariableBytecode]]) ifTrue: [^false]. storeValueDesc := self generatorAt: bytecodeSetOffset + (objectMemory fetchByte: bytecodePC + pushArrayDesc numBytes + storeArrayDesc numBytes + pushValueDesc numBytes ofObject: methodObj). + remoteTempIndex := objectMemory + fetchByte: bytecodePC + + pushArrayDesc numBytes + + storeArrayDesc numBytes + + pushValueDesc numBytes + + 2 + ofObject: methodObj. + (storeValueDesc generator == #genStoreAndPopRemoteTempLongBytecode + and: [tempIndex = remoteTempIndex]) ifFalse: - storeValueDesc generator ~~ #genStoreAndPopRemoteTempLongBytecode ifTrue: [^false]. objectRepresentation genNewArrayOfSize: 1 initialized: false. self evaluate: pushValueDesc at: bytecodePC + pushArrayDesc numBytes + storeArrayDesc numBytes. reg := self ssStorePop: true toPreferredReg: TempReg. objectRepresentation genStoreSourceReg: reg slotIndex: 0 intoNewObjectInDestReg: ReceiverResultReg. self ssPushRegister: ReceiverResultReg. self evaluate: storeArrayDesc at: bytecodePC + pushArrayDesc numBytes. bytecodePC := bytecodePC "+ pushArrayDesc numBytes this gets added by nextBytecodePCFor:at:exts:in:" + storeArrayDesc numBytes + pushValueDesc numBytes + storeValueDesc numBytes. ^true!

1 0

VM Maker: VMMaker.oscog-eem.746.mcz
by commits＠source.squeak.org 02 Jun '14

02 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.746.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.746 Author: eem Time: 1 June 2014, 6:05:30.694 pm UUID: cc4961d3-e629-4e28-b308-88eab314a8c9 Ancestors: VMMaker.oscog-eem.745 Implement a peephole in the Spur Cogit for an indirection vector initialized with a single value Avoid initializing the slot in the array to nil and instead initialize it with the value. Refactor setting byte1, byte2 & byte3 into loadSubsequentBytesForDescriptor:at: for the peephole tryCollapseTempVectorInitializationOfSize:. No loner inline CoInterpreter>>pre/postGCAction: for VM profiling. Increase the number of trampoline table slots. Simulator: Fix CurrentImageCoInterpreterFacade for the new Spur inline instantiation code. =============== Diff against VMMaker.oscog-eem.745 =============== Item was changed: ----- Method: CoInterpreter>>postGCAction: (in category 'object memory support') ----- postGCAction: gcModeArg "Attempt to shrink free memory, signal the gc semaphore and let the Cogit do its post GC thang" + <inline: false> self assert: gcModeArg = gcMode. super postGCAction: gcModeArg. cogit cogitPostGCAction: gcModeArg. lastCoggableInterpretedBlockMethod := lastUncoggableInterpretedBlockMethod := nil. gcMode := 0! Item was changed: ----- Method: CoInterpreter>>preGCAction: (in category 'object memory support') ----- preGCAction: gcModeArg + <inline: false> - <inline: true> "Need to write back the frame pointers unless all pages are free (as in snapshot). Need to set gcMode var (to avoid passing the flag through a lot of the updating code)" super preGCAction: gcModeArg. gcMode := gcModeArg. cogit recordEventTrace ifTrue: [| traceType | traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] ifFalse: [TraceIncrementalGC]. self recordTrace: traceType thing: traceType source: 0]. cogit recordPrimTrace ifTrue: [| traceType | traceType := gcModeArg == GCModeFull ifTrue: [TraceFullGC] ifFalse: [TraceIncrementalGC]. self fastLogPrim: traceType]! Item was added: + ----- Method: CogObjectRepresentation>>createsArraysInline (in category 'bytecode generator support') ----- + createsArraysInline + "Answer if the object representation allocates arrays inline. By + default answer false. Better code can be generated when creating + arrays inline if values are /not/ flushed to the stack." + ^false! Item was removed: - ----- Method: CogObjectRepresentationFor32BitSpur>>createsClosuresInline (in category 'bytecode generator support') ----- - createsClosuresInline - "Answer if the object representation allocates closures inline. By - default answer false. Better code can be generated when creating - closures inline if copied values are /not/ flushed to the stack." - ^true! Item was added: + ----- Method: CogObjectRepresentationForSpur>>createsArraysInline (in category 'bytecode generator support') ----- + createsArraysInline + "Answer if the object representation allocates arrays inline. By + default answer false. Better code can be generated when creating + arrays inline if values are /not/ flushed to the stack." + ^true! Item was added: + ----- Method: CogObjectRepresentationForSpur>>createsClosuresInline (in category 'bytecode generator support') ----- + createsClosuresInline + "Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack." + ^true! Item was changed: ----- Method: Cogit>>compileAbstractInstructionsFrom:through: (in category 'compile abstract instructions') ----- compileAbstractInstructionsFrom: start through: end "Loop over bytecodes, dispatching to the generator for each bytecode, handling fixups in due course." | nextOpcodeIndex descriptor fixup result nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #fixup type: #'BytecodeFixup *'> bytecodePC := start. nExts := 0. [byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. + self loadSubsequentBytesForDescriptor: descriptor at: bytecodePC. - descriptor numBytes > 1 ifTrue: - [byte1 := objectMemory fetchByte: bytecodePC + 1 ofObject: methodObj. - descriptor numBytes > 2 ifTrue: - [byte2 := objectMemory fetchByte: bytecodePC + 2 ofObject: methodObj. - descriptor numBytes > 3 ifTrue: - [byte3 := objectMemory fetchByte: bytecodePC + 3 ofObject: methodObj. - descriptor numBytes > 4 ifTrue: - [self notYetImplemented]]]]. nextOpcodeIndex := opcodeIndex. result := self perform: descriptor generator. descriptor isExtension ifFalse: "extended bytecodes must consume their extensions" [self assert: (extA = 0 and: [extB = 0])]. fixup := self fixupAt: bytecodePC - initialPC. fixup targetInstruction ~= 0 ifTrue: ["There is a fixup for this bytecode. It must point to the first generated instruction for this bytecode. If there isn't one we need to add a label." opcodeIndex = nextOpcodeIndex ifTrue: [self Label]. fixup targetInstruction: (self abstractInstructionAt: nextOpcodeIndex)]. bytecodePC := self nextBytecodePCFor: descriptor at: bytecodePC exts: nExts in: methodObj. result = 0 and: [bytecodePC <= end]] whileTrue: [nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. self checkEnoughOpcodes. ^result! Item was added: + ----- Method: Cogit>>loadSubsequentBytesForDescriptor:at: (in category 'compile abstract instructions') ----- + loadSubsequentBytesForDescriptor: descriptor at: pc + <var: #descriptor type: #'BytecodeDescriptor *'> + descriptor numBytes > 1 ifTrue: + [byte1 := objectMemory fetchByte: pc + 1 ofObject: methodObj. + descriptor numBytes > 2 ifTrue: + [byte2 := objectMemory fetchByte: pc + 2 ofObject: methodObj. + descriptor numBytes > 3 ifTrue: + [byte3 := objectMemory fetchByte: pc + 3 ofObject: methodObj. + descriptor numBytes > 4 ifTrue: + [self notYetImplemented]]]]! Item was added: + ----- Method: CurrentImageCoInterpreterFacade class>>objectMemoryClass (in category 'accessing') ----- + objectMemoryClass + ^self subclassResponsibility! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>cogit: (in category 'initialize-release') ----- cogit: aCogit cogit := aCogit. coInterpreter cogit: aCogit. + (objectMemory respondsTo: #cogit:) ifTrue: + [objectMemory cogit: aCogit]! - objectMemory cogit: aCogit! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>indexablePointersFormat (in category 'accessing') ----- + indexablePointersFormat + ^objectMemory indexablePointersFormat! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize memory := ByteArray new: 262144. + objectMemory := self class objectMemoryClass new. - objectMemory := NewCoObjectMemory new. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' put: objectMemory; instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). variables := Dictionary new. #('stackLimit') do: [:l| self addressForLabel: l]. self initializeObjectMap! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>methodNeedsLargeContext: (in category 'accessing') ----- + methodNeedsLargeContext: aMethodOop + ^(self objectForOop: aMethodOop) frameSize > CompiledMethod smallFrameSize! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation class>>objectMemoryClass (in category 'accessing') ----- + objectMemoryClass + ^Spur32BitCoMemoryManager! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>arrayFormat (in category 'accessing') ----- + arrayFormat + ^objectMemory arrayFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>getScavengeThreshold (in category 'accessing') ----- + getScavengeThreshold + ^objectMemory getScavengeThreshold ifNil: [16r24680]! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>headerForSlots:format:classIndex: (in category 'accessing') ----- + headerForSlots: numSlots format: formatField classIndex: classIndex + ^objectMemory headerForSlots: numSlots format: formatField classIndex: classIndex! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>numSlotsMask (in category 'accessing') ----- + numSlotsMask + ^objectMemory numSlotsMask! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>rememberedBitShift (in category 'accessing') ----- + rememberedBitShift + ^objectMemory rememberedBitShift! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>smallObjectBytesForSlots: (in category 'accessing') ----- + smallObjectBytesForSlots: numSlots + ^objectMemory smallObjectBytesForSlots: numSlots! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>storeCheckBoundary (in category 'accessing') ----- + storeCheckBoundary + ^objectMemory storeCheckBoundary ifNil: [16r12345678]! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation class>>objectMemoryClass (in category 'accessing') ----- + objectMemoryClass + ^NewObjectMemory! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeMiscConstants (in category 'class initialization') ----- initializeMiscConstants super initializeMiscConstants. MaxLiteralCountForCompile := initializationOptions at: #MaxLiteralCountForCompile ifAbsent: [60]. NumTrampolines := NewspeakVM + ifTrue: [50] + ifFalse: [42]! - ifTrue: [46] - ifFalse: [38]! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeMiscConstants (in category 'class initialization') ----- initializeMiscConstants super initializeMiscConstants. NumTrampolines := NewspeakVM + ifTrue: [60] + ifFalse: [52]! - ifTrue: [58] - ifFalse: [50]! Item was changed: ----- Method: StackToRegisterMappingCogit>>compileAbstractInstructionsFrom:through: (in category 'compile abstract instructions') ----- compileAbstractInstructionsFrom: start through: end "Loop over bytecodes, dispatching to the generator for each bytecode, handling fixups in due course." | nextOpcodeIndex descriptor nExts fixup result | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #fixup type: #'BytecodeFixup *'> self traceSimStack. bytecodePC := start. nExts := 0. descriptor := nil. deadCode := false. [self cCode: '' inSmalltalk: [(debugBytecodePointers includes: bytecodePC) ifTrue: [self halt]]. fixup := self fixupAt: bytecodePC - initialPC. fixup targetInstruction asUnsignedInteger > 0 ifTrue: [deadCode := false. fixup targetInstruction asUnsignedInteger >= 2 ifTrue: [self merge: fixup afterContinuation: (descriptor notNil and: [descriptor isUnconditionalBranch or: [descriptor isReturn]]) not]] ifFalse: "If there's no fixup following a return there's no jump to that code and it is dead." [(descriptor notNil and: [descriptor isReturn]) ifTrue: [deadCode := true]]. self cCode: '' inSmalltalk: [deadCode ifFalse: [self assert: simStackPtr + (needsFrame ifTrue: [0] ifFalse: [1]) = (self debugStackPointerFor: bytecodePC)]]. byte0 := (objectMemory fetchByte: bytecodePC ofObject: methodObj) + bytecodeSetOffset. descriptor := self generatorAt: byte0. + self loadSubsequentBytesForDescriptor: descriptor at: bytecodePC. - descriptor numBytes > 1 ifTrue: - [byte1 := objectMemory fetchByte: bytecodePC + 1 ofObject: methodObj. - descriptor numBytes > 2 ifTrue: - [byte2 := objectMemory fetchByte: bytecodePC + 2 ofObject: methodObj. - descriptor numBytes > 3 ifTrue: - [byte3 := objectMemory fetchByte: bytecodePC + 3 ofObject: methodObj. - descriptor numBytes > 4 ifTrue: - [self notYetImplemented]]]]. nextOpcodeIndex := opcodeIndex. result := deadCode ifTrue: "insert nops for dead code that is mapped so that bc to mc mapping is not many to one" [(descriptor isMapped or: [inBlock and: [descriptor isMappedInBlock]]) ifTrue: [self annotateBytecode: self Nop]. 0] ifFalse: [self perform: descriptor generator]. descriptor isExtension ifFalse: "extended bytecodes must consume their extensions" [self assert: (extA = 0 and: [extB = 0])]. self traceDescriptor: descriptor; traceSimStack. (fixup targetInstruction asUnsignedInteger between: 1 and: 2) ifTrue: ["There is a fixup for this bytecode. It must point to the first generated instruction for this bytecode. If there isn't one we need to add a label." opcodeIndex = nextOpcodeIndex ifTrue: [self Label]. fixup targetInstruction: (self abstractInstructionAt: nextOpcodeIndex)]. bytecodePC := self nextBytecodePCFor: descriptor at: bytecodePC exts: nExts in: methodObj. result = 0 and: [bytecodePC <= end]] whileTrue: [nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. self checkEnoughOpcodes. ^result! Item was added: + ----- Method: StackToRegisterMappingCogit>>evaluate:at: (in category 'peephole optimizations') ----- + evaluate: descriptor at: pc + <var: #descriptor type: #'BytecodeDescriptor *'> + byte0 := objectMemory fetchByte: pc ofObject: methodObj. + self assert: descriptor = (self generatorAt: bytecodeSetOffset + byte0). + self loadSubsequentBytesForDescriptor: descriptor at: pc. + self perform: descriptor generator! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushNewArrayBytecode (in category 'bytecode generators') ----- genPushNewArrayBytecode | size popValues | self assert: needsFrame. optStatus isReceiverResultRegLive: false. (popValues := byte1 > 127) ifTrue: [self ssFlushTo: simStackPtr] ifFalse: [self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg]. size := byte1 bitAnd: 127. + popValues ifFalse: + [(self tryCollapseTempVectorInitializationOfSize: size) ifTrue: + [^0]]. objectRepresentation genNewArrayOfSize: size initialized: popValues not. popValues ifTrue: [size - 1 to: 0 by: -1 do: [:i| self PopR: TempReg. objectRepresentation genStoreSourceReg: TempReg slotIndex: i intoNewObjectInDestReg: ReceiverResultReg]. self ssPop: size]. ^self ssPushRegister: ReceiverResultReg! Item was added: + ----- Method: StackToRegisterMappingCogit>>tryCollapseTempVectorInitializationOfSize: (in category 'peephole optimizations') ----- + tryCollapseTempVectorInitializationOfSize: slots + "Try and collapse + push: (Array new: 1) + popIntoTemp: tempIndex + pushConstant: const or pushTemp: n + popIntoTemp: 0 inVectorAt: tempIndex + into + tempAt: tempIndex put: {const}. + One might think that we should look for a sequence of more than + one pushes and pops but this is extremely rare." + | pushArrayDesc storeArrayDesc pushValueDesc storeValueDesc reg | + <var: #pushArrayDesc type: #'BytecodeDescriptor *'> + <var: #pushValueDesc type: #'BytecodeDescriptor *'> + <var: #storeArrayDesc type: #'BytecodeDescriptor *'> + <var: #storeValueDesc type: #'BytecodeDescriptor *'> + slots ~= 1 ifTrue: + [^false]. + pushArrayDesc := self generatorAt: bytecodeSetOffset + + (objectMemory + fetchByte: bytecodePC + ofObject: methodObj). + self assert: pushArrayDesc generator == #genPushNewArrayBytecode. + storeArrayDesc := self generatorAt: bytecodeSetOffset + + (objectMemory + fetchByte: bytecodePC + + pushArrayDesc numBytes + ofObject: methodObj). + storeArrayDesc generator ~~ #genStoreAndPopTemporaryVariableBytecode ifTrue: + [^false]. + pushValueDesc := self generatorAt: bytecodeSetOffset + + (objectMemory + fetchByte: bytecodePC + + pushArrayDesc numBytes + + storeArrayDesc numBytes + ofObject: methodObj). + (pushValueDesc generator ~~ #genPushLiteralConstantBytecode + and: [pushValueDesc generator ~~ #genPushQuickIntegerConstantBytecode + and: [pushValueDesc generator ~~ #genPushTemporaryVariableBytecode]]) ifTrue: + [^false]. + storeValueDesc := self generatorAt: bytecodeSetOffset + + (objectMemory + fetchByte: bytecodePC + + pushArrayDesc numBytes + + storeArrayDesc numBytes + + pushValueDesc numBytes + ofObject: methodObj). + storeValueDesc generator ~~ #genStoreAndPopRemoteTempLongBytecode ifTrue: + [^false]. + + objectRepresentation genNewArrayOfSize: 1 initialized: false. + self evaluate: pushValueDesc at: bytecodePC + pushArrayDesc numBytes + storeArrayDesc numBytes. + reg := self ssStorePop: true toPreferredReg: TempReg. + objectRepresentation + genStoreSourceReg: reg + slotIndex: 0 + intoNewObjectInDestReg: ReceiverResultReg. + self ssPushRegister: ReceiverResultReg. + self evaluate: storeArrayDesc at: bytecodePC + pushArrayDesc numBytes. + bytecodePC := bytecodePC + "+ pushArrayDesc numBytes this gets added by nextBytecodePCFor:at:exts:in:" + + storeArrayDesc numBytes + + pushValueDesc numBytes + + storeValueDesc numBytes. + ^true!

1 0

Build tree flattening project update
by gettimothy 02 Jun '14

02 Jun '14

Hi all. I puttered with the cygwin stuff yesterday and could get stuff to start to build, but it would fail at a UTCDateTime function definition (I forget the details) so I left it at that until I hear from Goran. My dos boot is windows 7 on 64 bit amd, so who knows what it could have been. Porting the Makefiles consisted of 1. change platform path 2. change source path 3. remove -mno-cygwin flags 4. remove the -i/sys/.../mingw include Since I did not want to delve into the cause of the error, I have only done 1 and 2 above on the SVN tree and will tackle this another time. To be honest, I get cranky any time I have to boot to windows as I detest that o.s. That should take care of the flattening. Next up is port over the missing plugins and get a corresponding CMake build in place for each gnu-build. Cordially, tty

1 0

primitive external call
by Helmut Rohregger 02 Jun '14

02 Jun '14

Hi, could someone explain me primitive 117? I know the primitive is responsible for loading some kind of modules. But where do I find these modules. For example "Integer>>#bitAnd:" contains "<primitive: 'primDigitBitAnd' module:'LargeIntegers'>", which will load the 'primDigitBitAnd' method of module 'LargeIntegers'. Are these modules some kind of plug-ins outside the squeak image? Can I access these modules and check their implementation? best regards, Helmut

5 9

[commit][2938] CogVM source as per VMMaker.oscog-eem.746
by commits＠squeakvm.org 02 Jun '14

02 Jun '14

Revision: 2938 Author: eliot Date: 2014-06-01 18:11:49 -0700 (Sun, 01 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.746 Implement a peephole in the Spur Cogit for an indirection vector initialized with a single value Avoid initializing the slot in the array to nil and instead initialize it with the value. Refactor setting byte1, byte2 & byte3 into loadSubsequentBytesForDescriptor:at: for the peephole tryCollapseTempVectorInitializationOfSize:. No longer inline CoInterpreter>>pre/postGCAction: for VM profiling. Increase the number of trampoline table slots. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -297,7 +297,7 @@ #define NSSendIsPCAnnotated 1 #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 -#define NumTrampolines 58 +#define NumTrampolines 60 #define OrCqR 93 #define OrCwR 100 #define OrRR 86 @@ -565,6 +565,7 @@ void enterCogCodePopReceiverAndClassRegs(void); void enterCogCodePopReceiverArg0Regs(void); void enterCogCodePopReceiverArg1Arg0Regs(void); +static void evaluateat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms; static sqInt extABytecode(void); static sqInt extBBytecode(void); static sqInt extendedPushBytecode(void); @@ -917,6 +918,7 @@ static sqInt literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress) NoDbgRegParms; static sqInt liveRegisters(void); static sqInt loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize) NoDbgRegParms; +static void loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms; static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress) NoDbgRegParms; static AbstractInstruction * gMoveAwR(sqInt address, sqInt reg) NoDbgRegParms; static AbstractInstruction * gMoveCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms; @@ -1086,6 +1088,7 @@ static sqInt sib(AbstractInstruction * self_in_sib, sqInt scale, sqInt indexReg, sqInt baseReg) NoDbgRegParms; sqInt traceLinkedSendOffset(void); static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); @@ -4170,18 +4173,7 @@ byte0 = (fetchByteofObject(bytecodePC, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); - if (((descriptor->numBytes)) > 1) { - byte1 = fetchByteofObject(bytecodePC + 1, methodObj); - if (((descriptor->numBytes)) > 2) { - byte2 = fetchByteofObject(bytecodePC + 2, methodObj); - if (((descriptor->numBytes)) > 3) { - byte3 = fetchByteofObject(bytecodePC + 3, methodObj); - if (((descriptor->numBytes)) > 4) { - notYetImplemented(); - } - } - } - } + loadSubsequentBytesForDescriptorat(descriptor, bytecodePC); nextOpcodeIndex = opcodeIndex; result = (deadCode ? ((((descriptor->isMapped)) @@ -10397,7 +10389,16 @@ realCEEnterCogCodePopReceiverArg1Arg0Regs(); } +static void +evaluateat(BytecodeDescriptor *descriptor, sqInt pc) +{ + byte0 = fetchByteofObject(pc, methodObj); + assert(descriptor == (generatorAt(bytecodeSetOffset + byte0))); + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); +} + /* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) */ static sqInt @@ -15058,6 +15059,11 @@ ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); } size = byte1 & 0x7F; + if (!popValues) { + if (tryCollapseTempVectorInitializationOfSize(size)) { + return 0; + } + } genNewArrayOfSizeinitialized(size, !popValues); if (popValues) { for (i = (size - 1); i >= 0; i += -1) { @@ -17703,7 +17709,24 @@ return 5; } +static void +loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc) +{ + if (((descriptor->numBytes)) > 1) { + byte1 = fetchByteofObject(pc + 1, methodObj); + if (((descriptor->numBytes)) > 2) { + byte2 = fetchByteofObject(pc + 2, methodObj); + if (((descriptor->numBytes)) > 3) { + byte3 = fetchByteofObject(pc + 3, methodObj); + if (((descriptor->numBytes)) > 4) { + notYetImplemented(); + } + } + } + } +} + /* Since it's an extraction from other methods. */ /* This needs to be digfferent from jumpTargetAddress because long jumps can be to absolute addresses and hence we can't assert that the jump target is @@ -21569,7 +21592,59 @@ return theString; } + +/* Try and collapse + push: (Array new: 1) + popIntoTemp: tempIndex + pushConstant: const or pushTemp: n + popIntoTemp: 0 inVectorAt: tempIndex + into + tempAt: tempIndex put: {const}. + One might think that we should look for a sequence of more than + one pushes and pops but this is extremely rare. */ + static sqInt +tryCollapseTempVectorInitializationOfSize(sqInt slots) +{ + BytecodeDescriptor *pushArrayDesc; + BytecodeDescriptor *pushValueDesc; + sqInt reg; + BytecodeDescriptor *storeArrayDesc; + BytecodeDescriptor *storeValueDesc; + + if (slots != 1) { + return 0; + } + pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); + assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); + storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); + if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { + return 0; + } + pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); + if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) + && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) + && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + return 0; + } + storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); + if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + return 0; + } + genNewArrayOfSizeinitialized(1, 0); + evaluateat(pushValueDesc, (bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))); + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, 0, ReceiverResultReg); + ssPushRegister(ReceiverResultReg); + evaluateat(storeArrayDesc, bytecodePC + ((pushArrayDesc->numBytes))); + + /* + pushArrayDesc numBytes this gets added by nextBytecodePCFor:at:exts:in: */ + + bytecodePC = ((bytecodePC + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + ((storeValueDesc->numBytes)); + return 1; +} + +static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc) { sqInt op; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -839,6 +839,7 @@ unsigned long positiveMachineIntegerValueOf(sqInt oop); static void possibleRootStoreIntovalue(sqInt oop, sqInt valueObj) NoDbgRegParms; static void postGCAction(sqInt gcModeArg) NoDbgRegParms; +static void preGCAction(sqInt gcModeArg) NoDbgRegParms; static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; sqInt primErrTable(void); usqInt primFailCodeAddress(void); @@ -1311,8 +1312,8 @@ _iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt remapBufferCount; -_iss sqInt traceLogIndex; _iss sqInt bytesPerPage; +_iss sqInt traceLogIndex; _iss usqInt reserveStart; _iss char * stackLimit; _iss sqInt rootTableCount; @@ -1338,18 +1339,18 @@ _iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt backwardJumpCount; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; -_iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; _iss usqLong statCheckForEvents; _iss sqInt statMarkCount; +_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; @@ -2059,7 +2060,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.741"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.746"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4852,7 +4853,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l309; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4870,7 +4870,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l309: /* end baseFrameReturn */; goto l306; } @@ -22847,52 +22847,15 @@ void fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt i; - sqInt i1; sqInt limit; sqInt sz; - sqInt traceType; if (GIV(fullGCLock) > 0) { warning("aborting fullGC because fullGCLock > 0"); return; } runLeakCheckerForFullGC(1); - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - - GIV(gcMode) = GCModeFull; - if (recordEventTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeFull); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -24193,11 +24156,8 @@ sqInt delta; sqInt growth; sqInt i; - sqInt i1; - sqInt i2; sqInt limit; sqInt survivorCount; - sqInt traceType; sqInt weDidGrow; if (GIV(rootTableOverflowed)) { @@ -24210,41 +24170,7 @@ return; } runLeakCheckerForFullGC(0); - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - - GIV(gcMode) = GCModeIncr; - if (recordEventTrace()) { - traceType = (GCModeIncr == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeIncr == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeIncr); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -30457,6 +30383,72 @@ } +/* Need to write back the frame pointers unless all pages are free (as in + snapshot) + */ +/* Need to write back the frame pointers unless all pages are free (as in + snapshot). Need to set gcMode var (to avoid passing the flag through a lot + of the updating code) */ + +static void +preGCAction(sqInt gcModeArg) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt i1; + sqInt traceType; + + if (GIV(stackPage) != 0) { + /* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); + assert(GIV(stackPage) == (mostRecentlyUsedPage())); + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)); + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); + (GIV(stackPage)->headFP = GIV(framePointer)); + (GIV(stackPage)->headSP = GIV(stackPointer)); + assert(pageListIsWellFormed()); + } + if ((gcModeArg == GCModeFull) + && (0)) { + /* begin flushMethodCache */ + for (i = 1; i <= MethodCacheSize; i += 1) { + GIV(methodCache)[i] = 0; + } + + /* this for primitiveExternalMethod */ + + GIV(lastMethodCacheProbeWrite) = 0; + /* begin flushAtCache */ + for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { + GIV(atCache)[i1] = 0; + } + unlinkAllSends(); + } + GIV(gcMode) = gcModeArg; + if (recordEventTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin recordTrace:thing:source: */ + GIV(traceLog)[GIV(traceLogIndex)] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + } + if (recordPrimTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } +} + + /* Ensure that there are enough forwarding blocks to accomodate this become, then prepare forwarding blocks for the pointer swap. Return true if successful. */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -842,6 +842,7 @@ unsigned long positiveMachineIntegerValueOf(sqInt oop); static void possibleRootStoreIntovalue(sqInt oop, sqInt valueObj) NoDbgRegParms; static void postGCAction(sqInt gcModeArg) NoDbgRegParms; +static void preGCAction(sqInt gcModeArg) NoDbgRegParms; static sqInt prepareForwardingTableForBecomingwithtwoWay(sqInt array1, sqInt array2, sqInt twoWayFlag) NoDbgRegParms; sqInt primErrTable(void); usqInt primFailCodeAddress(void); @@ -1314,8 +1315,8 @@ _iss sqInt trueObj; _iss sqInt falseObj; _iss sqInt remapBufferCount; -_iss sqInt traceLogIndex; _iss sqInt bytesPerPage; +_iss sqInt traceLogIndex; _iss usqInt reserveStart; _iss char * stackLimit; _iss sqInt rootTableCount; @@ -1341,18 +1342,18 @@ _iss sqInt growHeadroom; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt backwardJumpCount; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt cogCompiledCodeCompactionCalledFor; -_iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; _iss usqLong statCheckForEvents; _iss sqInt statMarkCount; +_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss sqInt lowSpaceThreshold; @@ -2062,7 +2063,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.741"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.746"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4861,7 +4862,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l309; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4879,7 +4879,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l309: /* end baseFrameReturn */; goto l306; } @@ -22856,52 +22856,15 @@ void fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt i; - sqInt i1; sqInt limit; sqInt sz; - sqInt traceType; if (GIV(fullGCLock) > 0) { warning("aborting fullGC because fullGCLock > 0"); return; } runLeakCheckerForFullGC(1); - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - - GIV(gcMode) = GCModeFull; - if (recordEventTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeFull); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -24202,11 +24165,8 @@ sqInt delta; sqInt growth; sqInt i; - sqInt i1; - sqInt i2; sqInt limit; sqInt survivorCount; - sqInt traceType; sqInt weDidGrow; if (GIV(rootTableOverflowed)) { @@ -24219,41 +24179,7 @@ return; } runLeakCheckerForFullGC(0); - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - - GIV(gcMode) = GCModeIncr; - if (recordEventTrace()) { - traceType = (GCModeIncr == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeIncr == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeIncr); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -30466,6 +30392,72 @@ } +/* Need to write back the frame pointers unless all pages are free (as in + snapshot) + */ +/* Need to write back the frame pointers unless all pages are free (as in + snapshot). Need to set gcMode var (to avoid passing the flag through a lot + of the updating code) */ + +static void +preGCAction(sqInt gcModeArg) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt i1; + sqInt traceType; + + if (GIV(stackPage) != 0) { + /* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); + assert(GIV(stackPage) == (mostRecentlyUsedPage())); + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)); + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); + (GIV(stackPage)->headFP = GIV(framePointer)); + (GIV(stackPage)->headSP = GIV(stackPointer)); + assert(pageListIsWellFormed()); + } + if ((gcModeArg == GCModeFull) + && (0)) { + /* begin flushMethodCache */ + for (i = 1; i <= MethodCacheSize; i += 1) { + GIV(methodCache)[i] = 0; + } + + /* this for primitiveExternalMethod */ + + GIV(lastMethodCacheProbeWrite) = 0; + /* begin flushAtCache */ + for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { + GIV(atCache)[i1] = 0; + } + unlinkAllSends(); + } + GIV(gcMode) = gcModeArg; + if (recordEventTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin recordTrace:thing:source: */ + GIV(traceLog)[GIV(traceLogIndex)] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + } + if (recordPrimTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } +} + + /* Ensure that there are enough forwarding blocks to accomodate this become, then prepare forwarding blocks for the pointer swap. Return true if successful. */ Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/interp.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -295,7 +295,7 @@ #define NSSendIsPCAnnotated 1 #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 -#define NumTrampolines 58 +#define NumTrampolines 60 #define OrCqR 93 #define OrCwR 100 #define OrRR 86 @@ -558,6 +558,7 @@ void enterCogCodePopReceiverAndClassRegs(void); void enterCogCodePopReceiverArg0Regs(void); void enterCogCodePopReceiverArg1Arg0Regs(void); +static void evaluateat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms; static sqInt extABytecode(void); static sqInt extBBytecode(void); static sqInt extendedPushBytecode(void); @@ -928,6 +929,7 @@ static sqInt literalBeforeFollowingAddress(AbstractInstruction * self_in_literalBeforeFollowingAddress, sqInt followingAddress) NoDbgRegParms; static sqInt liveRegisters(void); static sqInt loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize) NoDbgRegParms; +static void loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc) NoDbgRegParms; static sqInt log2BytesPerWord(void); static AbstractInstruction * longJumpTargetAddress(AbstractInstruction * self_in_longJumpTargetAddress) NoDbgRegParms; static AbstractInstruction * gMoveAwR(sqInt address, sqInt reg) NoDbgRegParms; @@ -1094,6 +1096,7 @@ static sqInt sib(AbstractInstruction * self_in_sib, sqInt scale, sqInt indexReg, sqInt baseReg) NoDbgRegParms; sqInt traceLinkedSendOffset(void); static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs) NoDbgRegParms; +static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc) NoDbgRegParms; static sqInt unimplementedPrimitive(void); static sqInt unknownBytecode(void); @@ -4109,18 +4112,7 @@ byte0 = (fetchByteofObject(bytecodePC, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); - if (((descriptor->numBytes)) > 1) { - byte1 = fetchByteofObject(bytecodePC + 1, methodObj); - if (((descriptor->numBytes)) > 2) { - byte2 = fetchByteofObject(bytecodePC + 2, methodObj); - if (((descriptor->numBytes)) > 3) { - byte3 = fetchByteofObject(bytecodePC + 3, methodObj); - if (((descriptor->numBytes)) > 4) { - notYetImplemented(); - } - } - } - } + loadSubsequentBytesForDescriptorat(descriptor, bytecodePC); nextOpcodeIndex = opcodeIndex; result = (deadCode ? ((((descriptor->isMapped)) @@ -10331,7 +10323,16 @@ realCEEnterCogCodePopReceiverArg1Arg0Regs(); } +static void +evaluateat(BytecodeDescriptor *descriptor, sqInt pc) +{ + byte0 = fetchByteofObject(pc, methodObj); + assert(descriptor == (generatorAt(bytecodeSetOffset + byte0))); + loadSubsequentBytesForDescriptorat(descriptor, pc); + ((descriptor->generator))(); +} + /* 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) */ static sqInt @@ -16673,6 +16674,11 @@ ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); } size = byte1 & 0x7F; + if (!popValues) { + if (tryCollapseTempVectorInitializationOfSize(size)) { + return 0; + } + } genNewArrayOfSizeinitialized(size, !popValues); if (popValues) { for (i = (size - 1); i >= 0; i += -1) { @@ -19408,6 +19414,23 @@ return 5; } +static void +loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc) +{ + if (((descriptor->numBytes)) > 1) { + byte1 = fetchByteofObject(pc + 1, methodObj); + if (((descriptor->numBytes)) > 2) { + byte2 = fetchByteofObject(pc + 2, methodObj); + if (((descriptor->numBytes)) > 3) { + byte3 = fetchByteofObject(pc + 3, methodObj); + if (((descriptor->numBytes)) > 4) { + notYetImplemented(); + } + } + } + } +} + static sqInt log2BytesPerWord(void) { @@ -22934,7 +22957,59 @@ return theString; } + +/* Try and collapse + push: (Array new: 1) + popIntoTemp: tempIndex + pushConstant: const or pushTemp: n + popIntoTemp: 0 inVectorAt: tempIndex + into + tempAt: tempIndex put: {const}. + One might think that we should look for a sequence of more than + one pushes and pops but this is extremely rare. */ + static sqInt +tryCollapseTempVectorInitializationOfSize(sqInt slots) +{ + BytecodeDescriptor *pushArrayDesc; + BytecodeDescriptor *pushValueDesc; + sqInt reg; + BytecodeDescriptor *storeArrayDesc; + BytecodeDescriptor *storeValueDesc; + + if (slots != 1) { + return 0; + } + pushArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC, methodObj))); + assert(((pushArrayDesc->generator)) == genPushNewArrayBytecode); + storeArrayDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(bytecodePC + ((pushArrayDesc->numBytes)), methodObj))); + if (((storeArrayDesc->generator)) != genStoreAndPopTemporaryVariableBytecode) { + return 0; + } + pushValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes)), methodObj))); + if ((((pushValueDesc->generator)) != genPushLiteralConstantBytecode) + && ((((pushValueDesc->generator)) != genPushQuickIntegerConstantBytecode) + && (((pushValueDesc->generator)) != genPushTemporaryVariableBytecode))) { + return 0; + } + storeValueDesc = generatorAt(bytecodeSetOffset + (fetchByteofObject(((bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes)), methodObj))); + if (((storeValueDesc->generator)) != genStoreAndPopRemoteTempLongBytecode) { + return 0; + } + genNewArrayOfSizeinitialized(1, 0); + evaluateat(pushValueDesc, (bytecodePC + ((pushArrayDesc->numBytes))) + ((storeArrayDesc->numBytes))); + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, 0, ReceiverResultReg); + ssPushRegister(ReceiverResultReg); + evaluateat(storeArrayDesc, bytecodePC + ((pushArrayDesc->numBytes))); + + /* + pushArrayDesc numBytes this gets added by nextBytecodePCFor:at:exts:in: */ + + bytecodePC = ((bytecodePC + ((storeArrayDesc->numBytes))) + ((pushValueDesc->numBytes))) + ((storeValueDesc->numBytes)); + return 1; +} + +static sqInt twoByteInstructionSizeAt(AbstractInstruction * self_in_twoByteInstructionSizeAt, sqInt pc) { sqInt op; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 + CCodeGenerator VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -967,6 +967,7 @@ static void postBecomeOrCompactScanClassTable(sqInt effectsFlags) NoDbgRegParms; static void postGCAction(sqInt gcModeArg) NoDbgRegParms; static void postSnapshot(void); +static void preGCAction(sqInt gcModeArg) NoDbgRegParms; static void prepareForSnapshot(void); sqInt primErrTable(void); usqInt primFailCodeAddress(void); @@ -1476,8 +1477,8 @@ _iss sqInt falseObj; _iss sqInt needGCFlag; _iss sqInt totalFreeOldSpace; -_iss sqInt traceLogIndex; _iss sqInt bytesPerPage; +_iss sqInt traceLogIndex; _iss sqInt numSegments; _iss usqInt pastSpaceStart; _iss char * stackLimit; @@ -1485,9 +1486,9 @@ _iss usqInt scavengeThreshold; _iss usqInt freeListsMask; _iss sqInt rememberedSetSize; -_iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; _iss sqInt firstFreeChunk; +_iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; _iss sqInt numStackPages; @@ -1522,9 +1523,9 @@ _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1534,7 +1535,6 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss usqLong statCheckForEvents; -_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; @@ -1543,6 +1543,7 @@ _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; +_iss sqInt gcMode; _iss sqInt pendingFinalizationSignals; _iss usqLong statIOProcessEvents; _iss sqInt firstSegmentSize; @@ -2237,7 +2238,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.741"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.746"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5530,7 +5531,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l290; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -5548,7 +5548,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l290: /* end baseFrameReturn */; goto l287; } @@ -29180,61 +29180,10 @@ usqLong fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt i; - sqInt i1; - sqInt traceType; - GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statMarkCount) = 0; - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - /* begin flushMethodCache */ - for (i = 1; i <= MethodCacheSize; i += 1) { - GIV(methodCache)[i] = 0; - } - - /* this for primitiveExternalMethod */ - - GIV(lastMethodCacheProbeWrite) = 0; - /* begin flushAtCache */ - for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { - GIV(atCache)[i1] = 0; - } - unlinkAllSends(); - - GIV(gcMode) = GCModeFull; - if (recordEventTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeFull == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeFull); /* begin globalGarbageCollect */ null; assert(validObjStacks()); @@ -38542,6 +38491,72 @@ } +/* Need to write back the frame pointers unless all pages are free (as in + snapshot) + */ +/* Need to write back the frame pointers unless all pages are free (as in + snapshot). Need to set gcMode var (to avoid passing the flag through a lot + of the updating code) */ + +static void +preGCAction(sqInt gcModeArg) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt i1; + sqInt traceType; + + if (GIV(stackPage) != 0) { + /* begin externalWriteBackHeadFramePointers */ + assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); + assert(GIV(stackPage) == (mostRecentlyUsedPage())); + /* begin setHeadFP:andSP:inPage: */ + assert(GIV(stackPointer) < GIV(framePointer)); + assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); + assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) + && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); + (GIV(stackPage)->headFP = GIV(framePointer)); + (GIV(stackPage)->headSP = GIV(stackPointer)); + assert(pageListIsWellFormed()); + } + if ((gcModeArg == GCModeFull) + && (1)) { + /* begin flushMethodCache */ + for (i = 1; i <= MethodCacheSize; i += 1) { + GIV(methodCache)[i] = 0; + } + + /* this for primitiveExternalMethod */ + + GIV(lastMethodCacheProbeWrite) = 0; + /* begin flushAtCache */ + for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { + GIV(atCache)[i1] = 0; + } + unlinkAllSends(); + } + GIV(gcMode) = gcModeArg; + if (recordEventTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin recordTrace:thing:source: */ + GIV(traceLog)[GIV(traceLogIndex)] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; + GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + } + if (recordPrimTrace()) { + traceType = (gcModeArg == GCModeFull + ? TraceFullGC + : TraceIncrementalGC); + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; + primTraceLogIndex(GIV(primTraceLogIndex) + 1); + } +} + + /* shorten all segments by any trailing free space. */ static void @@ -62105,11 +62120,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; sqInt i1; - sqInt i11; - sqInt i2; sqInt probe; usqLong statSGCDeltaUsecs = 0; - sqInt traceType; assert(GIV(remapBufferCount) == 0); if (!(asserta(((((eden()).limit)) - GIV(freeStart)) > (interpreterAllocationReserveBytes())))) { @@ -62147,44 +62159,10 @@ /* begin runLeakCheckerForFullGC: */ runLeakCheckerForFullGCexcludeUnmarkedNewSpaceObjsclassIndicesShouldBeValid(0, 0, 1); /* return self */ - /* begin preGCAction: */ - if (GIV(stackPage) != 0) { - /* begin externalWriteBackHeadFramePointers */ - assert((GIV(framePointer) - GIV(stackPointer)) < LargeContextSize); - assert(GIV(stackPage) == (mostRecentlyUsedPage())); - /* begin setHeadFP:andSP:inPage: */ - assert(GIV(stackPointer) < GIV(framePointer)); - assert((GIV(stackPointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(stackPointer) > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - assert((GIV(framePointer) < ((GIV(stackPage)->baseAddress))) - && (GIV(framePointer) > (((GIV(stackPage)->realStackLimit)) - (((sqInt) LargeContextSize >> 1))))); - (GIV(stackPage)->headFP = GIV(framePointer)); - (GIV(stackPage)->headSP = GIV(stackPointer)); - assert(pageListIsWellFormed()); - } - - GIV(gcMode) = GCModeScavenge; - if (recordEventTrace()) { - traceType = (GCModeScavenge == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 1] = traceType; - GIV(traceLog)[GIV(traceLogIndex) + 2] = 0; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - } - if (recordPrimTrace()) { - traceType = (GCModeScavenge == GCModeFull - ? TraceFullGC - : TraceIncrementalGC); - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = traceType; - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } + preGCAction(GCModeScavenge); /* begin flushMethodCacheFrom:to: */ probe = 0; - for (i2 = 1; i2 <= MethodCacheEntries; i2 += 1) { + for (i = 1; i <= MethodCacheEntries; i += 1) { if (!((GIV(methodCache)[probe + MethodCacheSelector]) == 0)) { if (((((((usqInt) (GIV(methodCache)[probe + MethodCacheSelector]))) >= (((usqInt) GIV(newSpaceStart)))) && ((((usqInt) (GIV(methodCache)[probe + MethodCacheSelector]))) < (((usqInt) GIV(newSpaceLimit))))) @@ -62198,8 +62176,8 @@ probe += MethodCacheEntrySize; } /* begin flushAtCache */ - for (i11 = 1; i11 <= AtCacheTotalSize; i11 += 1) { - GIV(atCache)[i11] = 0; + for (i1 = 1; i1 <= AtCacheTotalSize; i1 += 1) { + GIV(atCache)[i1] = 0; } GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-06-02 01:11:49 UTC (rev 2938) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-01 19:43:14 UTC (rev 2937) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-06-02 01:11:49 UTC (rev 2938) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 from - CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 + CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.741 uuid: f73b1214-56e1-4dde-a466-bad10d979d17 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.746 uuid: cc4961d3-e629-4e28-b308-88eab314a8c9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -970,6 +970,7 @@ static void postBecomeOrCompactScanClassTable(sqInt effectsFlags) NoDbgRegParms; static void postGCAction(sqInt gcModeArg) NoDbgRegParms; static void postSnapshot(void); +static void preGCAction(sqInt gcModeArg) NoDbgRegParms; static void prepareForSnapshot(void); sqInt primErrTable(void); usqInt primFailCodeAddress(void); @@ -1479,8 +1480,8 @@ _iss sqInt falseObj; _iss sqInt needGCFlag; _iss sqInt totalFreeOldSpace; -_iss sqInt traceLogIndex; _iss sqInt bytesPerPage; +_iss sqInt traceLogIndex; _iss sqInt numSegments; _iss usqInt pastSpaceStart; _iss char * stackLimit; @@ -1488,9 +1489,9 @@ _iss usqInt scavengeThreshold; _iss usqInt freeListsMask; _iss sqInt rememberedSetSize; -_iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; _iss sqInt firstFreeChunk; +_iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; _iss sqInt numStackPages; @@ -1525,9 +1526,9 @@ _iss sqInt profileMethod; _iss sqInt classTableIndex; _iss sqInt ephemeronQueue; -_iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; +_iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1537,7 +1538,6 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss usqLong statCheckForEvents; -_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; @@ -1546,6 +1546,7 @@ _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; +_iss sqInt gcMode; _iss sqInt pendingFinalizationSignals; _iss usqLong statIOProcessEvents; _iss sqInt firstSegmentSize; @@ -2240,7 +2241,7 @@ /* 574 */ (void (*)(void))0, @@ Diff output truncated at 50000 characters. @@

1 0

[commit][2937] CogVM source as per VMMaker.oscog-eem.745
by commits＠squeakvm.org 01 Jun '14

01 Jun '14

Revision: 2937 Author: eliot Date: 2014-06-01 12:43:14 -0700 (Sun, 01 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.745 In Spur refactor closure creation in the Cogit to not flush copied values to the stack, assigning them direct to the closure. Generates much more compact code. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -551,6 +551,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -7721,6 +7722,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 0; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -11543,12 +11555,15 @@ static sqInt genExtPushClosureBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 3, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((((sqInt) extA >> 4)) * 8)), byte2 + (extB << 8)); extA = (extB = 0); + if (numCopied > 0) { ssFlushTo(simStackPtr); } @@ -14837,11 +14852,14 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -544,6 +544,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -712,6 +713,7 @@ static sqInt genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) NoDbgRegParms; static sqInt genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms; static sqInt genNonLocalReturnTrampoline(void); +static sqInt genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms; static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; @@ -7654,6 +7656,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 1; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -11091,59 +11104,9 @@ static sqInt genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) { - sqInt address; - sqInt address1; - usqLong header; sqInt i; - sqInt quickConstant; - sqInt quickConstant1; - AbstractInstruction *skip; - sqInt slotSize; - - /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ - - genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); - slotSize = ClosureFirstCopiedValueIndex + numCopied; - header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); - /* begin MoveAw:R: */ - address = freeStartAddress(); - genoperandoperand(MoveAwR, address, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((usqInt) header), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, header >> 32, TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, TempReg); - /* begin AddCq:R: */ - quickConstant = smallObjectBytesForSlots(slotSize); - genoperandoperand(AddCqR, quickConstant, TempReg); - /* begin MoveR:Aw: */ - address1 = freeStartAddress(); - genoperandoperand(MoveRAw, TempReg, address1); - /* begin CmpCq:R: */ - quickConstant1 = getScavengeThreshold(); - genoperandoperand(CmpCqR, quickConstant1, TempReg); - /* begin JumpBelow: */ - skip = genoperand(JumpBelow, ((sqInt)0)); - CallRT(ceSheduleScavengeTrampoline); - jmpTarget(skip, gLabel()); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bcpc, numArgs, numCopied, ctxtNumArgs, isLargeCtxt, isInBlock); for (i = 1; i <= numCopied; i += 1) { /* begin PopR: */ genoperand(PopR, TempReg); @@ -11715,12 +11678,24 @@ static sqInt genExtPushClosureBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 3, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((((sqInt) extA >> 4)) * 8)), byte2 + (extB << 8)); extA = (extB = 0); + assert(getActiveContextAllocatesInMachineCode()); + (optStatus.isReceiverResultRegLive = 0); + ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + for (i = 1; i <= numCopied; i += 1) { + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); + } + return ssPushRegister(ReceiverResultReg); + if (numCopied > 0) { ssFlushTo(simStackPtr); } @@ -15431,7 +15406,70 @@ return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); } + +/* Create a closure with the given startpc, numArgs and numCopied + within a context with ctxtNumArgs, large if isLargeCtxt that is in a + block if isInBlock. Do /not/ initialize the copied values. */ + static sqInt +genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) +{ + sqInt address; + sqInt address1; + usqLong header; + sqInt quickConstant; + sqInt quickConstant1; + AbstractInstruction *skip; + sqInt slotSize; + + + /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ + + genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); + slotSize = ClosureFirstCopiedValueIndex + numCopied; + header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); + /* begin MoveAw:R: */ + address = freeStartAddress(); + genoperandoperand(MoveAwR, address, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((usqInt) header), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, header >> 32, TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg); + /* begin AddCq:R: */ + quickConstant = smallObjectBytesForSlots(slotSize); + genoperandoperand(AddCqR, quickConstant, TempReg); + /* begin MoveR:Aw: */ + address1 = freeStartAddress(); + genoperandoperand(MoveRAw, TempReg, address1); + /* begin CmpCq:R: */ + quickConstant1 = getScavengeThreshold(); + genoperandoperand(CmpCqR, quickConstant1, TempReg); + /* begin JumpBelow: */ + skip = genoperand(JumpBelow, ((sqInt)0)); + CallRT(ceSheduleScavengeTrampoline); + jmpTarget(skip, gLabel()); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + return 0; +} + +static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) { /* begin MoveCq:R: */ @@ -16420,11 +16458,23 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + assert(getActiveContextAllocatesInMachineCode()); + (optStatus.isReceiverResultRegLive = 0); + ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + for (i = 1; i <= numCopied; i += 1) { + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); + } + return ssPushRegister(ReceiverResultReg); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Jun 1 10:16:54 PDT 2014 + Sun Jun 1 12:42:46 PDT 2014 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/sistasrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -552,6 +552,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -7293,6 +7294,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 0; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -13832,11 +13844,14 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/sistasrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct { Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursistasrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -544,6 +544,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -681,6 +682,7 @@ static sqInt genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) NoDbgRegParms; static sqInt genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms; static sqInt genNonLocalReturnTrampoline(void); +static sqInt genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms; static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; @@ -7219,6 +7221,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 1; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -10604,59 +10617,9 @@ static sqInt genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) { - sqInt address; - sqInt address1; - usqLong header; sqInt i; - sqInt quickConstant; - sqInt quickConstant1; - AbstractInstruction *skip; - sqInt slotSize; - - /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ - - genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); - slotSize = ClosureFirstCopiedValueIndex + numCopied; - header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); - /* begin MoveAw:R: */ - address = freeStartAddress(); - genoperandoperand(MoveAwR, address, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((usqInt) header), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, header >> 32, TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, TempReg); - /* begin AddCq:R: */ - quickConstant = smallObjectBytesForSlots(slotSize); - genoperandoperand(AddCqR, quickConstant, TempReg); - /* begin MoveR:Aw: */ - address1 = freeStartAddress(); - genoperandoperand(MoveRAw, TempReg, address1); - /* begin CmpCq:R: */ - quickConstant1 = getScavengeThreshold(); - genoperandoperand(CmpCqR, quickConstant1, TempReg); - /* begin JumpBelow: */ - skip = genoperand(JumpBelow, ((sqInt)0)); - CallRT(ceSheduleScavengeTrampoline); - jmpTarget(skip, gLabel()); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bcpc, numArgs, numCopied, ctxtNumArgs, isLargeCtxt, isInBlock); for (i = 1; i <= numCopied; i += 1) { /* begin PopR: */ genoperand(PopR, TempReg); @@ -14019,7 +13982,70 @@ return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); } + +/* Create a closure with the given startpc, numArgs and numCopied + within a context with ctxtNumArgs, large if isLargeCtxt that is in a + block if isInBlock. Do /not/ initialize the copied values. */ + static sqInt +genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) +{ + sqInt address; + sqInt address1; + usqLong header; + sqInt quickConstant; + sqInt quickConstant1; + AbstractInstruction *skip; + sqInt slotSize; + + + /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ + + genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); + slotSize = ClosureFirstCopiedValueIndex + numCopied; + header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); + /* begin MoveAw:R: */ + address = freeStartAddress(); + genoperandoperand(MoveAwR, address, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((usqInt) header), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, header >> 32, TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg); + /* begin AddCq:R: */ + quickConstant = smallObjectBytesForSlots(slotSize); + genoperandoperand(AddCqR, quickConstant, TempReg); + /* begin MoveR:Aw: */ + address1 = freeStartAddress(); + genoperandoperand(MoveRAw, TempReg, address1); + /* begin CmpCq:R: */ + quickConstant1 = getScavengeThreshold(); + genoperandoperand(CmpCqR, quickConstant1, TempReg); + /* begin JumpBelow: */ + skip = genoperand(JumpBelow, ((sqInt)0)); + CallRT(ceSheduleScavengeTrampoline); + jmpTarget(skip, gLabel()); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + return 0; +} + +static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) { /* begin MoveCq:R: */ @@ -14990,11 +15016,23 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + assert(getActiveContextAllocatesInMachineCode()); + (optStatus.isReceiverResultRegLive = 0); + ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + for (i = 1; i <= numCopied; i += 1) { + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); + } + return ssPushRegister(ReceiverResultReg); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursistasrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/spursistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursistasrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct { Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursrc/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -540,6 +540,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -676,6 +677,7 @@ static sqInt genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName) NoDbgRegParms; static sqInt genNewArrayOfSizeinitialized(sqInt size, sqInt initialized) NoDbgRegParms; static sqInt genNonLocalReturnTrampoline(void); +static sqInt genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) NoDbgRegParms; static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPassRegasArgument(AbstractInstruction * self_in_genPassRegasArgument, sqInt abstractRegister, sqInt zeroRelativeArgIndex) NoDbgRegParms; static sqInt genPICAbortTrampolineFor(sqInt numArgs) NoDbgRegParms; @@ -7188,6 +7190,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 1; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -10560,59 +10573,9 @@ static sqInt genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) { - sqInt address; - sqInt address1; - usqLong header; sqInt i; - sqInt quickConstant; - sqInt quickConstant1; - AbstractInstruction *skip; - sqInt slotSize; - - /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ - - genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); - slotSize = ClosureFirstCopiedValueIndex + numCopied; - header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); - /* begin MoveAw:R: */ - address = freeStartAddress(); - genoperandoperand(MoveAwR, address, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((usqInt) header), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, header >> 32, TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, TempReg); - /* begin AddCq:R: */ - quickConstant = smallObjectBytesForSlots(slotSize); - genoperandoperand(AddCqR, quickConstant, TempReg); - /* begin MoveR:Aw: */ - address1 = freeStartAddress(); - genoperandoperand(MoveRAw, TempReg, address1); - /* begin CmpCq:R: */ - quickConstant1 = getScavengeThreshold(); - genoperandoperand(CmpCqR, quickConstant1, TempReg); - /* begin JumpBelow: */ - skip = genoperand(JumpBelow, ((sqInt)0)); - CallRT(ceSheduleScavengeTrampoline); - jmpTarget(skip, gLabel()); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); - /* begin MoveCq:R: */ - genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); - /* begin MoveR:Mw:r: */ - genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bcpc, numArgs, numCopied, ctxtNumArgs, isLargeCtxt, isInBlock); for (i = 1; i <= numCopied; i += 1) { /* begin PopR: */ genoperand(PopR, TempReg); @@ -13939,7 +13902,70 @@ return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); } + +/* Create a closure with the given startpc, numArgs and numCopied + within a context with ctxtNumArgs, large if isLargeCtxt that is in a + block if isInBlock. Do /not/ initialize the copied values. */ + static sqInt +genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock) +{ + sqInt address; + sqInt address1; + usqLong header; + sqInt quickConstant; + sqInt quickConstant1; + AbstractInstruction *skip; + sqInt slotSize; + + + /* First get thisContext into ReceiverResultRega and thence in ClassReg. */ + + genGetActiveContextNumArgslargeinBlock(ctxtNumArgs, isLargeCtxt, isInBlock); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, ClassReg); + slotSize = ClosureFirstCopiedValueIndex + numCopied; + header = headerForSlotsformatclassIndex(slotSize, indexablePointersFormat(), ClassBlockClosureCompactIndex); + /* begin MoveAw:R: */ + address = freeStartAddress(); + genoperandoperand(MoveAwR, address, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((usqInt) header), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 0, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, header >> 32, TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, 4, ReceiverResultReg); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ReceiverResultReg, TempReg); + /* begin AddCq:R: */ + quickConstant = smallObjectBytesForSlots(slotSize); + genoperandoperand(AddCqR, quickConstant, TempReg); + /* begin MoveR:Aw: */ + address1 = freeStartAddress(); + genoperandoperand(MoveRAw, TempReg, address1); + /* begin CmpCq:R: */ + quickConstant1 = getScavengeThreshold(); + genoperandoperand(CmpCqR, quickConstant1, TempReg); + /* begin JumpBelow: */ + skip = genoperand(JumpBelow, ((sqInt)0)); + CallRT(ceSheduleScavengeTrampoline); + jmpTarget(skip, gLabel()); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, ClassReg, (ClosureOuterContextIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((bcpc << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureStartPCIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + /* begin MoveCq:R: */ + genoperandoperand(MoveCqR, ((numArgs << 1) | 1), TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (ClosureNumArgsIndex * BytesPerOop) + BaseHeaderSize, ReceiverResultReg); + return 0; +} + +static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex) { /* begin MoveCq:R: */ @@ -14910,11 +14936,23 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + assert(getActiveContextAllocatesInMachineCode()); + (optStatus.isReceiverResultRegLive = 0); + ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + for (i = 1; i <= numCopied; i += 1) { + reg = ssStorePoptoPreferredReg(1, TempReg); + genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); + } + return ssPushRegister(ReceiverResultReg); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursrc/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct { Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/src/vm/cogit.c 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 from - StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -547,6 +547,7 @@ static sqInt cPICMissTrampolineFor(sqInt numArgs) NoDbgRegParms; static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; +static sqInt createsClosuresInline(void); static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static sqInt doubleExtendedDoAnythingBytecode(void); @@ -7255,6 +7256,17 @@ } +/* Answer if the object representation allocates closures inline. By + default answer false. Better code can be generated when creating + closures inline if copied values are /not/ flushed to the stack. */ + +static sqInt +createsClosuresInline(void) +{ + return 0; +} + + /* Division is a little weird on some processors. Defer to the backEnd to allow it to generate any special code it may need to. */ @@ -13745,11 +13757,14 @@ static sqInt genPushClosureCopyCopiedValuesBytecode(void) { + sqInt i; sqInt numArgs; sqInt numCopied; + sqInt reg; assert(needsFrame); addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + if (numCopied > 0) { ssFlushTo(simStackPtr); } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/src/vm/cogit.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2014-06-01 17:18:37 UTC (rev 2936) +++ branches/Cog/src/vm/cogmethod.h 2014-06-01 19:43:14 UTC (rev 2937) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.743 uuid: 92a02694-b094-4525-b2e2-c166faf67785 + CCodeGenerator VMMaker.oscog-eem.745 uuid: 9ae88e74-1041-4ad2-be42-c2277e958b92 */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.745.mcz
by commits＠source.squeak.org 01 Jun '14

01 Jun '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.745.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.745 Author: eem Time: 1 June 2014, 11:33:15.168 am UUID: 9ae88e74-1041-4ad2-be42-c2277e958b92 Ancestors: VMMaker.oscog-eem.744 and don't forget genExtPushClosureBytecode =============== Diff against VMMaker.oscog-eem.744 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genExtPushClosureBytecode (in category 'bytecode generators') ----- genExtPushClosureBytecode "Block compilation. At this point in the method create the block. Note its start and defer generating code for it until after the method and any other preceeding blocks. The block's actual code will be compiled later." "253 11111101 eei i i kkk jjjjjjjj Push Closure Num Copied iii (+ Ext A // 16 * 8) Num Args kkk (+ Ext A \\ 16 * 8) BlockSize jjjjjjjj (+ Ext B * 256). ee = num extensions" | numArgs numCopied | self assert: needsFrame. self addBlockStartAt: bytecodePC + 3 "0 relative" numArgs: (numArgs := (byte1 bitAnd: 16r7) + (extA \\ 16 * 8)) numCopied: (numCopied := ((byte1 >> 3) bitAnd: 7) + (extA // 16 * 8)) span: byte2 + (extB << 8). extA := extB := 0. + + objectRepresentation createsClosuresInline ifTrue: + [self assert: objectRepresentation getActiveContextAllocatesInMachineCode. + optStatus isReceiverResultRegLive: false. + self ssAllocateCallReg: ReceiverResultReg + and: SendNumArgsReg + and: ClassReg. + objectRepresentation + genNoPopCreateClosureAt: bytecodePC + 4 "1 relative" + numArgs: numArgs + numCopied: numCopied + contextNumArgs: methodOrBlockNumArgs + large: (coInterpreter methodNeedsLargeContext: methodObj) + inBlock: inBlock. + 1 to: numCopied do: + [:i| | reg | + reg := self ssStorePop: true toPreferredReg: TempReg. + objectRepresentation + genStoreSourceReg: reg + slotIndex: ClosureFirstCopiedValueIndex + numCopied - i + intoNewObjectInDestReg: ReceiverResultReg]. + ^self ssPushRegister: ReceiverResultReg]. + numCopied > 0 ifTrue: [self ssFlushTo: simStackPtr]. optStatus isReceiverResultRegLive: false. objectRepresentation getActiveContextAllocatesInMachineCode ifTrue: [self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg and: ClassReg] ifFalse: [self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg]. objectRepresentation genCreateClosureAt: bytecodePC + 4 "1 relative" numArgs: numArgs numCopied: numCopied contextNumArgs: methodOrBlockNumArgs large: (coInterpreter methodNeedsLargeContext: methodObj) inBlock: inBlock. numCopied > 0 ifTrue: [self ssPop: numCopied]. ^self ssPushRegister: ReceiverResultReg!

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