Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

Quick update ons SqueakSSL plugin debugging
by gettimothy 08 Apr '14

08 Apr '14

Hi all, quick update no need to respond. <rant>Preface, man, I DO NOT MISS the edit/compile/debug dev loop at all. Give me a vm and a debugger baby....</rant> I *think* its related to two issues. 1. An include issue in the plugin. 2. Library path issue when loading attempting to load the plugin(s) I was unable to build the plugin for StackVMInterpreter due to includes going kablooie for /usr/include/openssl/ssl.h and err.h. So, I downloaded the Cog source tree from Jenkins and decided to poke around with that to see what the problem was. That eliminated the build include error--my guess is a misconfigure .mvm file,but I don't want to deal with that now. Cog from Jenkins builds--including the SqueakSSL plugin. When I run Squeak6 image with the new vm and run the tests, I get this error: ioLoadModule(/home/wm/usr/local/cogVM32/lib/squeak/4.0-2862/SqueakSSL): /home/wm/usr/local/cogVM32/lib/squeak/4.0-2862/SqueakSSL: undefined symbol: X509_NAME_get_text_by_NID That X509 is in x509.h . It is also #included in "openssl/ssl.h" so there "could be" some of that include magic going on.... However... 2 is more interesting at the moment because it looks like the LD_LIBRARY_PATH or something is hosed. Check out the bottom tryLoadModule below... /home/wm/usr/src/smalltalk/Squeak-vm-unix-4.7.0-Cog-2889-unofficial-src/platforms/unix/vm/sqUnixExternalPrims.c 237 tryLoadModule(,SqueakSSL) dude /home/wm/usr/src/smalltalk/Squeak-vm-unix-4.7.0-Cog-2889-unofficial-src/platforms/unix/vm/sqUnixExternalPrims.c 237 tryLoadModule(/usr/lib/,SqueakSSL) dude /home/wm/usr/src/smalltalk/Squeak-vm-unix-4.7.0-Cog-2889-unofficial-src/platforms/unix/vm/sqUnixExternalPrims.c 237 tryLoadModule(/home/wm/usr/local/cogVM32/lib/squeak/4.0-2862/SqueakSSL/.libs/,SqueakSSL) <---WHATS THAT .libs? FWIW, I install to /home/wm/usr/local/cogVM32...tomorrow, I will try a standard install path and see what happens. Anyway, that's the update. I will poke at it some more tomorrow. cordially, tty.

1 1

VM Maker: VMMaker.oscog-eem.668.mcz
by commits＠source.squeak.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.668.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.668 Author: eem Time: 7 April 2014, 4:14:40.585 pm UUID: 1d7c6ec0-1a6e-4a0b-8f6b-b0b937282745 Ancestors: VMMaker.oscog-eem.667 Fix some speeling erreurs in the SistaStackToRegisterMappingCogit comment. Fix the annotating of the instruction following the mustBeBoolean trampoline call in Sista's genJumpIf:to:. =============== Diff against VMMaker.oscog-eem.667 =============== Item was changed: StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue counterMethodCache prevMapAbsPCMcpc' classVariableNames: 'CounterBytes MaxCounterValue' poolDictionaries: 'VMSqueakClassIndices' category: 'VMMaker-JIT'! + !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/7/2014 12:23' prior: 0! - !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/4/2014 12:39' prior: 0! A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. + The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on the stack and performance data. Execution then resumes in the optimized code. - The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on teh stack and performance data. Execution then resumes in the optimized code. + SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path through code, they are a better choice to count than, for example, method or block entry. - SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path throguh code, they are a better choice to count than, for example, method or block entry. SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array. Instance Variables counterIndex: <Integer> counterMethodCache: <CogMethod> counters: <Array of AbstractInstruction> initialCounterValue: <Integer> numCounters: <Integer> picData: <Integer Oop> picDataIndex: <Integer> prevMapAbsPCMcpc: <Integer> counterIndex - xxxxx counterMethodCache - xxxxx counters - xxxxx initialCounterValue - xxxxx numCounters - xxxxx picData - xxxxx picDataIndex - xxxxx prevMapAbsPCMcpc - xxxxx ! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | desc ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. retry := counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will + return directly to machine code, returning the boolean. So the code should jump back to the retry point. + This is always the point at which the boolean is tested. The register to be tested must be reloaded with + the return value of the trampoline, if it differs from cResultRegister. + + In images with the Sista code loaded, return must be via backing up the PC to after the send, and returning + (this time answering the boolean via ReceiverResultReg). For this case, and for normal mustBeBoolean + processing, the instruction after the mustBeBoolean trampoline must be annotated as having a bytecode pc." + backEnd cResultRegister ~= TempReg + ifTrue: + [self annotateBytecode: (self MoveR: backEnd cResultRegister R: TempReg). + self Jump: retry] + ifFalse: + [self annotateBytecode: (self Jump: retry)]. + ok jmpTarget: self Label. - "Now we have to jump back to the retry point. This is always the point at which the boolean is tested. - The register to be tested must be reloaded with the return value of the trampoline; this is for the case - where the trampoline returns immediately without sending back.." - backEnd cResultRegister ~= TempReg ifTrue: - [self MoveR: backEnd cResultRegister R: TempReg]. - self Jump: retry. - ok jmpTarget: (self annotateBytecode: self Label). ^0!

1 0

Re: Pharo VM bug 11130
by Stephan Eggermont 06 Apr '14

06 Apr '14

Nicolas wrote: >Hmm, don't waste too much time. >All these methods are unchanged in github pharo-vm head revision (VMMaker-oscog-StefanMarr.313) >The cause must be completely different in latest pharo vms. Uhm, why? They haven’t changed. Pharo vms 105 and later no longer crash, but all reliably show the bug. And 236 is the last Squeak one to show the problem. I might take a look at Esteban’s versions from the same time, 228 and 229 Stephan

2 3

VM Maker: VMMaker.oscog-eem.667.mcz
by commits＠source.squeak.org 05 Apr '14

05 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.667.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.667 Author: eem Time: 5 April 2014, 12:57:23.437 pm UUID: 1a6d90d7-74e1-4519-9da1-d39c12321b2e Ancestors: VMMaker.oscog-eem.666 Add Spur support for Sista (shorten:toIndexableSize: et al). Implement instantiation in picDataFor:into: in terms of eeInstantiateClassIndex:format:numSlots:. Slang: Allow methods that are functional apart from an initial flag: send to be inlined. This allows e.g. rawSlotsOf: et al to be inlined in Spur. Add a Spur Sista configuration. =============== Diff against VMMaker.oscog-eem.666 =============== Item was added: + ----- Method: CogObjectRepresentationForSpur>>classForInlineCacheTag: (in category 'in-line cacheing') ----- + classForInlineCacheTag: classIndex + ^objectMemory classOrNilAtIndex: classIndex! Item was changed: ----- Method: NewObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots + "Reduce the number of indexable fields in obj, a pointer object, to nSlots. Convert the - "Reduce the number if indexable fields in obj, a pointer object, to nSlots. Convert the unused residual to a free chunk. Word and byte indexable objects are not changed. Answer the number of bytes returned to free memory, which may be zero if no change was possible." | deltaBytes desiredLength fixedFields fmt hdr totalLength indexableFields | (self isPointersNonImm: obj) ifFalse: [^0]. nSlots > 0 ifFalse: [^0]. "no change if nSlots is zero, error if nSlots is negative" hdr := self baseHeader: obj. fmt := self formatOfHeader: hdr. totalLength := self lengthOf: obj baseHeader: hdr format: fmt. fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. indexableFields := totalLength - fixedFields. nSlots >= indexableFields ifTrue: [^0]. "no change, or error if attempting to increase size into next chunk" desiredLength := fixedFields + nSlots. deltaBytes := (totalLength - desiredLength) * BytesPerWord. obj + BaseHeaderSize + (totalLength * BytesPerWord) = freeStart ifTrue: "Shortening the last object. Need to reduce freeStart." [self maybeFillWithAllocationCheckFillerFrom: obj + BaseHeaderSize + (desiredLength * BytesPerWord) to: freeStart. freeStart := obj + BaseHeaderSize + (desiredLength * BytesPerWord)] ifFalse: "Shortening some interior object. Need to create a free block." [self setSizeOfFree: obj + BaseHeaderSize + (desiredLength * BytesPerWord) to: deltaBytes]. (self headerType: obj) caseOf: { [HeaderTypeSizeAndClass] -> [self longAt: (obj - (BaseHeaderSize * 2)) put: (self sizeHeader: obj) - deltaBytes]. [HeaderTypeClass] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)]. [HeaderTypeShort] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)] }. ^deltaBytes! Item was changed: ----- Method: ObjectMemory>>shorten:toIndexableSize: (in category 'allocation') ----- shorten: obj toIndexableSize: nSlots + "Reduce the number of indexable fields in obj, a pointer object, to nSlots. Convert the - "Reduce the number if indexable fields in obj, a pointer object, to nSlots. Convert the unused residual to a free chunk. Word and byte indexable objects are not changed. Answer the number of bytes returned to free memory, which may be zero if no change was possible." | deltaBytes desiredLength fixedFields fmt hdr totalLength indexableFields | (self isPointersNonImm: obj) ifFalse: [^0]. nSlots > 0 ifFalse: [^0]. "no change if nSlots is zero, error if nSlots is negative" hdr := self baseHeader: obj. fmt := self formatOfHeader: hdr. totalLength := self lengthOf: obj baseHeader: hdr format: fmt. fixedFields := self fixedFieldsOf: obj format: fmt length: totalLength. indexableFields := totalLength - fixedFields. nSlots >= indexableFields ifTrue: [^0]. "no change, or error if attempting to increase size into next chunk" desiredLength := fixedFields + nSlots. deltaBytes := (totalLength - desiredLength) * BytesPerWord. self setSizeOfFree: obj + BaseHeaderSize + (desiredLength * BytesPerWord) to: deltaBytes. (self headerType: obj) caseOf: { [HeaderTypeSizeAndClass] -> [self longAt: (obj - (BaseHeaderSize * 2)) put: (self sizeHeader: obj) - deltaBytes]. [HeaderTypeClass] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)]. [HeaderTypeShort] -> [self longAt: obj put: ((hdr bitClear: SizeMask) bitOr: (hdr bitAnd: SizeMask) - deltaBytes)] }. ^deltaBytes! Item was changed: StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue counterMethodCache prevMapAbsPCMcpc' classVariableNames: 'CounterBytes MaxCounterValue' + poolDictionaries: 'VMSqueakClassIndices' - poolDictionaries: '' category: 'VMMaker-JIT'! !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/4/2014 12:39' prior: 0! A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on teh stack and performance data. Execution then resumes in the optimized code. SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path throguh code, they are a better choice to count than, for example, method or block entry. SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array. Instance Variables counterIndex: <Integer> counterMethodCache: <CogMethod> counters: <Array of AbstractInstruction> initialCounterValue: <Integer> numCounters: <Integer> picData: <Integer Oop> picDataIndex: <Integer> prevMapAbsPCMcpc: <Integer> counterIndex - xxxxx counterMethodCache - xxxxx counters - xxxxx initialCounterValue - xxxxx numCounters - xxxxx picData - xxxxx picDataIndex - xxxxx prevMapAbsPCMcpc - xxxxx ! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:Mcpc:Bcpc:Method: (in category 'method introspection') ----- picDataFor: descriptor Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg <var: #descriptor type: #'BytecodeDescriptor *'> <var: #mcpc type: #'char *'> <var: #cogMethodArg type: #'void *'> | entryPoint tuple | descriptor isNil ifTrue: [^0]. + descriptor isBranch ifTrue: + ["it's a branch; conditional?" + (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: + [tuple := self picDataForConditionalBranch: prevMapAbsPCMcpc at: bcpc. + tuple = 0 ifTrue: [^PrimErrNoMemory]. + objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. + picDataIndex := picDataIndex + 1]. - descriptor isBranch ifFalse: "infer it's a send" - [self assert: (backEnd isCallPreceedingReturnPC: mcpc asUnsignedInteger). - entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. - entryPoint <= methodZoneBase ifTrue: "send is not linked" - [^0]. - self targetMethodAndSendTableFor: entryPoint into: "It's a linked send; find which kind." - [:targetMethod :sendTable| - tuple := self picDataForSendTo: targetMethod at: mcpc bcpc: bcpc + 1 - descriptor numBytes]. - tuple = 0 ifTrue: [^PrimErrNoMemory]. - objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. - picDataIndex := picDataIndex + 1. ^0]. + "infer it's a send" + self assert: (backEnd isCallPreceedingReturnPC: mcpc asUnsignedInteger). + entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. + entryPoint <= methodZoneBase ifTrue: "send is not linked" + [^0]. + self targetMethodAndSendTableFor: entryPoint into: "It's a linked send; find which kind." + [:targetMethod :sendTable| + tuple := self picDataForSendTo: targetMethod + methodClassIfSuper: (sendTable = superSendTrampolines ifTrue: + [coInterpreter methodClassOf: + (self cCoerceSimple: cogMethodArg to: #'CogMethod *') methodObject]) + at: mcpc + bcpc: bcpc + 1 - descriptor numBytes]. + tuple = 0 ifTrue: [^PrimErrNoMemory]. + objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. + picDataIndex := picDataIndex + 1. - "it's a branch; conditional?" - (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: - [tuple := self picDataForConditionalBranch: prevMapAbsPCMcpc at: bcpc. - tuple = 0 ifTrue: [^PrimErrNoMemory]. - objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. - picDataIndex := picDataIndex + 1. - ^0]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataForConditionalBranch:at: (in category 'method introspection') ----- picDataForConditionalBranch: counterReferenceMcpc at: bcpc | address counter executedCount tuple untakenCount | <var: #counter type: #'unsigned long'> tuple := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: 3. - instantiateClass: (objectMemory splObj: ClassArray) - indexableSize: 3. tuple = 0 ifTrue: [^0]. self assert: CounterBytes = 4. address := backEnd counterTargetFromFollowingAddress: counterReferenceMcpc. counter := objectMemory longAt: address. executedCount := initialCounterValue - (counter >> 16). untakenCount := initialCounterValue - (counter bitAnd: 16rFFFF). objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: bcpc); storePointerUnchecked: 1 ofObject: tuple withValue: (objectMemory integerObjectOf: executedCount); storePointerUnchecked: 2 ofObject: tuple withValue: (objectMemory integerObjectOf: untakenCount). ^tuple! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>picDataForSendTo:at:bcpc: (in category 'method introspection') ----- - picDataForSendTo: cogMethod at: sendMcpc bcpc: sendBcpc - "Answer a tuple with the send data for a linked send to cogMethod. - If the target is a CogMethod (monomorphic send) answer - { bytecode pc, inline cache class, target method } - If the target is an open PIC (megamorphic send) answer - { bytecode pc, nil, send selector } - If the target is a closed PIC (polymorphic send) answer - { bytecode pc, first class, target method, second class, second target method, ... }" - <var: #cogMethod type: #'CogMethod *'> - <var: #sendMcpc type: #'char *'> - | tuple | - cogMethod cmType = CMMethod ifTrue: - [tuple := objectMemory - eeInstantiateClass: (objectMemory splObj: ClassArray) - indexableSize: 3. - tuple = 0 ifTrue: - [^0]. - objectMemory - storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc); - storePointer: 1 - ofObject: tuple - withValue: (objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger)); - storePointer: 2 ofObject: tuple withValue: cogMethod methodObject. - ^tuple]. - cogMethod cmType = CMClosedPIC ifTrue: - [tuple := objectMemory - eeInstantiateClass: (objectMemory splObj: ClassArray) - indexableSize: 2 * cogMethod cPICNumCases + 1. - tuple = 0 ifTrue: - [^0]. - objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc). - self populate: tuple withPICInfoFor: cogMethod firstCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger). - ^tuple]. - cogMethod cmType = CMOpenPIC ifTrue: - [tuple := objectMemory - eeInstantiateClass: (objectMemory splObj: ClassArray) - indexableSize: 3. - tuple = 0 ifTrue: - [^0]. - objectMemory - storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc); - storePointerUnchecked: 1 ofObject: tuple withValue: objectMemory nilObject; - storePointer: 2 ofObject: tuple withValue: cogMethod selector. - ^tuple]. - self error: 'invalid method type'. - ^0 "to get Slang to type this method as answering sqInt"! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>picDataForSendTo:methodClassIfSuper:at:bcpc: (in category 'method introspection') ----- + picDataForSendTo: cogMethod methodClassIfSuper: methodClassOrNil at: sendMcpc bcpc: sendBcpc + "Answer a tuple with the send data for a linked send to cogMethod. + If the target is a CogMethod (monomorphic send) answer + { bytecode pc, inline cache class, target method } + If the target is an open PIC (megamorphic send) answer + { bytecode pc, nil, send selector } + If the target is a closed PIC (polymorphic send) answer + { bytecode pc, first class, target method, second class, second target method, ... }" + <var: #cogMethod type: #'CogMethod *'> + <var: #sendMcpc type: #'char *'> + | tuple | + tuple := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: (cogMethod cmType = CMClosedPIC + ifTrue: [2 * cogMethod cPICNumCases + 1] + ifFalse: [3]). + tuple = 0 ifTrue: + [^0]. + objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc). + cogMethod cmType = CMMethod ifTrue: + [objectMemory + storePointer: 1 + ofObject: tuple + withValue: (methodClassOrNil ifNil: + [objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger)]); + storePointer: 2 ofObject: tuple withValue: cogMethod methodObject. + ^tuple]. + cogMethod cmType = CMClosedPIC ifTrue: + [self populate: tuple withPICInfoFor: cogMethod firstCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger). + ^tuple]. + cogMethod cmType = CMOpenPIC ifTrue: + [objectMemory + storePointerUnchecked: 1 ofObject: tuple withValue: objectMemory nilObject; + storePointer: 2 ofObject: tuple withValue: cogMethod selector. + ^tuple]. + self error: 'invalid method type'. + ^0 "to get Slang to type this method as answering sqInt"! Item was added: + ----- Method: Spur32BitMemoryManager>>oldRawNumSlotsOf: (in category 'object access') ----- + oldRawNumSlotsOf: objOop + <returnTypeC: #usqInt> + <inline: true> + self flag: #endianness. + ^(self longAt: objOop + 4) asUnsignedInteger >> self numSlotsHalfShift! Item was removed: - ----- Method: Spur32BitMemoryManager>>rawNumSlotsOf: (in category 'object access') ----- - rawNumSlotsOf: objOop - <returnTypeC: #usqInt> - <inline: true> - self flag: #endianness. - ^(self longAt: objOop + 4) asUnsignedInteger >> self numSlotsHalfShift! Item was added: + ----- Method: Spur32BitMemoryManager>>rawOverflowSlotsOf:put: (in category 'object access') ----- + rawOverflowSlotsOf: objOop put: numSlots + <returnTypeC: #usqInt> + <inline: true> + self flag: #endianness. + ^self longAt: objOop - self baseHeaderSize put: numSlots! Item was added: + ----- Method: Spur64BitMemoryManager>>oldRawNumSlotsOf: (in category 'object access') ----- + oldRawNumSlotsOf: objOop + <returnTypeC: #usqInt> + <inline: true> + ^(self longAt: objOop) asUnsignedLong >> self numSlotsFullShift! Item was removed: - ----- Method: Spur64BitMemoryManager>>rawNumSlotsOf: (in category 'object access') ----- - rawNumSlotsOf: objOop - <returnTypeC: #usqInt> - <inline: true> - ^(self longAt: objOop) asUnsignedLong >> self numSlotsFullShift! Item was added: + ----- Method: Spur64BitMemoryManager>>rawOverflowSlotsOf:put: (in category 'object access') ----- + rawOverflowSlotsOf: objOop put: numSlots + <returnTypeC: #usqLong> + <inline: true> + self flag: #endianness. + self longAt: objOop - self baseHeaderSize + put: (self byteAt: objOop - 1) << 56 + numSlots. + ^numSlots! Item was changed: ----- Method: SpurMemoryManager>>eeInstantiateClassIndex:format:numSlots: (in category 'instantiation') ----- eeInstantiateClassIndex: knownClassIndex format: objFormat numSlots: numSlots "Instantiate an instance of a compact class. ee stands for execution engine and implies that this allocation will *NOT* cause a GC. N.B. the instantiated object IS NOT FILLED and must be completed before returning it to Smalltalk. Since this call is used in routines that do just that we are safe. Break this rule and die in GC. Result is guaranteed to be young." + <api> <inline: true> self assert: (numSlots >= 0 and: [knownClassIndex ~= 0]). self assert: (objFormat < self firstByteFormat ifTrue: [objFormat] ifFalse: [objFormat bitAnd: self byteFormatMask]) = (self instSpecOfClass: (self knownClassAtIndex: knownClassIndex)). ^self allocateNewSpaceSlots: numSlots format: objFormat classIndex: knownClassIndex! Item was added: + ----- Method: SpurMemoryManager>>minSlotsForShortening (in category 'allocation') ----- + minSlotsForShortening + "Answer the minimum number of additional slots to allocate in an object to always be able to shorten it. + This is enough slots to allocate a minimum-sized object." + ^self allocationUnit * 2 / self bytesPerSlot! Item was added: + ----- Method: SpurMemoryManager>>oldRawNumSlotsOf: (in category 'object access') ----- + oldRawNumSlotsOf: objOop + <returnTypeC: #usqInt> + ^self subclassResponsibility! Item was changed: ----- Method: SpurMemoryManager>>rawNumSlotsOf: (in category 'object access') ----- rawNumSlotsOf: objOop <returnTypeC: #usqInt> + <inline: true> + self flag: #endian. + ^self byteAt: objOop + 7! - ^self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>rawNumSlotsOf:put: (in category 'object access') ----- + rawNumSlotsOf: objOop put: aByte + <returnTypeC: #usqInt> + <inline: true> + self flag: #endian. + ^self byteAt: objOop + 7 put: aByte! Item was added: + ----- Method: SpurMemoryManager>>rawOverflowSlotsOf:put: (in category 'object access') ----- + rawOverflowSlotsOf: objOop put: numSlots + <returnTypeC: #usqInt> + self subclassResponsibility! Item was added: + ----- Method: SpurMemoryManager>>shorten:toIndexableSize: (in category 'allocation') ----- + shorten: objOop toIndexableSize: indexableSize + "Reduce the number of indexable fields in objOop, a pointer object, to nSlots. Convert the + unused residual to a free chunk. Word and byte indexable objects are not changed. + Answer the number of bytes returned to free memory, which may be zero if no change + was possible." + <inline: false> + | numSlots bytesBefore bytesAfter | + (self formatOf: objOop) caseOf: + { [self arrayFormat] -> [numSlots := indexableSize] }. + bytesBefore := self bytesInObject: objOop. + (self hasOverflowHeader: objOop) + ifTrue: [self rawOverflowSlotsOf: objOop put: numSlots] + ifFalse: + [self assert: numSlots < self numSlotsMask. + self rawNumSlotsOf: objOop put: numSlots]. + bytesAfter := self bytesInObject: objOop. + self freeChunkWithBytes: bytesAfter - bytesBefore at: (self addressAfter: objOop). + ^bytesAfter - bytesBefore! Item was changed: ----- Method: StackInterpreter>>methodClassOf: (in category 'compiled methods') ----- methodClassOf: methodPointer + <api> - ^self cppIf: NewspeakVM ifTrue: [| literal | literal := self literal: (self literalCountOf: methodPointer) - 1 ofMethod: methodPointer. self assert: (objectMemory isForwarded: literal) not. literal = objectMemory nilObject ifTrue: [literal] ifFalse: [objectMemory fetchPointer: ValueIndex ofObject: literal]] ifFalse: [| literal | literal := self literal: (self literalCountOf: methodPointer) - 1 ofMethod: methodPointer. self assert: (objectMemory isForwarded: literal) not. objectMemory fetchPointer: ValueIndex ofObject: literal]! Item was changed: ----- Method: TMethod>>inlineFunctionCall:in: (in category 'inlining') ----- inlineFunctionCall: aSendNode in: aCodeGen "Answer the body of the called function, substituting the actual parameters for the formal argument variables in the method body. Assume caller has established that: 1. the method arguments are all substitutable nodes, and 2. the method to be inlined contains no additional embedded returns." | sel meth doNotRename argsForInlining substitutionDict | sel := aSendNode selector. meth := (aCodeGen methodNamed: sel) copy. doNotRename := Set withAll: args. argsForInlining := aSendNode argumentsForInliningCodeGenerator: aCodeGen. meth args with: argsForInlining do: [ :argName :exprNode | exprNode isLeaf ifTrue: [doNotRename add: argName]]. + (meth statements size = 2 + and: [meth statements first isSend + and: [meth statements first selector == #flag:]]) ifTrue: + [meth statements removeFirst]. meth renameVarsForInliningInto: self except: doNotRename in: aCodeGen. meth renameLabelsForInliningInto: self. self addVarsDeclarationsAndLabelsOf: meth except: doNotRename. substitutionDict := Dictionary new: meth args size * 2. meth args with: argsForInlining do: [ :argName :exprNode | substitutionDict at: argName put: exprNode. (doNotRename includes: argName) ifFalse: [locals remove: argName]]. meth parseTree bindVariablesIn: substitutionDict. ^meth statements first expression! Item was changed: ----- Method: TMethod>>isFunctional (in category 'inlining') ----- isFunctional "Answer true if the receiver is a functional method. That is, if it consists of a single return statement of an expression that contains no other returns. Answer false for methods with return types other than the simple integer types to work around bugs in the inliner." + parseTree statements isEmpty ifTrue: + [^false]. + parseTree statements last isReturn ifFalse: + [^false]. + parseTree statements size = 1 ifFalse: + [(parseTree statements size = 2 + and: [parseTree statements first isSend + and: [parseTree statements first selector == #flag:]]) ifFalse: + [^false]]. + parseTree statements last expression nodesDo: + [ :n | n isReturn ifTrue: [^false]]. - (parseTree statements size = 1 - and: [parseTree statements last isReturn]) ifFalse: [ ^false ]. - parseTree statements last expression nodesDo: [ :n | n isReturn ifTrue: [ ^false ]]. ^#(sqInt usqInt sqLong usqLong #'sqInt *' #'CogMethod *') includes: returnType! Item was added: + ----- Method: VMMaker class>>generateSqueakSpurCogSistaVM (in category 'configurations') ----- + generateSqueakSpurCogSistaVM + "No primitives since we can use those for the Cog VM" + ^VMMaker + generate: CoInterpreter + and: SistaStackToRegisterMappingCogit + with: #(ObjectMemory Spur32BitCoMemoryManager) + to: (FileDirectory default pathFromURI: 'oscogvm/spursistasrc') + platformDir: (FileDirectory default pathFromURI: 'oscogvm/platforms') + including:#()!

1 0

[commit][2889] CogVM source as per VMMaker.oscog-eem.666; devilishly good ; )
by commits＠squeakvm.org 05 Apr '14

05 Apr '14

Revision: 2889 Author: eliot Date: 2014-04-04 16:23:49 -0700 (Fri, 04 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.666; devilishly good ;) Sista: Fix several bugs in the primitiveSistaMethodPICAndCounterData primitive. Fix consistency between monomorphic and polymorphic send tuples, always answering pc, class, method/selector. Fix collecting data from PICs with MNU cases. Remove a stray halt. Make sure primitive fail points return. not continue on. Eliminate dead conditional branch elimination so that the send and branch data collection is not confused by branches for which no counting code was produced. Cogit: since the annotation arg is no longer used, refactor targetMethodAndSendTableFor:annotation:into: to targetMethodAndSendTableFor:into: Modified Paths: -------------- 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 Removed Paths: ------------- branches/Cog/sistamacbuild/sqNamedPrims.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/sistamacbuild/ branches/Cog/sistamacbuild/BochsIA32Plugin/ branches/Cog/sistamacbuild/CroquetPlugin/ branches/Cog/sistamacbuild/FloatArrayPlugin/ branches/Cog/sistamacbuild/FloatMathPlugin/ branches/Cog/sistamacbuild/Mpeg3Plugin/ branches/Cog/sistamacbuild/SqueakFFIPrims/ branches/Cog/sistamacbuild/SqueakSSL/ branches/Cog/sistamacbuild/UnixOSProcessPlugin/ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 3 17:18:40 PDT 2014 + Fri Apr 4 16:23:18 PDT 2014 Property changes on: branches/Cog/sistamacbuild ___________________________________________________________________ Added: svn:ignore + build *.app *.bundle LOG* *.sources sqNamedPrims.h Property changes on: branches/Cog/sistamacbuild/BochsIA32Plugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/CroquetPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/FloatArrayPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/FloatMathPlugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/Mpeg3Plugin ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/SqueakFFIPrims ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/SqueakSSL ___________________________________________________________________ Added: svn:ignore + build Property changes on: branches/Cog/sistamacbuild/UnixOSProcessPlugin ___________________________________________________________________ Added: svn:ignore + build Deleted: branches/Cog/sistamacbuild/sqNamedPrims.h =================================================================== --- branches/Cog/sistamacbuild/sqNamedPrims.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistamacbuild/sqNamedPrims.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,81 +0,0 @@ -/* Automatically generated on Wed Apr 2 19:33:03 PDT 2014 */ -extern sqExport vm_exports[]; -extern sqExport os_exports[]; -extern sqExport ADPCMCodecPlugin_exports[]; -extern sqExport AioPlugin_exports[]; -extern sqExport AsynchFilePlugin_exports[]; -extern sqExport B3DAcceleratorPlugin_exports[]; -extern sqExport B2DPlugin_exports[]; -extern sqExport BitBltPlugin_exports[]; -extern sqExport BMPReadWriterPlugin_exports[]; -extern sqExport ZipPlugin_exports[]; -extern sqExport DropPlugin_exports[]; -extern sqExport DSAPrims_exports[]; -extern sqExport FFTPlugin_exports[]; -extern sqExport FilePlugin_exports[]; -extern sqExport HostWindowPlugin_exports[]; -extern sqExport IA32ABI_exports[]; -extern sqExport InternetConfigPlugin_exports[]; -extern sqExport JoystickTabletPlugin_exports[]; -extern sqExport JPEGReaderPlugin_exports[]; -extern sqExport JPEGReadWriter2Plugin_exports[]; -extern sqExport Klatt_exports[]; -extern sqExport LargeIntegers_exports[]; -extern sqExport LocalePlugin_exports[]; -extern sqExport MacMenubarPlugin_exports[]; -extern sqExport Matrix2x3Plugin_exports[]; -extern sqExport MIDIPlugin_exports[]; -extern sqExport MiscPrimitivePlugin_exports[]; -extern sqExport RePlugin_exports[]; -extern sqExport SecurityPlugin_exports[]; -extern sqExport SerialPlugin_exports[]; -extern sqExport SocketPlugin_exports[]; -extern sqExport SoundCodecPrims_exports[]; -extern sqExport SoundGenerationPlugin_exports[]; -extern sqExport SoundPlugin_exports[]; -extern sqExport StarSqueakPlugin_exports[]; -extern sqExport SurfacePlugin_exports[]; -extern sqExport UUIDPlugin_exports[]; -extern sqExport VMProfileMacSupportPlugin_exports[]; - -sqExport *pluginExports[] = { - vm_exports, - os_exports, - ADPCMCodecPlugin_exports, - AioPlugin_exports, - AsynchFilePlugin_exports, - B3DAcceleratorPlugin_exports, - B2DPlugin_exports, - BitBltPlugin_exports, - BMPReadWriterPlugin_exports, - ZipPlugin_exports, - DropPlugin_exports, - DSAPrims_exports, - FFTPlugin_exports, - FilePlugin_exports, - HostWindowPlugin_exports, - IA32ABI_exports, - InternetConfigPlugin_exports, - JoystickTabletPlugin_exports, - JPEGReaderPlugin_exports, - JPEGReadWriter2Plugin_exports, - Klatt_exports, - LargeIntegers_exports, - LocalePlugin_exports, - MacMenubarPlugin_exports, - Matrix2x3Plugin_exports, - MIDIPlugin_exports, - MiscPrimitivePlugin_exports, - RePlugin_exports, - SecurityPlugin_exports, - SerialPlugin_exports, - SocketPlugin_exports, - SoundCodecPrims_exports, - SoundGenerationPlugin_exports, - SoundPlugin_exports, - StarSqueakPlugin_exports, - SurfacePlugin_exports, - UUIDPlugin_exports, - VMProfileMacSupportPlugin_exports, - NULL -}; Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/cogit.c 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b + CCodeGenerator VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -935,6 +935,7 @@ sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortTrampolineFor(sqInt numArgs); +static sqInt picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod); static sqInt picDataForConditionalBranchat(sqInt counterReferenceMcpc, sqInt bcpc); static sqInt picDataForSendToatbcpc(CogMethod *cogMethod, char *sendMcpc, sqInt sendBcpc); sqInt picDataForinto(CogMethod *cogMethod, sqInt arrayObj); @@ -2677,7 +2678,7 @@ /* It's a linked send; find which kind. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -12044,16 +12045,17 @@ and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch - decrements the lower half. */ + decrements the lower half. N.B. We *do not* eliminate dead branches (true + ifTrue:/true ifFalse:) + so that scanning for send and branch data is simplified and that branch + data is correct. */ static sqInt genJumpIfto(sqInt boolean, sqInt targetBytecodePC) { - AbstractInstruction *abstractInstruction; AbstractInstruction *counter; AbstractInstruction *countTripped; CogSimStackEntry *desc; - BytecodeFixup *fixup; void *jumpTarget; AbstractInstruction *ok; sqInt quickConstant; @@ -12063,30 +12065,6 @@ ssFlushTo(simStackPtr - 1); desc = ssTop(); ssPop(1); - if ((((desc->type)) == SSConstant) - && ((((desc->constant)) == (trueObject())) - || (((desc->constant)) == (falseObject())))) { - - /* Must arrange there's a fixup at the target whether it is jumped to or - not so that the simStackPtr can be kept correct. */ - - - /* Must enter any annotatedConstants into the map */ - - fixup = ensureFixupAt(targetBytecodePC - initialPC); - annotateBytecodeIfAnnotated(desc); - /* begin annotateBytecode: */ - abstractInstruction = (((desc->constant)) == boolean - ? (/* begin Jump: */ - genoperand(Jump, ((sqInt)fixup))) - : (prevInstIsPCAnnotated() - ? (/* begin Nop */ - gen(Nop)) - : (/* begin Label */ - genoperandoperand(Label, (labelCounter += 1), bytecodePC)))); - annotatewith(abstractInstruction, HasBytecodePC); - return 0; - } popToReg(desc, TempReg); ssAllocateRequiredReg(SendNumArgsReg); counter = (&(counters[counterIndex])); @@ -15209,7 +15187,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -16320,6 +16298,7 @@ : 0); } if (annotation == IsAbsPCReference) { + assert(mcpc != 0); prevMapAbsPCMcpc = mcpc; } } @@ -16933,7 +16912,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint1 & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint1 - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -17743,7 +17722,24 @@ return picAbortTrampolines[((numArgs < ((numRegArgs()) + 1)) ? numArgs : ((numRegArgs()) + 1))]; } + +/* Collect the branch and send data for the block method starting at + blockEntryMcpc, storing it into picData. + */ + static sqInt +picDataForBlockEntryMethod(sqInt blockEntryMcpc, sqInt cogMethod) +{ + CogBlockMethod *cogBlockMethod; + + cogBlockMethod = ((CogBlockMethod *) (blockEntryMcpc - (sizeof(CogBlockMethod)))); + if (((cogBlockMethod->stackCheckOffset)) == 0) { + return 0; + } + return mapForbcpcperformUntilarg(cogBlockMethod, (cogBlockMethod->startpc), picDataForMcpcBcpcMethod, cogMethod); +} + +static sqInt picDataForConditionalBranchat(sqInt counterReferenceMcpc, sqInt bcpc) { sqInt address; @@ -17767,6 +17763,16 @@ return tuple; } + +/* Answer a tuple with the send data for a linked send to cogMethod. + If the target is a CogMethod (monomorphic send) answer + { bytecode pc, inline cache class, target method } + If the target is an open PIC (megamorphic send) answer + { bytecode pc, nil, send selector } + If the target is a closed PIC (polymorphic send) answer + { bytecode pc, first class, target method, second class, second target + method, ... } */ + static sqInt picDataForSendToatbcpc(CogMethod *cogMethod, char *sendMcpc, sqInt sendBcpc) { @@ -17778,8 +17784,8 @@ return 0; } storePointerUncheckedofObjectwithValue(0, tuple, ((sendBcpc << 1) | 1)); - storePointerofObjectwithValue(1, tuple, (cogMethod->methodObject)); - storePointerofObjectwithValue(2, tuple, classForInlineCacheTag(inlineCacheTagAt(backEnd, ((usqInt)sendMcpc)))); + storePointerofObjectwithValue(1, tuple, classForInlineCacheTag(inlineCacheTagAt(backEnd, ((usqInt)sendMcpc)))); + storePointerofObjectwithValue(2, tuple, (cogMethod->methodObject)); return tuple; } if (((cogMethod->cmType)) == CMClosedPIC) { @@ -17792,12 +17798,13 @@ return tuple; } if (((cogMethod->cmType)) == CMOpenPIC) { - tuple = eeInstantiateClassindexableSize(splObj(ClassArray), 2); + tuple = eeInstantiateClassindexableSize(splObj(ClassArray), 3); if (tuple == 0) { return 0; } - storeIntegerofObjectwithValue(0, tuple, sendBcpc); + storePointerUncheckedofObjectwithValue(0, tuple, ((sendBcpc << 1) | 1)); storePointerUncheckedofObjectwithValue(1, tuple, nilObject()); + storePointerofObjectwithValue(2, tuple, (cogMethod->selector)); return tuple; } error("invalid method type"); @@ -17805,9 +17812,7 @@ } -/* Answer the zero-relative bytecode pc matching the machine code pc argument - in cogMethod, given the start of the bytecodes for cogMethod's block or - method object. */ +/* Collect the branch and send data for cogMethod, storing it into arrayObj. */ sqInt picDataForinto(CogMethod *cogMethod, sqInt arrayObj) @@ -17824,6 +17829,13 @@ assert(errCode == PrimErrNoMemory); return -1; } + if (((cogMethod->blockEntryOffset)) != 0) { + errCode = blockDispatchTargetsForperformarg(cogMethod, picDataForBlockEntryMethod, ((void *)cogMethod)); + if (errCode != 0) { + assert(errCode == PrimErrNoMemory); + return -1; + } + } return picDataIndex; } @@ -17831,8 +17843,10 @@ picDataForMcpcBcpcMethod(BytecodeDescriptor *descriptor, char *mcpc, sqInt bcpc, void *cogMethodArg) { sqInt entryPoint; - sqInt offset; - CogMethod *targetMethod; + sqInt sendTable; + sqInt *sendTable1; + sqInt targetMethod; + CogMethod *targetMethod1; sqInt tuple; if (descriptor == null) { @@ -17850,11 +17864,21 @@ return 0; } - offset = ((entryPoint & entryPointMask) == checkedEntryAlignment - ? cmEntryOffset - : cmNoCheckEntryOffset); - targetMethod = ((CogMethod *) (entryPoint - offset)); - tuple = picDataForSendToatbcpc(targetMethod, mcpc, bcpc); + /* begin targetMethodAndSendTableFor:into: */ + if ((entryPoint & entryPointMask) == checkedEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); + sendTable1 = sendTrampolines; + } + else { + targetMethod1 = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset)); + sendTable1 = superSendTrampolines; + } + + + /* It's a linked send; find which kind. */ + + tuple = picDataForSendToatbcpc(targetMethod1, mcpc, (bcpc + 1) - ((descriptor->numBytes))); + if (tuple == 0) { return PrimErrNoMemory; } @@ -17965,8 +17989,8 @@ sqInt i; sqInt pc; CogMethod *targetMethod; + sqInt value; - halt(); pc = (((sqInt)cPIC)) + firstCPICCaseOffset; for (i = 1; i <= ((cPIC->cPICNumCases)); i += 1) { cacheTag = (i == 1 @@ -17975,15 +17999,19 @@ classOop = classForInlineCacheTag(cacheTag); storePointerofObjectwithValue((i * 2) - 1, tuple, classOop); - /* Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC */ + /* Find target from jump. A jump to the MNU entry-point should collect #doesNotUnderstand: */ entryPoint = jumpLongTargetBeforeFollowingAddress(backEnd, pc); if (((((usqInt)entryPoint)) < (((usqInt)cPIC))) || ((((usqInt)entryPoint)) > (((usqInt)((((usqInt)cPIC)) + ((cPIC->blockSize))))))) { targetMethod = ((CogMethod *) (entryPoint - cmNoCheckEntryOffset)); assert(((targetMethod->cmType)) == CMMethod); - storePointerofObjectwithValue(i * 2, tuple, (targetMethod->methodObject)); + value = (targetMethod->methodObject); } + else { + value = splObj(SelectorDoesNotUnderstand); + } + storePointerofObjectwithValue(i * 2, tuple, value); pc += cPICCaseSize; } } @@ -19851,7 +19879,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -19892,7 +19920,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -19929,7 +19957,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -19966,7 +19994,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/cogit.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b + CCodeGenerator VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b + CCodeGenerator VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ typedef struct { Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/cointerp.c 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 from - CoInterpreter VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CoInterpreter VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1000,7 +1000,7 @@ EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); EXPORT(void) primitiveRemLargeIntegers(void); -EXPORT(void) primitiveResetCountersInMethod(void); +EXPORT(sqInt) primitiveResetCountersInMethod(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTableAt(void); static void primitiveScanCharacters(void); @@ -1025,7 +1025,7 @@ static void primitiveSignalAtMilliseconds(void); static void primitiveSignalAtUTCMicroseconds(void); static void primitiveSine(void); -EXPORT(void) primitiveSistaMethodPICAndCounterData(void); +EXPORT(sqInt) primitiveSistaMethodPICAndCounterData(void); static void primitiveSize(void); static void primitiveSnapshot(void); static void primitiveSnapshotEmbedded(void); @@ -2034,7 +2034,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.661]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.666]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -36934,13 +36934,13 @@ } } -EXPORT(void) +EXPORT(sqInt) primitiveResetCountersInMethod(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt methodReceiver; if (GIV(argumentCount) != 0) { - GIV(primFailCode) = PrimErrBadNumArgs; + return (GIV(primFailCode) = PrimErrBadNumArgs); } methodReceiver = longAt(GIV(stackPointer)); if (methodHasCogMethod(methodReceiver)) { @@ -38360,7 +38360,7 @@ } } -EXPORT(void) +EXPORT(sqInt) primitiveSistaMethodPICAndCounterData(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt cm; @@ -38374,7 +38374,7 @@ char *sp; if (GIV(argumentCount) != 0) { - GIV(primFailCode) = PrimErrBadNumArgs; + return (GIV(primFailCode) = PrimErrBadNumArgs); } methodReceiver = longAt(GIV(stackPointer)); data = 0; @@ -38399,7 +38399,7 @@ data = data1; l1: /* end picDataFor: */; if (data == -1) { - GIV(primFailCode) = PrimErrNoMemory; + return (GIV(primFailCode) = PrimErrNoMemory); } } if (data == 0) { Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/cointerp.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2014-04-04 23:23:49 UTC (rev 2889) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 from - CoInterpreter VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CoInterpreter VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1003,7 +1003,7 @@ EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); EXPORT(void) primitiveRemLargeIntegers(void); -EXPORT(void) primitiveResetCountersInMethod(void); +EXPORT(sqInt) primitiveResetCountersInMethod(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTableAt(void); static void primitiveScanCharacters(void); @@ -1028,7 +1028,7 @@ static void primitiveSignalAtMilliseconds(void); static void primitiveSignalAtUTCMicroseconds(void); static void primitiveSine(void); -EXPORT(void) primitiveSistaMethodPICAndCounterData(void); +EXPORT(sqInt) primitiveSistaMethodPICAndCounterData(void); static void primitiveSize(void); static void primitiveSnapshot(void); static void primitiveSnapshotEmbedded(void); @@ -2037,7 +2037,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.661]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.666]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -36943,13 +36943,13 @@ } } -EXPORT(void) +EXPORT(sqInt) primitiveResetCountersInMethod(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt methodReceiver; if (GIV(argumentCount) != 0) { - GIV(primFailCode) = PrimErrBadNumArgs; + return (GIV(primFailCode) = PrimErrBadNumArgs); } methodReceiver = longAt(GIV(stackPointer)); if (methodHasCogMethod(methodReceiver)) { @@ -38369,7 +38369,7 @@ } } -EXPORT(void) +EXPORT(sqInt) primitiveSistaMethodPICAndCounterData(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt cm; @@ -38383,7 +38383,7 @@ char *sp; if (GIV(argumentCount) != 0) { - GIV(primFailCode) = PrimErrBadNumArgs; + return (GIV(primFailCode) = PrimErrBadNumArgs); } methodReceiver = longAt(GIV(stackPointer)); data = 0; @@ -38408,7 +38408,7 @@ data = data1; l1: /* end picDataFor: */; if (data == -1) { - GIV(primFailCode) = PrimErrNoMemory; + return (GIV(primFailCode) = PrimErrNoMemory); } } if (data == 0) { Modified: branches/Cog/sistasrc/vm/interp.h =================================================================== --- branches/Cog/sistasrc/vm/interp.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/interp.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/sistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/sistasrc/vm/vmCallback.h 2014-04-04 00:20:08 UTC (rev 2888) +++ branches/Cog/sistasrc/vm/vmCallback.h 2014-04-04 23:23:49 UTC (rev 2889) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.666 uuid: 647ff48c-1974-41d1-9b8f-678688bc79d8 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.666.mcz
by commits＠source.squeak.org 05 Apr '14

05 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.666.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.666 Author: eem Time: 4 April 2014, 4:00:55.973 pm UUID: 647ff48c-1974-41d1-9b8f-678688bc79d8 Ancestors: VMMaker.oscog-eem.665 Sista: Fix several bugs in the primitiveSistaMethodPICAndCounterData primitive. Fix consistency between monomorphic and polymorphic send tuples, always answering pc, class, method/selector. Fix collecting data from PICs with MNU cases. Remove a stray halt. Make sure primitive fail points return. not continue on. Eliminate dead conditional branch elimination so that the send and branch data collection is not confused by branches for which no counting code was produced. Cogit: since the annotation arg is no longer used, refactor targetMethodAndSendTableFor:annotation:into: to targetMethodAndSendTableFor:into:. Simulator: Add missing asVoidPointer on methods. Add instantiateClass:indexableSize: for the facade. Provide a cog: entry point for in-image compiling a method. =============== Diff against VMMaker.oscog-eem.665 =============== Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveResetCountersInMethod (in category 'method introspection primitives') ----- primitiveResetCountersInMethod <export: true> <option: #SistaStackToRegisterMappingCogit> | methodReceiver | argumentCount ~= 0 ifTrue: + [^self primitiveFailFor: PrimErrBadNumArgs]. - [self primitiveFailFor: PrimErrBadNumArgs]. methodReceiver := self stackTop. (self methodHasCogMethod: methodReceiver) ifTrue: [cogit resetCountersIn: (self cogMethodOf: methodReceiver)]! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveSistaMethodPICAndCounterData (in category 'method introspection primitives') ----- primitiveSistaMethodPICAndCounterData <export: true> <option: #SistaStackToRegisterMappingCogit> | methodReceiver data | argumentCount ~= 0 ifTrue: + [^self primitiveFailFor: PrimErrBadNumArgs]. - [self primitiveFailFor: PrimErrBadNumArgs]. methodReceiver := self stackTop. data := 0. (self methodHasCogMethod: methodReceiver) ifTrue: [data := self picDataFor: (self cogMethodOf: methodReceiver). data = -1 ifTrue: + [^self primitiveFailFor: PrimErrNoMemory]]. - [self primitiveFailFor: PrimErrNoMemory]]. data = 0 ifTrue: [data := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: 0]. self pop: 1 thenPush: data! Item was added: + ----- Method: CogMethodSurrogate>>asVoidPointer (in category 'coercing') ----- + asVoidPointer + ^self! Item was added: + ----- Method: Cogit class>>cog: (in category 'in-image compilation') ----- + cog: aCompiledMethod + ^self cog: aCompiledMethod options: #()! Item was added: + ----- Method: Cogit class>>cog:options: (in category 'in-image compilation') ----- + cog: aCompiledMethod options: optionsArray + ^self cog: aCompiledMethod selector: aCompiledMethod selector options: optionsArray! Item was changed: ----- Method: Cogit>>checkIfValidObjectRefAndTarget:pc:cogMethod: (in category 'garbage collection') ----- checkIfValidObjectRefAndTarget: annotation pc: mcpc cogMethod: cogMethod <var: #mcpc type: #'char *'> | literal entryPoint | annotation = IsObjectReference ifTrue: [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (self asserta: (objectRepresentation checkValidObjectReference: literal)) ifFalse: [^1]. ((objectRepresentation couldBeObject: literal) and: [objectMemory isReallyYoungObject: literal]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^2]]]. (self isSendAnnotation: annotation) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse: [^3]. self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:offset :cacheTag :tagCouldBeObject| tagCouldBeObject ifTrue: [(objectRepresentation couldBeObject: cacheTag) ifTrue: [(self asserta: (objectRepresentation checkValidObjectReference: cacheTag)) ifFalse: [^4]] ifFalse: [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: [^5]]. ((objectRepresentation couldBeObject: cacheTag) and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue: [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: [^6]]] ifFalse: [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: [^7]]]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: ["It's a linked send; find which kind." + self targetMethodAndSendTableFor: entryPoint into: - self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| (self asserta: (targetMethod cmType = CMMethod or: [targetMethod cmType = CMClosedPIC or: [targetMethod cmType = CMOpenPIC]])) ifFalse: [^8]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>incrementUsageOfTargetIfLinkedSend:mcpc:ignored: (in category 'compaction') ----- incrementUsageOfTargetIfLinkedSend: annotation mcpc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| targetMethod cmUsageCount < (CMMaxUsageCount // 2) ifTrue: [targetMethod cmUsageCount: targetMethod cmUsageCount + 1]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> | literal | annotation = IsObjectReference ifTrue: [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. objectRepresentation markAndTraceLiteral: literal]. (self isSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | cacheTagMarked | cacheTagMarked := tagCouldBeObj and: [objectRepresentation cacheTagIsMarked: cacheTag]. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | (cacheTagMarked not or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: ["Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send." unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true. objectRepresentation markAndTraceLiteral: targetMethod selector]]] ifFalse: [objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [| classpc mixinpc class mixin | objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" classpc := mcpc asInteger + backEnd jumpShortByteSize. mixinpc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. class := backEnd unalignedLongAt: classpc. class ~= 0 ifTrue: [self assert: (objectMemory addressCouldBeObj: class). (objectRepresentation cacheTagIsMarked: class) ifTrue: [(mixin := backEnd unalignedLongAt: mixinpc) ~= 0 ifTrue: [objectRepresentation markAndTraceLiteral: mixin]] ifFalse: [backEnd unalignedLongAt: classpc put: 0; unalignedLongAt: mixinpc put: 0. codeModified := true]] ifFalse: [self assert: (backEnd unalignedLongAt: mixinpc) = 0]]]]]]. ^0 "keep scanning"! Item was removed: - ----- Method: Cogit>>targetMethodAndSendTableFor:annotation:into: (in category 'in-line cacheing') ----- - targetMethodAndSendTableFor: entryPoint annotation: annotation into: binaryBlock - "Evaluate binaryBlock with the targetMethod and relevant send table for a linked-send - to entryPoint. Do so based on the alignment of entryPoint. N.B. For Newspeak sends - we don't need to distinguish between ceImplicitReceiver and the other sends since - ceImplicitReceiver will never appear to be linked, so only three cases here." - <inline: true> - | targetMethod sendTable | - <var: #targetMethod type: #'CogMethod *'> - <var: #sendTable type: #'sqInt *'> - self cppIf: NewspeakVM - ifTrue: - [self assert: annotation = IsSendCall. - (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: - [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. - sendTable := sendTrampolines] - ifFalse: - [(entryPoint bitAnd: entryPointMask) = dynSuperEntryAlignment - ifTrue: - [targetMethod := self cCoerceSimple: entryPoint - cmDynSuperEntryOffset to: #'CogMethod *'. - sendTable := dynamicSuperSendTrampolines] - ifFalse: - [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. - sendTable := superSendTrampolines]]] - ifFalse: - [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: - [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. - sendTable := sendTrampolines] - ifFalse: - [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. - sendTable := superSendTrampolines]]. - binaryBlock - value: targetMethod - value: sendTable! Item was added: + ----- Method: Cogit>>targetMethodAndSendTableFor:into: (in category 'in-line cacheing') ----- + targetMethodAndSendTableFor: entryPoint into: binaryBlock + "Evaluate binaryBlock with the targetMethod and relevant send table for a linked-send + to entryPoint. Do so based on the alignment of entryPoint. N.B. For Newspeak sends + we don't need to distinguish between ceImplicitReceiver and the other sends since + ceImplicitReceiver will never appear to be linked, so only three cases here." + <inline: true> + | targetMethod sendTable | + <var: #targetMethod type: #'CogMethod *'> + <var: #sendTable type: #'sqInt *'> + self cppIf: NewspeakVM + ifTrue: + [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment + ifTrue: + [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. + sendTable := sendTrampolines] + ifFalse: + [(entryPoint bitAnd: entryPointMask) = dynSuperEntryAlignment + ifTrue: + [targetMethod := self cCoerceSimple: entryPoint - cmDynSuperEntryOffset to: #'CogMethod *'. + sendTable := dynamicSuperSendTrampolines] + ifFalse: + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. + sendTable := superSendTrampolines]]] + ifFalse: + [(entryPoint bitAnd: entryPointMask) = checkedEntryAlignment + ifTrue: + [targetMethod := self cCoerceSimple: entryPoint - cmEntryOffset to: #'CogMethod *'. + sendTable := sendTrampolines] + ifFalse: + [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. + sendTable := superSendTrampolines]]. + binaryBlock + value: targetMethod + value: sendTable! Item was changed: ----- Method: Cogit>>unlinkIfFreeOrLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfFreeOrLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | (targetMethod cmType = CMFree or: [targetMethod selector = theSelector]) ifTrue: [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true]]] ifFalse: [self cppIf: NewspeakVM ifTrue: [(entryPoint = ceImplicitReceiverTrampoline and: [(backEnd inlineCacheTagAt: mcpc asInteger) = theSelector]) ifTrue: [backEnd unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize put: 0; unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop put: 0]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine]] ifFalse: [self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [backEnd unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize put: 0; unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop put: 0]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | targetMethod selector = theSelector ifTrue: [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true]]] ifFalse: [self cppIf: NewspeakVM ifTrue: [(entryPoint = ceImplicitReceiverTrampoline and: [(backEnd inlineCacheTagAt: mcpc asInteger) = theSelector]) ifTrue: [backEnd unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize put: 0; unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop put: 0]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:to: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc to: theCogMethod <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | targetMethod asInteger = theCogMethod ifTrue: [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true]]] ifFalse: "Can't tell the target with PushReciver/SendImplicit so flush anyway." [self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [backEnd unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize put: 0; unalignedLongAt: mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop put: 0]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSendToFree:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSendToFree: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: - [self targetMethodAndSendTableFor: entryPoint annotation: annotation into: [:targetMethod :sendTable| | unlinkedRoutine | targetMethod cmType = CMFree ifTrue: [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true]]]]. ^0 "keep scanning"! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>instantiateClass:indexableSize: (in category 'instantiation') ----- + instantiateClass: classPointer indexableSize: size + (self objectForOop: classPointer) caseOf: + {[Array] -> [^self oopForObject: (Array new: size)]}! Item was changed: StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue counterMethodCache prevMapAbsPCMcpc' classVariableNames: 'CounterBytes MaxCounterValue' poolDictionaries: '' category: 'VMMaker-JIT'! + + !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/4/2014 12:39' prior: 0! + A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. + + The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on teh stack and performance data. Execution then resumes in the optimized code. + + SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path throguh code, they are a better choice to count than, for example, method or block entry. + + SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array. + + Instance Variables + counterIndex: <Integer> + counterMethodCache: <CogMethod> + counters: <Array of AbstractInstruction> + initialCounterValue: <Integer> + numCounters: <Integer> + picData: <Integer Oop> + picDataIndex: <Integer> + prevMapAbsPCMcpc: <Integer> + + counterIndex + - xxxxx + + counterMethodCache + - xxxxx + + counters + - xxxxx + + initialCounterValue + - xxxxx + + numCounters + - xxxxx + + picData + - xxxxx + + picDataIndex + - xxxxx + + prevMapAbsPCMcpc + - xxxxx + ! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch + decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) + so that scanning for send and branch data is simplified and that branch data is correct." - decrements the lower half." <inline: false> + | desc ok counter countTripped retry | - | desc fixup ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> - <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. - (desc type == SSConstant - and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: - ["Must arrange there's a fixup at the target whether it is jumped to or - not so that the simStackPtr can be kept correct." - fixup := self ensureFixupAt: targetBytecodePC - initialPC. - "Must enter any annotatedConstants into the map" - self annotateBytecodeIfAnnotated: desc. - "Must annotate the bytecode for correct pc mapping." - self annotateBytecode: (desc constant = boolean - ifTrue: [self Jump: fixup] - ifFalse: [self prevInstIsPCAnnotated - ifTrue: [self Nop] - ifFalse: [self Label]]). - ^0]. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. retry := counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "Now we have to jump back to the retry point. This is always the point at which the boolean is tested. The register to be tested must be reloaded with the return value of the trampoline; this is for the case where the trampoline returns immediately without sending back.." backEnd cResultRegister ~= TempReg ifTrue: [self MoveR: backEnd cResultRegister R: TempReg]. self Jump: retry. ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. This works only for frameful methods." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor * desc, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. self assert: ((objectMemory byteAt: map) >> AnnotationShift = IsAbsPCReference or: [(objectMemory byteAt: map) >> AnnotationShift = IsRelativeCall or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory byteLengthOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader] ifFalse: [isInBlock := true. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. self assert: ((objectMemory byteAt: map) >> AnnotationShift = HasBytecodePC "fiducial" or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]). [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj]. bcpc := startbcpc. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. nExts := 0. "as a hack for collecting counters, remember the prev mcpc in a static variable." prevMapAbsPCMcpc := 0. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: nil with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| annotation nextBcpc | annotation := mapByte >> AnnotationShift. mcpc := mcpc + (mapByte bitAnd: DisplacementMask). (self isPCMappedAnnotation: annotation alternateInstructionSet: bsOffset > 0) ifTrue: [[byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. "All subsequent bytecodes except backward branches map to the following bytecode. Backward branches map to themselves other- wise mapping could cause premature breaking out of loops." result := self perform: functionSymbol with: descriptor with: (self cCoerceSimple: mcpc to: #'char *') with: ((descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]) ifTrue: [bcpc] ifFalse: [bcpc + descriptor numBytes]) with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. annotation = IsAbsPCReference ifTrue: + [self assert: mcpc ~= 0. + prevMapAbsPCMcpc := mcpc]] - [prevMapAbsPCMcpc := mcpc]] ifFalse: [mcpc := mcpc + (mapByte >= DisplacementX2N ifTrue: [mapByte - DisplacementX2N << AnnotationShift] ifFalse: [mapByte])]. map := map - 1]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:Mcpc:Bcpc:Method: (in category 'method introspection') ----- picDataFor: descriptor Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg <var: #descriptor type: #'BytecodeDescriptor *'> <var: #mcpc type: #'char *'> <var: #cogMethodArg type: #'void *'> + | entryPoint tuple | - | entryPoint offset targetMethod tuple | - <var: #targetMethod type: #'CogMethod *'> descriptor isNil ifTrue: [^0]. descriptor isBranch ifFalse: "infer it's a send" [self assert: (backEnd isCallPreceedingReturnPC: mcpc asUnsignedInteger). entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. entryPoint <= methodZoneBase ifTrue: "send is not linked" [^0]. + self targetMethodAndSendTableFor: entryPoint into: "It's a linked send; find which kind." + [:targetMethod :sendTable| + tuple := self picDataForSendTo: targetMethod at: mcpc bcpc: bcpc + 1 - descriptor numBytes]. - "It's a linked send; find which kind." - offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: [cmEntryOffset] - ifFalse: [cmNoCheckEntryOffset]. - targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. - tuple := self picDataForSendTo: targetMethod at: mcpc bcpc: bcpc. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. picDataIndex := picDataIndex + 1. ^0]. "it's a branch; conditional?" (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [tuple := self picDataForConditionalBranch: prevMapAbsPCMcpc at: bcpc. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. picDataIndex := picDataIndex + 1. ^0]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:into: (in category 'method introspection') ----- picDataFor: cogMethod into: arrayObj + "Collect the branch and send data for cogMethod, storing it into arrayObj." - "Answer the zero-relative bytecode pc matching the machine code pc argument in - cogMethod, given the start of the bytecodes for cogMethod's block or method object." <api> <var: #cogMethod type: #'CogMethod *'> | errCode | cogMethod stackCheckOffset = 0 ifTrue: [^0]. picDataIndex := 0. picData := arrayObj. errCode := self mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *') bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject) performUntil: #picDataFor:Mcpc:Bcpc:Method: arg: cogMethod asVoidPointer. errCode ~= 0 ifTrue: [self assert: errCode = PrimErrNoMemory. ^-1]. + cogMethod blockEntryOffset ~= 0 ifTrue: + [errCode := self blockDispatchTargetsFor: cogMethod + perform: #picDataForBlockEntry:Method: + arg: cogMethod asVoidPointer. + errCode ~= 0 ifTrue: + [self assert: errCode = PrimErrNoMemory. + ^-1]]. ^picDataIndex! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>picDataForBlockEntry:Method: (in category 'method introspection') ----- + picDataForBlockEntry: blockEntryMcpc Method: cogMethod + "Collect the branch and send data for the block method starting at blockEntryMcpc, storing it into picData." + | cogBlockMethod | + <var: #cogBlockMethod type: #'CogBlockMethod *'> + cogBlockMethod := self cCoerceSimple: blockEntryMcpc - (self sizeof: CogBlockMethod) + to: #'CogBlockMethod *'. + cogBlockMethod stackCheckOffset = 0 ifTrue: + [^0]. + ^self + mapFor: cogBlockMethod + bcpc: cogBlockMethod startpc + performUntil: #picDataFor:Mcpc:Bcpc:Method: + arg: cogMethod! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataForSendTo:at:bcpc: (in category 'method introspection') ----- picDataForSendTo: cogMethod at: sendMcpc bcpc: sendBcpc + "Answer a tuple with the send data for a linked send to cogMethod. + If the target is a CogMethod (monomorphic send) answer + { bytecode pc, inline cache class, target method } + If the target is an open PIC (megamorphic send) answer + { bytecode pc, nil, send selector } + If the target is a closed PIC (polymorphic send) answer + { bytecode pc, first class, target method, second class, second target method, ... }" <var: #cogMethod type: #'CogMethod *'> <var: #sendMcpc type: #'char *'> | tuple | cogMethod cmType = CMMethod ifTrue: [tuple := objectMemory eeInstantiateClass: (objectMemory splObj: ClassArray) indexableSize: 3. tuple = 0 ifTrue: [^0]. objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc); + storePointer: 1 - storePointer: 1 ofObject: tuple withValue: cogMethod methodObject; - storePointer: 2 ofObject: tuple + withValue: (objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger)); + storePointer: 2 ofObject: tuple withValue: cogMethod methodObject. - withValue: (objectRepresentation classForInlineCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger)). ^tuple]. cogMethod cmType = CMClosedPIC ifTrue: [tuple := objectMemory eeInstantiateClass: (objectMemory splObj: ClassArray) indexableSize: 2 * cogMethod cPICNumCases + 1. tuple = 0 ifTrue: [^0]. objectMemory storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc). self populate: tuple withPICInfoFor: cogMethod firstCacheTag: (backEnd inlineCacheTagAt: sendMcpc asUnsignedInteger). ^tuple]. cogMethod cmType = CMOpenPIC ifTrue: [tuple := objectMemory eeInstantiateClass: (objectMemory splObj: ClassArray) + indexableSize: 3. - indexableSize: 2. tuple = 0 ifTrue: [^0]. + objectMemory + storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: sendBcpc); + storePointerUnchecked: 1 ofObject: tuple withValue: objectMemory nilObject; + storePointer: 2 ofObject: tuple withValue: cogMethod selector. - coInterpreter - storeInteger: 0 ofObject: tuple withValue: sendBcpc; - storePointerUnchecked: 1 ofObject: tuple withValue: objectMemory nilObject. ^tuple]. self error: 'invalid method type'. ^0 "to get Slang to type this method as answering sqInt"! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>populate:withPICInfoFor:firstCacheTag: (in category 'method introspection') ----- populate: tuple withPICInfoFor: cPIC firstCacheTag: firstCacheTag "Populate tuple (which must be large enough) with the ClosedPIC's target method class pairs. The first entry in tuple contains the bytecode pc for the send, so skip the tuple's first field." <var: #cPIC type: #'CogMethod *'> + | pc cacheTag classOop entryPoint targetMethod value | - | pc cacheTag classOop entryPoint targetMethod | <var: #targetMethod type: #'CogMethod *'> - self halt. pc := cPIC asInteger + firstCPICCaseOffset. 1 to: cPIC cPICNumCases do: [:i| cacheTag := i = 1 ifTrue: [firstCacheTag] ifFalse: [backEnd literalBeforeFollowingAddress: pc - backEnd jumpLongConditionalByteSize - backEnd loadLiteralByteSize]. classOop := objectRepresentation classForInlineCacheTag: cacheTag. objectMemory storePointer: i * 2 - 1 ofObject: tuple withValue: classOop. entryPoint := backEnd jumpLongTargetBeforeFollowingAddress: pc. + "Find target from jump. A jump to the MNU entry-point should collect #doesNotUnderstand:" - "Find target from jump. Ignore jumps to the interpret and MNU calls within this PIC" (entryPoint asUnsignedInteger < cPIC asUnsignedInteger or: [entryPoint asUnsignedInteger > (cPIC asUnsignedInteger + cPIC blockSize) asUnsignedInteger]) ifTrue: [targetMethod := self cCoerceSimple: entryPoint - cmNoCheckEntryOffset to: #'CogMethod *'. self assert: targetMethod cmType = CMMethod. + value := targetMethod methodObject] + ifFalse: + [value := objectMemory splObj: SelectorDoesNotUnderstand]. + objectMemory storePointer: i * 2 ofObject: tuple withValue: value. - objectMemory storePointer: i * 2 ofObject: tuple withValue: targetMethod methodObject]. pc := pc + cPICCaseSize]!

1 0

Re: [Vm-dev] VM Maker: VMMaker.oscog-eem.662.mcz
by David T. Lewis 04 Apr '14

04 Apr '14

On Wed, Apr 02, 2014 at 10:17:56PM +0000, commits(a)source.squeak.org wrote: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-eem.662.mcz > <bump> Hi Eliot, Don't forget to move #minLargeHeaderSize and #sizeHeader:putBodySize: into the VMMaker package next time you do a commit :-) vm/vm.a(gcc3x-cointerp.o): In function `allInstancesOf': /var/lib/jenkins/workspace/CogVM/src/vm/gcc3x-cointerp.c:9592: undefined reference to `minLargeHeaderSize' /var/lib/jenkins/workspace/CogVM/src/vm/gcc3x-cointerp.c:9593: undefined reference to `sizeHeaderputBodySize' /var/lib/jenkins/workspace/CogVM/src/vm/gcc3x-cointerp.c:9664: undefined reference to `sizeHeaderputBodySize' Thanks, Dave

4 13

[commit][2888] CogVM source as per VMMaker.oscog-eem.665
by commits＠squeakvm.org 04 Apr '14

04 Apr '14

Revision: 2888 Author: eliot Date: 2014-04-03 17:20:08 -0700 (Thu, 03 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.665 Sista: Not understanding what I'm doing has caused confusion and delay. The return from ceCounterTripped: should indeed jump to the retry of the first counter decrement. But the result comes in through cResultRegister, which may be the same as TempReg which the code uses to hold the boolean tbeing tested. So TempReg should /not/ be reloaded with ReceiverResultReg. Remember to count the untaken branch in inlined special selector comparisons. Modified Paths: -------------- branches/Cog/sistamacbuild/sqNamedPrims.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 2 19:25:27 PDT 2014 + Thu Apr 3 17:18:40 PDT 2014 Modified: branches/Cog/sistamacbuild/sqNamedPrims.h =================================================================== --- branches/Cog/sistamacbuild/sqNamedPrims.h 2014-04-03 02:28:25 UTC (rev 2887) +++ branches/Cog/sistamacbuild/sqNamedPrims.h 2014-04-04 00:20:08 UTC (rev 2888) @@ -1,7 +1,8 @@ -/* Automatically generated on Mon Sep 23 09:23:27 PDT 2013 */ +/* Automatically generated on Wed Apr 2 19:33:03 PDT 2014 */ extern sqExport vm_exports[]; extern sqExport os_exports[]; extern sqExport ADPCMCodecPlugin_exports[]; +extern sqExport AioPlugin_exports[]; extern sqExport AsynchFilePlugin_exports[]; extern sqExport B3DAcceleratorPlugin_exports[]; extern sqExport B2DPlugin_exports[]; @@ -41,6 +42,7 @@ vm_exports, os_exports, ADPCMCodecPlugin_exports, + AioPlugin_exports, AsynchFilePlugin_exports, B3DAcceleratorPlugin_exports, B2DPlugin_exports, Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2014-04-03 02:28:25 UTC (rev 2887) +++ branches/Cog/sistasrc/vm/cogit.c 2014-04-04 00:20:08 UTC (rev 2888) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12057,6 +12057,7 @@ void *jumpTarget; AbstractInstruction *ok; sqInt quickConstant; + sqInt reg1; AbstractInstruction *retry; ssFlushTo(simStackPtr - 1); @@ -12118,12 +12119,13 @@ jmpTarget(countTripped, CallRT((boolean == (falseObject()) ? ceSendMustBeBooleanAddFalseTrampoline : ceSendMustBeBooleanAddTrueTrampoline))); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ReceiverResultReg, TempReg); - /* begin CmpCq:R: */ - genoperandoperand(CmpCqR, 0, ReceiverResultReg); - /* begin JumpNonZero: */ - genoperand(JumpNonZero, ((sqInt)retry)); + if ((cResultRegister(backEnd)) != TempReg) { + /* begin MoveR:R: */ + reg1 = cResultRegister(backEnd); + genoperandoperand(MoveRR, reg1, TempReg); + } + /* begin Jump: */ + genoperand(Jump, ((sqInt)retry)); jmpTarget(ok, annotateBytecode(gLabel())); return 0; } @@ -14334,6 +14336,9 @@ primDescriptor = generatorAt(byte0); argIsInt = ((((ssTop())->type)) == SSConstant) && ((((argInt = ((ssTop())->constant))) & 1)); + + /* short-cut the jump if operands are SmallInteger constants. */ + rcvrIsInt = ((((ssValue(1))->type)) == SSConstant) && ((((rcvrInt = ((ssValue(1))->constant))) & 1)); if (argIsInt @@ -14441,6 +14446,9 @@ genoperand(((branchDescriptor->isBranchTrue) ? (primDescriptor->opcode) : inverseBranchFor((primDescriptor->opcode))), ((usqInt)(ensureNonMergeFixupAt(targetBytecodePC - initialPC)))); + /* begin SubCq:R: */ + genoperandoperand(SubCqR, 1, SendNumArgsReg); + addDependent(counter, annotateAbsolutePCRef(gMoveRAw(SendNumArgsReg, ((usqInt)counter)))); /* begin Jump: */ jumpTarget = ensureNonMergeFixupAt(postBranchPC - initialPC); genoperand(Jump, ((sqInt)jumpTarget)); Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2014-04-03 02:28:25 UTC (rev 2887) +++ branches/Cog/sistasrc/vm/cogit.h 2014-04-04 00:20:08 UTC (rev 2888) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b */ Modified: branches/Cog/sistasrc/vm/cogmethod.h =================================================================== --- branches/Cog/sistasrc/vm/cogmethod.h 2014-04-03 02:28:25 UTC (rev 2887) +++ branches/Cog/sistasrc/vm/cogmethod.h 2014-04-04 00:20:08 UTC (rev 2888) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.661 uuid: e09e68b7-6224-4c07-acd0-ea1f7cf57370 + CCodeGenerator VMMaker.oscog-eem.665 uuid: bda8b202-c4ed-455a-aa43-e3135d74e79b */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.665.mcz
by commits＠source.squeak.org 04 Apr '14

04 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.665.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.665 Author: eem Time: 3 April 2014, 5:15:21.854 pm UUID: bda8b202-c4ed-455a-aa43-e3135d74e79b Ancestors: VMMaker.oscog-eem.664 Sista: Not understanding what I'm doing has caused confusion and delay. The return from ceCounterTripped: should indeed jump to the retry of the first counter decrement. But the result comes in through cResultRegister, which may be the same as TempReg which the code uses to hold the boolean tbeing tested. So TempReg should /not/ be reloaded with ReceiverResultReg. Remember to count the untaken branch in inlined special selector comparisons. Simulator: Change the prompt for the break block to present a template. =============== Diff against VMMaker.oscog-eem.664 =============== Item was changed: ----- Method: CogVMSimulator>>ceCounterTripped: (in category 'cog jit support') ----- ceCounterTripped: condition + self halt transcript cr; nextPutAll: 'counter tripped in '. - self transcript cr; nextPutAll: 'counter trpped in '. self shortPrintFrame: framePointer. ^super ceCounterTripped: condition! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulation; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; + add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. - add: 'set break block...' action: [|s| s := UIManager default request: 'break block'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half." <inline: false> | desc fixup ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> + <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> - <var: #retry type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must arrange there's a fixup at the target whether it is jumped to or not so that the simStackPtr can be kept correct." fixup := self ensureFixupAt: targetBytecodePC - initialPC. "Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: desc. "Must annotate the bytecode for correct pc mapping." self annotateBytecode: (desc constant = boolean ifTrue: [self Jump: fixup] ifFalse: [self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label]]). ^0]. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. retry := counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). + "Now we have to jump back to the retry point. This is always the point at which the boolean is tested. + The register to be tested must be reloaded with the return value of the trampoline; this is for the case + where the trampoline returns immediately without sending back.." + backEnd cResultRegister ~= TempReg ifTrue: + [self MoveR: backEnd cResultRegister R: TempReg]. + self Jump: retry. - "Return to machine code (e.g. via ceEnterCogCodePopReceiverReg in returnToMachineCodeFrame - loads return value into ReceiverResultReg but branch code tests TempReg. So reload Tempreg." - self MoveR: ReceiverResultReg R: TempReg. - self CmpCq: 0 R: ReceiverResultReg. - self JumpNonZero: retry. ok jmpTarget: (self annotateBytecode: self Label). ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison "Override to count inlined branches if followed by a conditional branch. We borrow the following conditional branch's counter and when about to inline the comparison we decrement the counter (without writing it back) and if it trips simply abort the inlining, falling back to the normal send which will then continue to the conditional branch which will trip and enter the abort." | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor nExts rcvrIsInt argIsInt rcvrInt argInt result jumpNotSmallInts inlineCAB annotateInst counter countTripped | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (rcvrInt := (self ssValue: 1) constant)]. + "short-cut the jump if operands are SmallInteger constants." (argIsInt and: [rcvrIsInt]) ifTrue: [self cCode: '' inSmalltalk: "In Simulator ints are unsigned..." [rcvrInt := objectMemory integerValueOf: rcvrInt. argInt := objectMemory integerValueOf: argInt]. primDescriptor opcode caseOf: { [JumpLess] -> [result := rcvrInt < argInt]. [JumpLessOrEqual] -> [result := rcvrInt <= argInt]. [JumpGreater] -> [result := rcvrInt > argInt]. [JumpGreaterOrEqual] -> [result := rcvrInt >= argInt]. [JumpZero] -> [result := rcvrInt = argInt]. [JumpNonZero] -> [result := rcvrInt ~= argInt] }. "Must enter any annotatedConstants into the map" self annotateBytecodeIfAnnotated: (self ssValue: 1). self annotateBytecodeIfAnnotated: self ssTop. "Must annotate the bytecode for correct pc mapping." self ssPop: 2. ^self ssPushAnnotatedConstant: (result ifTrue: [objectMemory trueObject] ifFalse: [objectMemory falseObject])]. nextPC := bytecodePC + primDescriptor numBytes. nExts := 0. [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256). branchDescriptor isExtension] whileTrue: [nExts := nExts + 1. nextPC := nextPC + branchDescriptor numBytes]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. targetBytecodePC := nextPC + branchDescriptor numBytes + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). postBranchPC := nextPC + branchDescriptor numBytes. argIsInt ifTrue: [(self ssValue: 1) popToReg: ReceiverResultReg. annotateInst := self ssTop annotateUse. self ssPop: 2. self MoveR: ReceiverResultReg R: TempReg] ifFalse: [self marshallSendArguments: 1. self MoveR: Arg0Reg R: TempReg. rcvrIsInt ifFalse: [objectRepresentation isSmallIntegerTagNonZero ifTrue: [self AndR: ReceiverResultReg R: TempReg] ifFalse: [self OrR: ReceiverResultReg R: TempReg]]]. jumpNotSmallInts := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "If counter trips simply abort the inlined comparison and send continuing to the following branch *without* writing back. A double decrement will not trip the second time." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" argIsInt ifTrue: [annotateInst ifTrue: [self annotateBytecode: (self CmpCq: argInt R: ReceiverResultReg)] ifFalse: [self CmpCq: argInt R: ReceiverResultReg]] ifFalse: [self CmpR: Arg0Reg R: ReceiverResultReg]. "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." self gen: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self SubCq: 1 R: SendNumArgsReg. "Count untaken" + counter addDependent: (self annotateAbsolutePCRef: + (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: (jumpNotSmallInts jmpTarget: self Label). argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg]. ^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset) numArgs: 1!

1 0

Scratch plugins for Mac & linux
by tim Rowledge 04 Apr '14

04 Apr '14

OK, here’s a problem I hope someone can help with. The Scratch plugins (that is ScratchPlugin CameraPlugin UnicodePlugin WeDoPlugin) are not integrated into the SVN tree properly. trunk/unix has all four; trunk/riscos has ScratchPlugin. trunk/Mac OS has none of them. trunk/win32 has just the CameraPlugin. The Cog tree (which isn’t currently viewable via the web, by the way) appears not to have any of them for unix nor Mac OS - the win32 directory is the same as for the plain interp and so is the RISCOS tree. It would be ever so nice if someone with the ability to do Mac builds could sort this out for both the plain & cog trees. I can’t do that part since I have no facility for doing vm development on a mac. I can try the unix bit on my Pi, of course, albeit v e r y s l o w l y . The original sources for the plugins can be found at http://download.scratch.mit.edu/source-code/ScratchPluginSrc1.4.zip and comparing with the versions in the trunk/unix tree might help with any changes needed. Oh, the WeDo plugin isn’t very important, so don’t bother too much with it. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Fractured Idiom:- VISA LA FRANCE - Don't leave chateau without it

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014