Vm-dev October 2020

vm-dev@lists.squeakfoundation.org

26 participants
351 discussions

VM Maker: VMMaker.oscog-eem.2863.mcz
by commits＠source.squeak.org 30 Oct '20

30 Oct '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2863.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2863 Author: eem Time: 29 October 2020, 6:11:02.270516 pm UUID: b8007876-9c01-49e1-90da-6b2059369a5c Ancestors: VMMaker.oscog-eem.2862 Cogit: Make sure stackLimit is the first clustered variable, ticky because it has a pseudonym. Implement flag setting in compare-and-swaps that do so (X64). Correct the range of valid pcs in simulateLeafCallOf:. Remember to pass the argument to ceTryLockVMOwner. Simplify the FakeStdinStream crap, providing line-oriented input. =============== Diff against VMMaker.oscog-eem.2862 =============== Item was changed: ----- Method: CoInterpreter class>>clusteredVariableNames (in category 'translation') ----- clusteredVariableNames "Insist that these variables are present early in the list of variables, and in this order, so that e.g. they are conveniently accessed via the VarBaseReg if it is available." + ^#(stackLimitFromMachineCode "ensures zero offset in simulation" stackLimit "stackLimit is e.g. lowest using the clang toolchain on MacOS X" + stackPointer framePointer CStackPointer CFramePointer CReturnAddress + scavengeThreshold freeStart needGCFlag specialObjectsOop - ^#(stackPointer framePointer CStackPointer CFramePointer CReturnAddress - stackLimit scavengeThreshold freeStart needGCFlag specialObjectsOop primFailCode newMethod instructionPointer argumentCount nextProfileTick nativeSP nativeStackPointer shadowCallStackPointer)! 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 ifNotNil: - disowningVMThread notNil ifTrue: [vmThread = disowningVMThread ifTrue: [self cCode: '' inSmalltalk: [| range | range := self cStackRangeForThreadIndex: threadIndex. self assert: (range includes: CStackPointer). self assert: (range includes: CFramePointer)]. 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." sched := self schedulerPointer. activeProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. (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). 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." (vmThread inMachineCode and: [instructionPointer >= objectMemory startOfMemory]) ifTrue: [self iframeSavedIP: framePointer put: instructionPointer. instructionPointer := cogit ceReturnToInterpreterPC]. newMethod := vmThread newMethodOrNull. argumentCount := vmThread argumentCount. vmThread newMethodOrNull: nil. self cCode: '' inSmalltalk: [| range | range := self cStackRangeForThreadIndex: threadIndex. self assert: (range includes: vmThread cStackPointer). self assert: (range includes: vmThread cFramePointer)]. self setCFramePointer: vmThread cFramePointer setCStackPointer: vmThread cStackPointer. self assert: newMethod ~~ nil. cogit recordEventTrace ifTrue: [self recordTrace: TraceOwnVM thing: ConstTwo source: 0]. ^threadIndexAndFlags bitAnd: OwnVMForeignThreadFlag! Item was changed: ----- Method: CogThreadManager>>acquireVMFor: (in category 'public api') ----- acquireVMFor: threadIndex "Attempt to acquire the VM, eventually blocking until it becomes available. Spin until the maxWaitingPriority has been updated if it is lower than this thread's priority." <returnTypeC: #'CogVMThread *'> | vmThread | <var: #vmThread type: #'CogVMThread *'> self assert: threadIndex = self ioGetThreadLocalThreadIndex. vmThread := self vmThreadAt: threadIndex. self assert: (vmThread state = CTMUnavailable or: [vmThread state = CTMWantingOwnership]). (cogit tryLockVMOwner: threadIndex) ifFalse: [vmThread state: CTMWantingOwnership. + [cogit tryLockVMOwner: threadIndex] whileFalse: - [cogit tryLockVMToIndex: threadIndex] whileFalse: [[coInterpreter getMaxWaitingPriority < vmThread priority] whileTrue: [coInterpreter waitingPriorityIsAtLeast: vmThread priority]. vmOwner ~= threadIndex ifTrue: [self ioWaitOnOSSemaphore: (self addressOf: vmThread osSemaphore)]]]. vmOSThread := vmThread osThread. vmThread state: CTMAssignableOrInVM. ^vmThread! Item was changed: ----- Method: CogThreadManager>>vmOwnerFromMachineCode (in category 'simulation') ----- vmOwnerFromMachineCode + <doNotGenerate> ^vmOwner! Item was changed: ----- Method: CogThreadManager>>vmOwnerFromMachineCode: (in category 'simulation') ----- vmOwnerFromMachineCode: aValue + <doNotGenerate> + self assert: (aValue between: 0 and: numThreads). vmOwner := aValue! Item was changed: ----- Method: Cogit>>handleCompareAndSwapSimulationTrap: (in category 'simulation only') ----- handleCompareAndSwapSimulationTrap: aCompareAndSwapSimulationTrap | variableValue accessor | variableValue := (simulatedVariableGetters at: aCompareAndSwapSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aCompareAndSwapSimulationTrap in: simulatedVariableGetters]) value asInteger. variableValue = aCompareAndSwapSimulationTrap expectedValue ifTrue: [(simulatedVariableSetters at: aCompareAndSwapSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aCompareAndSwapSimulationTrap in: simulatedVariableSetters]) value: aCompareAndSwapSimulationTrap storedValue]. + processor setFlagsForCompareAndSwap: variableValue = aCompareAndSwapSimulationTrap expectedValue. accessor := aCompareAndSwapSimulationTrap registerAccessor. processor perform: accessor with: (processor convertIntegerToInternal: variableValue). processor pc: aCompareAndSwapSimulationTrap nextpc. aCompareAndSwapSimulationTrap resume: processor! Item was changed: ----- Method: Cogit>>simulateLeafCallOf: (in category 'simulation only') ----- simulateLeafCallOf: someFunction "Simulate execution of machine code that leaf-calls someFunction, answering the result returned by someFunction." "CogProcessorAlienInspector openFor: coInterpreter" <doNotGenerate> | priorSP priorPC priorLR spOnEntry bogusRetPC | self recordRegisters. priorSP := processor sp. priorPC := processor pc. priorLR := backEnd hasLinkRegister ifTrue: [processor lr]. processor setFramePointer: coInterpreter getCFramePointer stackPointer: coInterpreter getCStackPointer; simulateLeafCallOf: someFunction nextpc: (bogusRetPC := 16rBADF00D5 roundTo: backEnd codeGranularity) memory: coInterpreter memory. spOnEntry := processor sp. self recordInstruction: {'(simulated call of '. someFunction. ')'}. + ^[[processor pc between: self class guardPageSize and: methodZone zoneEnd] whileTrue: - ^[[processor pc between: 0 and: methodZone zoneEnd] whileTrue: [[singleStep ifTrue: [self recordProcessing. self maybeBreakAt: processor pc. processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd]] on: ProcessorSimulationTrap, Error do: [:ex| "Again this is a hack for the processor simulators not properly simulating returns to bogus addresses. In this case BochsX64Alien doesn't do the right thing." processor pc = bogusRetPC ifTrue: [self recordInstruction: {'(simulated (real) return to '. processor pc. ')'}. ^processor cResultRegister]. ex isProcessorSimulationTrap ifFalse: [ex pass]. ex applyTo: self. ex type == #return ifTrue: [^processor cResultRegister]]]. processor pc = bogusRetPC ifTrue: [self recordInstruction: {'(simulated (real) return to '. processor pc. ')'}]. processor cResultRegister] ensure: [processor sp: priorSP. processor pc: priorPC. priorLR ifNotNil: [:lr| processor lr: lr]]! Item was changed: ----- Method: Cogit>>tryLockVMOwner: (in category 'multi-threading') ----- tryLockVMOwner: value <api> "ceTryLockVMOwner does an atomic compare-and-swap of the lock with the argument and zero, setting the lock to value if it was zero. It answers non-zero if the lock was zero." <cmacro: '(value) ceTryLockVMOwner(value)'> + processor abiMarshallArg0: value. ^(self simulateLeafCallOf: ceTryLockVMOwner) ~= 0! Item was added: + ----- Method: FakeStdinStream>>sqFile:Read:Into:At: (in category 'accessing') ----- + sqFile: file Read: count Into: byteArrayIndexArg At: startIndex + "Simulate the read primitive by answering a line of input" + | inputLine n | + position >= readLimit ifTrue: + [simulator isThreadedVM ifTrue: + [simulator forceInterruptCheckFromHeartbeat]. + inputLine := FillInTheBlankMorph + request: 'Input please!!' + initialAnswer: '' + centerAt: ActiveHand cursorPoint + inWorld: ActiveWorld + onCancelReturn: nil + acceptOnCR: true. + inputLine ifNil: [self atEnd: true. ^0]. + collection size <= inputLine size ifTrue: + [collection := collection species new: inputLine size + 1]. + collection + replaceFrom: 1 to: inputLine size with: inputLine startingAt: 1; + at: (readLimit := inputLine size + 1) put: Character lf. + position := 0]. + n := count min: readLimit - position. + simulator + strncpy: byteArrayIndexArg + startIndex + _: (collection copyFrom: position + 1 to: position + n) + _: n. + position := position + n. + ^n! Item was changed: ----- Method: FilePluginSimulator>>sqFile:Read:Into:At: (in category 'simulation') ----- + sqFile: file Read: count Into: byteArrayIndexArg At: startIndex + | byteArrayIndex | + file isFakeStdinStream ifTrue: + [^file sqFile: file Read: count Into: byteArrayIndexArg At: startIndex]. - sqFile: file Read: countArg Into: byteArrayIndexArg At: startIndex - | byteArrayIndex count | - count := file isFakeStdinStream - ifTrue: [1] - ifFalse: [countArg]. byteArrayIndex := byteArrayIndexArg asInteger. "Coerces CArray et al correctly" [[startIndex to: startIndex + count - 1 do: [ :i | + interpreterProxy byteAt: byteArrayIndex + i put: (file next ifNil: [^i - startIndex] ifNotNil: [:charOrByte| charOrByte asInteger])]] - file atEnd ifTrue: [^i - startIndex]. - interpreterProxy - byteAt: byteArrayIndex + i - put: (file next ifNil: [file isFakeStdinStream ifTrue: [^0]] ifNotNil: [:c| c asInteger])]] on: Error do: [:ex| (file isStream and: [file isTranscriptStream]) ifFalse: [ex pass]. ^0]] ensure: [self recordStateOf: file]. ^count!

1 0

VM Maker: Cog-eem.422.mcz
by commits＠source.squeak.org 30 Oct '20

30 Oct '20

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.422.mcz ==================== Summary ==================== Name: Cog-eem.422 Author: eem Time: 29 October 2020, 6:07:26.875213 pm UUID: 85b1cd7f-c753-4a65-9100-9f2408ba0f5c Ancestors: Cog-eem.421 Compare-and-swap support for BochsX64Alien =============== Diff against Cog-eem.421 =============== Item was added: + ----- Method: BochsIA32Alien>>abiMarshallArg0: (in category 'accessing-abstract') ----- + abiMarshallArg0: arg0 + "Marshall one integral argument according to the ABI. + Currently used in the COGMTVM to tryLockVMOwner:" + self push: arg0! Item was changed: ----- Method: BochsX64Alien class>>initialize (in category 'class initialization') ----- initialize "BochsX64Alien initialize" | it | it := self basicNew. OpcodeExceptionMap := Array new: 256 withAll: #handleExecutionPrimitiveFailureAt:in:rex:. OpcodeExceptionMap at: 1 + it twoByteEscape put: #handleTwoByteEscapeFailureAt:in:rex:; at: 1 + it operandSizeOverridePrefix put: #handleOperandSizeOverridePrefixFailureAt:in:rex:; at: 1 + it callOpcode put: #handleCallFailureAt:in:rex:; at: 1 + it jmpOpcode put: #handleJmpFailureAt:in:rex:; at: 1 + it retOpcode put: #handleRetFailureAt:in:rex:; at: 1 + it movALObOpcode put: #handleMovALObFailureAt:in:rex:; at: 1 + it movAXOvOpcode put: #handleMovAXOvFailureAt:in:rex:; at: 1 + it movObALOpcode put: #handleMovObALFailureAt:in:rex:; at: 1 + it movOvAXOpcode put: #handleMovOvAXFailureAt:in:rex:; at: 1 + it movGvEvOpcode put: #handleMovGvEvFailureAt:in:rex:; at: 1 + it movEvGvOpcode put: #handleMovEvGvFailureAt:in:rex:; at: 1 + it movGbEbOpcode put: #handleMovGbEbFailureAt:in:rex:; at: 1 + it movEbGbOpcode put: #handleMovEbGbFailureAt:in:rex:; + at: 1 + 16rF0 put: #handleGroup6through10FailureAt:in:rex:; "Table A6 One-Byte and Two-Byte Opcode ModRM Extensions" at: 1 + 16rFE put: #handleGroup4FailureAt:in:rex:; "Table A6 One-Byte and Two-Byte Opcode ModRM Extensions" at: 1 + 16rFF put: #handleGroup5FailureAt:in:rex:. "Table A6 One-Byte and Two-Byte Opcode ModRM Extensions" ExtendedOpcodeExceptionMap := Array new: 256 withAll: #handleExecutionPrimitiveFailureAt:in:rex:. ExtendedOpcodeExceptionMap at: 1 + it movGvEbOpcode put: #handleMovGvEbFailureAt:in:rex:! Item was added: + ----- Method: BochsX64Alien>>abiMarshallArg0: (in category 'accessing-abstract') ----- + abiMarshallArg0: arg0 + "Marshall one integral argument according to the ABI. + Currently used in the COGMTVM to tryLockVMOwner:" + (CogX64Compiler classPool at: #CArg0Reg) = 1 + ifTrue: [self rcx: arg0] "Hack; Win64" + ifFalse: [self rdi: arg0] "Hack; SysV"! Item was changed: ----- Method: BochsX64Alien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" fromAddress: address | string i1 i2 v o extra | string := PrintCodeBytes ifTrue: [anInstructionString] ifFalse: [anInstructionString copyFrom: 1 to: (anInstructionString lastIndexOf: $:) - 1]. "trailing space useful for parsing numbers" aSymbolManager relativeBaseForDisassemblyInto: [:baseAddress :baseName| string := baseName, '+', (address - baseAddress printStringBase: 16 length: 4 padded: true), (string copyFrom: (string indexOf: $:) + 1 to: string size)]. ((i1 := string indexOfSubCollection: '%ds:(') > 0 or: [(i1 := string indexOfSubCollection: '%ss:(') > 0]) ifTrue: + [string := string copyReplaceFrom: i1 + to: i1 + 3 + with: ((string copyFrom: i1 to: i1 + 9) = '%ds:(%rbx)' + ifTrue: ['%ds:0x0']"So the next clause finds it..." + ifFalse: [''])]. - [string := string copyReplaceFrom: i1 to: i1 + 3 with: '']. (i1 := string indexOfSubCollection: '%ds:0x') > 0 ifTrue: [i2 := i1 + 6. ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. (v := string copyFrom: i2 to: (i2 + 5 min: string size)) = '(%rbx)' ifTrue: + [| i3 | + o := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. - [o := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. (aSymbolManager lookupAddress: aSymbolManager varBaseAddress + o) ifNotNil: + [:varName| extra := ' = ', varName]. + (i3 := string indexOfSubCollection: '%ds:0x0(%rbx)' startingAt: i1) > 0 ifTrue: + [string := string copyReplaceFrom: i3 to: i3 + 6 with: ''. + i2 := 0]]. - [:varName| extra := ' = ', varName]]. v = '(%rip)' ifTrue: [o := anInstructionString size - (anInstructionString lastIndexOf: $:) - 1 / 3. "Count number of instruction bytes to find size of instruction" o := o + address. "Add address of instruction" o := o + (Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16) signedIntFromLong64. "Add offset to yield pc-relative address" (aSymbolManager lookupAddress: o) ifNotNil: [:methodName| extra := ' = ', methodName]]. v = ReceiverResultRegDereference ifTrue: [o := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. (aSymbolManager lookupInstVarOffset: o) ifNotNil: [:varName| string := string copyReplaceFrom: i1 to: i2 - 1 with: varName,'@',o printString. i2 := 0]]. i2 ~= 0 ifTrue: [string := string copyReplaceFrom: i1 to: i2 - 1 with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 4 to: i2 - 1))]]. (i1 := string indexOfSubCollection: '%ss:0x') > 0 ifTrue: [i2 := i1 + 6. ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. ((string at: i2) = $( and: [(string at: i2 + 1) = $%]) ifTrue: [o := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16. o := (o bitAnd: (1 bitShift: 31) - 1) - (o bitAnd: (1 bitShift: 31)). ((string copyFrom: i2 to: (i2 + 5 min: string size)) = '(%rbp)' and: [PrintTempNames]) ifTrue: [(aSymbolManager lookupFrameOffset: o) ifNotNil: [:varName| string := string copyReplaceFrom: i1 to: i2 - 1 with: varName,'@',o printString. i2 := 0]]. i2 ~= 0 ifTrue: [string := string copyReplaceFrom: i1 to: i2 - 1 with: o printString]]]. (i1 := string indexOfSubCollection: '$0x') > 0 ifTrue: [i2 := i1 + 3. ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1]. string := string copyReplaceFrom: i1 + 1 to: i2 - 1 with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))]. ((i1 := string indexOf: $() > 1 and: [(string at: i1 + 1) isDigit and: [i1 < (i2 := string indexOf: $))]]) ifTrue: [string := string copyReplaceFrom: i1 + 1 to: i2 - 1 with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1)). i1 := string indexOfSubCollection: '+0x'. "calls & jumps" i1 > 0 ifTrue: [o := Integer readFrom: (i2 := ReadStream on: string from: i1 + 3 to: string size) base: 16. o := ((o bitAnd: (1 bitShift: 63) - 1) - (o bitAnd: (1 bitShift: 63))) printStringRadix: 16. o := o first = $1 ifTrue: [o copyReplaceFrom: 1 to: 3 with: '+0x'] ifFalse: [o copyReplaceFrom: 2 to: 4 with: '0x']. string := string copyReplaceFrom: i1 to: i2 position with: o]]. ^extra ifNil: [string] ifNotNil: [PrintCodeBytes ifTrue: [i1 := string lastIndexOf: $:. string copyReplaceFrom: i1 - 1 to: i1 - 2 with: extra] ifFalse: [string, ';', extra]]! Item was added: + ----- Method: BochsX64Alien>>handleGroup6through10FailureAt:in:rex: (in category 'error handling') ----- + handleGroup6through10FailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" + "Convert an execution primitive failure for a group 5 instruction into the relevant ProcessorSimulationTrap signal." + | rexByte modrmByte baseReg srcReg | + (((rexByte := memoryArray byteAt: pc + 2) bitAnd: 16rF8) = self rexPrefix + and: [(memoryArray byteAt: pc + 3) = 16r0F + and: [(memoryArray byteAt: pc + 4) = 16rB1]]) ifTrue: + [modrmByte := memoryArray byteAt: pc + 5. + modrmByte >> 6 = 0 ifTrue: "ModRegInd" + [srcReg := (modrmByte >> 3 bitAnd: 7) + ((rexByte bitAnd: 4) bitShift: 1). + baseReg := (modrmByte bitAnd: 7) + ((rexByte bitAnd: 1) bitShift: 3). + ^(CompareAndSwapSimulationTrap + pc: pc + nextpc: pc + 5 + address: (self perform: (self registerStateGetters at: baseReg + 1)) + type: #write + accessor: (self registerStateSetters at: srcReg + 1)) + expectedValue: self rax; + storedValue: (self perform: (self registerStateGetters at: srcReg + 1)); + signal]]! Item was changed: ----- Method: BochsX64Alien>>handleMovEvGvFailureAt:in:rex: (in category 'error handling') ----- handleMovEvGvFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" rex: rexByteOrNil "<Integer|nil>" "Convert an execution primitive failure for a register write into a ProcessorSimulationTrap signal." | modrmByte getter base offset | self assert: rexByteOrNil notNil. modrmByte := memoryArray byteAt: pc + 3. + getter := self registerStateGetters at: (modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1. - getter := self registerStateGetters at: ((modrmByte >> 3 bitAnd: 7) + ((rexByteOrNil bitAnd: 4) << 1) + 1). (modrmByte bitAnd: 16rC7) = 16r5 ifTrue: "ModRegInd & disp32" [^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (memoryArray unsignedLongAt: pc + 4 bigEndian: false) type: #write accessor: getter) signal]. + (modrmByte bitAnd: 16rC0) = 0 ifTrue: "ModRegInd" + [base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. + ^(ProcessorSimulationTrap + pc: pc + nextpc: pc + 3 + address: (self perform: base) + type: #write + accessor: getter) + signal]. (modrmByte bitAnd: 16rC0) = 16r80 ifTrue: "ModRegRegDisp32" [offset := memoryArray longAt: pc + 4 bigEndian: false. + base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. - base := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). ^(ProcessorSimulationTrap pc: pc nextpc: pc + 7 address: (self perform: base) + offset type: #write accessor: getter) signal]. (modrmByte bitAnd: 16rC0) = 16r40 ifTrue: "ModRegRegDisp8" [offset := memoryArray unsignedByteAt: pc + 4. offset > 127 ifTrue: [offset := offset - 256]. + base := self registerStateGetters at: (modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1. - base := self registerStateGetters at: ((modrmByte bitAnd: 7) + ((rexByteOrNil bitAnd: 1) << 3) + 1). ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (self perform: base) + offset type: #write accessor: getter) signal]. ^self reportPrimitiveFailure! Item was changed: ----- Method: BochsX64Alien>>printFields:inRegisterState:on: (in category 'printing') ----- printFields: fields inRegisterState: registerStateVector on: aStream | rsvs | aStream ensureCr. rsvs := registerStateVector readStream. fields withIndexDo: [:sym :index| | val | sym = #cr ifTrue: [aStream cr] ifFalse: [(val := rsvs next) isNil ifTrue: [^self]. (sym beginsWith: 'xmm') ifTrue: [aStream nextPutAll: sym; nextPut: $:; space. val printOn: aStream base: 16 length: 16 padded: true. aStream space; nextPut: $(. "At the image level Float is apparently in big-endian format" ((Float basicNew: 2) at: 2 put: (val bitAnd: 16rFFFFFFFF); at: 1 put: (val bitShift: -32); yourself) printOn: aStream. aStream nextPut: $)] ifFalse: [aStream nextPutAll: sym; nextPut: $:; space. val printOn: aStream base: 16 length: 8 padded: true. + #rflags == sym - #eflags == sym ifTrue: [aStream space. 'C-P-A-ZS---O' withIndexDo: [:flag :bitIndex| flag ~= $- ifTrue: [aStream nextPut: flag; nextPutAll: 'F='; print: (val bitAnd: 1 << (bitIndex - 1)) >> (bitIndex - 1); space]]] ifFalse: [val > 16 ifTrue: [aStream space; nextPut: $(. val printOn: aStream base: 10 length: 1 padded: false. aStream nextPut: $)]]]. (fields at: index + 1) ~~ #cr ifTrue: [aStream tab]]]! Item was changed: ----- Method: BochsX64Alien>>rflags (in category 'accessing') ----- rflags + ^self unsignedLongAt: 621! - ^self unsignedLongLongAt: 621! Item was changed: ----- Method: BochsX64Alien>>rflags: (in category 'accessing') ----- rflags: anUnsignedInteger + ^self unsignedLongAt: 621 put: anUnsignedInteger! - ^self unsignedLongLongAt: 621 put: anUnsignedInteger! Item was added: + ----- Method: BochsX64Alien>>setFlagsForCompareAndSwap: (in category 'execution') ----- + setFlagsForCompareAndSwap: aBoolean + "Set ZF to aBoolean" + | flags | + flags := self rflags bitClear: 64. + self rflags: (aBoolean ifTrue: [flags + 64] ifFalse: [flags])! Item was added: + ----- Method: BochsX64Alien64>>prevRip (in category 'accessing') ----- + prevRip + ^self unsignedLongLongAt: 673! Item was added: + ----- Method: BochsX64Alien64>>prevRip: (in category 'accessing') ----- + prevRip: anUnsignedInteger + ^self unsignedLongLongAt: 673 put: anUnsignedInteger! Item was changed: ----- Method: BochsX64Alien64>>rflags (in category 'accessing') ----- rflags + ^self unsignedLongAt: 633! - ^self unsignedLongLongAt: 633! Item was added: + ----- Method: BochsX64Alien64>>rflags: (in category 'accessing') ----- + rflags: anUnsignedInteger + ^self unsignedLongAt: 633 put: anUnsignedInteger! Item was added: + ----- Method: CogProcessorAlien>>setFlagsForCompareAndSwap: (in category 'execution') ----- + setFlagsForCompareAndSwap: aBoolean + "If the processor sets flags in a compare-and-swap instruction, set its flags + according to aBoolean which is true if the compare-and-swap succeeded." + self subclassResponsibility!

1 0

[OpenSmalltalk/opensmalltalk-vm] f027c5: UnixOSProcessPlugin as per VMConstruction-Plugins-...
by Eliot Miranda 29 Oct '20

29 Oct '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: f027c5ce8940e88b9d02db8b7c5c0c2bbec456e8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f027c5ce8940e88b9d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-10-29 (Thu, 29 Oct 2020) Changed paths: M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Log Message: ----------- UnixOSProcessPlugin as per VMConstruction-Plugins-OSProcessPlugin.oscog-eem.71 Get the UnixOSProcessPlugin to simulate correctly environmentAtAsType:, the innards of primitiveEnvironmentAt[AsBytes]

1 0

OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.71.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 29 Oct '20

29 Oct '20

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.71 Author: eem Time: 29 October 2020, 3:42:55.794304 pm UUID: f543fca0-f9e8-49e3-9ab3-d7839df6378a Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.70 Fix a slip in the last commit.

1 0

[OpenSmalltalk/opensmalltalk-vm] c14b71: CogVM source as per Name: VMMaker.oscog-eem.2862
by Eliot Miranda 29 Oct '20

29 Oct '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c14b7173411680b35353844aa619d0b091d10e13 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c14b7173411680b353… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-10-29 (Thu, 29 Oct 2020) Changed paths: M build.macos64x64/bochsx64/exploration/Makefile M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitARMv8.c M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspur64src/vm/vmCallback.h M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspursrc/vm/vmCallback.h M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstack64src/vm/vmCallback.h M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M nsspurstacksrc/vm/vmCallback.h M platforms/iOS/vm/OSX/sqPlatformSpecific.h M processors/IA32/bochs/explorationx64/printcpu.c M processors/IA32/bochs/explorationx64/printcpucr.c M processors/IA32/bochs/explorationx64/printcpuxmm.c M scripts/gitrevert M spur64src/vm/cogit.h M spur64src/vm/cogitARMv8.c M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spur64src/vm/vmCallback.h M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitARMv8.c M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcode64src/vm/vmCallback.h M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/vmCallback.h M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestack64src/vm/vmCallback.h M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spurlowcodestacksrc/vm/vmCallback.h M spursista64src/vm/cogit.h M spursista64src/vm/cogitARMv8.c M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursista64src/vm/vmCallback.h M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursistasrc/vm/vmCallback.h M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.c M spursrc/vm/vmCallback.h M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/validImage.c M spurstack64src/vm/vmCallback.h M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/validImage.c M spurstacksrc/vm/vmCallback.h M src/plugins/B2DPlugin/B2DPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M src/vm/vmCallback.h M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c M stacksrc/vm/vmCallback.h Log Message: ----------- CogVM source as per Name: VMMaker.oscog-eem.2862 Cogit: Revise deriving the varBaseAddress after finding on MacOS that the linker may not "follow orders". So take the minimum of several likely addresses, secretly hoping the minimum is something like stackLimit, which likely has the highest dynamic frequency (well done clang). Eliminate ceEnterInterpreterOnReturnFromCogCode and have the ceReturnToInterpreterTrampoline invoke interpret directly, using the same code as ceInvokeInterpret. Do this by moving the setMethod: send into interpret from senders; setMethod: is key because it sets the bytecodeSetSelector to enable multiple bytecode set support, but machine code is (and should remain) ignorant of the details of bytecode set selection in compiled method headers. cogitARMv8.c Add __ARM_ARCH >= 8 to cogit.c's ARMv8 identifying macros. CoInterpreterMT: Get rid of vmOwnerLock; what a bogus idea. Just use CAS on vmOwner as God (DS) intended. Fix a bug in CoInterpreterMT>>wakeHighestPriority. Refactor ABI callout marshalling on X64 to use the same CArg0Reg thru CArg3Reg pattern as on ARMv8. Make CPUID the first processor specific opcode on Intel. Eliminate use of reenterInterpreter, this is StackInterpreter only now. FilePlugin: Add FilePlugin>>primitiveFileReadPinningAndDisowning, for file read in COGMTVM. Use methodReturnInteger: rather than methodReturnValue: ... integerObjectOf:: Slang: generate neater code for pointer indirection. Instead of indexing with zero, dereference with *. Eliminate a space in function type printing.

1 0

VM Maker: VMMaker.oscog-eem.2862.mcz
by commits＠source.squeak.org 29 Oct '20

29 Oct '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2862.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2862 Author: eem Time: 29 October 2020, 2:12:30.601633 pm UUID: a30f9d13-a2a4-415a-982c-898cc5b69848 Ancestors: VMMaker.oscog-eem.2861 Cogit: eliminate diplication in the new genReturnToInterpreterTrampoline. Revise deriving the varBaseAddress after finding on MacOS that the linker may not "follow orders". So take the minimum of several likely addresses, secretly hoping the minimum is something like stackLimit, which likely has the highest dynamic frequency (well done clang). =============== Diff against VMMaker.oscog-eem.2861 =============== Item was changed: ----- Method: CogX64Compiler>>concretizeMoveRAw (in category 'generate machine code - concretize') ----- concretizeMoveRAw "Will get inlined into concretizeAt: switch." <inline: true> | addressOperand reg offset save1 savedSize | reg := operands at: 0. addressOperand := operands at: 1. (self isAnInstruction: (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *')) ifTrue: [addressOperand := (cogit cCoerceSimple: addressOperand to: #'AbstractInstruction *') address]. (self isAddressRelativeToVarBase: addressOperand) ifTrue: [save1 := operands at: 1. operands at: 1 put: addressOperand - cogit varBaseAddress; at: 2 put: RBX. savedSize := self concretizeMoveRMwr. operands at: 1 put: save1; at: 2 put: 0. ^savedSize]. "If storing RAX, store directly, otherwise, because of instruction encoding limitations, the register _must_ be stored through RAX. If reg = RBP or RSP simply store directly, otherwise swap RAX with + the register before and after the store through RAX. We avoid swapping before hand with RBP - the register before and after the store through RAX. We avoid sweapping before hand with RBP and RSP because setting RSP to whatever the contents of RAX is can cause disastrous results if an interrupt is delivered immediately after that point. See mail threads beginning with http://lists.squeakfoundation.org/pipermail/vm-dev/2019-September/031428.ht… http://lists.squeakfoundation.org/pipermail/vm-dev/2019-October/031499.html" (reg = RAX or: [reg = RBP or: [reg = RSP]]) ifTrue: [offset := 0] ifFalse: [(reg = RBP or: [reg = RSP]) ifTrue: [machineCode at: 0 put: (self rexR: reg x: 0 b: RAX); at: 1 put: 16r89; at: 2 put: (self mod: ModReg RM: RAX RO: reg). offset := 3] ifFalse: [machineCode at: 0 put: (self rexR: RAX x: 0 b: reg); at: 1 put: 16r90 + (reg \\ 8). offset := 2]]. machineCode at: 0 + offset put: 16r48; at: 1 + offset put: 16rA3; at: 2 + offset put: (addressOperand bitAnd: 16rFF); at: 3 + offset put: (addressOperand >> 8 bitAnd: 16rFF); at: 4 + offset put: (addressOperand >> 16 bitAnd: 16rFF); at: 5 + offset put: (addressOperand >> 24 bitAnd: 16rFF); at: 6 + offset put: (addressOperand >> 32 bitAnd: 16rFF); at: 7 + offset put: (addressOperand >> 40 bitAnd: 16rFF); at: 8 + offset put: (addressOperand >> 48 bitAnd: 16rFF); at: 9 + offset put: (addressOperand >> 56 bitAnd: 16rFF). reg = RAX ifTrue: [^10]. (reg = RBP or: [reg = RSP]) ifTrue: [^13]. "Now effect the assignment via xchg, which restores RAX" machineCode at: 12 put: (machineCode at: 0); at: 13 put: (machineCode at: 1). ^14! Item was changed: CogClass subclass: #Cogit (excessive size, no diff calculated) Item was added: + ----- Method: Cogit>>computeGoodVarBaseAddress (in category 'initialization') ----- + computeGoodVarBaseAddress + "While we order variables in the CoInterpreter in order of dynamic frequency, and hence + expect that stackPointer will be output first, C optimizers and linkers may get their own + ideas and ``improve upon'' this ordering. So we cannot depend on stackPointer being + at the lowest address of the variables we want to access through VarBaseReg. Here we + choose the minimum amongst a set to try to choose a varBaseAddress that is just less + than but iwht in range of all variables we want to access through it." + | minAddress | + minAddress := coInterpreter stackLimitAddress. "stackLimit is e.g. lowest using the clang toolchain on MacOS X" + coInterpreter stackPointerAddress < minAddress ifTrue: + [minAddress := coInterpreter stackPointerAddress]. + coInterpreter framePointerAddress < minAddress ifTrue: + [minAddress := coInterpreter framePointerAddress]. + coInterpreter instructionPointerAddress < minAddress ifTrue: + [minAddress := coInterpreter instructionPointerAddress]. + coInterpreter argumentCountAddress < minAddress ifTrue: + [minAddress := coInterpreter argumentCountAddress]. + coInterpreter primFailCodeAddress < minAddress ifTrue: + [minAddress := coInterpreter primFailCodeAddress]. + ^minAddress! Item was changed: ----- Method: Cogit>>genReturnToInterpreterTrampoline (in category 'initialization') ----- genReturnToInterpreterTrampoline | startAddress | <inline: false> startAddress := methodZoneBase. self zeroOpcodeIndex. "Push the result, set the instruction pointer to the interpreter frame's saved ip, set the method and the bytecode set offset, then call interpret." self PushR: ReceiverResultReg. "The result" "Assign the iframeSavedIP to instructionPointer" self MoveMw: FoxIFSavedIP r: FPReg R: TempReg. self MoveR: TempReg Aw: coInterpreter instructionPointerAddress. self genSmalltalkToCStackSwitch: false "pushLinkReg". - cFramePointerInUse - ifTrue: [backEnd genLoadCStackPointers] - ifFalse: [backEnd genLoadCStackPointer]. "Sideways call interpret so that the stack looks correct, for exception handling etc" backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil. backEnd hasLinkRegister ifTrue: [self MoveAw: coInterpreter cReturnAddressAddress R: LinkReg] ifFalse: [self MoveAw: coInterpreter cReturnAddressAddress R: ABIResultReg. backEnd genSubstituteReturnAddressR: ABIResultReg]. self JumpFullRT: (self cCode: [#interpret asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: #interpret]). self outputInstructionsForGeneratedRuntimeAt: startAddress. self recordGeneratedRunTime: 'ceReturnToInterpreterTrampoline' address: startAddress. + ^startAddress! - ^self cCoerceSimple: startAddress to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>initializeBackend (in category 'initialization') ----- initializeBackend methodLabel machineCodeSize: 0. methodLabel opcode: Label. methodLabel operands at: 0 put: 0. methodLabel operands at: 1 put: 0. "label offset" backEnd hasVarBaseRegister ifTrue: + [self assert: ((self registerMaskFor: VarBaseReg) noMask: CallerSavedRegisterMask). + varBaseAddress := self computeGoodVarBaseAddress. + self assert: coInterpreter stackLimitAddress >= varBaseAddress. + self assert: coInterpreter cStackPointerAddress >= varBaseAddress. + self assert: coInterpreter cFramePointerAddress >= varBaseAddress. + self assert: coInterpreter cReturnAddressAddress >= varBaseAddress. + self assert: coInterpreter nextProfileTickAddress >= varBaseAddress]. - [self assert: ((self registerMaskFor: VarBaseReg) noMask: CallerSavedRegisterMask)]. literalsManager allocateLiterals: 4; resetLiterals! Item was changed: ----- Method: Cogit>>varBaseAddress (in category 'accessing') ----- varBaseAddress + <cmacro: '() varBaseAddress'> + ^varBaseAddress! - ^coInterpreter stackPointerAddress - objectMemory wordSize!

1 0

Canceled: OpenSmalltalk/opensmalltalk-vm#2288 (Cog - 6477267)
by Travis CI 29 Oct '20

29 Oct '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2288 Status: Canceled Duration: 6 mins and 49 secs Commit: 6477267 (Cog) Author: Eliot Miranda Message: ProcessorSimulator plugins as per Cog-eem.418 IA32ABI plugin as per VMMaker.oscog-eem.2857 Add the offset version of the run/step primitives which allow simulation of the simulator. IA32ABI: make most of the simple acessors simulate. This makes it possible to simulate the simulator ;-) Slang: generate neater code for pointer indirection. Instead of indexing with zero, dereference with *. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/b223cd542dc6...64… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/73969391… Restart your build: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/73969391… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

VM Maker: VMMaker.oscog-eem.2861.mcz
by commits＠source.squeak.org 29 Oct '20

29 Oct '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2861.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2861 Author: eem Time: 29 October 2020, 11:50:34.437951 am UUID: fe74d94b-c82c-47d0-8e6d-f2ac85eda597 Ancestors: VMMaker.oscog-eem.2860 Cog: Eliminate ceEnterInterpreterOnReturnFromCogCode and have the ceReturnToInterpreterTrampoline invoke interpret directly, using the same code as ceInvokeInterpret. Do this by moving the setMethod: send into interpret from senders; setMethod: is key because it sets the bytecodeSetSelector to enable multiple bytecode set support, but machine code is (and should remain) ignorant of the details of bytecode set selection in compiled method headers. Simulation: Eliminate teh simulator versions of interpret (too easy to get out of sync with the real versions). Do this by providing stubs for breakpointing and inctrementing of the bytecode count, in the real VMs and have these stubs implemented in teh simulators as they were in their own interpret imlementations. Sista: fix a pseeling rorre. =============== Diff against VMMaker.oscog-eem.2860 =============== Item was added: + ----- Method: CoInterpreter>>aboutToDispatchBytecode (in category 'interpreter shell') ----- + aboutToDispatchBytecode + "This is a hook for the simulator; null in production" + <inline: #always>! Item was removed: - ----- Method: CoInterpreter>>ceEnterInterpreterOnReturnFromCogCode (in category 'trampolines') ----- - ceEnterInterpreterOnReturnFromCogCode - "Perform a return from a machine code frame to an interpreted frame. - The machine code has executed a return instruction when the return address - is set to ceReturnToInterpreterPC. Push the result and call interpret." - <api> - self assert: (objectMemory addressCouldBeOop: self stackTop). - self deny: (self isMachineCodeFrame: framePointer). - self setMethod: (self iframeMethod: framePointer). - instructionPointer := self iframeSavedIP: framePointer. - self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer imbar: true line: #'__LINE__'. - cogit ceInvokeInterpret. - "NOTREACHED" - ^nil! Item was changed: ----- Method: CoInterpreter>>enterSmalltalkExecutiveImplementation (in category 'initialization') ----- enterSmalltalkExecutiveImplementation "Main entry-point into the interpreter at each execution level, where an execution level is either the start of execution or reentry for a callback. Capture the C stack pointers so that calls from machine-code into the C run-time occur at this level. This is the actual implementation, separated from enterSmalltalkExecutive so the simulator can wrap it in an exception handler and hence simulate the setjmp/longjmp." <inline: false> cogit assertCStackWellAligned. cogit ceCaptureCStackPointers. (self isMachineCodeFrame: framePointer) ifTrue: [self returnToExecutive: false postContextSwitch: true "NOTREACHED"]. - self setMethod: (self iframeMethod: framePointer). - instructionPointer = cogit ceReturnToInterpreterPC ifTrue: - [instructionPointer := self iframeSavedIP: framePointer]. - self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer imbar: true line: #'__LINE__'. self interpret. ^0! Item was changed: ----- Method: CoInterpreter>>interpret (in category 'interpreter shell') ----- interpret "This is the main interpreter loop. In a pure interpreter it loops forever, fetching and executing bytecodes. With the Cogit JIT executing code as well, the interpreter is reentered from machine code whenever the machine code wants to interpret a method instead of executing its machine code. Entry into the interpreter is done via a ''jump call'' in machine code that uses CFramePointer and CStackPointer to find the base of the C stack (set in CoInterpreter>> enterSmalltalkExecutiveImplementation) and substitutes CReturnAddress as the return address in the code so it always appears that interpret has been called from CoInterpreter>>enterSmalltalkExecutiveImplementation, which may be important to, for example, C exception handling inside the VM. When running in the context of a browser plugin VM the interpreter must return control to the browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently." <inline: false> "If stacklimit is zero then the stack pages have not been initialized." stackLimit = 0 ifTrue: [^self initStackPagesAndInterpret]. "An unchecked write is probably faster, so instead of CReturnAddress ifNil: [CReturnAddress := self cCoerceSimple: self getReturnAddress to: #usqIntptr_t] we have simply" self assert: (CReturnAddress isNil or: [CReturnAddress = (self cCoerceSimple: self getReturnAddress to: #usqIntptr_t)]). CReturnAddress := self cCoerceSimple: self getReturnAddress to: #usqIntptr_t. + + self useCogitBreakBlockIfNone. "record entry time when running as a browser plug-in" self browserPluginInitialiseIfNeeded. + self setMethod: (self iframeMethod: framePointer). + self deny: instructionPointer = cogit ceReturnToInterpreterPC. + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer imbar: true line: #'__LINE__'. self internalizeIPandSP. self initExtensions. self fetchNextBytecode. + [true] whileTrue: + [self aboutToDispatchBytecode. + self dispatchOn: currentBytecode in: BytecodeTable]. - [true] whileTrue: [self dispatchOn: currentBytecode in: BytecodeTable]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. ^nil! Item was added: + ----- Method: CoInterpreter>>useCogitBreakBlockIfNone (in category 'interpreter shell') ----- + useCogitBreakBlockIfNone + "This is a hook for the simulator; null in production" + <inline: #always>! Item was added: + ----- Method: CogVMSimulator>>aboutToDispatchBytecode (in category 'interpreter shell') ----- + aboutToDispatchBytecode + self incrementByteCount. + self assertValidExecutionPointers. + atEachStepBlock value "N.B. may be nil"! Item was removed: - ----- Method: CogVMSimulator>>interpret (in category 'interpreter shell') ----- - interpret - "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. - When running in the context of a web browser plugin VM, however, it must return control to the - web browser periodically. This should done only when the state of the currently running Squeak - thread is safely stored in the object heap. Since this is the case at the moment that a check for - interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt - checks happen quite frequently. - - Override for simulation to insert bytecode breakpoint support." - - "If stacklimit is zero then the stack pages have not been initialized." - stackLimit = 0 ifTrue: - [^self initStackPagesAndInterpret]. - - "An unchecked write is probably faster, so instead of - CReturnAddress ifNil: - [CReturnAddress := self cCoerceSimple: self getReturnAddress to: #usqIntptr_t] - we have simply" - self assert: (CReturnAddress isNil or: [CReturnAddress = self getReturnAddress]). - CReturnAddress := self cCoerceSimple: self getReturnAddress to: #usqIntptr_t. - - self useCogitBreakBlockIfNone. - "record entry time when running as a browser plug-in" - self browserPluginInitialiseIfNeeded. - self internalizeIPandSP. - self initExtensions. - self fetchNextBytecode. - [true] whileTrue: - [self assertValidExecutionPointers. - atEachStepBlock value. "N.B. may be nil" - self dispatchOn: currentBytecode in: BytecodeTable. - self incrementByteCount]. - localIP := localIP - 1. "undo the pre-increment of IP before returning" - self externalizeIPandSP. - ^nil - ! Item was changed: ----- Method: Cogit>>genReturnToInterpreterTrampoline (in category 'initialization') ----- genReturnToInterpreterTrampoline + | startAddress | + <inline: false> + startAddress := methodZoneBase. self zeroOpcodeIndex. + "Push the result, set the instruction pointer to the interpreter frame's saved ip, + set the method and the bytecode set offset, then call interpret." - "Set the instruction pointer to the interpreter frame's saved ip, set the method and the bytecode set offset, - then call interpret." self PushR: ReceiverResultReg. "The result" + "Assign the iframeSavedIP to instructionPointer" + self MoveMw: FoxIFSavedIP r: FPReg R: TempReg. + self MoveR: TempReg Aw: coInterpreter instructionPointerAddress. + self genSmalltalkToCStackSwitch: false "pushLinkReg". + cFramePointerInUse + ifTrue: [backEnd genLoadCStackPointers] + ifFalse: [backEnd genLoadCStackPointer]. + "Sideways call interpret so that the stack looks correct, for exception handling etc" + backEnd genMarshallNArgs: 0 arg: nil arg: nil arg: nil arg: nil. + backEnd hasLinkRegister + ifTrue: + [self MoveAw: coInterpreter cReturnAddressAddress R: LinkReg] + ifFalse: + [self MoveAw: coInterpreter cReturnAddressAddress R: ABIResultReg. + backEnd genSubstituteReturnAddressR: ABIResultReg]. + self JumpFullRT: (self + cCode: [#interpret asUnsignedInteger] + inSmalltalk: [self simulatedTrampolineFor: #interpret]). + self outputInstructionsForGeneratedRuntimeAt: startAddress. + self recordGeneratedRunTime: 'ceReturnToInterpreterTrampoline' address: startAddress. + ^self cCoerceSimple: startAddress to: #'void (*)(void)'! - ^self genTrampolineFor: #ceEnterInterpreterOnReturnFromCogCode - called: 'ceEnterInterpreterOnReturnFromCogCode' - numArgs: 0 arg: nil arg: nil arg: nil arg: nil - regsToSave: self emptyRegisterMask - pushLinkReg: false - resultReg: NoReg - appendOpcodes: true! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." InitializationOptions at: #SistaV1BytecodeSet put: (SistaV1BytecodeSet := true). BytecodeTable := Array new: 256. BytecodeEncoderClassName := #EncoderForSistaV1. BytecodeSetHasDirectedSuperSend := true. BytecodeSetHasExtensions := true. LongStoreBytecode := 245. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimNotIdenticalSistaV1) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) + (217 unconditionalTrapBytecode) - (217 unconditionnalTrapBytecode) (218 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 unknownBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 callMappedInlinedPrimitive) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 extPushFullClosureBytecode) (250 extPushClosureBytecode) (251 pushRemoteTempLongBytecode) (252 storeRemoteTempLongBytecode) (253 storeAndPopRemoteTempLongBytecode) (254 255 unknownBytecode) )! Item was added: + ----- Method: StackInterpreter>>aboutToDispatchBytecode (in category 'interpreter shell') ----- + aboutToDispatchBytecode + "This is a hook for the simulator; null in production" + <inline: #always>! Item was changed: ----- Method: StackInterpreter>>enterSmalltalkExecutiveImplementation (in category 'initialization') ----- enterSmalltalkExecutiveImplementation "Main entry-point into the interpreter at each execution level, where an execution level is either the start of execution or reentry for a callback. This is the actual implementation, separated from enterSmalltalkExecutive so the simulator can wrap it in an exception handler and hence simulate the setjmp/longjmp." <inline: false> "Setjmp for reentry into interpreter from elsewhere, e.g. FFI exception primitive failure." self _setjmp: reenterInterpreter. - self setMethod: (self frameMethod: framePointer). - self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer imbar: true line: #'__LINE__'. self interpret. ^0! Item was changed: ----- Method: StackInterpreter>>interpret (in category 'interpreter shell') ----- interpret "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. When running in the context of a browser plugin VM, however, it must return control to the browser periodically. This should done only when the state of the currently running Squeak thread is safely stored in the object heap. Since this is the case at the moment that a check for interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt checks happen quite frequently." <inline: false> "If stacklimit is zero then the stack pages have not been initialized." stackLimit = 0 ifTrue: [^self initStackPagesAndInterpret]. "record entry time when running as a browser plug-in" self browserPluginInitialiseIfNeeded. + self setMethod: (self frameMethod: framePointer). + self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer imbar: true line: #'__LINE__'. self internalizeIPandSP. self initExtensions. self fetchNextBytecode. + [true] whileTrue: + [self aboutToDispatchBytecode. + self dispatchOn: currentBytecode in: BytecodeTable]. - [true] whileTrue: [self dispatchOn: currentBytecode in: BytecodeTable]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP. + ^nil! - ^nil - ! Item was changed: ----- Method: StackInterpreter>>respondToSistaTrap (in category 'sista bytecodes') ----- respondToSistaTrap | ourContext | + <sharedCodeInCase: #unconditionalTrapBytecode> - <sharedCodeInCase: #unconditionnalTrapBytecode> messageSelector := objectMemory splObj: SelectorSistaTrap. ourContext := self ensureFrameIsMarried: localFP SP: localSP. self internalPush: ourContext. argumentCount := 0. self normalSend! Item was added: + ----- Method: StackInterpreter>>unconditionalTrapBytecode (in category 'sista bytecodes') ----- + unconditionalTrapBytecode + "SistaV1: * 217 Trap" + SistaVM + ifTrue: [^self respondToSistaTrap] + ifFalse: [^self respondToUnknownBytecode]! Item was removed: - ----- Method: StackInterpreter>>unconditionnalTrapBytecode (in category 'sista bytecodes') ----- - unconditionnalTrapBytecode - "SistaV1: * 217 Trap" - SistaVM - ifTrue: [^self respondToSistaTrap] - ifFalse: [^self respondToUnknownBytecode]! Item was added: + ----- Method: StackInterpreterSimulator>>aboutToDispatchBytecode (in category 'interpreter shell') ----- + aboutToDispatchBytecode + self incrementByteCount. + self assertValidExecutionPointers. + atEachStepBlock value "N.B. may be nil"! Item was removed: - ----- Method: StackInterpreterSimulator>>interpret (in category 'interpreter shell') ----- - interpret - "This is the main interpreter loop. It normally loops forever, fetching and executing bytecodes. - When running in the context of a web browser plugin VM, however, it must return control to the - web browser periodically. This should done only when the state of the currently running Squeak - thread is safely stored in the object heap. Since this is the case at the moment that a check for - interrupts is performed, that is when we return to the browser if it is time to do so. Interrupt - checks happen quite frequently. - - Override for simulation to insert bytecode breakpoint support." - - <inline: false> - "If stacklimit is zero then the stack pages have not been initialized." - stackLimit = 0 ifTrue: - [^self initStackPagesAndInterpret]. - "record entry time when running as a browser plug-in" - self browserPluginInitialiseIfNeeded. - self internalizeIPandSP. - self initExtensions. - self fetchNextBytecode. - [true] whileTrue: - [self assertValidExecutionPointers. - atEachStepBlock value. "N.B. may be nil" - self dispatchOn: currentBytecode in: BytecodeTable. - self incrementByteCount]. - localIP := localIP - 1. "undo the pre-increment of IP before returning" - self externalizeIPandSP. - ^nil!

1 0

VM Maker: VMMaker.oscog-eem.2860.mcz
by commits＠source.squeak.org 29 Oct '20

29 Oct '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2860.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2860 Author: eem Time: 28 October 2020, 11:58:42.592939 pm UUID: 3836e239-6ba6-476a-a9bc-69f0c0f0098f Ancestors: VMMaker.oscog-eem.2859 CoInterpreterMT: Get rid of vmOwnerLock; what a bogus idea. Just use CAS on vmOwner as God (DS) intended. Cogit: Switch over to double-dispathcing for ProcessorSimulationTrap, adding handleCompareAndSwapSimulationTrap:. Get rid of the (dis)ownVM: nonsense in FakeStdinStream>>nextm, moving it to FilePlugin>>primitiveFileReadPinningAndDisowning, whjere it belongs, having that method also pin/unpin around the read. =============== Diff against VMMaker.oscog-eem.2859 =============== Item was added: + ----- Method: CoInterpreterMT>>vmOwnerAddress (in category 'simulation') ----- + vmOwnerAddress + <doNotGenerate> + ^cogThreadManager vmOwnerAddress! Item was removed: - ----- Method: CoInterpreterMT>>vmOwnerLockAddress (in category 'cog jit support') ----- - vmOwnerLockAddress - <doNotGenerate> - ^cogThreadManager - ifNotNil: [:ctm| ctm vmOwnerLockAddress] - ifNil: [0]! Item was changed: CogClass subclass: #CogThreadManager (excessive size, no diff calculated) Item was changed: ----- Method: CogThreadManager>>initialize (in category 'initialize-release') ----- initialize <doNotGenerate> + vmOwner := numThreads := numThreadsIncrement := 0. - vmOwner := vmOwnerLock := numThreads := numThreadsIncrement := 0. memoryIsScarce := false. "N.B. Do not initialize threadLocalStorage; leave this to ioInitThreadLocalThreadIndices"! Item was added: + ----- Method: CogThreadManager>>vmOwnerAddress (in category 'public api') ----- + vmOwnerAddress + <api> "NB. For the JIT only, so it can generate the lock & unlock functions." + <returnTypeC: #usqInt> + ^self + cCode: [(self addressOf: vmOwner) asUnsignedInteger] + inSmalltalk: [cogit simulatedReadWriteVariableAddress: #vmOwnerFromMachineCode in: self]! Item was added: + ----- Method: CogThreadManager>>vmOwnerFromMachineCode (in category 'simulation') ----- + vmOwnerFromMachineCode + ^vmOwner! Item was added: + ----- Method: CogThreadManager>>vmOwnerFromMachineCode: (in category 'simulation') ----- + vmOwnerFromMachineCode: aValue + vmOwner := aValue! Item was removed: - ----- Method: CogThreadManager>>vmOwnerLockAddress (in category 'public api') ----- - vmOwnerLockAddress - <api> "NB. For the JIT only, so it can generate the lock & unlock functions." - <returnTypeC: #usqInt> - ^self - cCode: [(self addressOf: vmOwnerLock) asUnsignedInteger] - inSmalltalk: [cogit simulatedVariableAddress: #vmOwnerLockFromMachineCode in: self]! Item was removed: - ----- Method: CogThreadManager>>vmOwnerLockFromMachineCode (in category 'simulation') ----- - vmOwnerLockFromMachineCode - ^vmOwnerLock! Item was removed: - ----- Method: CogThreadManager>>vmOwnerLockFromMachineCode: (in category 'simulation') ----- - vmOwnerLockFromMachineCode: aValue - vmOwnerLock := aValue! Item was removed: - ----- Method: CogVMSimulator>>vmOwnerLockAddress (in category 'multi-threading simulation switch') ----- - vmOwnerLockAddress - "This method includes or excludes CoInterpreterMT methods as required. - Auto-generated by CogVMSimulator>>ensureMultiThreadingOverridesAreUpToDate" - - ^self perform: #vmOwnerLockAddress - withArguments: {} - inSuperclass: (cogThreadManager ifNil: [CoInterpreterPrimitives] ifNotNil: [CoInterpreterMT])! Item was changed: ----- Method: CogVMSimulator>>windowIsClosing (in category 'primitive support') ----- windowIsClosing self threadManager ifNotNil: [:threadManager| threadManager guiProcess ifNotNil: [:guiProcess| + (guiProcess ~= Processor activeProcess + and: [guiProcess isInteger not]) ifTrue: - guiProcess ~= Processor activeProcess ifTrue: [guiProcess signalException: (Notification new tag: #evaluateQuit; yourself)]. Processor terminateActive]]. quitBlock ifNotNil: [:effectiveQuitBlock| quitBlock := nil. "stop recursion on explicit window close." [effectiveQuitBlock value] on: BlockCannotReturn do: [:ex|]] "Cause return from #test, et al"! Item was changed: ----- Method: Cogit>>generateVMOwnerLockFunctions (in category 'initialization') ----- generateVMOwnerLockFunctions | startAddress | <inline: true> self cppIf: COGMTVM ifTrue: [self allocateOpcodes: backEnd numLowLevelLockOpcodes bytecodes: 0. self zeroOpcodeIndex. startAddress := methodZoneBase. + backEnd generateLowLevelTryLock: coInterpreter vmOwnerAddress. - backEnd generateLowLevelTryLock: coInterpreter vmOwnerLockAddress. self outputInstructionsForGeneratedRuntimeAt: startAddress. self recordGeneratedRunTime: 'ceTryLockVMOwner' address: startAddress. ceTryLockVMOwner := self cCoerceSimple: startAddress to: #'usqIntptr_t (*)(void)'. self zeroOpcodeIndex. initialPC := 0. endPC := numAbstractOpcodes - 1. startAddress := methodZoneBase. + backEnd generateLowLevelUnlock: coInterpreter vmOwnerAddress. - backEnd generateLowLevelUnlock: coInterpreter vmOwnerLockAddress. self outputInstructionsForGeneratedRuntimeAt: startAddress. self recordGeneratedRunTime: 'ceUnlockVMOwner' address: startAddress. ceUnlockVMOwner := self cCoerceSimple: startAddress to: #'void (*)(void)']! Item was changed: ----- Method: Cogit>>handleCallOrJumpSimulationTrap: (in category 'simulation only') ----- handleCallOrJumpSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | evaluable function memory result savedFramePointer savedStackPointer savedArgumentCount retpc | + + "This is a hack fix before we revise the simulators. When a jump call is made, the next + pc is effectively the return address on the stack, not the instruction following the jump." + aProcessorSimulationTrap type == #jump ifTrue: + [processor hackFixNextPCOfJumpFor: aProcessorSimulationTrap using: objectMemory]. + evaluable := simulatedTrampolines at: aProcessorSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aProcessorSimulationTrap in: simulatedTrampolines]. function := evaluable isBlock ifTrue: ['aBlock; probably some plugin primitive'] ifFalse: [evaluable receiver == backEnd ifTrue: [^self handleABICallOrJumpSimulationTrap: aProcessorSimulationTrap evaluable: evaluable]. evaluable selector]. memory := coInterpreter memory. function == #interpret ifTrue: "i.e. we're here via ceInvokeInterpret and should discard all state back to enterSmalltalkExecutiveImplementation" [processor simulateJumpCallOf: aProcessorSimulationTrap address memory: memory. self recordInstruction: {'(simulated jump call of '. aProcessorSimulationTrap address. '/'. function. ')'}. processor smashCallerSavedRegistersWithValuesFrom: 16r80000000 by: objectMemory wordSize in: memory. coInterpreter reenterInterpreter. "NOTREACHED" self halt]. function ~~ #ceBaseFrameReturn: ifTrue: [coInterpreter assertValidExternalStackPointers]. (backEnd wantsNearAddressFor: function) ifTrue: [^self perform: function with: aProcessorSimulationTrap]. processor simulateCallOf: aProcessorSimulationTrap address nextpc: aProcessorSimulationTrap nextpc memory: memory. retpc := processor retpcIn: memory. self recordInstruction: {'(simulated call of '. aProcessorSimulationTrap address. '/'. function. ')'}. savedFramePointer := coInterpreter framePointer. savedStackPointer := coInterpreter stackPointer. savedArgumentCount := coInterpreter argumentCount. result := ["self halt: evaluable selector." clickConfirm ifTrue: [(self confirm: 'skip run-time call?') ifFalse: [clickConfirm := false. self halt]]. evaluable valueWithArguments: (processor postCallArgumentsNumArgs: evaluable numArgs in: memory)] on: ReenterMachineCode do: [:ex| ex return: #continueNoReturn]. 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: [coInterpreter primFailCode = 0 ifTrue: [(CogVMSimulator stackAlteringPrimitives includes: function) ifFalse: ["This is a rare case (e.g. in Scorch where a married context's sender is set to nil on trapTrpped and hence the stack layout is altered." (function == #primitiveSlotAtPut and: [objectMemory isContext: (coInterpreter frameReceiver: coInterpreter framePointer)]) ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer + (savedArgumentCount * objectMemory wordSize) = coInterpreter stackPointer]]] ifFalse: [self assert: savedFramePointer = coInterpreter framePointer. self assert: savedStackPointer = coInterpreter stackPointer]]. result ~~ #continueNoReturn ifTrue: [self recordInstruction: {'(simulated return to '. processor retpcIn: memory. ')'}. processor simulateReturnIn: memory. self assert: processor pc = retpc. processor smashCallerSavedRegistersWithValuesFrom: 16r80000000 by: objectMemory wordSize in: memory]. self assert: (result isInteger "an oop result" or: [result == coInterpreter or: [result == objectMemory or: [result == nil or: [result == #continueNoReturn]]]]). processor cResultRegister: (result ifNil: [0] ifNotNil: [result isInteger ifTrue: [result] ifFalse: [16rF00BA222]])! Item was added: + ----- Method: Cogit>>handleCompareAndSwapSimulationTrap: (in category 'simulation only') ----- + handleCompareAndSwapSimulationTrap: aCompareAndSwapSimulationTrap + | variableValue accessor | + variableValue := (simulatedVariableGetters + at: aCompareAndSwapSimulationTrap address + ifAbsent: [self errorProcessingSimulationTrap: aCompareAndSwapSimulationTrap + in: simulatedVariableGetters]) + value asInteger. + variableValue = aCompareAndSwapSimulationTrap expectedValue ifTrue: + [(simulatedVariableSetters + at: aCompareAndSwapSimulationTrap address + ifAbsent: [self errorProcessingSimulationTrap: aCompareAndSwapSimulationTrap + in: simulatedVariableSetters]) value: aCompareAndSwapSimulationTrap storedValue]. + accessor := aCompareAndSwapSimulationTrap registerAccessor. + processor + perform: accessor + with: (processor convertIntegerToInternal: variableValue). + processor pc: aCompareAndSwapSimulationTrap nextpc. + aCompareAndSwapSimulationTrap resume: processor! Item was changed: ----- Method: Cogit>>handleReadSimulationTrap: (in category 'simulation only') ----- handleReadSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | variableValue accessor | variableValue := (simulatedVariableGetters at: aProcessorSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aProcessorSimulationTrap in: simulatedVariableGetters]) value asInteger. accessor := aProcessorSimulationTrap registerAccessor. processor perform: accessor with: (processor convertIntegerToInternal: variableValue). accessor ~~ #pc: ifTrue: [processor pc: aProcessorSimulationTrap nextpc. "In an enilopmart stackPointer is assigned to sp before framePointer. In a trampoline fp and sp are written to the interpreter variables immediately before assigning sp with CStackPointer and immediately there-after fp with CFramePointer. So set processorFrameValid appropriately when assigning fp. This is for CogHeadFrameInspector" (processor accessorIsFramePointerSetter: accessor) ifTrue: + [processorFrameValid := aProcessorSimulationTrap address ~= (simulatedAddresses at: #getCFramePointer)]]. + aProcessorSimulationTrap resume: processor! - [processorFrameValid := aProcessorSimulationTrap address ~= (simulatedAddresses at: #getCFramePointer)]]! Item was added: + ----- Method: Cogit>>handleReturnSimulationTrap: (in category 'simulation only') ----- + handleReturnSimulationTrap: aProcessorSimulationTrap + <doNotGenerate> + | retpc | + retpc := processor leafRetpcIn: coInterpreter memory. + processor simulateLeafReturnIn: coInterpreter memory. + self recordInstruction: {'(simulated return to '. retpc. ')'}! Item was changed: ----- Method: Cogit>>handleWriteSimulationTrap: (in category 'simulation only') ----- handleWriteSimulationTrap: aProcessorSimulationTrap <doNotGenerate> | variableValue | (self addressIsInCodeZone: aProcessorSimulationTrap address) ifTrue: [self error: 'attempt to write to code space']. variableValue := processor perform: aProcessorSimulationTrap registerAccessor. (simulatedVariableSetters at: aProcessorSimulationTrap address ifAbsent: [self errorProcessingSimulationTrap: aProcessorSimulationTrap in: simulatedVariableSetters]) value: variableValue. + processor pc: aProcessorSimulationTrap nextpc. + ^aProcessorSimulationTrap resume: processor! - processor pc: aProcessorSimulationTrap nextpc! Item was changed: ----- Method: Cogit>>simulateCogCodeAt: (in category 'simulation only') ----- simulateCogCodeAt: address "<Integer>" <doNotGenerate> | stackZoneBase | stackZoneBase := coInterpreter stackZoneBase. processor pc: address. [[[singleStep ifTrue: [[processor sp < stackZoneBase ifTrue: [self halt]. self recordProcessing. self maybeBreakAt: processor pc] value. "So that the Debugger's Over steps over all this" processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd]. "((printRegisters or: [printInstructions]) and: [clickConfirm]) ifTrue: [(self confirm: 'continue?') ifFalse: [clickConfirm := false. self halt]]." true] whileTrue] on: ProcessorSimulationTrap + do: [:ex| ex applyTo: self]. - do: [:ex| - ex type == #read ifTrue: - [self handleReadSimulationTrap: ex. ex resume: processor]. - ex type == #write ifTrue: - [self handleWriteSimulationTrap: ex. ex resume: processor]. - ex type == #jump ifTrue: - [processor hackFixNextPCOfJumpFor: ex using: objectMemory]. - self handleCallOrJumpSimulationTrap: ex]. true] whileTrue! Item was changed: ----- Method: Cogit>>simulateLeafCallOf: (in category 'simulation only') ----- simulateLeafCallOf: someFunction "Simulate execution of machine code that leaf-calls someFunction, answering the result returned by someFunction." "CogProcessorAlienInspector openFor: coInterpreter" <doNotGenerate> | priorSP priorPC priorLR spOnEntry bogusRetPC | self recordRegisters. priorSP := processor sp. priorPC := processor pc. priorLR := backEnd hasLinkRegister ifTrue: [processor lr]. processor setFramePointer: coInterpreter getCFramePointer stackPointer: coInterpreter getCStackPointer; simulateLeafCallOf: someFunction nextpc: (bogusRetPC := 16rBADF00D5 roundTo: backEnd codeGranularity) memory: coInterpreter memory. spOnEntry := processor sp. self recordInstruction: {'(simulated call of '. someFunction. ')'}. + ^[[processor pc between: 0 and: methodZone zoneEnd] whileTrue: - [[processor pc between: 0 and: methodZone zoneEnd] whileTrue: [[singleStep ifTrue: [self recordProcessing. self maybeBreakAt: processor pc. processor singleStepIn: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd] ifFalse: [processor runInMemory: coInterpreter memory minimumAddress: guardPageSize readOnlyBelow: methodZone zoneEnd]] on: ProcessorSimulationTrap, Error + do: [:ex| + "Again this is a hack for the processor simulators not properly simulating returns to bogus addresses. + In this case BochsX64Alien doesn't do the right thing." - do: [:ex| | retpc | processor pc = bogusRetPC ifTrue: [self recordInstruction: {'(simulated (real) return to '. processor pc. ')'}. ^processor cResultRegister]. + ex isProcessorSimulationTrap ifFalse: + [ex pass]. + ex applyTo: self. + ex type == #return ifTrue: + [^processor cResultRegister]]]. - ex class == ProcessorSimulationTrap ifTrue: - [ex type == #read ifTrue: - [self handleReadSimulationTrap: ex. ex resume: processor]. - ex type == #write ifTrue: - [self handleWriteSimulationTrap: ex. ex resume: processor]. - ex type == #return ifTrue: - [retpc := processor leafRetpcIn: coInterpreter memory. - self assert: retpc = bogusRetPC. - processor simulateLeafReturnIn: coInterpreter memory. - self recordInstruction: {'(simulated return to '. retpc. ')'}. - ^processor cResultRegister]]. - ex pass]]. processor pc = bogusRetPC ifTrue: [self recordInstruction: {'(simulated (real) return to '. processor pc. ')'}]. + processor cResultRegister] - ^processor cResultRegister] ensure: [processor sp: priorSP. processor pc: priorPC. priorLR ifNotNil: [:lr| processor lr: lr]]! Item was changed: ----- Method: FakeStdinStream>>next (in category 'accessing') ----- next "Answer the next object in the Stream represented by the receiver. If there are no more elements in the stream fill up the buffer by prompting for input" + | sem inputLine next | - | sem threadIndex inputLine next | position >= readLimit ifTrue: [simulator isThreadedVM ifTrue: + [simulator forceInterruptCheckFromHeartbeat. - ["(simulator cogit singleStep not - and: [UIManager confirm: 'Single step?']) ifTrue: - [simulator cogit singleStep: true]." - threadIndex := simulator disownVM: DisownVMLockOutFullGC. - simulator forceInterruptCheckFromHeartbeat. sem := Semaphore new. WorldState addDeferredUIMessage: [inputLine := UIManager default request: 'Input please!!'. sem signal]. sem wait] ifFalse: "simulate line-oriented input" [inputLine := ((Smalltalk classNamed: #FillInTheBlankMorph) ifNotNil: "Squeak" [:fITBM| fITBM request: 'Input please!!' initialAnswer: '' centerAt: ActiveHand cursorPoint inWorld: ActiveWorld onCancelReturn: nil acceptOnCR: true] ifNil: "Pharo; onCancelReturn: nil is the default here" [UIManager default request: 'Input please!!' initialAnswer: '']). inputLine ifNil: [self atEnd: true. ^nil]]. collection size <= inputLine size ifTrue: [collection := collection species new: inputLine size + 1]. collection replaceFrom: 1 to: inputLine size with: inputLine startingAt: 1; at: (readLimit := inputLine size + 1) put: Character lf. + position := 0]. - position := 0. - simulator isThreadedVM ifTrue: - [simulator ownVM: threadIndex]]. next := collection at: (position := position + 1). ^next " This does it with workspaces: | ws r s | s := Semaphore new. ws := Workspace new contents: ''. ws acceptAction: [:t| r := t asString. s signal]. [ws openLabel: 'Yo!!'; shouldStyle: false. (ws dependents detect: [:dep | dep isKindOf: PluggableTextMorph] ifNone: [nil]) ifNotNil: [:textMorph| textMorph acceptOnCR: true; hasUnacceptedEdits: true]] fork. Processor activeProcess == Project uiProcess ifTrue: [[r isNil] whileTrue: [World doOneCycle]] ifFalse: [s wait]. ws topView delete. s wait. s signal. r"! Item was changed: ----- Method: FilePlugin>>primitiveFileRead (in category 'file primitives') ----- primitiveFileRead <export: true> self cppIf: SPURVM + ifTrue: [self cppIf: COGMTVM + ifTrue: [self primitiveFileReadPinningAndDisowning] + ifFalse: [self primitiveFileReadWithPinning]] - ifTrue: [self primitiveFileReadWithPinning] ifFalse: [self primitiveFileReadWithoutPinning]! Item was added: + ----- Method: FilePlugin>>primitiveFileReadPinningAndDisowning (in category 'file primitives') ----- + primitiveFileReadPinningAndDisowning + "This version of primitiveFileRead is for garbage collectors that support pinning + and the multi-threaded VM. It actually does the own/disown dance." + | count startIndex array file slotSize elementSize bytesRead threadIndexAndFlags wasPinned | + <inline: true> + <var: 'file' type: #'SQFile *'> + <var: 'count' type: #'size_t'> + <var: 'startIndex' type: #'size_t'> + <var: 'slotSize' type: #'size_t'> + <var: 'elementSize' type: #'size_t'> + count := interpreterProxy positiveMachineIntegerValueOf: (interpreterProxy stackValue: 0). + startIndex := interpreterProxy positiveMachineIntegerValueOf: (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]. + + slotSize := interpreterProxy slotSizeOf: array. + (startIndex >= 1 and: [startIndex + count - 1 <= slotSize]) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (wasPinned := interpreterProxy isPinned: array) ifFalse: + [array := interpreterProxy pinObject: array]. + threadIndexAndFlags := interpreterProxy disownVM: DisownVMForFFICall. + "Note: adjust startIndex for zero-origin byte indexing" + elementSize := slotSize = 0 + ifTrue: [1] + ifFalse: [(interpreterProxy byteSizeOf: array) // slotSize]. + bytesRead := self + sqFile: file + Read: count * elementSize + Into: (interpreterProxy cCoerce: (interpreterProxy firstIndexableField: array) to: #'char *') + At: startIndex - 1 * elementSize. + interpreterProxy ownVM: threadIndexAndFlags. + wasPinned ifFalse: + [interpreterProxy unpinObject: array]. + interpreterProxy failed ifFalse: + [interpreterProxy methodReturnInteger: bytesRead // elementSize] "answer # of elements read"!

1 0

VM Maker: Cog-eem.421.mcz
by commits＠source.squeak.org 29 Oct '20

29 Oct '20

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.421.mcz ==================== Summary ==================== Name: Cog-eem.421 Author: eem Time: 28 October 2020, 11:53:43.385785 pm UUID: 0ace52a2-3ab3-4b9f-bdc5-890dba71fbaa Ancestors: Cog-eem.420 Modify dispatch of ProcessorSimulationTraps to doiuble dispatching (ProcessorSimulationTrap>>applyTo:). Extent the set of traps with CompareAndSwapSimulationTrap. Support MultiProcessor in goig with the flow by having CompareAndSwapSimulationTrap resume always with teh nonVirtualProcessor. =============== Diff against Cog-eem.420 =============== Item was added: + ProcessorSimulationTrap subclass: #CompareAndSwapSimulationTrap + instanceVariableNames: 'expectedValue storedValue' + classVariableNames: '' + poolDictionaries: '' + category: 'Cog-Processors'! Item was added: + ----- Method: CompareAndSwapSimulationTrap>>applyTo: (in category 'double dispatching') ----- + applyTo: aCogit + ^aCogit handleCompareAndSwapSimulationTrap: self! Item was added: + ----- Method: CompareAndSwapSimulationTrap>>expectedValue (in category 'accessing') ----- + expectedValue + + ^expectedValue! Item was added: + ----- Method: CompareAndSwapSimulationTrap>>expectedValue: (in category 'accessing') ----- + expectedValue: anObject + + expectedValue := anObject! Item was added: + ----- Method: CompareAndSwapSimulationTrap>>storedValue (in category 'accessing') ----- + storedValue + + ^storedValue! Item was added: + ----- Method: CompareAndSwapSimulationTrap>>storedValue: (in category 'accessing') ----- + storedValue: anObject + + storedValue := anObject! Item was added: + ----- Method: Exception>>isProcessorSimulationTrap (in category '*Cog-Processors-testing') ----- + isProcessorSimulationTrap + ^false! Item was changed: ----- Method: GdbARMv8AlienTests>>testNfib1 (in category 'tests') ----- testNfib1 "self new testNfib1" self should: [self runNFib: 1 disassemble: false printRegisters: false] raise: Error withExceptionDo: [:err| + self assert: err isProcessorSimulationTrap. - self assert: err class = ProcessorSimulationTrap. self assert: #return = err type. self assert: 16r1000 equals: err address]. self deny: (self processor pc between: 0 and: self nfib size). self assert: self processor r0 = 1 benchFib! Item was changed: ----- Method: MultiProcessor>>doesNotUnderstand: (in category 'message forwarding') ----- doesNotUnderstand: aMessage "Forward a message to the actual processor, managing a thread-switch if necessary. Catch ProcessorSimulationTraps and raise them outside of the critical section to avoid deadlock when reentering the VM from a trap and switching threads in the run-time." | selector result trap contextInCritical | selector := aMessage selector. (guardedProcessorProtocol includes: selector) ifFalse: [^(unguardedProcessorProtocol includes: selector) ifTrue: [processor perform: selector withArguments: aMessage arguments] ifFalse: [super doesNotUnderstand: aMessage]]. result := [mutex critical: [contextInCritical := thisContext. owner ~~ mutex owningProcess ifTrue: [owner ifNotNil: [registerState at: owner put: processor registerState]. (registerState at: (owner := mutex owningProcess) ifAbsent: nil) ifNil: [coInterpreter initializeProcessorForThreadIndex: (threadIndex := threadIndex + 1)] ifNotNil: [:newState| processor setRegisterState: newState]]. processor perform: selector withArguments: aMessage arguments]] on: ProcessorSimulationTrap, Error, AssertionFailure do: [:ex| + ex isProcessorSimulationTrap ifFalse: - ex class == ProcessorSimulationTrap ifFalse: [ex pass]. "Alas things are not so simple with ARMv8 ldp/stp... The comments in these two methods explain..." (self isAboutToReturn: ex signalerContext) ifFalse: [self saveStackFor: ex signalerContext above: contextInCritical homeContext: thisContext home]. trap := ex]. ^trap ifNil: [result] ifNotNil: [trap signal ifNotNil: [:resultOfSignal| resultOfSignal == self ifTrue: [processor] ifFalse: [resultOfSignal]]]! Item was added: + ----- Method: ProcessorSimulationTrap>>applyTo: (in category 'double dispatching') ----- + applyTo: aCogit + type == #read ifTrue: + [^aCogit handleReadSimulationTrap: self]. + (type == #call or: [type == #jump]) ifTrue: + [^aCogit handleCallOrJumpSimulationTrap: self]. + type == #write ifTrue: + [^aCogit handleWriteSimulationTrap: self]. + self assert: type == #return. + ^aCogit handleReturnSimulationTrap: self! Item was added: + ----- Method: ProcessorSimulationTrap>>isProcessorSimulationTrap (in category 'testing') ----- + isProcessorSimulationTrap + ^true! Item was added: + ----- Method: ProcessorSimulationTrap>>resume: (in category 'handling') ----- + resume: aProcessorSimulator + ^super resume: aProcessorSimulator nonVirtualProcessor!

1 0

← Newer
1
2
3
4
5
6
7
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2020