Vm-dev January 2015

vm-dev@lists.squeakfoundation.org

22 participants
111 discussions

VM Maker: VMMaker.oscog-eem.1021.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1021.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1021 Author: eem Time: 15 January 2015, 12:59:45.824 pm UUID: 8d22d520-7ec6-4a2e-b554-441ae57f5453 Ancestors: VMMaker.oscog-eem.1020 Fix in-image compilation for the at:put: primitive. Bow to the inevitable and add a manual override for primitive accessor depth. Use it in at: & at:put:. If manual override is not used then the automatically computed depth is too deep because of context access. =============== Diff against VMMaker.oscog-eem.1020 =============== Item was changed: ----- Method: CCodeGenerator>>accessorDepthForMethod: (in category 'spur primitive compilation') ----- accessorDepthForMethod: method "Compute the depth the method traverses object structure, assuming it is a primitive. This is in support of Spur's lazy become. A primitive may fail because it may encounter a forwarder. The primitive failure code needs to know to what depth it must follow arguments to follow forwarders and, if any are found and followed, retry the primitive. This method determines that depth. It starts by collecting references to the stack and then follows these through assignments to variables and use of accessor methods such as fetchPointer:ofObject:. For example | obj field | obj := self stackTop. field := objectMemory fetchPointer: 1 ofObject: obj. self storePointer: 1 ofObject: field withValue: (self stackValue: 1) has depth 2, since field is accessed, and field is an element of obj." + ^((method definingClass >> method selector) pragmaAt: #accessorDepth:) + ifNil: + [((self + accessorChainsForMethod: method + interpreterClass: (vmClass ifNil: [StackInterpreter])) + inject: 0 + into: [:length :chain| length max: (self accessorDepthForChain: chain)]) - 1] + ifNotNil: [:pragma| pragma arguments first]! - ^((self - accessorChainsForMethod: method - interpreterClass: (vmClass ifNil: [StackInterpreter])) - inject: 0 - into: [:length :chain| length max: (self accessorDepthForChain: chain)]) - 1! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>firstByteFormat (in category 'accessing') ----- + firstByteFormat + ^objectMemory firstByteFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>firstCompiledMethodFormat (in category 'accessing') ----- + firstCompiledMethodFormat + ^objectMemory firstCompiledMethodFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>firstLongFormat (in category 'accessing') ----- + firstLongFormat + ^objectMemory firstLongFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>weakArrayFormat (in category 'accessing') ----- + weakArrayFormat + ^objectMemory weakArrayFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>accessorDepthForPrimitiveIndex: (in category 'accessing') ----- + accessorDepthForPrimitiveIndex: anInteger + ^StackInterpreterPrimitives primitiveAccessorDepthTable at: anInteger + 1! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>ceCheckForAndFollowForwardedPrimitiveState (in category 'accessing') ----- + ceCheckForAndFollowForwardedPrimitiveState + ^coInterpreter ceCheckForAndFollowForwardedPrimitiveState! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>firstShortFormat (in category 'accessing') ----- + firstShortFormat + ^objectMemory firstShortFormat! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>fixedFieldsOfClassFormatMask (in category 'accessing') ----- + fixedFieldsOfClassFormatMask + ^objectMemory fixedFieldsOfClassFormatMask! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>formatMask (in category 'accessing') ----- + formatMask + ^objectMemory formatMask! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>formatShift (in category 'accessing') ----- + formatShift + ^objectMemory formatShift! Item was changed: ----- Method: InterpreterPrimitives>>primitiveAt (in category 'indexing primitives') ----- primitiveAt + <accessorDepth: 0> + self commonAt: false! - - self commonAt: false.! Item was changed: ----- Method: InterpreterPrimitives>>primitiveAtPut (in category 'indexing primitives') ----- primitiveAtPut + <accessorDepth: 0> + self commonAtPut: false! - - self commonAtPut: false.! Item was changed: ----- Method: StackInterpreter class>>primitiveAccessorDepthTable (in category 'constants') ----- primitiveAccessorDepthTable | cg | cg := CCodeGenerator new. cg vmClass: StackInterpreter. ^self primitiveTable collect: + [:thing| | implementingClass method | - [:thing| |class method | (thing isInteger "quick prims, 0 for fast primitve fail" or: [thing == #primitiveFail + or: [(implementingClass := self primitivesClass whichClassIncludesSelector: thing) isNil]]) - or: [(class := self primitivesClass whichClassIncludesSelector: thing) isNil]]) ifTrue: [-1] ifFalse: + [method := cg compileToTMethodSelector: thing in: implementingClass. - [method := (class >> thing) methodNode asTranslationMethodOfClass: TMethod. cg accessorDepthForMethod: method]]! Item was added: + ----- Method: VMClass class>>isNonArgumentImplicitReceiverVariableName: (in category 'translation') ----- + isNonArgumentImplicitReceiverVariableName: aString + ^false!

1 0

VM Maker: VMMaker.oscog-eem.1020.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1020.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1020 Author: eem Time: 15 January 2015, 11:39:01.031 am UUID: ef73cd3f-99cc-4bb1-83ac-31e56411dc5c Ancestors: VMMaker.oscog-cb.1019 Fix monumental blunder in jitted store-check code. The saved registers mask needs to be the *or* of the value reg and the caller-saved registers, not the *and*!! Merge with VMMaker.oscog-cb.1019's changes that use the method header flag bit to identify optimized methods. rename HeaderFlagBitPosition and MethodHeaderOptimizedBitShift to MethodHeaderFlagBitPosition. Slang: Eliminate null expressions in and: and or: if generateDeadCode is false. =============== Diff against VMMaker.oscog-cb.1019 =============== Item was changed: ----- Method: CCodeGenerator>>generateSequentialAnd:on:indent: (in category 'C translation') ----- generateSequentialAnd: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." + (self nilOrBooleanConstantReceiverOf: msgNode receiver) + ifNil: + [self emitCExpression: msgNode receiver on: aStream indent: level. + aStream crtab: level; nextPutAll: ' && ('. + self emitCTestBlock: msgNode args first on: aStream indent: level. + aStream nextPut: $)] + ifNotNil: + [:const | + const + ifTrue: [self emitCTestBlock: msgNode args first on: aStream indent: level] + ifFalse: [aStream nextPut: $0]]! - self emitCExpression: msgNode receiver on: aStream indent: level. - aStream crtab: level; nextPutAll: ' && ('. - self emitCTestBlock: msgNode args first on: aStream indent: level. - aStream nextPut: $)! Item was changed: ----- Method: CCodeGenerator>>generateSequentialOr:on:indent: (in category 'C translation') ----- generateSequentialOr: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." "Note: PP 2.3 compiler produces two arguments for or:, presumably to help with inlining later. Taking the last agument should do the correct thing even if your compiler is different." + (self nilOrBooleanConstantReceiverOf: msgNode receiver) + ifNil: + [self emitCExpression: msgNode receiver on: aStream indent: level. + aStream crtab: level; nextPutAll: ' || ('. + self emitCTestBlock: msgNode args last on: aStream indent: level. + aStream nextPut: $)] + ifNotNil: + [:const | + const + ifTrue: [aStream nextPut: $1] + ifFalse: [self emitCTestBlock: msgNode args first on: aStream indent: level]]! - self emitCExpression: msgNode receiver on: aStream indent: level. - aStream crtab: level; nextPutAll: ' || ('. - self emitCTestBlock: msgNode args last on: aStream indent: level. - aStream nextPutAll: ')'! Item was changed: ----- Method: CoInterpreter>>maybeFlagMethodAsInterpreted: (in category 'compiled methods') ----- maybeFlagMethodAsInterpreted: aMethod + "In the Sista VM the flag bit in the method header is taken to identify optimized methods. + In other VMs it can be used to flag methods that are interpreted, if it has been requested + from the image header flags." + (SistaVM not and: [flagInterpretedMethods]) ifTrue: + [| rawHeader realHeader | + rawHeader := self rawHeaderOf: aMethod. - | rawHeader realHeader | - flagInterpretedMethods ifTrue: - [rawHeader := self rawHeaderOf: aMethod. realHeader := (self isCogMethodReference: rawHeader) ifTrue: [(self cCoerceSimple: rawHeader to: #'CogMethod *') methodHeader] ifFalse: [rawHeader]. + realHeader := realHeader bitOr: (objectMemory integerObjectOf: 1 << MethodHeaderFlagBitPosition). - realHeader := realHeader bitOr: (objectMemory integerObjectOf: 1 << HeaderFlagBitPosition). (self isCogMethodReference: rawHeader) ifTrue: [(self cCoerceSimple: rawHeader to: #'CogMethod *') methodHeader: realHeader] ifFalse: [objectMemory storePointerUnchecked: 0 ofObject: aMethod withValue: realHeader]]! Item was changed: ----- Method: CoInterpreter>>setImageHeaderFlagsFrom: (in category 'image save/restore') ----- setImageHeaderFlagsFrom: headerFlags "Set the flags that are contained in the 7th long of the image header." imageHeaderFlags := headerFlags. "so as to preserve unrecognised flags." fullScreenFlag := headerFlags bitAnd: 1. imageFloatsBigEndian := (headerFlags bitAnd: 2) = 0 ifTrue: [1] ifFalse: [0]. processHasThreadId := (headerFlags bitAnd: 4) ~= 0. flagInterpretedMethods := (headerFlags bitAnd: 8) ~= 0. preemptionYields := (headerFlags bitAnd: 16) = 0. + noThreadingOfGUIThread := (headerFlags bitAnd: 32) ~= 0. + + (SistaVM and: [flagInterpretedMethods]) ifTrue: + [self print: 'warning, flagInterpretedMethods inoperable in Sista VMs.'; cr]! - noThreadingOfGUIThread := (headerFlags bitAnd: 32) ~= 0! Item was changed: ----- Method: CogObjectRepresentationForSpur>>genStoreCheckReceiverReg:valueReg:scratchReg: (in category 'compile abstract instructions') ----- genStoreCheckReceiverReg: destReg valueReg: valueReg scratchReg: scratchReg "Generate the code for a store check of valueReg into destReg." | jmpImmediate jmpDestYoung jmpSourceOld jmpAlreadyRemembered mask rememberedBitByteOffset | <var: #jmpImmediate type: #'AbstractInstruction *'> <var: #jmpDestYoung type: #'AbstractInstruction *'> <var: #jmpSourceOld type: #'AbstractInstruction *'> <var: #jmpAlreadyRemembered type: #'AbstractInstruction *'> "Is value stored an integer? If so we're done" cogit MoveR: valueReg R: scratchReg. cogit AndCq: objectMemory tagMask R: scratchReg. jmpImmediate := cogit JumpNonZero: 0. "Get the old/new boundary in scratchReg" cogit MoveCw: objectMemory storeCheckBoundary R: scratchReg. "Is target young? If so we're done" cogit CmpR: scratchReg R: destReg. "N.B. FLAGS := destReg - scratchReg" jmpDestYoung := cogit JumpBelow: 0. "Is value stored old? If so we're done." cogit CmpR: scratchReg R: valueReg. "N.B. FLAGS := valueReg - scratchReg" jmpSourceOld := cogit JumpAboveOrEqual: 0. "value is young and target is old. Need to remember this only if the remembered bit is not already set. Test the remembered bit. Only need to fetch the byte containing it, which reduces the size of the mask constant." rememberedBitByteOffset := jmpSourceOld isBigEndian ifTrue: [objectMemory baseHeaderSize - 1 - (objectMemory rememberedBitShift // 8)] ifFalse:[objectMemory rememberedBitShift // 8]. mask := 1 << (objectMemory rememberedBitShift \\ 8). "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: rememberedBitByteOffset r: destReg R: scratchReg. cogit AndCq: mask R: scratchReg. jmpAlreadyRemembered := cogit JumpNonZero: 0. "Remembered bit is not set. Call store check to insert dest into remembered table." self assert: destReg == ReceiverResultReg. cogit CallRT: ceStoreCheckTrampoline registersToBeSavedMask: ((cogit registerMaskFor: valueReg) + bitOr: cogit callerSavedRegMask). - bitAnd: cogit callerSavedRegMask). jmpImmediate jmpTarget: (jmpDestYoung jmpTarget: (jmpSourceOld jmpTarget: (jmpAlreadyRemembered jmpTarget: cogit Label))). ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genStoreSourceReg:slotIndex:destReg:scratchReg: (in category 'compile abstract instructions') ----- genStoreSourceReg: sourceReg slotIndex: index destReg: destReg scratchReg: scratchReg | jmpImmediate jmpDestYoung jmpSourceOld jmpAlreadyRoot mask rootBitByteOffset | <var: #jmpImmediate type: #'AbstractInstruction *'> <var: #jmpDestYoung type: #'AbstractInstruction *'> <var: #jmpSourceOld type: #'AbstractInstruction *'> <var: #jmpAlreadyRoot type: #'AbstractInstruction *'> "do the store" cogit MoveR: sourceReg Mw: index * objectMemory wordSize + objectMemory baseHeaderSize r: destReg. "now the check. Is value stored an integer? If so we're done" cogit MoveR: sourceReg R: scratchReg. cogit AndCq: 1 R: scratchReg. jmpImmediate := cogit JumpNonZero: 0. "Get the old/new boundary in scratchReg" cogit MoveAw: objectMemory youngStartAddress R: scratchReg. "Is target young? If so we're done" cogit CmpR: scratchReg R: destReg. "N.B. FLAGS := destReg - scratchReg" jmpDestYoung := cogit JumpAboveOrEqual: 0. "Is value stored old? If so we're done." cogit CmpR: scratchReg R: sourceReg. "N.B. FLAGS := sourceReg - scratchReg" jmpSourceOld := cogit JumpBelow: 0. "value is young and target is old. Need to make this a root if the root bit is not already set. Test the root bit. Only need to fetch the byte containing it, which reduces the size of the mask constant." rootBitByteOffset := jmpSourceOld isBigEndian ifTrue: [objectMemory wordSize - RootBitDigitLength] ifFalse:[RootBitDigitLength - 1]. mask := RootBitDigitLength > 1 ifTrue: [RootBit >> (RootBitDigitLength - 1 * 8)] ifFalse: [RootBit]. "N.B. MoveMb:r:R: does not zero other bits" cogit MoveMb: rootBitByteOffset r: destReg R: scratchReg. cogit AndCq: mask R: scratchReg. jmpAlreadyRoot := cogit JumpNonZero: 0. "Root bit is not set. Call store check to insert dest into root table." self assert: destReg == ReceiverResultReg. cogit CallRT: ceStoreCheckTrampoline registersToBeSavedMask: ((cogit registerMaskFor: sourceReg) + bitOr: cogit callerSavedRegMask). - bitAnd: cogit callerSavedRegMask). jmpImmediate jmpTarget: (jmpDestYoung jmpTarget: (jmpSourceOld jmpTarget: (jmpAlreadyRoot jmpTarget: cogit Label))). ^0! Item was changed: InterpreterPrimitives subclass: #StackInterpreter instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' + classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderFlagBitPosition MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' - classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderOptimizedBitShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>initializeMethodIndices (in category 'initialization') ----- initializeMethodIndices | tagBits | "Class CompiledMethod" HeaderIndex := 0. LiteralStart := 1. tagBits := self objectMemoryClass numSmallIntegerTagBits. LargeContextBit := 16r20000 << tagBits. "This bit set in method headers if large context is needed." - MethodHeaderOptimizedBitShift := 28 + tagBits. MethodHeaderTempCountShift := 18 + tagBits. MethodHeaderArgCountShift := 24 + tagBits. V3PrimitiveBitsMask := 16r100001FF << tagBits. AlternateHeaderHasPrimFlag := 16r10000 << tagBits. + "The position of the unused flag bit in the method header, not including tag bit(s). + This is used either as the `has been interpreted' flag or the `is an optimized method' flag; the + latter if this is a Sista VM." + MethodHeaderFlagBitPosition := 28 + tagBits! - "The position of the unused flag bit in the method header, not including tag bit(s)" - HeaderFlagBitPosition := 29! Item was changed: ----- Method: StackInterpreter>>isOptimizedMethod: (in category 'compiled methods') ----- isOptimizedMethod: header <api> + <option: #SistaVM> + ^header >> MethodHeaderFlagBitPosition anyMask: 1! - ^ (header >> MethodHeaderOptimizedBitShift bitAnd: 1) = 1 !

1 0

VM Maker: VMMaker.oscog-cb.1019.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1019.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1019 Author: cb Time: 15 January 2015, 5:14:07.437 pm UUID: 9f3b07dd-ec85-455f-b8a4-2dc0f27868ed Ancestors: VMMaker.oscog-cb.1018 added super calls in conditionnal jumps generation in order not to generate counters for optimized methods. =============== Diff against VMMaker.oscog-cb.1018 =============== 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 counterAddress countTripped retry | <var: #ok type: #'AbstractInstruction *'> <var: #desc type: #'CogSimStackEntry *'> <var: #retry type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> + + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genJumpIf: boolean to: targetBytecodePC ]. + self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: objectMemory wordSize = CounterBytes. retry := self MoveAw: counterAddress 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. self MoveR: SendNumArgsReg Aw: counterAddress. "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" self MoveR: SendNumArgsReg Aw: counterAddress. "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. The trampoline makes sure that TempReg has been reloaded." self annotateBytecode: self Label. self Jump: retry. ok jmpTarget: 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 counterAddress countTripped | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> + + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genSpecialSelectorComparison ]. + 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." counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: objectMemory wordSize = CounterBytes. self MoveAw: counterAddress 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. self MoveR: SendNumArgsReg Aw: counterAddress. "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" self MoveR: SendNumArgsReg Aw: counterAddress. "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! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- genSpecialSelectorEqualsEquals "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 counterAddress countTripped unforwardArg unforwardRcvr | <var: #countTripped type: #'AbstractInstruction *'> <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> + + (coInterpreter isOptimizedMethod: methodObj) ifTrue: [ ^ super genSpecialSelectorEqualsEquals ]. + self ssFlushTo: simStackPtr - 2. primDescriptor := self generatorAt: byte0. 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." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^self genSpecialSelectorSend]. targetBytecodePC := nextPC + branchDescriptor numBytes + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). postBranchPC := nextPC + branchDescriptor numBytes. unforwardRcvr := (self ssValue: 1) type ~= SSConstant or: [objectRepresentation shouldAnnotateObjectReference: (self ssValue: 1) constant]. unforwardArg := self ssTop type ~= SSConstant or: [objectRepresentation shouldAnnotateObjectReference: self ssTop constant]. self marshallSendArguments: 1. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counterAddress := counters + ((self sizeof: #sqInt) * counterIndex). self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: objectMemory wordSize = CounterBytes. self MoveAw: counterAddress 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. self MoveR: SendNumArgsReg Aw: counterAddress. "write back" unforwardRcvr ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: ReceiverResultReg scratchReg: TempReg]. unforwardArg ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: Arg0Reg scratchReg: TempReg]. 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: [JumpZero] ifFalse: [JumpNonZero]) operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. self SubCq: 1 R: SendNumArgsReg. "Count untaken" self MoveR: SendNumArgsReg Aw: counterAddress. "write back" self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). countTripped jmpTarget: self Label. ^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset) numArgs: 1! Item was changed: InterpreterPrimitives subclass: #StackInterpreter instanceVariableNames: 'currentBytecode bytecodeSetSelector localFP localIP localSP stackLimit stackPage stackPages method instructionPointer stackPointer framePointer localReturnValue extA extB primitiveFunctionPointer methodCache atCache lkupClassTag lkupClass methodDictLinearSearchLimit highestRunnableProcessPriority nextWakeupUsecs nextPollUsecs inIOProcessEvents interruptKeycode interruptPending savedWindowSize imageHeaderFlags fullScreenFlag deferDisplayUpdates pendingFinalizationSignals extraVMMemory interpreterProxy showSurfaceFn primitiveTable primitiveAccessorDepthTable externalPrimitiveTable externalPrimitiveTableFirstFreeIndex overflowedPage extraFramesToMoveOnOverflow globalSessionID jmpBuf jmpDepth suspendedCallbacks suspendedMethods numStackPages desiredNumStackPages desiredEdenBytes classNameIndex thisClassIndex metaclassNumSlots interruptCheckChain suppressHeartbeatFlag breakSelector breakSelectorLength longRunningPrimitiveCheckMethod longRunningPrimitiveCheckSemaphore longRunningPrimitiveStartUsecs longRunningPrimitiveStopUsecs longRunningPrimitiveGCUsecs longRunningPrimitiveCheckSequenceNumber longRunningPrimitiveSignalUndelivered checkAllocFiller tempOop tempOop2 theUnknownShort the2ndUnknownShort imageFloatsBigEndian maxExtSemTabSizeSet lastMethodCacheProbeWrite gcSemaphoreIndex classByteArrayCompactIndex statForceInterruptCheck statStackOverflow statStackPageDivorce statCheckForEvents statProcessSwitch statIOProcessEvents statPendingFinalizationSignals' + classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderOptimizedBitShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' - classVariableNames: 'AltBytecodeEncoderClassName AltLongStoreBytecode AlternateHeaderHasPrimFlag AtCacheEntries AtCacheFixedFields AtCacheFmt AtCacheMask AtCacheOop AtCacheSize AtCacheTotalSize AtPutBase BytecodeEncoderClassName BytecodeTable CacheProbeMax DirBadPath DirEntryFound DirNoMoreEntries DumpStackOnLowSpace EnclosingMixinIndex EnclosingObjectIndex FailImbalancedPrimitives HeaderFlagBitPosition LongStoreBytecode MaxExternalPrimitiveTableSize MaxJumpBuf MaxPrimitiveIndex MaxQuickPrimitiveIndex MethodHeaderArgCountShift MethodHeaderTempCountShift MixinIndex PrimitiveExternalCallIndex PrimitiveTable StackPageReachedButUntraced StackPageTraceInvalid StackPageTraced StackPageUnreached V3PrimitiveBitsMask' poolDictionaries: 'VMBasicConstants VMMethodCacheConstants VMObjectIndices VMSpurObjectRepresentationConstants VMSqueakClassIndices VMSqueakV3BytecodeConstants VMStackFrameOffsets' category: 'VMMaker-Interpreter'! !StackInterpreter commentStamp: 'eem 12/5/2014 11:32' prior: 0! This class is a complete implementation of the Smalltalk-80 virtual machine, derived originally from the Blue Book specification but quite different in some areas. This VM supports Closures but *not* old-style BlockContexts. It has been modernized with 32-bit pointers, better management of Contexts (see next item), and attention to variable use that allows the CCodeGenerator (qv) to keep, eg, the instruction pointer and stack pointer in registers as well as keeping most simple variables in a global array that seems to improve performance for most platforms. The VM does not use Contexts directly. Instead Contexts serve as proxies for a more conventional stack format that is invisible to the image. There is considerable explanation at http://www.mirandabanda.org/cogblog/2009/01/14/under-cover-contexts-and-the…. The VM maintains a fixed-size stack zone divided into pages, each page being capable of holding several method/block activations. A send establishes a new frame in the current stack page, a return returns to the previous frame. This eliminates allocation/deallocation of contexts and the moving of receiver and arguments from caller to callee on each send/return. Contexts are created lazily when an activation needs a context (creating a block, explicit use of thisContext, access to sender when sender is a frame, or linking of stack pages together). Contexts are either conventional and heap-resident ("single") or "married" and serve as proxies for their corresponding frame or "widowed", meaning that their spouse frame has been returned from (died). A married context is specially marked (more details in the code) and refers to its frame. Likewise a married frame is specially marked and refers to its context. In addition to SmallInteger arithmetic and Floats, the VM supports logic on 32-bit PositiveLargeIntegers, thus allowing it to simulate itself much more effectively than would otherwise be the case. StackInterpreter and subclasses support multiple memory managers. Currently there are two. NewMemoryManager is a slightly refined version of ObjectMemory, and is the memory manager and garbage collector for the original Squeak object representation as described in "Back to the Future The Story of Squeak, A Practical Smalltalk Written in Itself", see http://ftp.squeak.org/docs/OOPSLA.Squeak.html. Spur is a faster, more regular object representation that is designed for more performance and functionality, and to have a common header format for both 32-bit and 64-bit versions. You can read about it in SpurMemoryManager's class comment. There is also a video of a presentation at ESUG 2014 (https://www.youtube.com/watch?v=k0nBNS1aHZ4), along with slides (http://www.slideshare.net/esug/spur-a-new-object-representation-for-cog?rel…).! Item was changed: ----- Method: StackInterpreter class>>initializeMethodIndices (in category 'initialization') ----- initializeMethodIndices | tagBits | "Class CompiledMethod" HeaderIndex := 0. LiteralStart := 1. tagBits := self objectMemoryClass numSmallIntegerTagBits. LargeContextBit := 16r20000 << tagBits. "This bit set in method headers if large context is needed." + MethodHeaderOptimizedBitShift := 28 + tagBits. MethodHeaderTempCountShift := 18 + tagBits. MethodHeaderArgCountShift := 24 + tagBits. V3PrimitiveBitsMask := 16r100001FF << tagBits. AlternateHeaderHasPrimFlag := 16r10000 << tagBits. "The position of the unused flag bit in the method header, not including tag bit(s)" HeaderFlagBitPosition := 29! Item was added: + ----- Method: StackInterpreter>>isOptimizedMethod: (in category 'compiled methods') ----- + isOptimizedMethod: header + <api> + ^ (header >> MethodHeaderOptimizedBitShift bitAnd: 1) = 1 !

1 0

VM Maker: BytecodeSets.spur-cb.17.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.17.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.17 Author: cb Time: 15 January 2015, 4:23:17.576 pm UUID: 9d811a19-73c0-4b1f-9f65-3b50c72875f0 Ancestors: BytecodeSets.spur-eem.16 introducing new bytecode 217 unconditionnal trap =============== Diff against BytecodeSets.spur-eem.16 =============== Item was changed: BytecodeEncoder subclass: #EncoderForSistaV1 (excessive size, no diff calculated) Item was added: + ----- Method: EncoderForSistaV1>>genTrap (in category 'bytecode generation') ----- + genTrap + "217 11011001 Unconditionnal trap" + stream nextPut: 217!

1 0

VM Maker: VMMaker.oscog-cb.1018.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

ClementBera uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1018.mcz ==================== Summary ==================== Name: VMMaker.oscog-cb.1018 Author: cb Time: 15 January 2015, 4:20:09.697 pm UUID: f6c38e14-dde6-469d-98a9-d4dd54b6fa99 Ancestors: VMMaker.oscog-eem.1017 added unconditionnal single bytecode 217 This bytecode can be used in two case: - when a method is discarded, all its bytecodes are replaced by the unconditionnal trap and its cogVMState is flushed - in optimized methods, in a branch that wants to trigger dynamic deoptimization =============== Diff against VMMaker.oscog-eem.1017 =============== Item was added: + ----- Method: SimpleStackBasedCogit>>genUnconditionnalTrapBytecode (in category 'bytecode generators') ----- + genUnconditionnalTrapBytecode + "SistaV1: * 217 Trap" + ^EncounteredUnknownBytecode! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>genUnconditionnalTrapBytecode (in category 'bytecode generators') ----- + genUnconditionnalTrapBytecode + "SistaV1: * 217 Trap" + "Use ssFlushNoUpdateTo: so we continue compiling as if the stack had not been flushed . + (typically, this kind of trap is in a branch) + Control does not return after the ceClassTrapTrampoline call." + self ssFlushNoUpdateTo: simStackPtr. + self CallRT: ceTrapTrampoline. + ^0! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) + (217 unconditionnalTrapBytecode) + (218 223 unknownBytecode) - (217 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 extTrapIfNotInstanceOfBehaviorsBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) (251 pushRemoteTempLongBytecode) (252 storeRemoteTempLongBytecode) (253 storeAndPopRemoteTempLongBytecode) (254 255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>unconditionnalTrapBytecode (in category 'sista bytecodes') ----- + unconditionnalTrapBytecode + "SistaV1: * 217 Trap" + ^ self respondToSistaTrap! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForSistaV1 (in category 'class initialization') ----- initializeBytecodeTableForSistaV1 "StackToRegisterMappingCogit initializeBytecodeTableForSistaV1" numPushNilsFunction := #sistaV1:Num:Push:Nils:. pushNilSizeFunction := #sistaV1PushNilSize:. FirstSpecialSelector := 96. self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( "1 byte bytecodes" "pushes" (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushLiteralVariable16CasesBytecode needsFrameNever: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 75 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 76 76 genPushReceiverBytecode needsFrameNever: 1) (1 77 77 genPushConstantTrueBytecode needsFrameNever: 1) (1 78 78 genPushConstantFalseBytecode needsFrameNever: 1) (1 79 79 genPushConstantNilBytecode needsFrameNever: 1) (1 80 80 genPushConstantZeroBytecode needsFrameNever: 1) (1 81 81 genPushConstantOneBytecode needsFrameNever: 1) (1 82 82 genExtPushPseudoVariable) (1 83 83 duplicateTopBytecode needsFrameNever: 1) (1 84 87 unknownBytecode) "returns" (1 88 88 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 89 89 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 90 90 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 91 91 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 92 92 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 93 93 genReturnNilFromBlock return needsFrameNever: -1) (1 94 94 genReturnTopFromBlock return needsFrameNever: -1) (1 95 95 genExtNopBytecode needsFrameNever: 0) "sends" (1 96 96 genSpecialSelectorArithmetic isMapped AddRR) (1 97 97 genSpecialSelectorArithmetic isMapped SubRR) (1 98 98 genSpecialSelectorComparison isMapped JumpLess) (1 99 99 genSpecialSelectorComparison isMapped JumpGreater) (1 100 100 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 101 101 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 102 102 genSpecialSelectorComparison isMapped JumpZero) (1 103 103 genSpecialSelectorComparison isMapped JumpNonZero) (1 104 109 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 110 110 genSpecialSelectorArithmetic isMapped AndRR) (1 111 111 genSpecialSelectorArithmetic isMapped OrRR) (1 112 117 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 118 118 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 119 119 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 120 127 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 128 143 genSendLiteralSelector0ArgsBytecode isMapped) (1 144 159 genSendLiteralSelector1ArgBytecode isMapped) (1 160 175 genSendLiteralSelector2ArgsBytecode isMapped) "jumps" (1 176 183 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 184 191 genShortJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (1 192 199 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) "stores" (1 200 207 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 208 215 genStoreAndPopTemporaryVariableBytecode) (1 216 216 genPopStackBytecode needsFrameNever: -1) + (1 217 217 genUnconditionnalTrapBytecode isMapped) - (1 217 223 unknownBytecode) + (1 218 223 unknownBytecode) + "2 byte bytecodes" (2 224 224 extABytecode extension) (2 225 225 extBBytecode extension) "pushes" (2 226 226 genExtPushReceiverVariableBytecode needsFrameNever: 1) (2 227 227 genExtPushLiteralVariableBytecode needsFrameNever: 1) (2 228 228 genExtPushLiteralBytecode needsFrameNever: 1) (2 229 229 genLongPushTemporaryVariableBytecode) (2 230 230 genPushClosureTempsBytecode) (2 231 231 genPushNewArrayBytecode) (2 232 232 genExtPushIntegerBytecode needsFrameNever: 1) (2 233 233 genExtPushCharacterBytecode needsFrameNever: 1) "returns" "sends" (2 234 234 genExtSendBytecode isMapped) (2 235 235 genExtSendSuperBytecode isMapped) "sista bytecodes" (2 236 236 genExtTrapIfNotInstanceOfBehaviorsBytecode isMapped) "jumps" (2 237 237 genExtUnconditionalJump branch isMapped "because of interrupt check" v4:Long:Branch:Distance:) (2 238 238 genExtJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) (2 239 239 genExtJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v4:Long:Branch:Distance:) "stores" (2 240 240 genExtStoreAndPopReceiverVariableBytecode) (2 241 241 genExtStoreAndPopLiteralVariableBytecode) (2 242 242 genLongStoreAndPopTemporaryVariableBytecode) (2 243 243 genExtStoreReceiverVariableBytecode) (2 244 244 genExtStoreLiteralVariableBytecode) (2 245 245 genLongStoreTemporaryVariableBytecode) (2 246 247 unknownBytecode) "3 byte bytecodes" (3 248 248 genCallPrimitiveBytecode) (3 249 249 unknownBytecode) "reserved for Push Float" (3 250 250 genExtPushClosureBytecode block v4:Block:Code:Size:) (3 251 251 genPushRemoteTempLongBytecode) (3 252 252 genStoreRemoteTempLongBytecode) (3 253 253 genStoreAndPopRemoteTempLongBytecode) (3 254 255 unknownBytecode))!

1 0

VM Maker: Cog-eem.235.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.235.mcz ==================== Summary ==================== Name: Cog-eem.235 Author: eem Time: 14 January 2015, 5:27:40.323 pm UUID: dd2727c3-405f-4e08-85ae-9564bf7315b7 Ancestors: Cog-eem.234 Merge with Kernel-nice.892: Fix Float class>>fromIEEE32Bit: in the case of gradual underflow again... =============== Diff against Cog-eem.234 =============== Item was changed: ----- Method: SpurBootstrapPrototypes>>FloatclassPROTOTYPEfromIEEE32Bit: (in category 'method prototypes') ----- FloatclassPROTOTYPEfromIEEE32Bit: word "Convert the given 32 bit word (which is supposed to be a positive 32-bit value) from a 32 bit IEEE floating point representation into an actual Squeak float object (being 64 bits wide). Should only be used for conversion in FloatArrays or likewise objects." | sign mantissa exponent delta | word <= 0 ifTrue: [^word negative ifTrue: [self error: 'Cannot deal with negative numbers'] ifFalse: [self zero]]. sign := word bitAnd: 16r80000000. word = sign ifTrue: [^self negativeZero]. exponent := ((word bitShift: -23) bitAnd: 16rFF) - 127. mantissa := word bitAnd: 16r7FFFFF. exponent = 128 ifTrue: "Either NAN or INF" [^mantissa = 0 ifTrue: [sign = 0 ifTrue: [self infinity] ifFalse: [self negativeInfinity]] ifFalse: [self nan]]. exponent = -127 ifTrue: "gradual underflow (denormalized number) Remove first bit of mantissa and adjust exponent" [delta := mantissa highBit. + mantissa := (mantissa bitAnd: (1 bitShift: delta - 1) - 1) bitShift: 24 - delta. - mantissa := (mantissa bitShift: 1) bitAnd: (1 bitShift: delta) - 1. exponent := exponent + delta - 23]. "Create new float" ^(self basicNew: 2) basicAt: 1 put: ((sign bitOr: (1023 + exponent bitShift: 20)) bitOr: (mantissa bitShift: -3)); basicAt: 2 put: ((mantissa bitAnd: 7) bitShift: 29); * 1.0 "reduce to SmallFloat64 if possible"!

1 0

[commit][3229] CogVM source as per VMMaker.oscog-eem.1017
by commits＠squeakvm.org 15 Jan '15

15 Jan '15

Revision: 3229 Author: eliot Date: 2015-01-14 16:03:32 -0800 (Wed, 14 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1017 Add an assert to check for forwarding in wakeHighestPriority to hunt bug CM sees Comment typo Fix slips in some sista build scripts (wrong install dir on linux, bad path for plist edit on mac). Modified Paths: -------------- branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm branches/Cog/build.macos32x86/squeak.sista.spur/makevm branches/Cog/build.macos64x64/squeak.sista.spur/makevm branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # Spur VM with VM profiler and threaded heartbeat -INSTALLDIR=cogspurlinuxht +INSTALLDIR=sistaspurlinuxht # Some gcc versions create a broken VM using -O2 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in 3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";; Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # assert VM with VM profiler and threaded heartbeat -INSTALLDIR=assert/cogspurlinuxht +INSTALLDIR=assert/sistaspurlinuxht OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" if [ $# -ge 1 ]; then Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # assert VM with VM profiler and itimer heartbeat -INSTALLDIR=assert/cogspurlinux +INSTALLDIR=assert/sistaspurlinux OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" if [ $# -ge 1 ]; then Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # debug Spur VM with VM profiler and threaded heartbeat -INSTALLDIR=debug/cogspurlinuxht +INSTALLDIR=debug/sistaspurlinuxht OPT="-g3 -O0 -DDEBUGVM=1" if [ $# -ge 1 ]; then Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # debug Spur VM with VM profiler and itimer heartbeat -INSTALLDIR=debug/cogspurlinux +INSTALLDIR=debug/sistaspurlinux OPT="-g3 -O0 -DDEBUGVM=1" if [ $# -ge 1 ]; then Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,6 +1,6 @@ #!/bin/bash # Spur VM with VM profiler and itimer heartbeat -INSTALLDIR=cogspurlinux +INSTALLDIR=sistaspurlinux # Some gcc versions create a broken VM using -O2 case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in 3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0";; Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-01-15 00:03:32 UTC (rev 3229) @@ -70,7 +70,7 @@ else mv build/$BUILD_CONFIGURATION/$APP "$DEST" fi -../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist" +../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" # Build the Float plugin echo @@ -116,7 +116,7 @@ if false; then # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in -# ../processors/IA32/bochs. cd ../processors/IA32/bochs. Run conf.COG & makeem. +# ../../processors/IA32/bochs. cd ../../processors/IA32/bochs. Run conf.COG & makeem. echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle" Modified: branches/Cog/build.macos64x64/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos64x64/squeak.sista.spur/makevm 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/build.macos64x64/squeak.sista.spur/makevm 2015-01-15 00:03:32 UTC (rev 3229) @@ -70,7 +70,7 @@ else mv build/$BUILD_CONFIGURATION/$APP "$DEST" fi -../scripts/versionInfoPlist ../platforms CoreVM.plist "$DEST/Contents/Info.plist" +../../scripts/versionInfoPlist ../../platforms CoreVM.plist "$DEST/Contents/Info.plist" # Build the Float plugin echo @@ -116,7 +116,7 @@ if false; then # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in -# ../processors/IA32/bochs. cd ../processors/IA32/bochs. Run conf.COG & makeem. +# ../../processors/IA32/bochs. cd ../../processors/IA32/bochs. Run conf.COG & makeem. echo BochsIA32Plugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle" Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46801,6 +46801,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2104,7 +2104,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46810,6 +46810,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2354,7 +2354,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -48294,7 +48294,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -66358,6 +66358,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2357,7 +2357,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -48303,7 +48303,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -66367,6 +66367,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2102,7 +2102,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1017"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -34493,7 +34493,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -53265,6 +53265,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2099,7 +2099,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1014"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1017"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -34484,7 +34484,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -53256,6 +53256,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jan 13 10:08:57 PST 2015 + Wed Jan 14 16:02:15 PST 2015 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/sistasrc/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/sistasrc/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/sistasrc/vm/cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/sistasrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2098,7 +2098,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46774,6 +46774,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/sistasrc/vm/cointerp.h =================================================================== --- branches/Cog/sistasrc/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/sistasrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/sistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/sistasrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -46783,6 +46783,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursistasrc/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1015 uuid: cc6ec010-1b1d-4ba3-8a4d-1c31b2931fbd + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2350,7 +2350,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9167,7 +9167,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -9227,7 +9227,7 @@ null; goto l77; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11964,7 +11964,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -12024,7 +12024,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29608,7 +29608,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29655,7 +29655,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -48527,7 +48527,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -66470,6 +66470,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursistasrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2353,7 +2353,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -9176,7 +9176,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -9236,7 +9236,7 @@ null; goto l77; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11973,7 +11973,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -12033,7 +12033,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -29617,7 +29617,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29664,7 +29664,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -48536,7 +48536,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -66479,6 +66479,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursrc/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursrc/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2341,7 +2341,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43425,7 +43425,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -61359,6 +61359,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2344,7 +2344,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -43434,7 +43434,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -61368,6 +61368,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spurstack64src/vm/gcc3x-interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2122,7 +2122,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -33278,7 +33278,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -53233,6 +53233,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 7) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spurstack64src/vm/interp.c =================================================================== --- branches/Cog/spurstack64src/vm/interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spurstack64src/vm/interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2119,7 +2119,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -33269,7 +33269,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -53224,6 +53224,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 7) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2092,7 +2092,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -30347,7 +30347,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -48611,6 +48611,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/spurstacksrc/vm/interp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2089,7 +2089,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.1017]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -30338,7 +30338,7 @@ 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) - 24 - 31 compiled method (28-21 unused in 32-bits) */ + 24 - 31 compiled method (28-31 unused in 32-bits) */ static sqInt formatOf(sqInt objOop) @@ -48602,6 +48602,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 3) == 0) && (((longAt(oop)) & 0x3FFFFF) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/src/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/src/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1004 uuid: 132642b3-ab26-4957-82a4-8aa19b60f188 + CCodeGenerator VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/src/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2089,7 +2089,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1017]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -42144,6 +42144,7 @@ static sqInt isLiveContext(sqInt oop) { + assert(!((isOopForwarded(oop)))); if (!(((oop & 1) == 0) && (((((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F) == ClassMethodContextCompactIndex))) { return 0; Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/src/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2015-01-13 18:10:05 UTC (rev 3228) +++ branches/Cog/src/vm/cointerpmt.c 2015-01-15 00:03:32 UTC (rev 3229) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 from - CoInterpreterMT VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d + CoInterpreterMT VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1014 uuid: 8c9c75f6-b340-4135-ae40-399c35379d5d " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2186,7 +2186,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1014]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.1017]"; @@ Diff output truncated at 50000 characters. @@

1 0

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

14 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1017.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1017 Author: eem Time: 14 January 2015, 10:59:37.787 am UUID: 5684df46-8489-43e5-b2ac-6406ef739cf5 Ancestors: VMMaker.oscog-eem.1016 Add an assert to check for forwarding in wakeHighestPriority to hunt bug CM is seeing. Comment typo =============== Diff against VMMaker.oscog-eem.1016 =============== Item was changed: ----- Method: SpurMemoryManager>>formatOf: (in category 'object access') ----- formatOf: objOop "0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) 3 = indexable objects with inst vars (MethodContext AdditionalMethodState et al) 4 = weak indexable objects with inst vars (WeakArray et al) 5 = weak non-indexable objects with inst vars (ephemerons) (Ephemeron) 6 unused, reserved for exotic pointer objects? 7 Forwarded Object, 1st field is pointer, rest of fields are ignored 8 unused, reserved for exotic non-pointer objects? 9 (?) 64-bit indexable 10 - 11 32-bit indexable (11 unused in 32 bits) 12 - 15 16-bit indexable (14 & 15 unused in 32-bits) 16 - 23 byte indexable (20-23 unused in 32-bits) + 24 - 31 compiled method (28-31 unused in 32-bits)" - 24 - 31 compiled method (28-21 unused in 32-bits)" ^(self longAt: objOop) >> self formatShift bitAnd: self formatMask! Item was changed: ----- Method: StackInterpreter>>isLiveContext: (in category 'frame access') ----- isLiveContext: oop "Answer if the argument, which can be any object, is a live context." + self deny: (objectMemory isOopForwarded: oop). (objectMemory isContext: oop) ifFalse: [^false]. (self isSingleContext: oop) ifTrue: [^objectMemory isIntegerObject: (objectMemory fetchPointer: InstructionPointerIndex ofObject: oop)]. ^(self isWidowedContext: oop) not!

1 0

Implementing lazy loading for expandable collections (part 2)
by Max Leske 14 Jan '15

14 Jan '15

Hi Alex I thought the following little experiment might interest you. I was trying to find out (as per your suggestion) how big the difference would be between: - setting the array in OrderedCollection to nil and initializing it to size 10 on first access - initializing the array in OrderedCollection to size 0. Expectation: #grow will take time, ergo, using an empty array should be slower than using a preallocated array. Experiment (Pharo 1.3 on SqueakVM): [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 100000. 1 to: 10000 do: [ :i | c add: i ] ] ] timeToRun 17566 [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 10000. 1 to: 10000 do: [ :i | c add: i ] ] ] timeToRun 19717 [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 0. 1 to: 10000 do: [ :i | c add: i ] ] ] timeToRun 17598 [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 1000. 1 to: 10000 do: [ :i | c add: i ] ] ] timeToRun 18084 Result: growing a collection is always faster (or at least nearly equally fast)! Explanation: What makes preinitialized collections so slow is the fact the the firstIndex variable will be set to the first third of the array (3333 in this case). When the last position in the array is reached, all elements are copied to the beginning of the array (2n operations). This copy operation is really slow (which can be seen from the first example with an oversized collection that does not require copying because the last position of the array is never reached). Experiment (Pharo 4 on PharoVM): (I’m using bigger numbers here to compensate for the faster VM :) ) [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 1000000. 1 to: 100000 do: [ :i | c add: i ] ] ] timeToRun "0:00:01:09.225" [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 100000. 1 to: 100000 do: [ :i | c add: i ] ] ] timeToRun "0:00:00:37.653" [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 0. 1 to: 100000 do: [ :i | c add: i ] ] ] timeToRun "0:00:00:40.152" [ 10000 timesRepeat: [ | c | c := OrderedCollection new: 10000. 1 to: 100000 do: [ :i | c add: i ] ] ] timeToRun "0:00:00:42.121” Result: growing a collection is easily fast enough, although minute performance gains are possible with preinitialized collections. Explanation: #makeRoomAtLast has been improved. Also: firstIndex is now set to the beginning of the array, preventing the copy operation that made the former measurements so slow. The run with the oversized collection is only so slow because it apparently takes a lot of time to assign the large array (?). Consequence of my little experiment: My initial implementation of the idea in you paper set the array in OrderedCollection to nil under the assumption that grow operations are very costly. That choice leads to many changes in methods of OrderedCollection where it is necessary to check if the array has been initialized yet. This introduces overhead and makes the code more error prone. I see now that it makes much more sense to use an empty array, the performance lost by growing ist neglectable. It is also interesting to note that there almost never seems to be a good reason to initialize an OrderedCollection with a large array. Cheers, Max

1 0

[commit][3228] Add a processor-agnostic include file for alien callouts and callbacks.
by commits＠squeakvm.org 13 Jan '15

13 Jan '15

Revision: 3228 Author: eliot Date: 2015-01-13 10:10:05 -0800 (Tue, 13 Jan 2015) Log Message: ----------- Add a processor-agnostic include file for alien callouts and callbacks. Needed for linux where host_cpu and build_cpu are not necessarily the target cpu. Add some support for identifying the presence of epoll_wait & epoll_pwait on linux. Modified Paths: -------------- branches/Cog/platforms/unix/config/acinclude.m4 branches/Cog/platforms/unix/config/config.h.in branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/config/configure.ac branches/Cog/platforms/unix/plugins/IA32ABI/acinclude.m4 Added Paths: ----------- branches/Cog/platforms/unix/config/ax_have_epoll.m4 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 9 14:03:48 PST 2015 + Tue Jan 13 10:08:57 PST 2015 Modified: branches/Cog/platforms/unix/config/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/config/acinclude.m4 2015-01-13 18:04:53 UTC (rev 3227) +++ branches/Cog/platforms/unix/config/acinclude.m4 2015-01-13 18:10:05 UTC (rev 3228) @@ -286,3 +286,6 @@ plibs="${plibs} $1", AC_MSG_RESULT([******** disabling ${plugin} due to missing libraries]) disabled_plugins="${disabled_plugins} ${plugin}")]) + +# Recent Unix stuff +m4_include([ax_have_epoll.m4]) Added: branches/Cog/platforms/unix/config/ax_have_epoll.m4 =================================================================== --- branches/Cog/platforms/unix/config/ax_have_epoll.m4 (rev 0) +++ branches/Cog/platforms/unix/config/ax_have_epoll.m4 2015-01-13 18:10:05 UTC (rev 3228) @@ -0,0 +1,104 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_have_epoll.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_EPOLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# AX_HAVE_EPOLL_PWAIT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro determines whether the system supports the epoll I/O event +# interface. A neat usage example would be: +# +# AX_HAVE_EPOLL( +# [AX_CONFIG_FEATURE_ENABLE(epoll)], +# [AX_CONFIG_FEATURE_DISABLE(epoll)]) +# AX_CONFIG_FEATURE( +# [epoll], [This platform supports epoll(7)], +# [HAVE_EPOLL], [This platform supports epoll(7).]) +# +# The epoll interface was added to the Linux kernel in version 2.5.45, and +# the macro verifies that a kernel newer than this is installed. This +# check is somewhat unreliable if <linux/version.h> doesn't match the +# running kernel, but it is necessary regardless, because glibc comes with +# stubs for the epoll_create(), epoll_wait(), etc. that allow programs to +# compile and link even if the kernel is too old; the problem would then +# be detected only at runtime. +# +# Linux kernel version 2.6.19 adds the epoll_pwait() call in addition to +# epoll_wait(). The availability of that function can be tested with the +# second macro. Generally speaking, it is safe to assume that +# AX_HAVE_EPOLL would succeed if AX_HAVE_EPOLL_PWAIT has, but not the +# other way round. +# +# LICENSE +# +# Copyright (c) 2008 Peter Simons <simons(a)cryp.to> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_HAVE_EPOLL], [dnl + ax_have_epoll_cppflags="${CPPFLAGS}" + AC_CHECK_HEADER([linux/version.h], [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) + AC_MSG_CHECKING([for Linux epoll(7) interface]) + AC_CACHE_VAL([ax_cv_have_epoll], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM([dnl +#include <sys/epoll.h> +#ifdef HAVE_LINUX_VERSION_H +# include <linux/version.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45) +# error linux kernel version is too old to have epoll +# endif +#endif +], [dnl +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0);])], + [ax_cv_have_epoll=yes], + [ax_cv_have_epoll=no])]) + CPPFLAGS="${ax_have_epoll_cppflags}" + AS_IF([test "${ax_cv_have_epoll}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl + +AC_DEFUN([AX_HAVE_EPOLL_PWAIT], [dnl + ax_have_epoll_cppflags="${CPPFLAGS}" + AC_CHECK_HEADER([linux/version.h], + [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) + AC_MSG_CHECKING([for Linux epoll(7) interface with signals extension]) + AC_CACHE_VAL([ax_cv_have_epoll_pwait], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM([dnl +#ifdef HAVE_LINUX_VERSION_H +# include <linux/version.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +# error linux kernel version is too old to have epoll_pwait +# endif +#endif +#include <sys/epoll.h> +#include <signal.h> +], [dnl +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0); +rc = epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0));])], + [ax_cv_have_epoll_pwait=yes], + [ax_cv_have_epoll_pwait=no])]) + CPPFLAGS="${ax_have_epoll_cppflags}" + AS_IF([test "${ax_cv_have_epoll_pwait}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl Modified: branches/Cog/platforms/unix/config/config.h.in =================================================================== --- branches/Cog/platforms/unix/config/config.h.in 2015-01-13 18:04:53 UTC (rev 3227) +++ branches/Cog/platforms/unix/config/config.h.in 2015-01-13 18:10:05 UTC (rev 3228) @@ -112,6 +112,9 @@ #undef HAVE_ALLOCA #undef HAVE_ALLOCA_H +#undef HAVE_EPOLL +#undef HAVE_EPOLL_PWAIT + #undef HAVE_UNSETENV #undef HAVE_NANOSLEEP Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2015-01-13 18:04:53 UTC (rev 3227) +++ branches/Cog/platforms/unix/config/configure 2015-01-13 18:10:05 UTC (rev 3228) @@ -23764,7 +23764,445 @@ fi + ax_have_epoll_cppflags="${CPPFLAGS}" + if test "${ac_cv_header_linux_version_h+set}" = set; then + echo "$as_me:$LINENO: checking for linux/version.h" >&5 +echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking linux/version.h usability" >&5 +echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <linux/version.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking linux/version.h presence" >&5 +echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <linux/version.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/version.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/version.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/version.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for linux/version.h" >&5 +echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_linux_version_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 + +fi +if test $ac_cv_header_linux_version_h = yes; then + CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H" +fi + + + echo "$as_me:$LINENO: checking for Linux epoll(7) interface" >&5 +echo $ECHO_N "checking for Linux epoll(7) interface... $ECHO_C" >&6 + if test "${ax_cv_have_epoll+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/epoll.h> +#ifdef HAVE_LINUX_VERSION_H +# include <linux/version.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45) +# error linux kernel version is too old to have epoll +# endif +#endif + +int +main () +{ +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_have_epoll=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_have_epoll=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + CPPFLAGS="${ax_have_epoll_cppflags}" + if test "${ax_cv_have_epoll}" = "yes"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi + + + ax_have_epoll_cppflags="${CPPFLAGS}" + if test "${ac_cv_header_linux_version_h+set}" = set; then + echo "$as_me:$LINENO: checking for linux/version.h" >&5 +echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking linux/version.h usability" >&5 +echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <linux/version.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking linux/version.h presence" >&5 +echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <linux/version.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: linux/version.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: linux/version.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: linux/version.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for linux/version.h" >&5 +echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 +if test "${ac_cv_header_linux_version_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_linux_version_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 +echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 + +fi +if test $ac_cv_header_linux_version_h = yes; then + CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H" +fi + + + echo "$as_me:$LINENO: checking for Linux epoll(7) interface with signals extension" >&5 +echo $ECHO_N "checking for Linux epoll(7) interface with signals extension... $ECHO_C" >&6 + if test "${ax_cv_have_epoll_pwait+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_LINUX_VERSION_H +# include <linux/version.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +# error linux kernel version is too old to have epoll_pwait +# endif +#endif +#include <sys/epoll.h> +#include <signal.h> + +int +main () +{ +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0); +rc = epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0)); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_have_epoll_pwait=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_have_epoll_pwait=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + CPPFLAGS="${ax_have_epoll_cppflags}" + if test "${ax_cv_have_epoll_pwait}" = "yes"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi + + + # Checks for platform characteristics. echo "$as_me:$LINENO: checking for $host_cpu optimisation flags" >&5 @@ -27784,20 +28222,8 @@ plugin="IA32ABI" plibs="" rm -f IA32ABI.sub IA32ABI.lib -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o" +ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o xabicc.o" -case $host_cpu in -i386|i486|i586|i686) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ia32abicc.o" -;; -powerpc|ppc) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ppcia32abicc.o" -;; -x86_64|x64) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o x64ia32abicc.o" -;; -esac - IA32ABI_OBJS=$ia32abi_objs if test "${plibs}"; then Modified: branches/Cog/platforms/unix/config/configure.ac =================================================================== --- branches/Cog/platforms/unix/config/configure.ac 2015-01-13 18:04:53 UTC (rev 3227) +++ branches/Cog/platforms/unix/config/configure.ac 2015-01-13 18:10:05 UTC (rev 3228) @@ -286,6 +286,8 @@ AC_FUNC_MMAP AC_FUNC_ALLOCA +AX_HAVE_EPOLL +AX_HAVE_EPOLL_PWAIT # Checks for platform characteristics. Modified: branches/Cog/platforms/unix/plugins/IA32ABI/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/plugins/IA32ABI/acinclude.m4 2015-01-13 18:04:53 UTC (rev 3227) +++ branches/Cog/platforms/unix/plugins/IA32ABI/acinclude.m4 2015-01-13 18:10:05 UTC (rev 3228) @@ -1,15 +1,3 @@ -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o" +ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o xabicc.o" -case $host_cpu in -i386|i486|i586|i686) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ia32abicc.o" -;; -powerpc|ppc) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o ppcia32abicc.o" -;; -x86_64|x64) -ia32abi_objs="IA32ABI.o AlienSUnitTestProcedures.o x64ia32abicc.o" -;; -esac - AC_SUBST(IA32ABI_OBJS, $ia32abi_objs)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2015