Vm-dev February 2022

vm-dev@lists.squeakfoundation.org

11 participants
83 discussions

[OpenSmalltalk/opensmalltalk-vm] 6bd78b: CogVm source as per VMMaker.oscog-eem.3154
by Eliot Miranda 11 Feb '22

11 Feb '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 6bd78bcd9787fcf0022c99ab0a45b9cb3518bca5 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6bd78bcd9787fcf002… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-02-10 (Thu, 10 Feb 2022) Changed paths: M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c Log Message: ----------- CogVm source as per VMMaker.oscog-eem.3154 CoInterpreterPrimitives>>primitiveSuspend lost its validation check on the context and list; restore it.

1 0

VM Maker: VMMaker.oscog-eem.3154.mcz
by commits＠source.squeak.org 11 Feb '22

11 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3154.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3154 Author: eem Time: 10 February 2022, 6:59:49.141104 pm UUID: 7a65f763-45ca-452b-a879-efbbc38030c9 Ancestors: VMMaker.oscog-eem.3153 And anotehr oops. CoInterpreterPrimitives>>primitiveSuspend lost its validation check on teh context and list. restore it. =============== Diff against VMMaker.oscog-eem.3153 =============== Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveSuspend (in category 'process primitives') ----- primitiveSuspend "Primitive #88. Suspend the receiver, aProcess, such that it can be executed again by sending #resume. If the given process is not the active process, take it off its corresponding list. The primitive returns the list the receiver was previously on. c.f. primitiveSuspendBackingUpV1,#568 & primitiveSuspendBackingUpV2,#578" | process myList myContext ok | process := self stackTop. process = self activeProcess ifTrue: [| inInterpreter | "We're going to switch process, either to an interpreted frame or a machine code frame. To know whether to return or enter machine code we have to know from whence we came. We could have come from the interpreter, either directly or via a machine code primitive. We could have come from machine code. The instructionPointer tells us where from:" self stackTopPut: objectMemory nilObject. inInterpreter := instructionPointer >= objectMemory startOfMemory. self transferTo: self wakeHighestPriority from: CSSuspend. ^self forProcessPrimitiveReturnToExecutivePostContextSwitch: inInterpreter]. myList := objectMemory fetchPointer: MyListIndex ofObject: process. myContext := objectMemory fetchPointer: SuspendedContextIndex ofObject: process. + ((objectMemory isPointers: myList) + and: [(objectMemory numSlotsOf: myList) > LastLinkIndex + and: [(objectMemory isContext: myContext) + and: [self isResumableContext: myContext]]]) ifFalse: + [^self primitiveFailFor: PrimErrBadReceiver]. ok := self removeProcess: process fromList: myList. ok ifFalse: [^self primitiveFailFor: PrimErrOperationFailed]. objectMemory storePointerUnchecked: MyListIndex ofObject: process withValue: objectMemory nilObject. self stackTopPut: myList!

1 0

[OpenSmalltalk/opensmalltalk-vm] c1e261: CogVM source as per Name: VMMaker.oscog-eem.3153
by Eliot Miranda 11 Feb '22

11 Feb '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c1e261e306293786a80a301779405176811b25dc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c1e261e306293786a8… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-02-10 (Thu, 10 Feb 2022) Changed paths: A platforms/Cross/plugins/FileDialogPlugin/FileDialogPlugin.h A platforms/iOS/plugins/FileDialogPlugin/sqMacFileDialog.m A platforms/unix/plugins/FileDialogPlugin/sqUnixFileDialog.c A platforms/win32/plugins/FileDialogPlugin/sqWin32FileDialog.c A src/plugins/FileDialogPlugin/FileDialogPlugin.c M src/plugins/ZipPlugin/ZipPlugin.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per Name: VMMaker.oscog-eem.3153 Primitive suspend: revert the semantics of #88 to Andreas' revision in the early 2000's. #88 removes a process from a condition variable, allowing subsequently resumed processes to get past their condition variable. This is a bug, but there are images (noably Qwaq/Teleplace/Virtend) which depend on this behaviour. Provide #568 (primitiveSuspendBackingUpV1) which backs up a process waiting on a condition variable to the send that invoked the wait primitive, and which answers that list. Provide #578 (primitiveSuspendBackingUpV2) which backs up a process waiting on a condition variable to the send that invoked the wait primitive, but in which case answers nil. The presence of the three primitives is indicated by bit 5 of the cogVMFeatureFlags. DeflatePlugin: the update primitives can run on the Smalltalk stack. Add the FileDialogPlugin from Qwaq/Teleplace/Virtend. Commit: 5bc132db808ce7f5b50566693f36263063816333 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5bc132db808ce7f5b5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-02-10 (Thu, 10 Feb 2022) Changed paths: M building/linux32/squeak.stack.spur/plugins.int M building/linux32ARMv6/squeak.cog.spur/plugins.int M building/linux32ARMv6/squeak.cog.v3/plugins.int M building/linux32ARMv6/squeak.stack.spur/plugins.int M building/linux32ARMv6/squeak.stack.v3/plugins.int M building/linux32x86/squeak.cog.spur/plugins.int M building/linux32x86/squeak.cog.v3/plugins.int M building/linux32x86/squeak.sista.spur/plugins.int M building/linux32x86/squeak.stack.spur/plugins.int M building/linux32x86/squeak.stack.v3/plugins.int M building/linux64/squeak.stack.spur/plugins.int M building/linux64ARMv8/squeak.cog.spur/plugins.int M building/linux64ARMv8/squeak.cogmt.spur/plugins.int M building/linux64ARMv8/squeak.stack.spur/plugins.int M building/linux64x64/squeak.cog.spur/plugins.int M building/linux64x64/squeak.stack.spur/plugins.int M building/macos32x86/squeak.cog.spur/plugins.int M building/macos32x86/squeak.cog.v3/plugins.int M building/macos32x86/squeak.sista.spur/plugins.int M building/macos32x86/squeak.stack.spur/plugins.int M building/macos32x86/squeak.stack.v3/plugins.int M building/macos64ARMv8/squeak.cog.spur/plugins.int M building/macos64ARMv8/squeak.sista.spur/plugins.int M building/macos64ARMv8/squeak.stack.spur/plugins.int M building/macos64x64/squeak.cog.spur/plugins.int M building/macos64x64/squeak.sista.spur/plugins.int M building/macos64x64/squeak.stack.spur/plugins.int M building/sunos32x86/squeak.cog.spur/plugins.int M building/sunos32x86/squeak.stack.spur/plugins.int M building/sunos64x64/squeak.cog.spur/plugins.int M building/sunos64x64/squeak.stack.spur/plugins.int M building/win32x86/squeak.cog.spur.lowcode/plugins.int M building/win32x86/squeak.cog.spur/plugins.int M building/win32x86/squeak.cog.v3/plugins.int M building/win32x86/squeak.sista.spur/plugins.int M building/win32x86/squeak.stack.spur/plugins.int M building/win32x86/squeak.stack.v3/plugins.int M building/win64x64/squeak.cog.spur/plugins.int M building/win64x64/squeak.stack.spur/plugins.int Log Message: ----------- And add the FileDialogPlugin as an internal plugin alongside FilePlugin in all Squeak builds. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/55a60cbffc62...5b…

1 0

VM Maker: VMMaker.oscog-eem.3153.mcz
by commits＠source.squeak.org 11 Feb '22

11 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3153.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3153 Author: eem Time: 10 February 2022, 6:13:52.196272 pm UUID: 30273ce5-072e-48f7-ab75-fd98b697b8e0 Ancestors: VMMaker.oscog-eem.3152 And another. FastCPrimitive => FastCPrimitiveFlag =============== Diff against VMMaker.oscog-eem.3152 =============== Item was changed: ----- Method: DeflatePlugin>>primitiveDeflateUpdateHashTable (in category 'primitives') ----- primitiveDeflateUpdateHashTable "Primitive. Update the hash tables after data has been moved by delta." <export: true> + <primitiveMetadata: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." - <primitiveMetadata: #(FastCPrimitive FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." | delta table tableSize tablePtr entry | <var: #tablePtr type:'int *'> delta := interpreterProxy stackIntegerValue: 0. table := interpreterProxy stackValue: 1. interpreterProxy failed ifTrue:[^nil]. (interpreterProxy isWords: table) ifFalse: [^interpreterProxy primitiveFail]. tableSize := interpreterProxy slotSizeOf: table. tablePtr := interpreterProxy firstIndexableField: table. 0 to: tableSize-1 do:[:i| entry := tablePtr at: i. entry >= delta ifTrue:[tablePtr at: i put: entry - delta] ifFalse:[tablePtr at: i put: 0]]. interpreterProxy pop: 2 "Leave rcvr on stack"! Item was changed: ----- Method: DeflatePlugin>>primitiveUpdateAdler32 (in category 'primitives') ----- primitiveUpdateAdler32 "Primitive. Update a 32bit CRC value." <export: true> + <primitiveMetadata: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." - <primitiveMetadata: #(FastCPrimitive FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." | collection stopIndex startIndex length bytePtr s1 adler32 s2 b | <var: #adler32 type:'unsigned int '> <var: #bytePtr type:'unsigned char *'> collection := interpreterProxy stackValue: 0. stopIndex := interpreterProxy stackIntegerValue: 1. startIndex := interpreterProxy stackIntegerValue: 2. adler32 := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 3). interpreterProxy failed ifTrue: [^nil]. ((interpreterProxy isBytes: collection) and:[stopIndex >= startIndex and:[startIndex > 0]]) ifFalse:[^interpreterProxy primitiveFail]. length := interpreterProxy byteSizeOf: collection. (stopIndex <= length) ifFalse:[^interpreterProxy primitiveFail]. bytePtr := interpreterProxy firstIndexableField: collection. startIndex := startIndex - 1. stopIndex := stopIndex - 1. s1 := adler32 bitAnd: 16rFFFF. s2 := adler32 >> 16 bitAnd: 16rFFFF. startIndex to: stopIndex do:[:i| b := bytePtr at: i. s1 := (s1 + b) \\ 65521. s2 := (s2 + s1) \\ 65521. ]. adler32 := (s2 bitShift: 16) + s1. interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: adler32)! Item was changed: ----- Method: DeflatePlugin>>primitiveUpdateGZipCrc32 (in category 'primitives') ----- primitiveUpdateGZipCrc32 "Primitive. Update a 32bit CRC value." <export: true> + <primitiveMetadata: #(FastCPrimitiveFlag FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." - <primitiveMetadata: #(FastCPrimitive FastCPrimitiveAlignForFloatsFlag)> "Using AlignForFloats since the arithmetic is potentially vectorizable..." | collection stopIndex startIndex crc length bytePtr | <var: #bytePtr type: #'unsigned char *'> collection := interpreterProxy stackValue: 0. stopIndex := interpreterProxy stackIntegerValue: 1. startIndex := interpreterProxy stackIntegerValue: 2. crc := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 3). interpreterProxy failed ifTrue: [^self]. ((interpreterProxy isBytes: collection) and:[stopIndex >= startIndex and:[startIndex > 0]]) ifFalse:[^interpreterProxy primitiveFail]. length := interpreterProxy byteSizeOf: collection. (stopIndex <= length) ifFalse:[^interpreterProxy primitiveFail]. bytePtr := interpreterProxy firstIndexableField: collection. self cCode:'' inSmalltalk:[zipCrcTable := CArrayAccessor on: GZipWriteStream crcTable]. startIndex := startIndex - 1. stopIndex := stopIndex - 1. startIndex to: stopIndex do: [:i| crc := (zipCrcTable at: ((crc bitXor: (bytePtr at: i)) bitAnd: 255)) bitXor: crc >> 8]. interpreterProxy methodReturnValue: (interpreterProxy positive32BitIntegerFor: crc)!

1 0

VM Maker: VMMaker.oscog-eem.3152.mcz
by commits＠source.squeak.org 11 Feb '22

11 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3152.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3152 Author: eem Time: 10 February 2022, 5:45:57.832227 pm UUID: 4283c2f2-1749-4c8d-91f2-1f5c0ddbd28e Ancestors: VMMaker.oscog-eem.3151 Oops. Update MaxPrimitiveIndex to accomodate new primitives. =============== Diff against VMMaker.oscog-eem.3151 =============== Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated)

1 0

[OpenSmalltalk/opensmalltalk-vm] 55a60c: CogVM source as per VMMaker.oscog-eem.3150
by Eliot Miranda 10 Feb '22

10 Feb '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 55a60cbffc62ffb0707352fc4dcb2ad2f4b2e222 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/55a60cbffc62ffb070… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-02-10 (Thu, 10 Feb 2022) Changed paths: M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog.lowcode/vmCallback.h M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.cog/vmCallback.h M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.sista/vmCallback.h M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack.lowcode/vmCallback.h M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/vmCallback.h M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog.lowcode/vmCallback.h M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.cog/vmCallback.h M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.sista/vmCallback.h M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack.lowcode/vmCallback.h M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/vmCallback.h M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.cog/vmCallback.h M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c M src/v3.stack/vmCallback.h Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3150 Spur CoInterpreter: further cleanup of primitive property flags computation. primitiveFunctionPointer is no longer part of primitive-invoke-time state, so expunge it from VMCallbackContext.

1 0

[OpenSmalltalk/opensmalltalk-vm] 5b1e8d: SqueakFFIPrims as an internal plugin. Add some mis...
by Eliot Miranda 10 Feb '22

10 Feb '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5b1e8dc032b2fca13e3d61e2c9c6969e17e1f9cc https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5b1e8dc032b2fca13e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-02-10 (Thu, 10 Feb 2022) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncExports.h Log Message: ----------- SqueakFFIPrims as an internal plugin. Add some missing exports.

1 0

VM Maker: VMMaker.oscog-eem.3150.mcz
by commits＠source.squeak.org 10 Feb '22

10 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3150.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3150 Author: eem Time: 10 February 2022, 10:40:21.847379 am UUID: 832f44e4-6d22-4545-ae94-d8453b49d54f Ancestors: VMMaker.oscog-eem.3149 Spur CoInterpreter: further cleanup of primitive property flags computation. Fix null-pointer accesses in StackInterpreterTests>>testXXXMemoryAccess tests. Fix two tests in IncludedMethodsTest. Add error codes to the primitives. =============== Diff against VMMaker.oscog-eem.3149 =============== Item was changed: ----- Method: CoInterpreter>>functionPointerForCompiledMethod:primitiveIndex:primitivePropertyFlagsInto: (in category 'cog jit support') ----- functionPointerForCompiledMethod: methodObj primitiveIndex: primitiveIndex primitivePropertyFlagsInto: flagsPtr <api> <returnTypeC: 'void (*functionPointerForCompiledMethodprimitiveIndexprimitivePropertyFlagsInto(sqInt methodObj, sqInt primitiveIndex, sqInt *flagsPtr))(void)'> + <inline: false> + | flags | - | functionPointer flags | - <var: #functionPointer declareC: #'void (*functionPointer)(void)'> flagsPtr ifNotNil: [flagsPtr at: 0 put: (flags := self primitivePropertyFlags: primitiveIndex numArgs: (self argumentCountOf: methodObj))]. + primitiveIndex == PrimNumberFFICall ifTrue: - functionPointer := self functionPointerFor: primitiveIndex inClass: nil. - functionPointer == #primitiveCalloutToFFI ifTrue: [^self functionForPrimitiveCallout]. + primitiveIndex == PrimNumberExternalCall ifTrue: - functionPointer == #primitiveExternalCall ifTrue: [| lit | lit := self attemptToLinkExternalPrimitive: methodObj. flagsPtr ifNotNil: + ["N.B. We only support the FastCPrimitiveFlag on Spur because Spur will not run a GC to + satisfy an allocation in a primitive. The V3 ObjectMemory will and hence the depth of + stack needed in a V3 primitive is probably too large to safely execute on a stack page." + objectMemory hasSpurMemoryManagerAPI ifTrue: + [| metadata metadataFlags | + metadata := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. + (objectMemory isIntegerObject: metadata) ifTrue: + [metadataFlags := (objectMemory integerValueOf: metadata) bitAnd: SpurPrimitiveFlagsMask. + "combine the specific external primitive's flags with the base flags. + Hence e.g. if profiling is in effect (as indicated by PrimCallCollectsProfileSamples + in the base flags) it remains in effect after combining the specific flags." + flags := flags bitOr: metadataFlags]]. + (self externalCallLiteralModuleIsVM: lit) ifTrue: + [flags := flags bitOr: PrimCallIsInternalPrim]. - ["N.B. We only support the FastCPrimitiveFlag on Spur because Spur - will *not* run a GC to satisfy an allocation in a primitive. The V3 - ObjectMemory will and hence the depth of stack needed in a V3 - primitive is probably too large to safely execute on a stack page." - objectMemory hasSpurMemoryManagerAPI ifTrue: - [| metadataFlags shiftedMetadataFlags | - metadataFlags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. - (objectMemory isIntegerObject: metadataFlags) ifTrue: - [shiftedMetadataFlags := (objectMemory integerValueOf: metadataFlags) - bitAnd: SpurPrimitiveFlagsMask. - shiftedMetadataFlags > 0 ifTrue: - ["Intentionally clear all other flags if there are Spur metadata flags..." - flags := shiftedMetadataFlags]. - (self externalCallLiteralModuleIsVM: lit) ifTrue: - [flags := flags bitOr: PrimCallIsInternalPrim]]]. - (self object: (objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: lit) - equalsString: 'primitiveProfileSemaphore') ifTrue: - [flags := flags bitOr: PrimCallMayEndureCodeCompaction]. - profileSemaphore ~= objectMemory nilObject ifTrue: - [flags := flags bitOr: PrimCallCollectsProfileSamples]. flagsPtr at: 0 put: flags]. ^self functionForPrimitiveExternalCall: methodObj]. + ^self functionPointerFor: primitiveIndex inClass: nil! - ^functionPointer! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveProfileSemaphore (in category 'process primitives') ----- primitiveProfileSemaphore "Primitive. Install the semaphore to be used for profiling, or nil if no semaphore should be used. See also primitiveProfileStart." - | sema flushState | <export: true> + <primitiveMetadata: #PrimCallMayEndureCodeCompaction> + | sema flushState | sema := self stackValue: 0. sema = objectMemory nilObject ifTrue: [flushState := profileSemaphore ~= objectMemory nilObject] ifFalse: [flushState := profileSemaphore = objectMemory nilObject. (objectMemory isSemaphoreOop: sema) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]]. profileSemaphore := sema. profileProcess := profileMethod := objectMemory nilObject. "If we've switched profiling on or off we must void machine code (and machine code pcs in contexts) since we will start or stop testing the profile clock in machine code primitive invocations, and so generate slightly different code from here on in." flushState ifTrue: [self flushExternalPrimitives] ifFalse: [self methodReturnReceiver]! Item was changed: ----- Method: CogVMSimulator>>initStackPagesForTests (in category 'test support') ----- initStackPagesForTests numStackPages := 8. - stackPages := self stackPagesClass new. objectMemory allocateMemoryOfSize: 1024 * 1024. + cogCodeSize := effectiveCogCodeSize := 0. - cogCodeSize := 0. heapBase := self methodCacheSize + self primTraceLogSize + self rumpCStackSize + self computeStackZoneSize. + cogit instVarNamed: 'codeBase' put: 0. self initStackPages! Item was changed: ----- Method: FullSimulationTest>>testSimulate2MillionBytecodes (in category 'as yet unclassified') ----- testSimulate2MillionBytecodes <timeout: 120> | vm om | vm := StackInterpreterSimulator newWithOptions: (Smalltalk isRunningSpur ifTrue: [Smalltalk wordSize = 4 + ifTrue: [#(#ObjectMemory #Spur32BitMemoryManager MULTIPLEBYTECODESETS true)] + ifFalse: [#(#ObjectMemory #Spur64BitMemoryManager MULTIPLEBYTECODESETS true)]] - ifTrue: [#(#ObjectMemory #Spur32BitMemoryManager )] - ifFalse: [#(#ObjectMemory #Spur64BitMemoryManager )]] ifFalse: [#(#ObjectMemory)]). om := vm objectMemory. vm desiredNumStackPages: 8. "Makes simulation faster by creating fewer stack pages." vm openOn: Smalltalk imageName. vm instVarNamed: 'assertVEPAES' put: false. "This makes the simulation faster by turning off some expensive asserts" [[vm runForNBytes: 1500000] on: Halt , ProvideAnswerNotification "This exception handler ignores some halts and confirmers occurring during simulation" do: [:ex | ex messageText == #primitiveExecuteMethodArgsArray ifTrue: [ex resume]. ex messageText = 'clear transcript?' ifTrue: [ex resume: false]. ex pass]] ensure: [Display restore].! Item was changed: ----- Method: IncludedMethodsTest>>compare:with:collated: (in category 'primitives') ----- compare: string1 with: string2 collated: order "Return 1, 2 or 3, if string1 is <, =, or > string2, with the collating order of characters given by the order array." + <primitive: 'primitiveCompareString' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveCompareString' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>compress:toByteArray: (in category 'primitives') ----- compress: bm toByteArray: ba + <primitive: 'primitiveCompressToByteArray' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveCompressToByteArray' module: 'MiscPrimitivePlugin'> self primitiveFailed! Item was changed: ----- Method: IncludedMethodsTest>>convert8bitSignedFrom:to16Bit: (in category 'primitives') ----- convert8bitSignedFrom: aByteArray to16Bit: aSoundBuffer "Copy the contents of the given array of signed 8-bit samples into the given array of 16-bit signed samples." + <primitive: 'primitiveConvert8BitSigned' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveConvert8BitSigned' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>decompress:fromByteArray:at: (in category 'primitives') ----- decompress: bm fromByteArray: ba at: index + <primitive: 'primitiveDecompressFromByteArray' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveDecompressFromByteArray' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>findFirstInString:inSet:startingAt: (in category 'primitives') ----- findFirstInString: aString inSet: inclusionMap startingAt: start + <primitive: 'primitiveFindFirstInString' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveFindFirstInString' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>findSubstring:in:startingAt:matchTable: (in category 'primitives') ----- findSubstring: key in: body startingAt: start matchTable: matchTable "Answer the index in the string body at which the substring key first occurs, at or beyond start. The match is determined using matchTable, which can be used to effect, eg, case-insensitive matches. If no match is found, zero will be returned." + <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>indexOfAscii:inString:startingAt: (in category 'primitives') ----- indexOfAscii: anInteger inString: aString startingAt: start + <primitive: 'primitiveIndexOfAsciiInString' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveIndexOfAsciiInString' module: 'MiscPrimitivePlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>mixSampleCount:into:startingAt:leftVol:rightVol: (in category 'primitives') ----- mixSampleCount: n into: aSoundBuffer startingAt: startIndex leftVol: leftVol rightVol: rightVol "Play samples from a wave table by stepping a fixed amount through the table on every sample. The table index and increment are scaled to allow fractional increments for greater pitch accuracy." "(FMSound pitch: 440.0 dur: 1.0 loudness: 0.5) play" + <primitive:'primitiveMixFMSound' module: 'SoundGenerationPlugin' error: ec> - <primitive:'primitiveMixFMSound' module:'SoundGenerationPlugin'> self primitiveFailed ! Item was changed: ----- Method: IncludedMethodsTest>>testCompressToByteArray (in category 'testing - MiscPrimitivePlugin') ----- testCompressToByteArray | bitmap byteArray | bitmap := Bitmap with: 16rFFFFFFFF. + byteArray := ByteArray new: 12. "minimum size given by (bitmap size * 4) + 7 + (bitmap size // 1984 * 3)" - byteArray := ByteArray new: 4. self compress: bitmap toByteArray: byteArray. + self should: byteArray = #[1 5 255 0 0 0 0 0 0 0 0 0]! - self should: byteArray = #[1 5 255 0]! Item was changed: ----- Method: IncludedMethodsTest>>testTranslateFromToTable (in category 'testing - MiscPrimitivePlugin') ----- testTranslateFromToTable "Verify that primitive exists in the VM" | s t | s := 'foo' copy. "copy so string is instantiated each time" + t := (1 to: 255), #(0) as: ByteArray. - t := ByteArray withAll: ((1 to: 255) as: ByteArray). self translate: s from: 1 to: 3 table: t. self assert: s = 'gpp' ! Item was changed: ----- Method: IncludedMethodsTest>>translate:from:to:table: (in category 'primitives') ----- translate: aString from: start to: stop table: table "translate the characters in the string by the given table, in place" + <primitive: 'primitiveTranslateStringWithTable' module: 'MiscPrimitivePlugin' error: ec> - <primitive: 'primitiveTranslateStringWithTable' module: 'MiscPrimitivePlugin'> self primitiveFailed! Item was added: + ----- Method: PrintfFormatStringTest class>>expectedFailures (in category '*VMMaker-anomalies') ----- + expectedFailures + "VMMaker redefined %P to mean ``print a pointer in capitals'', according to modern printf implementations. This breaks the use of %P as ``print a Point''" + ^#(testOnePrintString)! Item was changed: ----- Method: StackInterpreterTests>>testByteMemoryAccess (in category 'tests') ----- testByteMemoryAccess "self new testByteMemoryAccess" | om | om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. om byteAt: 0 put: 16r11. om byteAt: 1 put: 16r22. om byteAt: 2 put: 16r33. om byteAt: 3 put: 16r44. self assert: (om longAt: 0) equals: 16r44332211. self assert: (om byteAt: 0) equals: 16r11. self assert: (om byteAt: 1) equals: 16r22. self assert: (om byteAt: 2) equals: 16r33. self assert: (om byteAt: 3) equals: 16r44. om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. + self should: [om byteAt: 0 put: 16r11] raise: Error. + om byteAt: 4 put: 16r11. + om byteAt: 5 put: 16r22. + om byteAt: 6 put: 16r33. + om byteAt: 7 put: 16r44. + self should: [om longAt: 0] raise: Error. + self assert: (om longAt: 4) equals: 16r44332211. + self assert: (om byteAt: 4) equals: 16r11. + self assert: (om byteAt: 5) equals: 16r22. + self assert: (om byteAt: 6) equals: 16r33. + self assert: (om byteAt: 7) equals: 16r44. - om byteAt: 0 put: 16r11. - om byteAt: 1 put: 16r22. - om byteAt: 2 put: 16r33. - om byteAt: 3 put: 16r44. - self assert: (om longAt: 0) equals: 16r44332211. - self assert: (om byteAt: 0) equals: 16r11. - self assert: (om byteAt: 1) equals: 16r22. - self assert: (om byteAt: 2) equals: 16r33. - self assert: (om byteAt: 3) equals: 16r44. om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. + self should: [om byteAt: 0 put: 16r11] raise: Error. + om byteAt: 8 put: 16r11. + om byteAt: 9 put: 16r22. + om byteAt: 10 put: 16r33. + om byteAt: 11 put: 16r44. + om byteAt: 12 put: 16r55. + om byteAt: 13 put: 16r66. + om byteAt: 14 put: 16r77. + om byteAt: 15 put: 16r88. + self should: [om longAt: 0] raise: Error. + self assert: (om longAt: 8) equals: 16r8877665544332211. + self assert: (om byteAt: 8) equals: 16r11. + self assert: (om byteAt: 9) equals: 16r22. + self assert: (om byteAt: 10) equals: 16r33. + self assert: (om byteAt: 11) equals: 16r44. + self assert: (om byteAt: 12) equals: 16r55. + self assert: (om byteAt: 13) equals: 16r66. + self assert: (om byteAt: 14) equals: 16r77. + self assert: (om byteAt: 15) equals: 16r88. - om byteAt: 0 put: 16r11. - om byteAt: 1 put: 16r22. - om byteAt: 2 put: 16r33. - om byteAt: 3 put: 16r44. - om byteAt: 4 put: 16r55. - om byteAt: 5 put: 16r66. - om byteAt: 6 put: 16r77. - om byteAt: 7 put: 16r88. - self assert: (om longAt: 0) equals: 16r8877665544332211. - self assert: (om byteAt: 0) equals: 16r11. - self assert: (om byteAt: 1) equals: 16r22. - self assert: (om byteAt: 2) equals: 16r33. - self assert: (om byteAt: 3) equals: 16r44. - self assert: (om byteAt: 4) equals: 16r55. - self assert: (om byteAt: 5) equals: 16r66. - self assert: (om byteAt: 6) equals: 16r77. - self assert: (om byteAt: 7) equals: 16r88. (Smalltalk classNamed: #DoubleWordArray) ifNotNil: [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + self should: [om byteAt: 0 put: 16r11] raise: Error. + om byteAt: 8 put: 16r11. + om byteAt: 9 put: 16r22. + om byteAt: 10 put: 16r33. + om byteAt: 11 put: 16r44. + om byteAt: 12 put: 16r55. + om byteAt: 13 put: 16r66. + om byteAt: 14 put: 16r77. + om byteAt: 15 put: 16r88. + self should: [om longAt: 0] raise: Error. + self assert: (om longAt: 8) equals: 16r8877665544332211. + self assert: (om byteAt: 8) equals: 16r11. + self assert: (om byteAt: 9) equals: 16r22. + self assert: (om byteAt: 10) equals: 16r33. + self assert: (om byteAt: 11) equals: 16r44. + self assert: (om byteAt: 12) equals: 16r55. + self assert: (om byteAt: 13) equals: 16r66. + self assert: (om byteAt: 14) equals: 16r77. + self assert: (om byteAt: 15) equals: 16r88]! - om byteAt: 0 put: 16r11. - om byteAt: 1 put: 16r22. - om byteAt: 2 put: 16r33. - om byteAt: 3 put: 16r44. - om byteAt: 4 put: 16r55. - om byteAt: 5 put: 16r66. - om byteAt: 6 put: 16r77. - om byteAt: 7 put: 16r88. - self assert: (om longAt: 0) equals: 16r8877665544332211. - self assert: (om byteAt: 0) equals: 16r11. - self assert: (om byteAt: 1) equals: 16r22. - self assert: (om byteAt: 2) equals: 16r33. - self assert: (om byteAt: 3) equals: 16r44. - self assert: (om byteAt: 4) equals: 16r55. - self assert: (om byteAt: 5) equals: 16r66. - self assert: (om byteAt: 6) equals: 16r77. - self assert: (om byteAt: 7) equals: 16r88]! Item was changed: ----- Method: StackInterpreterTests>>testShortMemoryAccess (in category 'tests') ----- testShortMemoryAccess "self new testShortMemoryAccess" | om | om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. om shortAt: 0 put: 16r2211. om shortAt: 2 put: 16r4433. self assert: (om longAt: 0) equals: 16r44332211. self assert: (om shortAt: 0) equals: 16r2211. self assert: (om shortAt: 2) equals: 16r4433. om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. + self should: [om shortAt: 0 put: 16r2211] raise: Error. + om shortAt: 4 put: 16r2211. + om shortAt: 6 put: 16r4433. + self should: [om shortAt: 0] raise: Error. + self assert: (om longAt: 4) equals: 16r44332211. + self assert: (om shortAt: 4) equals: 16r2211. + self assert: (om shortAt: 6) equals: 16r4433. - om shortAt: 0 put: 16r2211. - om shortAt: 2 put: 16r4433. - self assert: (om longAt: 0) equals: 16r44332211. - self assert: (om shortAt: 0) equals: 16r2211. - self assert: (om shortAt: 2) equals: 16r4433. om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. + self should: [om shortAt: 0 put: 16r2211] raise: Error. + om shortAt: 8 put: 16r2211. + om shortAt: 10 put: 16r4433. + om shortAt: 12 put: 16r6655. + om shortAt: 14 put: 16r8877. + self should: [om shortAt: 0] raise: Error. + self assert: (om longAt: 8) equals: 16r8877665544332211. + self assert: (om shortAt: 8) equals: 16r2211. + self assert: (om shortAt: 10) equals: 16r4433. + self assert: (om shortAt: 12) equals: 16r6655. + self assert: (om shortAt: 14) equals: 16r8877. - om shortAt: 0 put: 16r2211. - om shortAt: 2 put: 16r4433. - om shortAt: 4 put: 16r6655. - om shortAt: 6 put: 16r8877. - self assert: (om longAt: 0) equals: 16r8877665544332211. - self assert: (om shortAt: 0) equals: 16r2211. - self assert: (om shortAt: 2) equals: 16r4433. - self assert: (om shortAt: 4) equals: 16r6655. - self assert: (om shortAt: 6) equals: 16r8877. (Smalltalk classNamed: #DoubleWordArray) ifNotNil: [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + self should: [om shortAt: 0 put: 16r2211] raise: Error. + om shortAt: 8 put: 16r2211. + om shortAt: 10 put: 16r4433. + om shortAt: 12 put: 16r6655. + om shortAt: 14 put: 16r8877. + self should: [om shortAt: 0] raise: Error. + self assert: (om longAt: 8) equals: 16r8877665544332211. + self assert: (om shortAt: 8) equals: 16r2211. + self assert: (om shortAt: 10) equals: 16r4433. + self assert: (om shortAt: 12) equals: 16r6655. + self assert: (om shortAt: 14) equals: 16r8877]! - om shortAt: 0 put: 16r2211. - om shortAt: 2 put: 16r4433. - om shortAt: 4 put: 16r6655. - om shortAt: 6 put: 16r8877. - self assert: (om longAt: 0) equals: 16r8877665544332211. - self assert: (om shortAt: 0) equals: 16r2211. - self assert: (om shortAt: 2) equals: 16r4433. - self assert: (om shortAt: 4) equals: 16r6655. - self assert: (om shortAt: 6) equals: 16r8877]! Item was changed: ----- Method: StackInterpreterTests>>testUnalignedMemoryAccess (in category 'tests') ----- testUnalignedMemoryAccess "self new testUnalignedMemoryAccess" | om | om := NewCoObjectMemorySimulator new allocateMemoryOfSize: 16. om unalignedLongAt: 1 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r22334400. self assert: (om unalignedLongAt: 4) equals: 16r11. self assert: (om unalignedLongAt: 1) equals: 16r11223344. om longAt: 0 put: 16rAAAAAAAA. om longAt: 4 put: 16rAAAAAAAA. om unalignedLongAt: 1 put: 16r11223344. self assert: (om unalignedLongAt: 0) equals: 16r223344AA. self assert: (om unalignedLongAt: 4) equals: 16rAAAAAA11. self assert: (om unalignedLongAt: 1) equals: 16r11223344. om := Spur32BitMMLECoSimulator new allocateMemoryOfSize: 16. + om unalignedLongAt: 7 put: 16r11223344. + self assert: (om unalignedLongAt: 4) equals: 16r44000000. + self assert: (om unalignedLongAt: 8) equals: 16r112233. + self assert: (om unalignedLongAt: 7) equals: 16r11223344. - om unalignedLongAt: 3 put: 16r11223344. - self assert: (om unalignedLongAt: 0) equals: 16r44000000. - self assert: (om unalignedLongAt: 4) equals: 16r112233. - self assert: (om unalignedLongAt: 3) equals: 16r11223344. - om longAt: 0 put: 16rAAAAAAAA. om longAt: 4 put: 16rAAAAAAAA. + om longAt: 8 put: 16rAAAAAAAA. + om unalignedLongAt: 7 put: 16r11223344. + self assert: (om unalignedLongAt: 4) equals: 16r44AAAAAA. + self assert: (om unalignedLongAt: 8) equals: 16rAA112233. + self assert: (om unalignedLongAt: 7) equals: 16r11223344. - om unalignedLongAt: 3 put: 16r11223344. - self assert: (om unalignedLongAt: 0) equals: 16r44AAAAAA. - self assert: (om unalignedLongAt: 4) equals: 16rAA112233. - self assert: (om unalignedLongAt: 3) equals: 16r11223344. om := Spur64BitMMLECoSimulator new allocateMemoryOfSize: 32. + om unalignedLongAt: 11 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 8) equals: 16r4455667788000000. + self assert: (om unalignedLongAt: 16) equals: 16r112233. + self assert: (om unalignedLongAt: 11) equals: 16r1122334455667788. - om unalignedLongAt: 3 put: 16r1122334455667788. - self assert: (om unalignedLongAt: 0) equals: 16r4455667788000000. - self assert: (om unalignedLongAt: 8) equals: 16r112233. - self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. - om longAt: 0 put: 16rAAAAAAAAAAAAAAAA. om longAt: 8 put: 16rAAAAAAAAAAAAAAAA. + om longAt: 16 put: 16rAAAAAAAAAAAAAAAA. + om unalignedLongAt: 11 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 8) equals: 16r4455667788AAAAAA. + self assert: (om unalignedLongAt: 16) equals: 16rAAAAAAAAAA112233. + self assert: (om unalignedLongAt: 11) equals: 16r1122334455667788. - om unalignedLongAt: 3 put: 16r1122334455667788. - self assert: (om unalignedLongAt: 0) equals: 16r4455667788AAAAAA. - self assert: (om unalignedLongAt: 8) equals: 16rAAAAAAAAAA112233. - self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. (Smalltalk classNamed: #DoubleWordArray) ifNotNil: [om := Spur64BitMMLECoSimulatorFor64Bits new allocateMemoryOfSize: 32. + om unalignedLongAt: 11 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 8) equals: 16r4455667788000000. + self assert: (om unalignedLongAt: 16) equals: 16r112233. + self assert: (om unalignedLongAt: 11) equals: 16r1122334455667788. - om unalignedLongAt: 3 put: 16r1122334455667788. - self assert: (om unalignedLongAt: 0) equals: 16r4455667788000000. - self assert: (om unalignedLongAt: 8) equals: 16r112233. - self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788. - om longAt: 0 put: 16rAAAAAAAAAAAAAAAA. om longAt: 8 put: 16rAAAAAAAAAAAAAAAA. + om longAt: 16 put: 16rAAAAAAAAAAAAAAAA. + om unalignedLongAt: 11 put: 16r1122334455667788. + self assert: (om unalignedLongAt: 8) equals: 16r4455667788AAAAAA. + self assert: (om unalignedLongAt: 16) equals: 16rAAAAAAAAAA112233. + self assert: (om unalignedLongAt: 11) equals: 16r1122334455667788]! - om unalignedLongAt: 3 put: 16r1122334455667788. - self assert: (om unalignedLongAt: 0) equals: 16r4455667788AAAAAA. - self assert: (om unalignedLongAt: 8) equals: 16rAAAAAAAAAA112233. - self assert: (om unalignedLongAt: 3) equals: 16r1122334455667788]!

1 0

VM Maker: VMMaker.oscog-eem.3149.mcz
by commits＠source.squeak.org 09 Feb '22

09 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3149.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3149 Author: eem Time: 9 February 2022, 11:04:10.777055 am UUID: e4e91830-a047-4c80-971d-ec6ebbfaf798 Ancestors: VMMaker.oscog-eem.3148 primitiveFunctionPointer is no longer part of primitive-invoke-time state, so expunge it from VMCallbackContext. =============== Diff against VMMaker.oscog-eem.3148 =============== Item was changed: ----- Method: StackInterpreter>>returnAs:ThroughCallback:Context: (in category 'callback support') ----- returnAs: returnTypeOop ThroughCallback: vmCallbackContext Context: callbackMethodContext "callbackMethodContext is an activation of invokeCallback:[stack:registers:jmpbuf:]. Its sender is the VM's state prior to the callback. Reestablish that state (via longjmp), and mark callbackMethodContext as dead." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | calloutMethodContext theFP thePage | <var: #theFP type: #'char *'> <var: #thePage type: #'StackPage *'> self assert: primFailCode = 0. self assert: (objectMemory isIntegerObject: returnTypeOop). self assert: (objectMemory isImmediate: vmCallbackContext asInteger) not. self assert: ((objectMemory addressCouldBeObj: callbackMethodContext) and: [objectMemory isContext: callbackMethodContext]). self assert: (debugCallbackPath := 0) = 0. ((objectMemory isIntegerObject: returnTypeOop) and: [self isLiveContext: callbackMethodContext]) ifFalse: [self assert: (debugCallbackPath := 1) = 1. ^false]. calloutMethodContext := self externalInstVar: SenderIndex ofContext: callbackMethodContext. (self isLiveContext: calloutMethodContext) ifFalse: [self assert: (debugCallbackPath := 2) = 2. ^false]. self assert: (debugCallbackReturns := debugCallbackReturns + 1) > 0. "self assert: debugCallbackReturns < 3802." "We're about to leave this stack page; must save the current frame's instructionPointer." self push: instructionPointer. self externalWriteBackHeadFramePointers. "Mark callbackMethodContext as dead; the common case is that it is the current frame. We go the extra mile for the debugger." (self isSingleContext: callbackMethodContext) ifTrue: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 4) > 0. self markContextAsDead: callbackMethodContext] ifFalse: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 8) > 0. theFP := self frameOfMarriedContext: callbackMethodContext. self assert: (self frameReceiver: theFP) = (objectMemory splObj: ClassAlien). framePointer = theFP "common case" ifTrue: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 16) > 0. (self isBaseFrame: theFP) ifFalse: "calloutMethodContext is immediately below on the same page. Make it current." [self assert: (debugCallbackPath := debugCallbackPath bitOr: 32) > 0. instructionPointer := (self frameCallerSavedIP: theFP) asUnsignedInteger. stackPointer := theFP + (self frameStackedReceiverOffset: theFP) + objectMemory wordSize. framePointer := self frameCallerFP: theFP. self setMethod: (self frameMethodObject: framePointer). self restoreCStackStateForCallbackContext: vmCallbackContext. self assertValidExecutionPointe: instructionPointer r: framePointer s: stackPointer. "N.B. siglongjmp is defines as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self _longjmp: vmCallbackContext trampoline _: (self integerValueOf: returnTypeOop). ^true]. stackPages freeStackPage: stackPage] ifFalse: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 64) > 0. self externalDivorceFrame: theFP andContext: callbackMethodContext. self markContextAsDead: callbackMethodContext]]. "Make the calloutMethodContext the active frame. The case where calloutMethodContext is immediately below callbackMethodContext on the same page is handled above." (self isStillMarriedContext: calloutMethodContext) ifTrue: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 128) > 0. theFP := self frameOfMarriedContext: calloutMethodContext. thePage := stackPages stackPageFor: theFP. "findSPOf:on: points to the word beneath the instructionPointer, but there is no instructionPointer on the top frame of the current page." self assert: thePage ~= stackPage. stackPointer := thePage headFP = theFP ifTrue: [thePage headSP] ifFalse: [(self findSPOf: theFP on: thePage) - objectMemory wordSize]. framePointer := theFP. self assert: stackPointer < framePointer] ifFalse: [self assert: (debugCallbackPath := debugCallbackPath bitOr: 256) > 0. thePage := self makeBaseFrameFor: calloutMethodContext. self setStackPointersFromPage: thePage]. instructionPointer := self popStack. self setMethod: (objectMemory fetchPointer: MethodIndex ofObject: calloutMethodContext). self setStackPageAndLimit: thePage. self restoreCStackStateForCallbackContext: vmCallbackContext. - primitiveFunctionPointer := vmCallbackContext savedPrimFunctionPointer. "N.B. siglongjmp is defined as _longjmp on non-win32 platforms. This matches the use of _setjmp in ia32abicc.c." self _longjmp: vmCallbackContext trampoline _: (self integerValueOf: returnTypeOop). "NOTREACHED" ^true! Item was changed: ----- Method: StackInterpreter>>sendInvokeCallbackContext: (in category 'callback support') ----- sendInvokeCallbackContext: vmCallbackContext "Send the calllback message to Alien class with the supplied arg(s). Use either the 1 arg invokeCallbackContext: or the 4 arg invokeCallback:stack:registers:jmpbuf: message, depending on what selector is installed in the specialObjectsArray. Note that if invoking the legacy invokeCallback:stack:registers:jmpbuf: we pass the vmCallbackContext as the jmpbuf argument (see reestablishContextPriorToCallback:). The arguments are raw C addresses and are converted to integer objects on the way. sendInvokeCallbackContext: & returnAs:ThroughCallback:Context: along with ownVM: and disownVM: conspire to save and restore newMethod, argumentCount and primitiveFunctionPointer around a callback. The VM depends on argumentCount being correct to cut-back the correct number of + arguments on primitive return." - arguments on primitive return. If a primitive that invokes a callback fails after invoking a - callback (a bad idea, but s**t happens during development) then newMethod is required to - activate the right faling method, and Spur expects primitiveFunctionPointer to be valid, so - asserts will fail misleadingly if not." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | classTag | - vmCallbackContext savedPrimFunctionPointer: primitiveFunctionPointer. classTag := self fetchClassTagOfNonImm: (objectMemory splObj: ClassAlien). messageSelector := self splObj: SelectorInvokeCallback. (self lookupInMethodCacheSel: messageSelector classTag: classTag) ifFalse: [(self lookupOrdinaryNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [^false]]. - primitiveFunctionPointer ~= 0 ifTrue: - [primitiveFunctionPointer := vmCallbackContext savedPrimFunctionPointer. - ^false]. self assert: (debugCallbackInvokes := debugCallbackInvokes + 1) > 0. "self assert: debugCallbackInvokes < 3802." self saveCStackStateForCallbackContext: vmCallbackContext. self push: (objectMemory splObj: ClassAlien). "receiver" (self argumentCountOf: newMethod) = 4 ifTrue: [self push: (self positiveMachineIntegerFor: vmCallbackContext thunkp asUnsignedInteger). self push: (self positiveMachineIntegerFor: vmCallbackContext stackp asUnsignedInteger). self push: (self positiveMachineIntegerFor: vmCallbackContext intregargsp asUnsignedInteger)]. self push: (self positiveMachineIntegerFor: vmCallbackContext asUnsignedInteger). self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector. self justActivateNewMethod: false. "either interpreted or machine code" (self isMachineCodeFrame: framePointer) ifFalse: [self maybeFlagMethodAsInterpreted: newMethod]. self checkForStackOverflow. self assert: (self frameReceiver: framePointer) = (objectMemory splObj: ClassAlien). self enterSmalltalkExecutiveFromCallback. "not reached" ^true! Item was changed: VMStructType subclass: #VMCallbackContext + instanceVariableNames: 'thunkp stackp intregargsp floatregargsp savedCStackPointer savedCFramePointer rvs savedMostRecentCallbackContext trampoline savedReenterInterpreter' - instanceVariableNames: 'thunkp stackp intregargsp floatregargsp savedCStackPointer savedCFramePointer rvs savedPrimFunctionPointer savedMostRecentCallbackContext trampoline savedReenterInterpreter' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! Item was removed: - ----- Method: VMCallbackContext>>savedPrimFunctionPointer (in category 'accessing') ----- - savedPrimFunctionPointer - - ^ savedPrimFunctionPointer - ! Item was removed: - ----- Method: VMCallbackContext>>savedPrimFunctionPointer: (in category 'accessing') ----- - savedPrimFunctionPointer: anObject - - ^ savedPrimFunctionPointer := anObject. - !

1 0

VM Maker: VMMaker.oscog-eem.3147.mcz
by commits＠source.squeak.org 08 Feb '22

08 Feb '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3147.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3147 Author: eem Time: 6 February 2022, 1:51:16.763917 pm UUID: 409be388-ed75-49dc-a648-c7051eb48168 Ancestors: VMMaker.oscog-eem.3146 Fix regressions in the stack interpreter generated sources from VMMaker.oscog-eem.3144, and in primitiveSupend[V2] from VMMaker.oscog-eem.3142,VMMaker.oscog-eem.3134,VMMaker.oscog-eem.3127. =============== Diff against VMMaker.oscog-eem.3146 =============== Item was removed: - ----- Method: CoInterpreter>>accessorDepthForExternalPrimitiveMethod: (in category 'plugin primitive support') ----- - accessorDepthForExternalPrimitiveMethod: methodObj - <option: #SpurObjectMemory> - | flags lit | - self assert: (self isLinkedExternalPrimitive: methodObj). - lit := self literal: 0 ofMethod: methodObj. - flags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. - ^(objectMemory integerValueOf: flags) >>> SpurPrimitiveAccessorDepthShift! Item was removed: - ----- Method: CoInterpreter>>isLinkedExternalPrimitive: (in category 'plugin primitive support') ----- - isLinkedExternalPrimitive: methodObj - | header primIdx literal targetFunctionIndex | - header := objectMemory methodHeaderOf: methodObj. - primIdx := self primitiveIndexOfMethod: methodObj header: header. - ^primIdx = PrimNumberExternalCall - and: [(objectMemory literalCountOfMethodHeader: header) > 0 - and: [(objectMemory isArray: (literal := self literal: 0 ofMethod: methodObj)) - and: [(objectMemory numSlotsOf: literal) = 4 - and: [targetFunctionIndex := objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: literal. - (objectMemory isIntegerObject: targetFunctionIndex) - and: [(objectMemory integerValueOf: targetFunctionIndex) > 0]]]]] "A 0 byte module name implies a primitive in the main VM; these can't change"! Item was added: + ----- Method: StackInterpreter>>accessorDepthForExternalPrimitiveMethod: (in category 'plugin primitive support') ----- + accessorDepthForExternalPrimitiveMethod: methodObj + <option: #SpurObjectMemory> + | flags lit | + self assert: (self isLinkedExternalPrimitive: methodObj). + lit := self literal: 0 ofMethod: methodObj. + flags := objectMemory fetchPointer: ExternalCallLiteralFlagsIndex ofObject: lit. + ^(objectMemory integerValueOf: flags) >>> SpurPrimitiveAccessorDepthShift! Item was added: + ----- Method: StackInterpreter>>isLinkedExternalPrimitive: (in category 'plugin primitive support') ----- + isLinkedExternalPrimitive: methodObj + | header primIdx literal targetFunctionIndex | + header := objectMemory methodHeaderOf: methodObj. + primIdx := self primitiveIndexOfMethod: methodObj header: header. + ^primIdx = PrimNumberExternalCall + and: [(objectMemory literalCountOfMethodHeader: header) > 0 + and: [(objectMemory isArray: (literal := self literal: 0 ofMethod: methodObj)) + and: [(objectMemory numSlotsOf: literal) = 4 + and: [targetFunctionIndex := objectMemory fetchPointer: ExternalCallLiteralTargetFunctionIndex ofObject: literal. + (objectMemory isIntegerObject: targetFunctionIndex) + and: [(objectMemory integerValueOf: targetFunctionIndex) > 0]]]]] "A 0 byte module name implies a primitive in the main VM; these can't change"! 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 + 1 r: framePointer s: stackPointer. sched := self schedulerPointer. oldProc := objectMemory fetchPointer: ActiveProcessIndex ofObject: sched. activeContext := self ensureFrameIsMarried: framePointer SP: stackPointer + objectMemory wordSize. 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. + ^0 "to allow primitiveSuspend[V2] to exit early by returning the result of transferTo:"! - self externalSetStackPageAndPointersForSuspendedContextOfProcess: newProc!

3 3

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2022