Vm-dev July 2013

vm-dev@lists.squeakfoundation.org

20 participants
104 discussions

VM Maker: Cog-eem.61.mcz
by commits＠source.squeak.org 19 Jul '13

19 Jul '13

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.61.mcz ==================== Summary ==================== Name: Cog-eem.61 Author: eem Time: 19 July 2013, 11:40:38.157 am UUID: 3dba03de-7a41-4da2-bdf4-d8276f5665da Ancestors: Cog-lw.60 Add versions of run and single-step to the processor plugins that take a maximum address parameter to allow trapping writes beyond freeStart (not used yet in VMMaker). =============== Diff against Cog-lw.60 =============== Item was added: + ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" + "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveRunInMemoryMinAddressMaxAddressReadWrite' module: 'BochsIA32Plugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress + readOnlyBelow: minimumWritableAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: BochsIA32Alien>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - call, jump and memory read/writes into register instructions into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was added: + ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" + "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite' module: 'BochsIA32Plugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress + readOnlyBelow: minimumWritableAddress] + ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: BochsIA32Alien>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - call, jump and memory read/writes into register instructions into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinimumAddressReadWrite' module: 'BochsIA32Plugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was added: + ----- Method: BochsIA32Plugin>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + "cpuAlien <BochsIA32Alien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" + "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu memorySize maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveRunInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. + prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: + [prevInterruptCheckChain = 0]. + memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. + maybeErr := self runCPU: cpu + In: memory + Size: (memorySize min: maxAddress) + MinAddressRead: minAddress + Write: minWriteMaxExecAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was added: + ----- Method: BochsIA32Plugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + "cpuAlien <BochsIA32Alien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" + "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." + | cpuAlien cpu memorySize maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. + maybeErr := self singleStepCPU: cpu + In: memory + Size: (memorySize min: maxAddress) + MinAddressRead: minAddress + Write: minWriteMaxExecAddress. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was added: + ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" + "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveRunInMemoryMinAddressMaxAddressReadWrite' module: 'GdbARMPlugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress + readOnlyBelow: minimumWritableAddress] + ifFalse: [self reportPrimitiveFailure] + + "self printRegistersOn: Transcript"! Item was changed: ----- Method: GdbARMAlien>>primitiveRunInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveRunInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Run the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - call, jump and memory read/writes into register instructions into ProcessorSimulationTrap signals." <primitive: 'primitiveRunInMemoryMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure] "self printRegistersOn: Transcript"! Item was added: + ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" maximumAddress: maximimAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" + "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the + memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." + <primitive: 'primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite' module: 'GdbARMPlugin' error: ec> + ^ec == #'inappropriate operation' + ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray + minimumAddress: minimumAddress + readOnlyBelow: minimumWritableAddress] + ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: GdbARMAlien>>primitiveSingleStepInMemory:minimumAddress:readOnlyBelow: (in category 'primitives') ----- primitiveSingleStepInMemory: memoryArray "<Bitmap|ByteArray>" minimumAddress: minimumAddress "<Integer>" readOnlyBelow: minimumWritableAddress "<Integer>" "Single-step the receiver using the argument as the store. Origin the argument at 0. i.e. the first byte of the memoryArray is address 0. Make addresses below minimumAddress illegal. Convert out-of-range + calls, jumps and memory read/writes into ProcessorSimulationTrap signals." - call, jump and memory read/writes into register instructions into ProcessorSimulationTrap signals." <primitive: 'primitiveSingleStepInMemoryMinimumAddressReadWrite' module: 'GdbARMPlugin' error: ec> ^ec == #'inappropriate operation' ifTrue: [self handleExecutionPrimitiveFailureIn: memoryArray minimumAddress: minimumAddress readOnlyBelow: minimumWritableAddress] ifFalse: [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMPlugin>>primitiveRunInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + "cpuAlien <GdbARMAlien>" primitiveRunInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" + "Run the cpu using the first argument as the memory and the following arguments defining valid addresses, running until it halts or hits an exception." + | cpuAlien cpu memorySize maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveRunInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + prevInterruptCheckChain := interpreterProxy setInterruptCheckChain: #forceStopOnInterrupt asSymbol. + prevInterruptCheckChain = #forceStopOnInterrupt asSymbol ifTrue: + [prevInterruptCheckChain = 0]. + memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. + maybeErr := self runCPU: cpu + In: memory + Size: (memorySize min: maxAddress) + MinAddressRead: minAddress + Write: minWriteMaxExecAddress. + interpreterProxy setInterruptCheckChain: prevInterruptCheckChain. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien! Item was added: + ----- Method: GdbARMPlugin>>primitiveSingleStepInMemory:minimumAddress:maximumAddress:readOnlyBelow: (in category 'primitives') ----- + "cpuAlien <GdbARMAlien>" primitiveSingleStepInMemory: memory "<Bitmap|ByteArray|WordArray>" minimumAddress: minAddress "<Integer>" maximumAddress: maxAddress "<Integer>" readOnlyBelow: minWriteMaxExecAddress "<Integer>" + "Single-step the cpu using the first argument as the memory and the following arguments defining valid addresses." + | cpuAlien cpu memorySize maybeErr | + <var: #cpu type: #'void *'> + cpuAlien := self primitive: #primitiveSingleStepInMemoryMinAddressMaxAddressReadWrite + parameters: #(WordsOrBytes Unsigned Unsigned Unsigned) + receiver: #Oop. + (cpu := self startOfData: cpuAlien) = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. + memorySize := interpreterProxy byteSizeOf: memory cPtrAsOop. + maybeErr := self singleStepCPU: cpu + In: memory + Size: (memorySize min: maxAddress) + MinAddressRead: minAddress + Write: minWriteMaxExecAddress. + maybeErr ~= 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrInappropriate]. + ^cpuAlien!

1 0

VM Maker: VMMaker.oscog-eem.307.mcz
by commits＠source.squeak.org 19 Jul '13

19 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.307.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.307 Author: eem Time: 19 July 2013, 11:12:32.01 am UUID: 737feb1e-5228-463a-8f3e-0f55f10fc3c9 Ancestors: VMMaker.oscog-eem.306 Fix simulation of ImageSegmentTest by using correct receivers, and by fixing the cast to char * in FilePlugin>>primitiveFileRead. Change FilePlugin>>primitiveFileWrite to match. Rename kernel: and builtin: to isKernelSelector: and isBuiltinSelector:. Add cCoerce:to: and cCoerceSimple:to: to kernel selectors. Make simulator check for last object overwritten after calling functions through dispatchFunctionPointer: and handleCallOrJumpSimulationTrap:. Add checks for writing past freeStart to byteAt:put: and simulated storePointer:ofObject:withValue: et al. Delete a number of bogus reverseBytesFrom:to: implementations in favour of ObjectMemory>>reverseBytesFrom:to:. Move printMemoryFrom:to: to NewObjectMemory. Fix overriding base in promptHex: =============== Diff against VMMaker.oscog-eem.306 =============== Item was changed: ----- Method: CArray>>coerceTo:sim: (in category 'converting') ----- coerceTo: cTypeString sim: interpreterSimulator ^cTypeString caseOf: { ['int'] -> [self ptrAddress]. ['float *'] -> [self asCArrayAccessor asFloatAccessor]. ['int *'] -> [self asCArrayAccessor asIntAccessor]. + ['char *'] -> [self shallowCopy unitSize: 1; yourself]. ['unsigned'] -> [self ptrAddress]. ['sqInt'] -> [self ptrAddress]. ['usqInt'] -> [self ptrAddress] }! Item was removed: - ----- Method: CCodeGenerator>>builtin: (in category 'utilities') ----- - builtin: sel - "Answer true if the given selector is one of the builtin selectors." - - ^(self kernel: sel) or: [translationDict includesKey: sel]! Item was added: + ----- Method: CCodeGenerator>>isBuiltinSelector: (in category 'utilities') ----- + isBuiltinSelector: sel + "Answer true if the given selector is one of the builtin selectors." + + ^(self isKernelSelector: sel) or: [translationDict includesKey: sel]! Item was added: + ----- Method: CCodeGenerator>>isKernelSelector: (in category 'utilities') ----- + isKernelSelector: sel + "Answer true if the given selector is one of the kernel selectors that are implemented as macros." + + ^(#(error: + oopAt: oopAt:put: oopAtPointer: oopAtPointer:put: + byteAt: byteAt:put: byteAtPointer: byteAtPointer:put: + shortAt: shortAt:put: shortAtPointer: shortAtPointer:put: + intAt: intAt:put: intAtPointer: intAtPointer:put: + longAt: longAt:put: longAtPointer: longAtPointer:put: + fetchFloatAt:into: storeFloatAt:from: + fetchFloatAtPointer:into: storeFloatAtPointer:from: + fetchSingleFloatAt:into: storeSingleFloatAt:from: + fetchSingleFloatAtPointer:into: storeSingleFloatAtPointer:from: + pointerForOop: oopForPointer: + cCoerce:to: cCoerceSimple:to:) + includes: sel)! Item was removed: - ----- Method: CCodeGenerator>>kernel: (in category 'utilities') ----- - kernel: sel - "Answer true if the given selector is one of the kernel selectors that are implemented as macros." - - ^(#(error: - oopAt: oopAt:put: oopAtPointer: oopAtPointer:put: - byteAt: byteAt:put: byteAtPointer: byteAtPointer:put: - shortAt: shortAt:put: shortAtPointer: shortAtPointer:put: - intAt: intAt:put: intAtPointer: intAtPointer:put: - longAt: longAt:put: longAtPointer: longAtPointer:put: - fetchFloatAt:into: storeFloatAt:from: - fetchFloatAtPointer:into: storeFloatAtPointer:from: - fetchSingleFloatAt:into: storeSingleFloatAt:from: - fetchSingleFloatAtPointer:into: storeSingleFloatAtPointer:from: - pointerForOop: oopForPointer:) - includes: sel)! Item was changed: ----- Method: CCodeGenerator>>messageReceiverIsInterpreterProxy: (in category 'utilities') ----- messageReceiverIsInterpreterProxy: sendNode ^self isGeneratingPluginCode and: [sendNode receiver isVariable and: ['interpreterProxy' = sendNode receiver name + and: [(self isKernelSelector: sendNode selector) not]]]! - and: [(self kernel: sendNode selector) not]]]! Item was changed: ----- Method: CCodeGenerator>>removeUnneededBuiltins (in category 'public') ----- removeUnneededBuiltins | toRemove | toRemove := Set new: 64. methods keysDo: [:sel| + (self isBuiltinSelector: sel) ifTrue: - (self builtin: sel) ifTrue: [(requiredSelectors includes: sel) ifFalse: [toRemove add: sel]]]. toRemove do: [:sel| self removeMethodForSelector: sel]! Item was removed: - ----- Method: CogVMSimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - objectMemory memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: Cogit>>handleCallOrJumpSimulationTrap: (in category 'simulation only') ----- handleCallOrJumpSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | evaluable function result savedFramePointer savedStackPointer savedArgumentCount rpc | evaluable := simulatedTrampolines at: aProcessorSimulationTrap address. function := evaluable isBlock ifTrue: ['aBlock; probably some plugin primitive'] ifFalse: [evaluable selector]. function ~~ #ceBaseFrameReturn: ifTrue: [coInterpreter assertValidExternalStackPointers]. (function beginsWith: 'ceShort') ifTrue: [^self perform: function with: aProcessorSimulationTrap]. aProcessorSimulationTrap type = #call ifTrue: [processor simulateCallOf: aProcessorSimulationTrap address nextpc: aProcessorSimulationTrap nextpc memory: coInterpreter memory. self recordInstruction: {'(simulated call of '. aProcessorSimulationTrap address. '/'. function. ')'}] ifFalse: [processor simulateJumpCallOf: aProcessorSimulationTrap address memory: coInterpreter memory. self recordInstruction: {'(simulated jump to '. aProcessorSimulationTrap address. '/'. function. ')'}]. savedFramePointer := coInterpreter framePointer. savedStackPointer := coInterpreter stackPointer. savedArgumentCount := coInterpreter argumentCount. result := ["self halt: evaluable selector." evaluable valueWithArguments: (processor postCallArgumentsNumArgs: evaluable numArgs in: coInterpreter memory)] on: ReenterMachineCode do: [:ex| ex return: ex returnValue]. coInterpreter assertValidExternalStackPointers. "Verify the stack layout assumption compileInterpreterPrimitive: makes, provided we've not called something that has built a frame, such as closure value or evaluate method, or switched frames, such as primitiveSignal, primitiveWait, primitiveResume, primitiveSuspend et al." (function beginsWith: 'primitive') ifTrue: + [objectMemory checkForLastObjectOverwrite. + coInterpreter primFailCode = 0 - [coInterpreter primFailCode = 0 ifTrue: [(#( primitiveClosureValue primitiveClosureValueWithArgs primitiveClosureValueNoContextSwitch primitiveSignal primitiveWait primitiveResume primitiveSuspend primitiveYield primitiveExecuteMethodArgsArray primitiveExecuteMethod primitivePerform primitivePerformWithArgs primitivePerformInSuperclass primitiveTerminateTo primitiveStoreStackp primitiveDoPrimitiveWithArgs) includes: function) ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer + (savedArgumentCount * BytesPerWord) = coInterpreter stackPointer]] ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer = coInterpreter stackPointer]]. result ~~ #continueNoReturn ifTrue: [self recordInstruction: {'(simulated return to '. processor retpcIn: coInterpreter memory. ')'}. rpc := processor retpcIn: coInterpreter memory. self assert: (rpc >= codeBase and: [rpc < methodZone freeStart]). processor smashCallerSavedRegistersWithValuesFrom: 16r80000000 by: BytesPerWord; simulateReturnIn: coInterpreter memory]. self assert: (result isInteger "an oop result" or: [result == coInterpreter or: [result == objectMemory or: [#(nil continue continueNoReturn) includes: result]]]). processor cResultRegister: (result ifNil: [0] ifNotNil: [result isInteger ifTrue: [result] ifFalse: [16rF00BA222]]) "coInterpreter cr. processor sp + 32 to: processor sp - 32 by: -4 do: [:sp| sp = processor sp ifTrue: [coInterpreter print: 'sp->'; tab] ifFalse: [coInterpreter printHex: sp]. coInterpreter tab; printHex: (coInterpreter longAt: sp); cr]"! Item was changed: ----- Method: FilePlugin>>primitiveFileRead (in category 'file primitives') ----- primitiveFileRead <export: true> | retryCount count startIndex array file elementSize bytesRead | <var: 'file' type: #'SQFile *'> <var: 'count' type: #'size_t'> <var: 'startIndex' type: #'size_t'> <var: 'elementSize' type: #'size_t'> retryCount := 0. count := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). startIndex := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 1). [array := interpreterProxy stackValue: 2. file := self fileValueOf: (interpreterProxy stackValue: 3). (interpreterProxy failed "buffer can be any indexable words or bytes object except CompiledMethod" or: [(interpreterProxy isWordsOrBytes: array) not]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. elementSize := (interpreterProxy isWords: array) ifTrue: [4] ifFalse: [1]. (startIndex >= 1 and: [(startIndex + count - 1) <= (interpreterProxy slotSizeOf: array)]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. "Note: adjust startIndex for zero-origin indexing" bytesRead := self sqFile: file Read: count * elementSize + Into: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') - Into: (self cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') At: (startIndex - 1) * elementSize. interpreterProxy primitiveFailureCode = PrimErrObjectMayMove and: [(retryCount := retryCount + 1) <= 2] "Two objects, the file and the array can move"] whileTrue: [interpreterProxy tenuringIncrementalGC; primitiveFailFor: PrimNoErr]. interpreterProxy failed ifFalse: [interpreterProxy pop: 5 "pop rcvr, file, array, startIndex, count" thenPush:(interpreterProxy integerObjectOf: bytesRead // elementSize) "push # of elements read"]! Item was changed: ----- Method: FilePlugin>>primitiveFileWrite (in category 'file primitives') ----- primitiveFileWrite + | count startIndex array file elementSize bytesWritten | - | count startIndex array file byteSize arrayIndex bytesWritten | <var: 'file' type: 'SQFile *'> <var: 'arrayIndex' type: 'char *'> <var: 'count' type: 'size_t'> <var: 'startIndex' type: 'size_t'> + <var: 'elementSize' type: 'size_t'> - <var: 'byteSize' type: 'size_t'> <export: true> count := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). startIndex := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 1). array := interpreterProxy stackValue: 2. file := self fileValueOf: (interpreterProxy stackValue: 3). + + (interpreterProxy failed + "buffer can be any indexable words or bytes object except CompiledMethod" + or: [(interpreterProxy isWordsOrBytes: array) not]) ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + + elementSize := (interpreterProxy isWords: array) ifTrue: [4] ifFalse: [1]. + (startIndex >= 1 + and: [(startIndex + count - 1) <= (interpreterProxy slotSizeOf: array)]) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + + "Note: adjust startIndex for zero-origin indexing" + bytesWritten := self - "buffer can be any indexable words or bytes object except CompiledMethod " - (interpreterProxy isWordsOrBytes: array) - ifFalse: [^ interpreterProxy primitiveFail]. - (interpreterProxy isWords: array) - ifTrue: [byteSize := 4] - ifFalse: [byteSize := 1]. - (startIndex >= 1 and: [startIndex + count - 1 <= (interpreterProxy slotSizeOf: array)]) - ifFalse: [^ interpreterProxy primitiveFail]. - interpreterProxy failed - ifFalse: [arrayIndex := interpreterProxy firstIndexableField: array. - "Note: adjust startIndex for zero-origin indexing" - bytesWritten := self sqFile: file + Write: count * elementSize + From: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') + At: startIndex - 1 * elementSize. + interpreterProxy failed ifFalse: + [interpreterProxy pop: 5 thenPush: (interpreterProxy integerObjectOf: bytesWritten // elementSize)]! - Write: count * byteSize - From: arrayIndex - At: startIndex - 1 * byteSize]. - interpreterProxy failed - ifFalse: [interpreterProxy pop: 5 thenPush:( interpreterProxy integerObjectOf: bytesWritten // byteSize)]! Item was removed: - ----- Method: InterpreterSimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: NewCoObjectMemory>>copyObj:toSegment:addr:stopAt:saveOopAt:headerAt: (in category 'image segment in/out') ----- copyObj: oop toSegment: segmentWordArray addr: lastSeg stopAt: stopAddr saveOopAt: oopPtr headerAt: hdrPtr "Copy this object into the segment beginning at lastSeg. Install a forwarding pointer, and save oop and header. Fail if out of space. Return the next segmentAddr if successful." "Copy the object..." | extraSize bodySize hdrAddr | <inline: false> self flag: #Dan. "None of the imageSegment stuff has been updated for 64 bits" extraSize := self extraHeaderBytes: oop. bodySize := self sizeBitsOf: oop. (self oop: (lastSeg + extraSize + bodySize) isGreaterThanOrEqualTo: stopAddr) ifTrue: [^0]. "failure" self transfer: extraSize + bodySize // BytesPerWord "wordCount" from: oop - extraSize to: lastSeg+BytesPerWord. "Clear root and mark bits of all headers copied into the segment" hdrAddr := lastSeg+BytesPerWord + extraSize. self longAt: hdrAddr put: ((self longAt: hdrAddr) bitAnd: AllButRootBit - MarkBit). "Make sure Cogged methods have their true header field written to the segment." ((self isCompiledMethod: oop) + and: [coInterpreter methodHasCogMethod: oop]) ifTrue: + [self longAt: hdrAddr+BaseHeaderSize put: (coInterpreter headerOf: oop)]. - and: [self methodHasCogMethod: oop]) ifTrue: - [self longAt: hdrAddr+BaseHeaderSize put: (self headerOf: oop)]. self forward: oop to: (lastSeg+BytesPerWord + extraSize - segmentWordArray) savingOopAt: oopPtr andHeaderAt: hdrPtr. "Return new end of segment" ^lastSeg + extraSize + bodySize! Item was changed: ----- Method: NewCoObjectMemorySimulator>>fetchPointer:ofObject: (in category 'interpreter access') ----- fetchPointer: fieldIndex ofObject: oop "index by word size, and return a pointer as long as the word size" self assert: oop >= self startOfMemory. + self assert: oop + BaseHeaderSize + (fieldIndex << ShiftForWord) < freeStart. ^super fetchPointer: fieldIndex ofObject: oop! Item was removed: - ----- Method: NewCoObjectMemorySimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: NewCoObjectMemorySimulator>>storePointer:ofObject:withValue: (in category 'interpreter access') ----- + storePointer: fieldIndex ofObject: oop withValue: valuePointer - storePointer: index ofObject: oop withValue: valuePointer "Override to ensure acess is within the heap, and within the object" | fmt hdr | self assert: oop >= self startOfMemory. hdr := self baseHeader: oop. fmt := self formatOfHeader: hdr. self assert: ((fmt <= 4 or: [fmt >= 12]) + and: [fieldIndex >= 0 and: [fieldIndex < (self lengthOf: oop baseHeader: hdr format: fmt)]]). + self assert: oop + BaseHeaderSize + (fieldIndex << ShiftForWord) < freeStart. + ^super storePointer: fieldIndex ofObject: oop withValue: valuePointer! - and: [index >= 0 and: [index < (self lengthOf: oop baseHeader: hdr format: fmt)]]). - ^super storePointer: index ofObject: oop withValue: valuePointer! Item was changed: ----- Method: NewCoObjectMemorySimulator>>storePointerUnchecked:ofObject:withValue: (in category 'interpreter access') ----- + storePointerUnchecked: fieldIndex ofObject: oop withValue: valuePointer - storePointerUnchecked: index ofObject: oop withValue: valuePointer "Override to ensure acess is within the heap, and within the object" | fmt hdr | self assert: oop >= self startOfMemory. hdr := self baseHeader: oop. fmt := self formatOfHeader: hdr. self assert: ((fmt <= 4 or: [fmt >= 12]) + and: [fieldIndex >= 0 and: [fieldIndex < (self lengthOf: oop baseHeader: hdr format: fmt)]]). + self assert: oop + BaseHeaderSize + (fieldIndex << ShiftForWord) < freeStart. + ^super storePointerUnchecked: fieldIndex ofObject: oop withValue: valuePointer! - and: [index >= 0 and: [index < (self lengthOf: oop baseHeader: hdr format: fmt)]]). - ^super storePointerUnchecked: index ofObject: oop withValue: valuePointer! Item was changed: ----- Method: NewCoObjectMemorySimulatorLSB>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | lowBits long longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. long := self longAt: longAddress. long := (lowBits caseOf: { [0] -> [ (long bitAnd: 16rFFFFFF00) bitOr: byte ]. [1] -> [ (long bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. [2] -> [ (long bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. [3] -> [ (long bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ] }). + self assert: longAddress < freeStart. - self longAt: longAddress put: long. ^byte! Item was changed: ----- Method: NewCoObjectMemorySimulatorMSB>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | longWord shift lowBits bpwMinus1 longAddress | bpwMinus1 := BytesPerWord-1. lowBits := byteAddress bitAnd: bpwMinus1. longAddress := byteAddress - lowBits. longWord := self longAt: longAddress. shift := (bpwMinus1 - lowBits) * 8. longWord := longWord - (longWord bitAnd: (16rFF bitShift: shift)) + (byte bitShift: shift). + self assert: longAddress < freeStart. self longAt: longAddress put: longWord. ^byte! Item was added: + ----- Method: NewObjectMemory>>checkForLastObjectOverwrite (in category 'allocation') ----- + checkForLastObjectOverwrite + <doNotGenerate> + self assert: (freeStart >= scavengeThreshold + or: [(AllocationCheckFiller = 0 + or: [(self longAt: freeStart) = (AllocationCheckFiller = 16rADD4E55 + ifTrue: [freeStart] + ifFalse: [AllocationCheckFiller])])])! Item was added: + ----- Method: NewObjectMemory>>imageSegmentVersion (in category 'image segment in/out') ----- + imageSegmentVersion + | wholeWord | + "a more complex version that tells both the word reversal and the endianness of the machine it came from. Low half of word is 6502. Top byte is top byte of #doesNotUnderstand: on this machine. ($d on the Mac or $s on the PC)" + + wholeWord := self longAt: (self splObj: SelectorDoesNotUnderstand) + BaseHeaderSize. + "first data word, 'does' " + ^coInterpreter imageFormatVersion bitOr: (wholeWord bitAnd: 16rFF000000)! Item was added: + ----- Method: NewObjectMemory>>printMemoryFrom:to: (in category 'printing') ----- + printMemoryFrom: start to: end + <doNotGenerate> + | address | + address := start bitAnd: (BytesPerWord - 1) bitInvert. + [address < end] whileTrue: + [coInterpreter printHex: address; printChar: $:; space; printHex: (self longAt: address); cr. + address := address + BytesPerWord]! Item was changed: ----- Method: NewObjectMemory>>safePrintStringOf: (in category 'debug printing') ----- safePrintStringOf: oop "Version of printStringOf: that copes with forwarding during garbage collection." | fmt header cnt i | <inline: false> (self isIntegerObject: oop) ifTrue: [^nil]. (oop between: self startOfMemory and: freeStart) ifFalse: [^nil]. (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: [^nil]. header := self headerWhileForwardingOf: oop. fmt := self formatOfHeader: header. fmt < 8 ifTrue: [ ^nil ]. cnt := 100 min: (self lengthOf: oop baseHeader: header format: fmt). i := 0. [i < cnt] whileTrue: [self printChar: (self fetchByte: i ofObject: oop). i := i + 1]. + coInterpreter flush. - self flush. ^oop! Item was removed: - ----- Method: NewObjectMemorySimulator>>printMemoryFrom:to: (in category 'printing') ----- - printMemoryFrom: start to: end - | address | - address := start bitAnd: (BytesPerWord - 1) bitInvert. - [address < end] whileTrue: - [self printHex: address; printChar: $:; space; printHex: (self longAt: address); cr. - address := address + BytesPerWord]! Item was removed: - ----- Method: NewObjectMemorySimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: NewObjectMemorySimulatorLSB>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | lowBits long longAddress | lowBits := byteAddress bitAnd: 3. longAddress := byteAddress - lowBits. long := self longAt: longAddress. long := (lowBits caseOf: { [0] -> [ (long bitAnd: 16rFFFFFF00) bitOr: byte ]. [1] -> [ (long bitAnd: 16rFFFF00FF) bitOr: (byte bitShift: 8) ]. [2] -> [ (long bitAnd: 16rFF00FFFF) bitOr: (byte bitShift: 16) ]. [3] -> [ (long bitAnd: 16r00FFFFFF) bitOr: (byte bitShift: 24) ] }). + self assert: longAddress < freeStart. - self longAt: longAddress put: long. ^byte! Item was changed: ----- Method: NewObjectMemorySimulatorMSB>>byteAt:put: (in category 'memory access') ----- byteAt: byteAddress put: byte | longWord shift lowBits bpwMinus1 longAddress | bpwMinus1 := BytesPerWord-1. lowBits := byteAddress bitAnd: bpwMinus1. longAddress := byteAddress - lowBits. longWord := self longAt: longAddress. shift := (bpwMinus1 - lowBits) * 8. longWord := longWord - (longWord bitAnd: (16rFF bitShift: shift)) + (byte bitShift: shift). + self assert: longAddress < freeStart. self longAt: longAddress put: longWord. ^byte! Item was removed: - ----- Method: NewspeakInterpreterSimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: ObjectMemory>>reverseBytesFrom:to: (in category 'image save/restore') ----- reverseBytesFrom: startAddr to: stopAddr "Byte-swap the given range of memory (not inclusive of stopAddr!!)." | addr | - self flag: #Dan. addr := startAddr. [self oop: addr isLessThan: stopAddr] whileTrue: [self longAt: addr put: (self byteSwapped: (self longAt: addr)). addr := addr + BytesPerWord].! Item was changed: ----- Method: StackInterpreter>>dispatchFunctionPointer: (in category 'message sending') ----- dispatchFunctionPointer: aFunctionPointer "In C aFunctionPointer is void (*aFunctionPointer)()" <cmacro: '(aFunctionPointer) (aFunctionPointer)()'> + | result | (aFunctionPointer isInteger and: [aFunctionPointer >= 1000]) ifTrue: + [result := self callExternalPrimitive: aFunctionPointer. + objectMemory checkForLastObjectOverwrite. + ^result]. - [^self callExternalPrimitive: aFunctionPointer]. "In Smalltalk aFunctionPointer is a message selector symbol" + result := self perform: aFunctionPointer. + objectMemory checkForLastObjectOverwrite. + ^result! - ^self perform: aFunctionPointer! Item was removed: - ----- Method: StackInterpreterSimulator>>reverseBytesFrom:to: (in category 'initialization') ----- - reverseBytesFrom: begin to: end - "Byte-swap the given range of memory (not inclusive!!)." - | wordAddr | - wordAddr := begin. - objectMemory memory swapBytesFrom: wordAddr // 4 + 1 to: end // 4! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen "Record sends of builtin operators, map sends of the special selector dispatchOn:in: with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. Note: Only replaces top-level sends of dispatchOn:in: et al and caseOf:[otherwise:]. These must be top-level statements; they cannot appear in expressions. As a hack also update the types of variables introduced to implement cascades correctly. This has to be done at teh same time as this is done, so why not piggy back here?" | replacements |. cascadeVariableNumber ifNotNil: [declarations keysAndValuesDo: [:varName :decl| decl isBlock ifTrue: [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). locals add: varName. self declarationAt: varName put: (decl value: self value: aCodeGen), ' ', varName]]]. replacements := IdentityDictionary new. aCodeGen pushScope: declarations while: [parseTree nodesDo: [:node| node isSend ifTrue: + [(aCodeGen isBuiltinSelector: node selector) - [(aCodeGen builtin: node selector) ifTrue: [node isBuiltinOperator: true. "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" (node selector = #to:by:do: and: [node args size = 4]) ifTrue: [| limitExpr | limitExpr := node args first. (limitExpr anySatisfy: [:subNode| subNode isSend + and: [(aCodeGen isBuiltinSelector: subNode selector) not - and: [(aCodeGen builtin: subNode selector) not and: [(subNode isStructSend: aCodeGen) not]]]) ifTrue: [locals add: node args last name] ifFalse: [node arguments: node args allButLast]]] ifFalse: [(CaseStatements includes: node selector) ifTrue: [replacements at: node put: (self buildCaseStmt: node)]. (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: [replacements at: node put: (self buildSwitchStmt: node)]]]. ((node isAssignment or: [node isReturn]) and: [node expression isSwitch]) ifTrue: [replacements at: node put: (self transformSwitchExpression: node)]]]. replacements isEmpty ifFalse: [parseTree := parseTree replaceNodesIn: replacements]! Item was changed: ----- Method: TSendNode>>bindVariableUsesIn:andConstantFoldIf:in: (in category 'transformations') ----- bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen "Answer either the receiver, if it contains no references to the given variables, or a new node with the given variables rebound. Attempt to constant-fold and answer a constant node commented with the original expression. Commenting with the original expression is important because it allows us to detect shared cases. e.g. currentBytecode bitAnd: 15 is the same in case 1 and case 17, but '1 /* 1 bitAnd: 15 */' differs from '1 /* 17 bitAnd: 15 */', whereas '1 /* currentBytecode bitAnd: 15 */' doesn't change." | newReceiver newArguments | newReceiver := receiver bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen. newArguments := arguments collect: [:a| a bindVariableUsesIn: aDictionary andConstantFoldIf: constantFold in: codeGen]. (newReceiver = receiver and: [newArguments = arguments]) ifTrue: [^self]. (constantFold and: [newReceiver isConstant and: [newReceiver value isInteger] and: [(newArguments allSatisfy: [:ea| ea isConstant and: [ea value isInteger]]) + and: [codeGen isBuiltinSelector: selector]]]) ifTrue: - and: [codeGen builtin: selector]]]) ifTrue: [| value | value := [newReceiver value perform: selector withArguments: (newArguments collect: [:ea| ea value])] on: Error do: [:ea| nil]. (value isInteger or: [value == true or: [value == false]]) ifTrue: [^TConstantNode new setValue: value; "We assume Message prints its keywords and arguments interleaved. e.g. that (Message selector: #between:and: arguments: #(0 1)) printString = 'between: 0 and: 1'" comment: (receiver isLeaf ifTrue: [receiver printString] ifFalse: ['(', receiver printString, ')']), ' ', (Message selector: selector arguments: (arguments collect: [:ea| ea value])) printString; yourself]]. ^self shallowCopy receiver: newReceiver; arguments: newArguments; yourself ! Item was changed: ----- Method: VMClass>>promptHex: (in category 'simulation support') ----- promptHex: string <doNotGenerate> | s | s := UIManager default request: string, ' (hex)'. ^s notEmpty ifTrue: + [(s includes: $r) + ifTrue: + [Number readFrom: s readStream] + ifFalse: + [(#('0x' '-0x') detect: [:prefix| s beginsWith: prefix] ifNone: []) ifNotNil: + [:prefix| + s := s allButFirst: prefix size. + prefix first = $- ifTrue: [s := '-', s]]. + Integer readFrom: s readStream base: 16]]! - [(#('16r' '-16r' '0x' '-0x') detect: [:prefix| s beginsWith: prefix] ifNone: []) ifNotNil: - [:prefix| - s := s allButFirst: prefix size. - prefix first = $- ifTrue: [s := '-', s]]. - Integer readFrom: s readStream base: 16]! Item was changed: ----- Method: VMPluginCodeGenerator>>pluginFunctionsToClone (in category 'public') ----- pluginFunctionsToClone "Answer those of the used plugin functions to clone as a sorted collection. Exclude those that are static to sqVirtualMachine.c and hence always need to be called through interpreterProxy." + ^((pluginFunctionsUsed + reject: [:selector| self noteUsedPluginFunction: selector]) + select: [:selector| InterpreterProxy includesSelector: selector]) + asSortedCollection! - ^(pluginFunctionsUsed reject: - [:selector| self noteUsedPluginFunction: selector]) - asSortedCollection!

1 0

[commit][2753] CogVM source as per VMMaker.oscog-eem.306.
by commits＠squeakvm.org 18 Jul '13

18 Jul '13

Revision: 2753 Author: eliot Date: 2013-07-18 12:45:39 -0700 (Thu, 18 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.306. Add an assertValidExecutionPointers to the front side of process switch. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1976,7 +1976,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.306"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -52273,6 +52273,9 @@ sqInt aProcess; sqInt index; StackPage *lastUsedPage; + char *lifp; + usqInt lip; + char *lisp; StackPage *lruOrFree; sqInt newContext; StackPage *newPage; @@ -52313,6 +52316,11 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); + /* begin assertValidExecutionPointe:r:s: */ + lip = GIV(instructionPointer); + lifp = GIV(framePointer); + lisp = GIV(stackPointer); + assertValidExecutionPointersimbarline(lip, lifp, lisp, !((((usqInt)(longAt(lifp + FoxMethod)))) < (startOfMemory())), __LINE__); sched = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord)); oldProc = longAt((sched + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); /* begin ensureFrameIsMarried:SP: */ @@ -52420,12 +52428,12 @@ : 0); } - /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin assertValidExecutionPointe:r:s: */ + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1979,7 +1979,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.306"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -52282,6 +52282,9 @@ sqInt aProcess; sqInt index; StackPage *lastUsedPage; + char *lifp; + usqInt lip; + char *lisp; StackPage *lruOrFree; sqInt newContext; StackPage *newPage; @@ -52322,6 +52325,11 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); + /* begin assertValidExecutionPointe:r:s: */ + lip = GIV(instructionPointer); + lifp = GIV(framePointer); + lisp = GIV(stackPointer); + assertValidExecutionPointersimbarline(lip, lifp, lisp, !((((usqInt)(longAt(lifp + FoxMethod)))) < (startOfMemory())), __LINE__); sched = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord)); oldProc = longAt((sched + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); /* begin ensureFrameIsMarried:SP: */ @@ -52429,12 +52437,12 @@ : 0); } - /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin assertValidExecutionPointe:r:s: */ + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 17 14:15:47 PDT 2013 + Thu Jul 18 12:44:57 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cogit.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__cogitBuildInfo = __buildInfo; Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cogit.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cogmethod.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b + CCodeGenerator VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ typedef struct { Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1966,7 +1966,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.306]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -47704,6 +47704,9 @@ sqInt aProcess; sqInt index; StackPage *lastUsedPage; + char *lifp; + usqInt lip; + char *lisp; StackPage *lruOrFree; sqInt newContext; StackPage *newPage; @@ -47744,6 +47747,11 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); + /* begin assertValidExecutionPointe:r:s: */ + lip = GIV(instructionPointer); + lifp = GIV(framePointer); + lisp = GIV(stackPointer); + assertValidExecutionPointersimbarline(lip, lifp, lisp, !((((usqInt)(longAt(lifp + FoxMethod)))) < (startOfMemory())), __LINE__); sched = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord)); oldProc = longAt((sched + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); /* begin ensureFrameIsMarried:SP: */ @@ -47848,12 +47856,12 @@ assert(isOopCompiledMethod(GIV(method))); } - /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin assertValidExecutionPointe:r:s: */ + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cointerp.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreterMT VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2065,7 +2065,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.306]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -17041,7 +17041,8 @@ } -/* Set stackPage, framePointer and stackPointer for the suspendedContext of +/* Set stackPage, instructionPointer, framePointer and stackPointer for the + suspendedContext of aProcess, marrying the context if necessary, and niling the suspendedContext slot. This is used on process switch to ensure a context has a stack frame and so can @@ -17058,6 +17059,7 @@ StackPage *newPage; char *theFrame; StackPage *thePage; + sqInt top; sqInt value; newContext = longAt((aProcess + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); @@ -17136,8 +17138,12 @@ assert(isOopCompiledMethod(GIV(method))); } + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } @@ -26030,7 +26036,6 @@ sqInt sched; sqInt threadId; sqInt threadIndex; - sqInt top; CogVMThread *vmThread; CogVMThread *vmThread1; @@ -26165,10 +26170,6 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; externalSetStackPageAndPointersForSuspendedContextOfProcess(myProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); if (((vmThread->inMachineCode)) && (GIV(instructionPointer) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ @@ -49293,7 +49294,6 @@ sqInt oop; sqInt ownerIndex; sqInt threadId; - sqInt top; do { assert(((vmThread->state)) == CTMAssignableOrInVM); @@ -49360,10 +49360,6 @@ assert((fetchPointerofObject(MyListIndex, activeProcess())) == (nilObject())); if ((longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord))) != GIV(nilObj)) { externalSetStackPageAndPointersForSuspendedContextOfProcess(activeProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); } enterSmalltalkExecutive(); } @@ -49487,7 +49483,6 @@ char *sp; char *theFP; char *theSP; - sqInt top; CogVMThread *vmThread; GIV(statProcessSwitch) += 1; @@ -49555,10 +49550,6 @@ longAtput((newProc + BaseHeaderSize) + (MyListIndex << ShiftForWord), GIV(nilObj)); threadSwitchIfNecessaryfrom(newProc, sourceCode); externalSetStackPageAndPointersForSuspendedContextOfProcess(newProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); } sqInt Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1969,7 +1969,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.306]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -47713,6 +47713,9 @@ sqInt aProcess; sqInt index; StackPage *lastUsedPage; + char *lifp; + usqInt lip; + char *lisp; StackPage *lruOrFree; sqInt newContext; StackPage *newPage; @@ -47753,6 +47756,11 @@ (GIV(stackPage)->headFP = GIV(framePointer)); (GIV(stackPage)->headSP = GIV(stackPointer)); assert(pageListIsWellFormed()); + /* begin assertValidExecutionPointe:r:s: */ + lip = GIV(instructionPointer); + lifp = GIV(framePointer); + lisp = GIV(stackPointer); + assertValidExecutionPointersimbarline(lip, lifp, lisp, !((((usqInt)(longAt(lifp + FoxMethod)))) < (startOfMemory())), __LINE__); sched = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << ShiftForWord))) + BaseHeaderSize) + (ValueIndex << ShiftForWord)); oldProc = longAt((sched + BaseHeaderSize) + (ActiveProcessIndex << ShiftForWord)); /* begin ensureFrameIsMarried:SP: */ @@ -47857,12 +47865,12 @@ assert(isOopCompiledMethod(GIV(method))); } - /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); /* begin popStack */ top = longAt(GIV(stackPointer)); GIV(stackPointer) += BytesPerWord; GIV(instructionPointer) = ((sqInt) top); + /* begin assertValidExecutionPointe:r:s: */ + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } sqInt Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-18 19:45:39 UTC (rev 2753) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea from - CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CoInterpreterMT VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2068,7 +2068,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.306]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -17050,7 +17050,8 @@ } -/* Set stackPage, framePointer and stackPointer for the suspendedContext of +/* Set stackPage, instructionPointer, framePointer and stackPointer for the + suspendedContext of aProcess, marrying the context if necessary, and niling the suspendedContext slot. This is used on process switch to ensure a context has a stack frame and so can @@ -17067,6 +17068,7 @@ StackPage *newPage; char *theFrame; StackPage *thePage; + sqInt top; sqInt value; newContext = longAt((aProcess + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord)); @@ -17145,8 +17147,12 @@ assert(isOopCompiledMethod(GIV(method))); } + /* begin popStack */ + top = longAt(GIV(stackPointer)); + GIV(stackPointer) += BytesPerWord; + GIV(instructionPointer) = ((sqInt) top); /* begin assertValidExecutionPointe:r:s: */ - assertValidExecutionPointersimbarline(((usqInt)(longAt(GIV(stackPointer)))), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); + assertValidExecutionPointersimbarline(GIV(instructionPointer), GIV(framePointer), GIV(stackPointer), !((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())), __LINE__); } @@ -26039,7 +26045,6 @@ sqInt sched; sqInt threadId; sqInt threadIndex; - sqInt top; CogVMThread *vmThread; CogVMThread *vmThread1; @@ -26174,10 +26179,6 @@ /* begin initPrimCall */ GIV(primFailCode) = 0; externalSetStackPageAndPointersForSuspendedContextOfProcess(myProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); if (((vmThread->inMachineCode)) && (GIV(instructionPointer) >= (startOfMemory()))) { /* begin iframeSavedIP:put: */ @@ -49302,7 +49303,6 @@ sqInt oop; sqInt ownerIndex; sqInt threadId; - sqInt top; do { assert(((vmThread->state)) == CTMAssignableOrInVM); @@ -49369,10 +49369,6 @@ assert((fetchPointerofObject(MyListIndex, activeProcess())) == (nilObject())); if ((longAt((activeProc + BaseHeaderSize) + (SuspendedContextIndex << ShiftForWord))) != GIV(nilObj)) { externalSetStackPageAndPointersForSuspendedContextOfProcess(activeProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); } enterSmalltalkExecutive(); } @@ -49496,7 +49492,6 @@ char *sp; char *theFP; char *theSP; - sqInt top; CogVMThread *vmThread; GIV(statProcessSwitch) += 1; @@ -49564,10 +49559,6 @@ longAtput((newProc + BaseHeaderSize) + (MyListIndex << ShiftForWord), GIV(nilObj)); threadSwitchIfNecessaryfrom(newProc, sourceCode); externalSetStackPageAndPointersForSuspendedContextOfProcess(newProc); - /* begin popStack */ - top = longAt(GIV(stackPointer)); - GIV(stackPointer) += BytesPerWord; - GIV(instructionPointer) = ((sqInt) top); } sqInt Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/interp.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-17 21:17:03 UTC (rev 2752) +++ branches/Cog/src/vm/vmCallback.h 2013-07-18 19:45:39 UTC (rev 2753) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.306 uuid: ef4dab92-e348-4081-8041-92ae24d73bea */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.306.mcz
by commits＠source.squeak.org 18 Jul '13

18 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.306.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.306 Author: eem Time: 18 July 2013, 12:07:47.208 pm UUID: ef4dab92-e348-4081-8041-92ae24d73bea Ancestors: VMMaker.oscog-eem.305 Add an assertValidExecutionPointers to the front side of process switch. Restore the simulator after adding the MaxStackAllocBytes limit check to allocateOpcodes:bytecodes:ifFail: by adding size approximations for CogAbstractInstruction et al. Make cppIf:ifTrue:[ifFalse:] accept a symbol, thereby restoring the simulator after Tim's ENABLE_FAST_BLT changes. =============== Diff against VMMaker.oscog-eem.305 =============== Item was changed: ----- Method: CoInterpreterMT>>ownVM: (in category 'vm scheduling') ----- ownVM: threadIndexAndFlags <api> <inline: false> "This is the entry-point for plugins and primitives that wish to reacquire the VM after having released it via disownVM or callbacks that want to acquire it without knowing their ownership status. This call will block until the VM is owned by the current thread or an error occurs. The argument should be the value answered by disownVM, or 0 for callbacks that don't know if they have disowned or not. This is both an optimization to avoid having to query thread- local storage for the current thread's index (since it can easily keep it in some local variable), and a record of when an unbound process becomes affined to a thread for the dynamic extent of some operation. Answer 0 if the current thread is known to the VM. Answer 1 if the current thread is unknown to the VM and takes ownership. Answer -1 if the current thread is unknown to the VM and fails to take ownership." | threadIndex flags vmThread myProc activeProc sched | <var: #vmThread type: #'CogVMThread *'> threadIndexAndFlags = 0 ifTrue: [^self ownVMFromUnidentifiedThread]. threadIndex := threadIndexAndFlags bitAnd: ThreadIdMask. flags := threadIndexAndFlags >> DisownFlagsShift. (flags anyMask: DisownVMForProcessorRelinquish) ifTrue: [relinquishing := false. self sqLowLevelMFence]. (threadIndexAndFlags anyMask: LockGUIThreadFlag) ifTrue: [self assert: (noThreadingOfGUIThread and: [self inGUIThread]). self assert: disowningVMThread = nil. (flags anyMask: DisownVMLockOutFullGC) ifTrue: [objectMemory decrementFullGCLock]. cogit recordEventTrace ifTrue: [self recordTrace: TraceOwnVM thing: ConstZero source: 0]. ^0]. vmThread := cogThreadManager acquireVMFor: threadIndex. disownCount := disownCount - 1. (flags anyMask: DisownVMLockOutFullGC) ifTrue: [objectMemory decrementFullGCLock]. disowningVMThread notNil ifTrue: [vmThread = disowningVMThread ifTrue: [self cCode: '' inSmalltalk: [| range | range := self cStackRangeForThreadIndex: threadIndex. self assert: (range includes: cogit getCStackPointer). self assert: (range includes: cogit getCFramePointer)]. self assert: self successful. self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject. disowningVMThread := nil. cogit recordEventTrace ifTrue: [self recordTrace: TraceOwnVM thing: ConstOne source: 0]. ^0]. "if not preempted we're done." self preemptDisowningThread]. "We've been preempted; we must restore state and update the threadId in our process, and may have to put the active process to sleep." activeProc := self activeProcess. (threadIndexAndFlags anyMask: OwnVMForeignThreadFlag) ifTrue: [self assert: foreignCallbackProcessSlot == ForeignCallbackProcess. myProc := objectMemory splObj: foreignCallbackProcessSlot. self assert: myProc ~= objectMemory nilObject. objectMemory splObj: foreignCallbackProcessSlot put: objectMemory nilObject] ifFalse: [myProc := cogThreadManager popAWOLProcess: vmThread]. self assert: activeProc ~= myProc. (activeProc ~= objectMemory nilObject and: [(objectMemory fetchPointer: MyListIndex ofObject: activeProc) = objectMemory nilObject]) ifTrue: [self putToSleep: activeProc yieldingIf: preemptionYields]. self assert: (objectMemory fetchPointer: MyListIndex ofObject: myProc) = (objectMemory splObj: ProcessInExternalCodeTag). sched := self schedulerPointer. objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: myProc; storePointerUnchecked: MyListIndex ofObject: myProc withValue: objectMemory nilObject. "Only unaffine if the process was affined at this level and did not become bound in the interim." ((threadIndexAndFlags anyMask: ProcessUnaffinedOnDisown) and: [(self isBoundProcess: myProc) not]) ifTrue: [self setOwnerIndexOfProcess: myProc to: 0 bind: false]. self initPrimCall. self externalSetStackPageAndPointersForSuspendedContextOfProcess: myProc. "If this primitive is called from machine code maintain the invariant that the return pc of an interpreter callee calling a machine code caller is ceReturnToInterpreterPC." - instructionPointer := self popStack. (vmThread inMachineCode and: [instructionPointer >= objectMemory startOfMemory]) ifTrue: [self iframeSavedIP: framePointer put: instructionPointer. instructionPointer := cogit ceReturnToInterpreterPC]. newMethod := vmThread newMethodOrNull. argumentCount := vmThread argumentCount. self cCode: [self mem: reenterInterpreter cp: vmThread reenterInterpreter y: (self sizeof: #'jmp_buf')] inSmalltalk: [reenterInterpreter := vmThread reenterInterpreter]. vmThread newMethodOrNull: nil. self cCode: '' inSmalltalk: [| range | range := self cStackRangeForThreadIndex: threadIndex. self assert: (range includes: vmThread cStackPointer). self assert: (range includes: vmThread cFramePointer)]. cogit setCStackPointer: vmThread cStackPointer. cogit setCFramePointer: vmThread cFramePointer. self assert: newMethod ~~ nil.. cogit recordEventTrace ifTrue: [self recordTrace: TraceOwnVM thing: ConstTwo source: 0]. ^threadIndexAndFlags bitAnd: OwnVMForeignThreadFlag! Item was changed: ----- Method: CoInterpreterMT>>transferTo:from: (in category 'process primitive support') ----- transferTo: newProc from: sourceCode "Record a process to be awoken on the next interpreter cycle. Override to potentially switch threads either if the new process is bound to another thread, or if there is no runnable process but there is a waiting thread. Note that the abort on no runnable process has beeen moved here from wakeHighestPriority." | sched oldProc activeContext vmThread | <inline: false> <var: #vmThread type: #'CogVMThread *'> statProcessSwitch := statProcessSwitch + 1. self push: instructionPointer. self externalWriteBackHeadFramePointers. sched := self schedulerPointer. oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. self recordContextSwitchFrom: oldProc in: sourceCode. activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer. objectMemory storePointer: SuspendedContextIndex ofObject: oldProc withValue: activeContext. newProc isNil ifTrue: ["Two possibilities. One, there is at least one thread waiting to own the VM in which case it should be activated. Two, there are no processes to run and so abort." vmThread := self willingVMThread. (vmThread notNil and: [vmThread state = CTMWantingOwnership]) ifTrue: [self returnToSchedulingLoopAndReleaseVMOrWakeThread: vmThread source: sourceCode]. self error: 'scheduler could not find a runnable process']. objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: newProc. objectMemory storePointerUnchecked: MyListIndex ofObject: newProc withValue: objectMemory nilObject. self threadSwitchIfNecessary: newProc from: sourceCode. + self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc! - self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc. - instructionPointer := self popStack! Item was changed: ----- Method: CoInterpreterMT>>tryToExecuteSmalltalk: (in category 'vm scheduling') ----- tryToExecuteSmalltalk: vmThread "Attempt to run the current process, if it exists, on the given vmThread." <var: #vmThread type: #'CogVMThread *'> | dvmt activeProc ownerIndex | <var: #dvmt type: #'CogVMThread *'> self assert: cogThreadManager getVMOwner = vmThread index. self assert: cogThreadManager ioGetThreadLocalThreadIndex = vmThread index. dvmt := disowningVMThread. disowningVMThread ifNil: [activeProc := self activeProcess] ifNotNil: [self preemptDisowningThread. activeProc := self wakeHighestPriority. activeProc ifNil: [activeProc := objectMemory nilObject] ifNotNil: [objectMemory storePointerUnchecked: MyListIndex ofObject: activeProc withValue: objectMemory nilObject]. objectMemory storePointer: ActiveProcessIndex ofObject: self schedulerPointer withValue: activeProc]. activeProc = objectMemory nilObject ifTrue: [cogThreadManager releaseVM. ^nil]. ownerIndex := self ownerIndexOfProcess: activeProc. (ownerIndex = 0 or: [ownerIndex ~= 0 and: [ownerIndex = cogThreadManager getVMOwner]]) ifTrue: [self assert: (objectMemory fetchPointer: MyListIndex ofObject: self activeProcess) = objectMemory nilObject. (objectMemory fetchPointer: SuspendedContextIndex ofObject: activeProc) ~= objectMemory nilObject ifTrue: + [self externalSetStackPageAndPointersForSuspendedContextOfProcess: activeProc]. - [self externalSetStackPageAndPointersForSuspendedContextOfProcess: activeProc. - instructionPointer := self popStack]. self enterSmalltalkExecutive. "When we return here we should have already given up the VM and so we cannot touch any interpreter state."] ifFalse: [cogThreadManager wakeVMThreadFor: ownerIndex]! Item was added: + ----- Method: CogAbstractInstruction class>>byteSizeForSimulator: (in category 'simulation only') ----- + byteSizeForSimulator: aVMClass + "Answer an approximation of the byte size of an AbstractInstruction struct. + This is for estimating the alloca in allocateOpcodes:bytecodes:ifFail:" + | concreteClass ptrsize | + concreteClass := aVMClass processor abstractInstructionCompilerClass. + ptrsize := aVMClass sizeof: #'void *'. + ^concreteClass instSize - 4 "cogit, objectMemory et al" * ptrsize + + concreteClass basicNew machineCodeBytes + roundTo: ptrsize! Item was added: + ----- Method: CogBytecodeFixup class>>byteSizeForSimulator: (in category 'simulation only') ----- + byteSizeForSimulator: aVMClass + "Answer an approximation of the byte size of an AbstractInstruction struct. + This is for estimating the alloca in allocateOpcodes:bytecodes:ifFail:" + ^self instSize * (aVMClass sizeof: #'void *')! Item was added: + ----- Method: CogInstructionAnnotation class>>byteSizeForSimulator: (in category 'simulation only') ----- + byteSizeForSimulator: aVMClass + "Answer an approximation of the byte size of an AbstractInstruction struct. + This is for estimating the alloca in allocateOpcodes:bytecodes:ifFail:" + ^self instSize * (aVMClass sizeof: #'void *')! Item was added: + ----- Method: CogVMSimulator>>deferStackLimitSmashAround:with: (in category 'multi-threading simulation switch') ----- + deferStackLimitSmashAround: functionSymbol with: arg + "This method includes or excludes CoInterpreterMT methods as required. + Auto-generated by CogVMSimulator>>ensureMultiThreadingOverridesAreUpToDate" + + ^self perform: #deferStackLimitSmashAround:with: + withArguments: {functionSymbol. arg} + inSuperclass: (cogThreadManager ifNil: [CoInterpreterPrimitives] ifNotNil: [CoInterpreterMT])! Item was changed: ----- Method: Cogit>>allocateOpcodes:bytecodes:ifFail: (in category 'initialization') ----- allocateOpcodes: numberOfAbstractOpcodes bytecodes: numberOfBytecodes ifFail: failBlock "Allocate the various arrays needed to compile abstract instructions. This needs to be a macro since the arrays are alloca'ed (stack allocated) to ensure their being freed when compilation is done. Notionally we only need as many fixups as there are bytecodes. But we reuse fixups to record pc-dependent instructions in generateInstructionsAt: and so need at least as many as there are abstract opcodes. N.B. We do one single alloca to save embarrassing C optimizers that generate incorrect code as both gcc and the intel compiler do on x86." <cmacro: '(numberOfAbstractOpcodes,numberOfBytecodes,failBlock) do { \ int opcodeSize = sizeof(AbstractInstruction) * (numAbstractOpcodes = (numberOfAbstractOpcodes)); \ int fixupSize = sizeof(BytecodeFixup) * numAbstractOpcodes; \ int annotationSize = sizeof(InstructionAnnotation) * ((numAbstractOpcodes + 3) / 4); \ int allocSize = opcodeSize + fixupSize + annotationSize; \ if (allocSize > MaxStackAllocSize) failBlock; \ abstractOpcodes = alloca(allocSize); \ bzero(abstractOpcodes, opcodeSize + fixupSize); \ fixups = (void *)((char *)abstractOpcodes + opcodeSize); \ annotations = (void *)((char *)fixups + fixupSize); \ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0)'> | opcodeSize fixupSize annotationSize allocSize | + opcodeSize := (self sizeof: CogAbstractInstruction) * numberOfAbstractOpcodes. + fixupSize := (self sizeof: CogBytecodeFixup) * numberOfAbstractOpcodes. + annotationSize := (self sizeof: CogInstructionAnnotation) * ((numberOfAbstractOpcodes + 3) / 4). - opcodeSize := (self sizeof: #AbstractInstruction) * numberOfAbstractOpcodes. - fixupSize := (self sizeof: #BytecodeFixup) * numberOfAbstractOpcodes. - annotationSize := (self sizeof: #InstructionAnnotation) * ((numberOfAbstractOpcodes + 3) / 4). allocSize := opcodeSize + fixupSize + annotationSize. allocSize > MaxStackAllocSize ifTrue: [^failBlock value]. numAbstractOpcodes := numberOfAbstractOpcodes. abstractOpcodes := CArrayAccessor on: ((1 to: numAbstractOpcodes) collect: [:ign| processor abstractInstructionCompilerClass for: self]). fixups := CArrayAccessor on: ((1 to: numAbstractOpcodes) collect: [:ign| self bytecodeFixupClass new]). annotations := CArrayAccessor on: ((1 to: numAbstractOpcodes + 3 // 4) collect: [:ign| CogInstructionAnnotation new]). opcodeIndex := labelCounter := annotationIndex := 0! Item was changed: ----- Method: StackInterpreter>>externalSetStackPageAndPointersForSuspendedContextOfProcess: (in category 'frame access') ----- externalSetStackPageAndPointersForSuspendedContextOfProcess: aProcess + "Set stackPage, instructionPointer, framePointer and stackPointer for the suspendedContext of + aProcess, marrying the context if necessary, and niling the suspendedContext slot. This is used - "Set stackPage, framePointer and stackPointer for the suspendedContext of aProcess, - marrying the context if necessary, and niling the suspendedContext slot. This is used on process switch to ensure a context has a stack frame and so can continue execution." | newContext theFrame thePage newPage | <var: #theFrame type: #'char *'> <var: #thePage type: #'StackPage *'> <var: #newPage type: #'StackPage *'> newContext := objectMemory fetchPointer: SuspendedContextIndex ofObject: aProcess. self assert: (objectMemory isContext: newContext). (self isMarriedOrWidowedContext: newContext) ifTrue: [self assert: (self checkIsStillMarriedContext: newContext currentFP: framePointer)]. objectMemory storePointerUnchecked: SuspendedContextIndex ofObject: aProcess withValue: objectMemory nilObject. (self isStillMarriedContext: newContext) ifTrue: [theFrame := self frameOfMarriedContext: newContext. thePage := stackPages stackPageFor: theFrame. theFrame ~= thePage headFP ifTrue: ["explicit assignment of suspendedContext can cause switch to interior frame." newPage := self newStackPage. self moveFramesIn: thePage through: (self findFrameAbove: theFrame inPage: thePage) toPage: newPage. stackPages markStackPageLeastMostRecentlyUsed: newPage]. self assert: thePage headFP = theFrame] ifFalse: [thePage := self makeBaseFrameFor: newContext. theFrame := thePage baseFP]. self setStackPageAndLimit: thePage. stackPointer := thePage headSP. framePointer := thePage headFP. (self isMachineCodeFrame: framePointer) ifFalse: + [self setMethod: (self iframeMethod: framePointer)].. + instructionPointer := self popStack. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer! - [self setMethod: (self iframeMethod: framePointer)]. - self assertValidExecutionPointe: self stackTop asUnsignedInteger r: framePointer s: stackPointer! Item was changed: ----- Method: StackInterpreter>>transferTo: (in category 'process primitive support') ----- transferTo: newProc "Record a process to be awoken on the next interpreter cycle." | activeContext sched oldProc | <inline: false> statProcessSwitch := statProcessSwitch + 1. self push: instructionPointer. self externalWriteBackHeadFramePointers. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. sched := self schedulerPointer. oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer. objectMemory storePointer: SuspendedContextIndex ofObject: oldProc withValue: activeContext. objectMemory storePointer: ActiveProcessIndex ofObject: sched withValue: newProc. objectMemory storePointerUnchecked: MyListIndex ofObject: newProc withValue: objectMemory nilObject. + self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc! - self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc. - instructionPointer := self popStack! Item was changed: ----- Method: VMClass>>cppIf:ifTrue: (in category 'translation support') ----- cppIf: conditionBlockOrValue ifTrue: trueExpressionOrBlock "When translated, produces #if (condition) #else #endif CPP directives. Example usage: self cppIf: IMMUTABILITY ifTrue: [(self internalIsImmutable: obj) ifTrue: [^self primitiveFailFor: PrimErrNoModification]]" + ^self cppIf: conditionBlockOrValue ifTrue: trueExpressionOrBlock ifFalse: nil! - ^self cppIf: conditionBlockOrValue ifTrue: trueExpressionOrBlock ifFalse: []! Item was changed: ----- Method: VMClass>>cppIf:ifTrue:ifFalse: (in category 'translation support') ----- + cppIf: conditionBlockOrSymbolValue ifTrue: trueExpressionOrBlock ifFalse: falseExpressionOrBlockOrNil - cppIf: conditionBlockOrValue ifTrue: trueExpressionOrBlock ifFalse: falseExpressionOrBlockOrNil "When translated, produces #if (condition) #else #endif CPP directives. Example usage: self cppIf: [BytesPerWord = 8] ifTrue: [self doSomethingFor64Bit] ifFalse: [self doSomethingFor32Bit] self cppIf: BytesPerWord = 8 ifTrue: [self doSomethingFor64Bit] + ifFalse: [self doSomethingFor32Bit] + self cppIf: #A_GLOBAL + ifTrue: [self doSomethingFor64Bit] ifFalse: [self doSomethingFor32Bit]" + ^(conditionBlockOrSymbolValue value - ^(conditionBlockOrValue value ifNil: [false] ifNotNil: [:value| value isInteger ifTrue: [value ~= 0] + ifFalse: + [value isSymbol + ifTrue: [(self class bindingOf: value) + ifNil: [false] + ifNotNil: [:binding| binding value]] + ifFalse: [value]]]) - ifFalse: [value]]) ifTrue: trueExpressionOrBlock ifFalse: falseExpressionOrBlockOrNil! Item was added: + ----- Method: VMStructType class>>alignedByteSizeOf:forClient: (in category 'simulation only') ----- + alignedByteSizeOf: objectSymbolOrClass forClient: aVMClass + ^objectSymbolOrClass byteSizeForSimulator: aVMClass!

1 0

[commit][2752] CogVM source as per VMMaker.oscog-eem.305.
by commits＠squeakvm.org 17 Jul '13

17 Jul '13

Revision: 2752 Author: eliot Date: 2013-07-17 14:17:03 -0700 (Wed, 17 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.305. Limit the ammount of space the Cogit will stack allocate when compiling. This limits the maximum number of bytecodes in a method that the Cogit will compile. Currently set at 1.5Mb of stack space from empirical tests of alloca on Mac OS X 10.6, linux 2.6 & Windows XP. Merge initializeCompilationWithConstantsOptions: into initializeMiscConstantsWith:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b from - StackToRegisterMappingCogit VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -255,6 +255,7 @@ #define MaxMethodSize 65535 #define MaxNegativeErrorCode -6 #define MaxNumArgs 15 +#define MaxStackAllocSize 1572864 #define MaxStackCheckOffset 0xFFF #define MaxUnitDisplacement 31 #define MaxX2NDisplacement 992 @@ -1962,6 +1963,18 @@ annotations = (void *)((char *)fixups + fixupSize); \ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0) +#define allocateOpcodesbytecodesifFail(numberOfAbstractOpcodes,numberOfBytecodes,failBlock) do { \ + int opcodeSize = sizeof(AbstractInstruction) * (numAbstractOpcodes = (numberOfAbstractOpcodes)); \ + int fixupSize = sizeof(BytecodeFixup) * numAbstractOpcodes; \ + int annotationSize = sizeof(InstructionAnnotation) * ((numAbstractOpcodes + 3) / 4); \ + int allocSize = opcodeSize + fixupSize + annotationSize; \ + if (allocSize > MaxStackAllocSize) failBlock; \ + abstractOpcodes = alloca(allocSize); \ + bzero(abstractOpcodes, opcodeSize + fixupSize); \ + fixups = (void *)((char *)abstractOpcodes + opcodeSize); \ + annotations = (void *)((char *)fixups + fixupSize); \ + opcodeIndex = labelCounter = annotationIndex = 0; \ +} while (0) #define blockStartAt(index) (&blockStarts[index]) #define breakOnImplicitReceiver() (traceFlags & 64) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline @@ -4171,7 +4184,7 @@ ? initialPC - 1 : byteLengthOf(methodObj)); numBytecodes = (endPC - initialPC) + 1; - allocateOpcodesbytecodes((numBytecodes + extra) * 10, numBytecodes); + allocateOpcodesbytecodesifFail((numBytecodes + extra) * 10, numBytecodes, return ((CogMethod *) MethodTooBig)); if (((numBlocks = scanMethod())) < 0) { return ((CogMethod *) numBlocks); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 17 13:57:16 PDT 2013 + Wed Jul 17 14:15:47 PDT 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/src/vm/cogit.c 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b from - StackToRegisterMappingCogit VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -255,6 +255,7 @@ #define MaxMethodSize 65535 #define MaxNegativeErrorCode -6 #define MaxNumArgs 15 +#define MaxStackAllocSize 1572864 #define MaxStackCheckOffset 0xFFF #define MaxUnitDisplacement 31 #define MaxX2NDisplacement 992 @@ -1649,6 +1650,18 @@ annotations = (void *)((char *)fixups + fixupSize); \ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0) +#define allocateOpcodesbytecodesifFail(numberOfAbstractOpcodes,numberOfBytecodes,failBlock) do { \ + int opcodeSize = sizeof(AbstractInstruction) * (numAbstractOpcodes = (numberOfAbstractOpcodes)); \ + int fixupSize = sizeof(BytecodeFixup) * numAbstractOpcodes; \ + int annotationSize = sizeof(InstructionAnnotation) * ((numAbstractOpcodes + 3) / 4); \ + int allocSize = opcodeSize + fixupSize + annotationSize; \ + if (allocSize > MaxStackAllocSize) failBlock; \ + abstractOpcodes = alloca(allocSize); \ + bzero(abstractOpcodes, opcodeSize + fixupSize); \ + fixups = (void *)((char *)abstractOpcodes + opcodeSize); \ + annotations = (void *)((char *)fixups + fixupSize); \ + opcodeIndex = labelCounter = annotationIndex = 0; \ +} while (0) #define blockStartAt(index) (&blockStarts[index]) #define breakOnImplicitReceiver() (traceFlags & 64) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline @@ -3754,7 +3767,7 @@ ? initialPC - 1 : byteLengthOf(methodObj)); numBytecodes = (endPC - initialPC) + 1; - allocateOpcodesbytecodes((numBytecodes + extra) * 10, numBytecodes); + allocateOpcodesbytecodesifFail((numBytecodes + extra) * 10, numBytecodes, return ((CogMethod *) MethodTooBig)); if (((numBlocks = scanMethod())) < 0) { return ((CogMethod *) numBlocks); } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/src/vm/cogit.h 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-07-17 20:57:47 UTC (rev 2751) +++ branches/Cog/src/vm/cogmethod.h 2013-07-17 21:17:03 UTC (rev 2752) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.302 uuid: 2ac39432-ac54-4584-964e-b129c90792f4 + CCodeGenerator VMMaker.oscog-eem.305 uuid: ca4b6f0d-e113-4cd5-b859-527f897bd29b */ typedef struct {

1 0

VM Maker: VMMaker.oscog-eem.305.mcz
by commits＠source.squeak.org 17 Jul '13

17 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.305.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.305 Author: eem Time: 17 July 2013, 2:02:59.495 pm UUID: ca4b6f0d-e113-4cd5-b859-527f897bd29b Ancestors: VMMaker.oscog-eem.304 Limit the ammount of space the Cogit will stack allocate when compiling. This limits the maximum number of bytecodes in a method that the Cogit will compile. Currently set at 1.5Mb of stack space from empirical tests of alloca on Mac OS X 10.6, linux 2.6 & Windows XP. Merge initializeCompilationWithConstantsOptions: into initializeMiscConstantsWith:. =============== Diff against VMMaker.oscog-eem.304 =============== Item was changed: CogClass subclass: #Cogit instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMissCall missOffset entryPointMask checkedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset mnuCall interpretCall endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxMethodBefore maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceStoreCheckTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceClosureCopyTrampoline ceCreateNewArrayTrampoline ceEnterCogCodePopReceiverReg ceEnterCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceActiveContextTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline cePositive32BitIntegerTrampoline ceImplicitReceiverTrampoline ceExplicitReceiverTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB' + classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass YoungSelectorInPIC' - classVariableNames: 'AltBlockCreationBytecodeSize AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumSendTrampolines NumTrampolines ProcessorClass YoungSelectorInPIC' poolDictionaries: 'CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was removed: - ----- Method: Cogit class>>initializeCompilationWithConstantsOptions: (in category 'class initialization') ----- - initializeCompilationWithConstantsOptions: optionsDictionary - ProcessorClass := (optionsDictionary at: #ISA ifAbsent: [#IA32]) caseOf: { - [#IA32] -> [BochsIA32Alien]. - [#ARMv5] -> [GdbARMAlien]. }. - NumSendTrampolines := 4! Item was changed: ----- Method: Cogit class>>initializeMiscConstantsWith: (in category 'class initialization') ----- initializeMiscConstantsWith: optionsDictionary super initializeMiscConstantsWith: optionsDictionary. Debug := optionsDictionary at: #Debug ifAbsent: [false]. (optionsDictionary includesKey: #EagerInstructionDecoration) ifTrue: [EagerInstructionDecoration := optionsDictionary at: #EagerInstructionDecoration] ifFalse: [EagerInstructionDecoration isNil ifTrue: [EagerInstructionDecoration := false]]. "speeds up single stepping but could lose fidelity" + ProcessorClass := (optionsDictionary at: #ISA ifAbsent: [#IA32]) caseOf: { + [#IA32] -> [BochsIA32Alien]. + [#ARMv5] -> [GdbARMAlien]. }. + "we special-case 0, 1 & 2 argument sends, N is numArgs >= 3" + NumSendTrampolines := 4. "Currently only the ceImplicitReceiverTrampoline contains object references." + NumObjRefsInRuntime := 2. + "Max size to alloca when compiling. + Mac OS X 10.6.8 segfaults approaching 8Mb. + Linux 2.6.9 segfaults above 11Mb. + WIndows XP segfaults approaching 2Mb." + MaxStackAllocSize := 1024 * 1024 * 3 / 2 ! - NumObjRefsInRuntime := 2! Item was changed: ----- Method: Cogit class>>initializeWithOptions: (in category 'class initialization') ----- initializeWithOptions: optionsDictionary self initializeMiscConstantsWith: optionsDictionary. "must preceed other initialization." self initializeErrorCodes. self initializeCogMethodConstants. self initializeAnnotationConstants. - self initializeCompilationWithConstantsOptions: optionsDictionary. self initializeBytecodeTable. self initializePrimitiveTable! Item was added: + ----- Method: Cogit>>allocateOpcodes:bytecodes:ifFail: (in category 'initialization') ----- + allocateOpcodes: numberOfAbstractOpcodes bytecodes: numberOfBytecodes ifFail: failBlock + "Allocate the various arrays needed to compile abstract instructions. + This needs to be a macro since the arrays are alloca'ed (stack allocated) + to ensure their being freed when compilation is done. + Notionally we only need as many fixups as there are bytecodes. But we + reuse fixups to record pc-dependent instructions in generateInstructionsAt: + and so need at least as many as there are abstract opcodes. + + N.B. We do one single alloca to save embarrassing C optimizers that + generate incorrect code as both gcc and the intel compiler do on x86." + <cmacro: '(numberOfAbstractOpcodes,numberOfBytecodes,failBlock) do { \ + int opcodeSize = sizeof(AbstractInstruction) * (numAbstractOpcodes = (numberOfAbstractOpcodes)); \ + int fixupSize = sizeof(BytecodeFixup) * numAbstractOpcodes; \ + int annotationSize = sizeof(InstructionAnnotation) * ((numAbstractOpcodes + 3) / 4); \ + int allocSize = opcodeSize + fixupSize + annotationSize; \ + if (allocSize > MaxStackAllocSize) failBlock; \ + abstractOpcodes = alloca(allocSize); \ + bzero(abstractOpcodes, opcodeSize + fixupSize); \ + fixups = (void *)((char *)abstractOpcodes + opcodeSize); \ + annotations = (void *)((char *)fixups + fixupSize); \ + opcodeIndex = labelCounter = annotationIndex = 0; \ + } while (0)'> + | opcodeSize fixupSize annotationSize allocSize | + opcodeSize := (self sizeof: #AbstractInstruction) * numberOfAbstractOpcodes. + fixupSize := (self sizeof: #BytecodeFixup) * numberOfAbstractOpcodes. + annotationSize := (self sizeof: #InstructionAnnotation) * ((numberOfAbstractOpcodes + 3) / 4). + allocSize := opcodeSize + fixupSize + annotationSize. + allocSize > MaxStackAllocSize ifTrue: [^failBlock value]. + numAbstractOpcodes := numberOfAbstractOpcodes. + abstractOpcodes := CArrayAccessor on: + ((1 to: numAbstractOpcodes) collect: + [:ign| processor abstractInstructionCompilerClass for: self]). + fixups := CArrayAccessor on: + ((1 to: numAbstractOpcodes) collect: + [:ign| self bytecodeFixupClass new]). + annotations := CArrayAccessor on: + ((1 to: numAbstractOpcodes + 3 // 4) collect: + [:ign| CogInstructionAnnotation new]). + opcodeIndex := labelCounter := annotationIndex := 0! Item was changed: ----- Method: Cogit>>compileCogMethod: (in category 'compile abstract instructions') ----- compileCogMethod: selector <returnTypeC: #'CogMethod *'> | numBytecodes numBlocks result extra | hasYoungReferent := (objectMemory isYoung: methodObj) or: [objectMemory isYoung: selector]. methodOrBlockNumArgs := coInterpreter argumentCountOf: methodObj. inBlock := false. primInvokeLabel := nil. postCompileHook := nil. maxLitIndex := -1. extra := ((primitiveIndex := coInterpreter primitiveIndexOf: methodObj) > 0 and: [(coInterpreter isQuickPrimitiveIndex: primitiveIndex) not]) ifTrue: [30] ifFalse: [10]. initialPC := coInterpreter startPCOfMethod: methodObj. "initial estimate. Actual endPC is determined in scanMethod." endPC := (coInterpreter isQuickPrimitiveIndex: primitiveIndex) ifTrue: [initialPC - 1] ifFalse: [objectMemory byteLengthOf: methodObj]. numBytecodes := endPC - initialPC + 1. + self allocateOpcodes: (numBytecodes + extra) * 10 + bytecodes: numBytecodes + ifFail: [^coInterpreter cCoerceSimple: MethodTooBig to: #'CogMethod *']. - self allocateOpcodes: (numBytecodes + extra) * 10 bytecodes: numBytecodes. (numBlocks := self scanMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: numBlocks to: #'CogMethod *']. self allocateBlockStarts: numBlocks. blockEntryLabel := nil. methodLabel dependent: nil. (result := self compileEntireMethod) < 0 ifTrue: [^coInterpreter cCoerceSimple: result to: #'CogMethod *']. ^self generateCogMethod: selector!

1 0

[commit][2751] CogVM source as per VMMaker.oscog-eem.304.
by commits＠squeakvm.org 17 Jul '13

17 Jul '13

Revision: 2751 Author: eliot Date: 2013-07-17 13:57:47 -0700 (Wed, 17 Jul 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.304. Make deferStackLimitSmashAround:[with:] answer true so it can be invoked in an assert and hence be optimized out in a non-assert VM, hence optimizing away assertValidExecutionPointe:r:s:imbar:line:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -480,7 +480,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); static sqInt divorceAllFrames(void); @@ -1976,7 +1976,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.303"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13405,7 +13405,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -18393,7 +18393,7 @@ assert checks) */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -18406,6 +18406,7 @@ sqLowLevelMFence(); forceInterruptCheck(); } + return 1; } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -483,7 +483,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); static sqInt divorceAllFrames(void); @@ -1979,7 +1979,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.303"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.304"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -13414,7 +13414,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -18402,7 +18402,7 @@ assert checks) */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -18415,6 +18415,7 @@ sqLowLevelMFence(); forceInterruptCheck(); } + return 1; } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/nscogsrc/vm/interp.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jul 16 15:53:52 PDT 2013 + Wed Jul 17 13:57:16 PDT 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/cointerp.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -475,7 +475,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); static sqInt divorceAllFrames(void); @@ -1966,7 +1966,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.303]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9511,7 +9511,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -14307,7 +14307,7 @@ assert checks) */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -14320,6 +14320,7 @@ sqLowLevelMFence(); forceInterruptCheck(); } + return 1; } Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/cointerp.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/cointerpmt.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -522,7 +522,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); sqInt disownVM(sqInt flags); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); @@ -2065,7 +2065,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.303]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9612,7 +9612,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -14749,7 +14749,7 @@ N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -14763,6 +14763,7 @@ forceInterruptCheck(); checkVMOwnershipFromHeartbeat(); } + return 1; } Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/cointerpmt.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -478,7 +478,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); static sqInt divorceAllFrames(void); @@ -1969,7 +1969,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.303]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.304]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -9520,7 +9520,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -14316,7 +14316,7 @@ assert checks) */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -14329,6 +14329,7 @@ sqLowLevelMFence(); forceInterruptCheck(); } + return 1; } Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-07-17 20:57:47 UTC (rev 2751) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 from - CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -525,7 +525,7 @@ static sqInt defaultCogCodeSize(void); static sqInt defaultEdenBytes(void); static sqInt defaultNumStackPages(void); -static void deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg); sqInt disownVM(sqInt flags); static void displayBitsOfLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); sqInt displayObject(void); @@ -2068,7 +2068,7 @@ /* 575 */ (void (*)(void))0, 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.303]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.304]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -9621,7 +9621,7 @@ assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); - deferStackLimitSmashAroundwith(assertValidStackLimits, ln); + assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); @@ -14758,7 +14758,7 @@ N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat */ -static void +static sqInt deferStackLimitSmashAroundwith(void (*functionSymbol)(sqInt), sqInt arg) { DECL_MAYBE_SQ_GLOBAL_STRUCT GIV(deferSmash) = 1; @@ -14772,6 +14772,7 @@ forceInterruptCheck(); checkVMOwnershipFromHeartbeat(); } + return 1; } Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/interp.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-07-16 22:54:52 UTC (rev 2750) +++ branches/Cog/src/vm/vmCallback.h 2013-07-17 20:57:47 UTC (rev 2751) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.303 uuid: 99b81fe2-3c89-43bb-8a2c-2541842da7e0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.304 uuid: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 */ #define VM_CALLBACK_INC 1

1 0

squeakvm.org is down...
by Eliot Miranda 17 Jul '13

17 Jul '13

SLSIA -- best, Eliot

1 0

VM Maker: VMMaker.oscog-eem.304.mcz
by commits＠source.squeak.org 17 Jul '13

17 Jul '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.304.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.304 Author: eem Time: 17 July 2013, 12:25:05.226 pm UUID: 79d06b10-06eb-49bc-a33a-a36bd68ab3c2 Ancestors: VMMaker.oscog-eem.303 Make deferStackLimitSmashAround:[with:] answer true so it can be invoked in an assert and hence be optimized out in a non-assert VM, hence optimizing away assertValidExecutionPointe:r:s:imbar:line:. =============== Diff against VMMaker.oscog-eem.303 =============== Item was changed: ----- Method: CoInterpreter>>assertValidExecutionPointe:r:s:imbar:line: (in category 'debug support') ----- assertValidExecutionPointe: lip r: lifp s: lisp imbar: inInterpreter line: ln <var: #lip type: #usqInt> <var: #lifp type: #'char *'> <var: #lisp type: #'char *'> | methodField cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: stackPage = (stackPages stackPageFor: lifp) l: ln. self assert: stackPage = stackPages mostRecentlyUsedPage l: ln. + self assert: (self deferStackLimitSmashAround: #assertValidStackLimits: asSymbol with: ln). - self deferStackLimitSmashAround: #assertValidStackLimits: asSymbol with: ln. self assert: lifp < stackPage baseAddress l: ln. self assert: lisp < lifp l: ln. self assert: lifp > lisp l: ln. self assert: lisp >= (stackPage realStackLimit - self stackLimitOffset) l: ln. self assert: (lifp - lisp) < LargeContextSize l: ln. methodField := self frameMethodField: lifp. inInterpreter ifTrue: [self assert: (self isMachineCodeFrame: lifp) not l: ln. self assert: method = methodField l: ln. self cppIf: MULTIPLEBYTECODESETS ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256) l: ln]. ((self asserta: methodField asUnsignedInteger > objectMemory startOfMemory l: ln) and: [self asserta: methodField asUnsignedInteger < objectMemory freeStart l: ln]) ifTrue: [lip ~= cogit ceReturnToInterpreterPC ifTrue: [self assert: (lip >= (methodField + (objectMemory lastPointerOf: methodField) + BaseHeaderSize - 1) and: [lip < (methodField + (objectMemory byteLengthOf: methodField) + BaseHeaderSize)]) l: ln]]. self assert: ((self iframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self iframeReceiver: lifp)]) l: ln] ifFalse: [self assert: (self isMachineCodeFrame: lifp) l: ln. ((self asserta: methodField asUnsignedInteger >= cogit minCogMethodAddress l: ln) and: [self asserta: methodField asUnsignedInteger < cogit maxCogMethodAddress l: ln]) ifTrue: [cogMethod := self mframeHomeMethod: lifp. self assert: (lip > (methodField + ((self mframeIsBlockActivation: lifp) ifTrue: [self sizeof: CogBlockMethod] ifFalse: [self sizeof: CogMethod])) and: [lip < (methodField + cogMethod blockSize)]) l: ln]. self assert: ((self mframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)]) l: ln]. (self isBaseFrame: lifp) ifTrue: [self assert: (self frameHasContext: lifp) l: ln. self assert: (self frameContext: lifp) = (stackPages longAt: stackPage baseAddress - BytesPerWord) l: ln]! Item was changed: ----- Method: CoInterpreter>>deferStackLimitSmashAround: (in category 'process primitive support') ----- deferStackLimitSmashAround: functionSymbol "Defer smashes of the stackLimit around the call of functionSymbol (for assert checks)" <var: #functionSymbol declareC: 'void (*functionSymbol)(void)'> deferSmash := true. self perform: functionSymbol. deferSmash := false. deferredSmash ifTrue: [deferredSmash := false. + self forceInterruptCheck]. + ^true "called from assert"! - self forceInterruptCheck]! Item was changed: ----- Method: CoInterpreter>>deferStackLimitSmashAround:with: (in category 'process primitive support') ----- deferStackLimitSmashAround: functionSymbol with: arg "Defer smashes of the stackLimit around the call of functionSymbol (for assert checks)" <var: #functionSymbol declareC: 'void (*functionSymbol)(sqInt)'> deferSmash := true. self sqLowLevelMFence. self perform: functionSymbol with: arg. deferSmash := false. self sqLowLevelMFence. deferredSmash ifTrue: [deferredSmash := false. self sqLowLevelMFence. + self forceInterruptCheck]. + ^true "called from assert"! - self forceInterruptCheck]! Item was changed: ----- Method: CoInterpreterMT>>deferStackLimitSmashAround: (in category 'process primitive support') ----- deferStackLimitSmashAround: functionSymbol "Defer smashes of the stackLimit around the call of functionSymbol (for assert checks). N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat" <var: #functionSymbol declareC: 'void (*functionSymbol)(void)'> deferSmash := true. self perform: functionSymbol. deferSmash := false. deferredSmash ifTrue: [deferredSmash := false. self forceInterruptCheck. + self checkVMOwnershipFromHeartbeat]. + ^true "called from assert"! - self checkVMOwnershipFromHeartbeat]! Item was changed: ----- Method: CoInterpreterMT>>deferStackLimitSmashAround:with: (in category 'process primitive support') ----- deferStackLimitSmashAround: functionSymbol with: arg "Defer smashes of the stackLimit around the call of functionSymbol (for assert checks). N.B. SYNCHRONIZE WITH forceInterruptCheckFromHeartbeat" <var: #functionSymbol declareC: 'void (*functionSymbol)(sqInt)'> deferSmash := true. self sqLowLevelMFence. self perform: functionSymbol with: arg. deferSmash := false. self sqLowLevelMFence. deferredSmash ifTrue: [deferredSmash := false. self sqLowLevelMFence. self forceInterruptCheck. + self checkVMOwnershipFromHeartbeat]. + ^true "called from assert"! - self checkVMOwnershipFromHeartbeat]!

1 0

Issue 122 in cog: [BUG]: Frequent crashes when loading with MC
by cog＠googlecode.com 17 Jul '13

17 Jul '13

Status: Accepted Owner: sean.p.d...(a)gmail.com CC: esteba...(a)gmail.com, siguc...(a)gmail.com Labels: Type-Defect Priority-High New issue 122 by sean.p.d...(a)gmail.com: [BUG]: Frequent crashes when loading with MC http://code.google.com/p/cog/issues/detail?id=122 Still trying to come up with a simple way to reproduce. Pharo #20564 VM Virtual Machine --------------- /Applications/Pharo.app/Contents/MacOS/Pharo NBCoInterpreter NativeBoost-CogPlugin-EstebanLorenzano.18 uuid: a53445f9-c0c0-4015-97a3-be7db8d9ed6b Feb 15 2013 NBCogit NativeBoost-CogPlugin-EstebanLorenzano.18 uuid: a53445f9-c0c0-4015-97a3-be7db8d9ed6b Feb 15 2013 git://gitorious.org/cogvm/blessed.git Commit: 05ed728452dc92732f9f23ce24a3c32bfdc0f4b8 Date: 2013-02-15 17:04:09 +0100 By: Igor Stasenko <siguctua(a)gmail.com> Jenkins build #14517 Mac Cocoa Cog 5.8b12 21-Sep-10 >1B0534FA-246C-47C5-AB29-7A76C81CCDCB< VMMaker versionString git://gitorious.org/cogvm/blessed.git Commit: 05ed728452dc92732f9f23ce24a3c32bfdc0f4b8 Date: 2013-02-15 17:04:09 +0100 By: Igor Stasenko <siguctua(a)gmail.com> Jenkins build #14517 NBCoInterpreter NativeBoost-CogPlugin-EstebanLorenzano.18 uuid: a53445f9-c0c0-4015-97a3-be7db8d9ed6b Feb 15 2013 NBCogit NativeBoost-CogPlugin-EstebanLorenzano.18 uuid: a53445f9-c0c0-4015-97a3-be7db8d9ed6b Feb 15 2013 *************************************************************************************************** *************************************************************************************************** *************************************************************************************************** Can't attach Mac crash report ("Issue attachment storage quota exceeded"): Process: Pharo [5079] Path: /Applications/Pharo.app/Contents/MacOS/Pharo Identifier: org.pharo-project.Pharo Version: Pharo VM 6.0-pre (21.0) Code Type: X86 (Native) Parent Process: launchd [230] Date/Time: 2013-02-22 20:00:12.830 -0500 OS Version: Mac OS X 10.8.2 (12C3012) Report Version: 10 Crashed Thread: 0 Dispatch queue: com.apple.main-thread Exception Type: EXC_BAD_ACCESS (SIGBUS) Exception Codes: KERN_PROTECTION_FAILURE at 0x0000000000000002 VM Regions Near 0x2: --> __PAGEZERO 0000000000000000-0000000000001000 [ 4K] ---/--- SM=NUL /Applications/Pharo.app/Contents/MacOS/Pharo __TEXT 0000000000001000-0000000000244000 [ 2316K] r-x/rwx SM=COW /Applications/Pharo.app/Contents/MacOS/Pharo Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 org.pharo-project.Pharo 0x001aed8f mapPointersInObjectsFromto + 2767 Thread 1:: Dispatch queue: com.apple.libdispatch-manager 0 libsystem_kernel.dylib 0x93ab79ae kevent + 10 1 libdispatch.dylib 0x984a1c71 _dispatch_mgr_invoke + 993 2 libdispatch.dylib 0x984a17a9 _dispatch_mgr_thread + 53 Thread 2:: AQClient 0 libsystem_kernel.dylib 0x93ab47d2 mach_msg_trap + 10 1 libsystem_kernel.dylib 0x93ab3d78 mach_msg + 268 2 com.apple.CoreFoundation 0x9806b599 __CFRunLoopServiceMachPort + 185 3 com.apple.CoreFoundation 0x98070f7f __CFRunLoopRun + 1247 4 com.apple.CoreFoundation 0x9807063a CFRunLoopRunSpecific + 378 5 com.apple.CoreFoundation 0x980704ab CFRunLoopRunInMode + 123 6 com.apple.audio.toolbox.AudioToolbox 0x978fd0d9 GenericRunLoopThread::Entry(void*) + 209 7 com.apple.audio.toolbox.AudioToolbox 0x978fd004 CAPThread::Entry(CAPThread*) + 196 8 libsystem_c.dylib 0x96804557 _pthread_start + 344 9 libsystem_c.dylib 0x967eecee thread_start + 34 Thread 3: 0 libsystem_kernel.dylib 0x93ab6c72 __semwait_signal + 10 1 libsystem_c.dylib 0x9688ea61 nanosleep$UNIX2003 + 189 2 org.pharo-project.Pharo 0x001d8edc beatStateMachine + 236 3 libsystem_c.dylib 0x967eecee thread_start + 34 Thread 4: 0 libsystem_kernel.dylib 0x93ab70ee __workq_kernreturn + 10 1 libsystem_c.dylib 0x9680704c _pthread_workq_return + 45 2 libsystem_c.dylib 0x96806e19 _pthread_wqthread + 448 3 libsystem_c.dylib 0x967eecca start_wqthread + 30 Thread 5: 0 libsystem_kernel.dylib 0x93ab70ee __workq_kernreturn + 10 1 libsystem_c.dylib 0x9680704c _pthread_workq_return + 45 2 libsystem_c.dylib 0x96806e19 _pthread_wqthread + 448 3 libsystem_c.dylib 0x967eecca start_wqthread + 30 Thread 0 crashed with X86 Thread State (32-bit): eax: 0x00000002 ebx: 0x00000004 ecx: 0x219bd03c edx: 0x00000003 edi: 0x21843a58 esi: 0x00235918 ebp: 0x001ae2cc esp: 0xbffabd60 ss: 0x00000023 efl: 0x00010246 eip: 0x001aed8f cs: 0x0000001b ds: 0x00000023 es: 0x00000023 fs: 0x00000000 gs: 0x0000000f cr2: 0x00000002 Logical CPU: 2 External Modification Summary: Calls made by other processes targeting this process: task_for_pid: 5 thread_create: 0 thread_set_state: 0 Calls made by this process: task_for_pid: 0 thread_create: 0 thread_set_state: 0 Calls made by all processes on this machine: task_for_pid: 2596 thread_create: 1 thread_set_state: 0 VM Region Summary: ReadOnly portion of Libraries: Total=157.2M resident=38.1M(24%) swapped_out_or_unallocated=119.0M(76%) Writable regions: Total=640.0M written=71.2M(11%) resident=77.0M(12%) swapped_out=12.2M(2%) unallocated=563.0M(88%) REGION TYPE VIRTUAL =========== ======= (null) (reserved) 384.0M reserved VM address space (unallocated) CG backing stores 11.1M CG image 80K CG raster data 96K CG shared images 224K CoreServices 9088K MALLOC 89.6M MALLOC guard page 48K Memory tag=240 4K Memory tag=242 12K Memory tag=243 4K Memory tag=35 4428K OpenCL 64K Stack 66.5M VM_ALLOCATE 144.1M __DATA 7568K __DATA/__OBJC 388K __IMAGE 528K __LINKEDIT 30.8M __OBJC 2180K __OBJC/__DATA 56K __PAGEZERO 4K __TEXT 126.3M __UNICODE 544K mapped file 101.0M shared memory 33.4M =========== ======= TOTAL 1.0G TOTAL, minus reserved VM space 627.6M Model: MacBookPro10,1, BootROM MBP101.00EE.B02, 4 processors, Intel Core i7, 2.6 GHz, 16 GB, SMC 2.3f32 Graphics: Intel HD Graphics 4000, Intel HD Graphics 4000, Built-In, 512 MB Graphics: NVIDIA GeForce GT 650M, NVIDIA GeForce GT 650M, PCIe, 1024 MB Memory Module: BANK 0/DIMM0, 8 GB, DDR3, 1600 MHz, 0x80AD, 0x484D5434314753364D465238432D50422020 Memory Module: BANK 1/DIMM0, 8 GB, DDR3, 1600 MHz, 0x80AD, 0x484D5434314753364D465238432D50422020 AirPort: spairport_wireless_card_type_airport_extreme (0x14E4, 0xEF), Broadcom BCM43xx 1.0 (5.106.98.100.14) Bluetooth: Version 4.1.2f9 11046, 2 service, 11 devices, 1 incoming serial ports Network Service: Wi-Fi, AirPort, en0 Serial ATA Device: APPLE SSD SM768E, 751.28 GB USB Device: hub_device, 0x8087 (Intel Corporation), 0x0024, 0x1a100000 / 2 USB Device: FaceTime HD Camera (Built-in), apple_vendor_id, 0x8510, 0x1a110000 / 3 USB Device: hub_device, 0x8087 (Intel Corporation), 0x0024, 0x1d100000 / 2 USB Device: hub_device, 0x0424 (SMSC), 0x2512, 0x1d180000 / 3 USB Device: Apple Internal Keyboard / Trackpad, apple_vendor_id, 0x0262, 0x1d182000 / 5 USB Device: BRCM20702 Hub, 0x0a5c (Broadcom Corp.), 0x4500, 0x1d181000 / 4 USB Device: Bluetooth USB Host Controller, apple_vendor_id, 0x8286, 0x1d181300 / 6 -- You received this message because this project is configured to send all issue notifications to this address. You may adjust your notification preferences at: https://code.google.com/hosting/settings

1 5

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2013