Vm-dev November 2022

vm-dev@lists.squeakfoundation.org

11 participants
72 discussions

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

08 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3269.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3269 Author: eem Time: 8 November 2022, 2:10:23.830859 pm UUID: 7b045694-3272-4049-b49c-d04bb90e6363 Ancestors: VMMaker.oscog-eem.3268 Add a more convenient typer interrogator for the ClipboardExtendedPlugin =============== Diff against VMMaker.oscog-eem.3268 =============== Item was changed: ----- Method: ClipboardExtendedPlugin class>>preambleCCode (in category 'translation') ----- preambleCCode + ^'// declarations for the support API. eem, 10/10/2022\\void sqPasteboardClear(void *inPasteboard);\sqInt sqPasteboardGetItemCount(void *inPasteboard);\sqInt sqPasteboardCopyItemFlavorsitemNumber(void *inPasteboard, sqInt formatNumber);\void *sqCreateClipboard(void);\void sqPasteboardPutItemFlavordatalengthformatTypeformatLength(void *inPasteboard, char *inData, sqInt dataLength, char *format, sqInt formatLength);\void sqPasteboardPutItemFlavordatalengthformatType(void *inPasteboard, char *inData, sqInt dataLength, sqInt format);\sqInt sqPasteboardCopyItemFlavorDataformatformatLength(void *inPasteboard, char *format, sqInt formatLength);\sqInt sqPasteboardCopyItemFlavorDataformat(void *inPasteboard, sqInt format);\sqInt sqPasteboardhasDataInFormatformatLength(void *inPasteboard, char *format, sqInt formatLength);\sqInt sqPasteboardhasDataInFormat(void *inPasteboard, sqInt format);' withCRs - ^'// declarations for the support API. eem, 10/10/2022\\void sqPasteboardClear(void *inPasteboard);\sqInt sqPasteboardGetItemCount(void *inPasteboard);\sqInt sqPasteboardCopyItemFlavorsitemNumber(void *inPasteboard, sqInt formatNumber);\void *sqCreateClipboard(void);\void sqPasteboardPutItemFlavordatalengthformatTypeformatLength(void *inPasteboard, char *inData, sqInt dataLength, char *format, sqInt formatLength);\void sqPasteboardPutItemFlavordatalengthformatType(void *inPasteboard, char *inData, sqInt dataLength, sqInt format);\sqInt sqPasteboardCopyItemFlavorDataformatformatLength(void *inPasteboard, char *format, sqInt formatLength);\sqInt sqPasteboardCopyItemFlavorDataformat(void *inPasteboard, sqInt format);' withCRs "quick test:" "ExtendedClipboardInterface current addClipboardDataConvertFormToPNG: Display"! Item was added: + ----- Method: ClipboardExtendedPlugin>>ioHasClipboardData:inFormat: (in category 'io') ----- + ioHasClipboardData: clipboard inFormat: format + self primitive: 'ioHasClipboardDataInFormat' parameters: #(Unsigned Oop). + (interpreterProxy isIntegerObject: format) ifTrue: + [^interpreterProxy methodReturnBool: + (self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy integerValueOf: format))]. + (interpreterProxy isBytes: format) ifTrue: + [^interpreterProxy methodReturnBool: + (self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy firstIndexableField: format) + formatLength: (interpreterProxy byteSizeOf: format))]. + interpreterProxy primitiveFailFor: PrimErrBadArgument!

1 0

[OpenSmalltalk/opensmalltalk-vm] 0f9020: Fix a comment typo in sqImageFileAccessViaStdio.h.
by Nicolas Cellier 08 Nov '22

08 Nov '22

Branch: refs/heads/virtend Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 0f9020bde4cb7ae5d93442428e87930b1eab120d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0f9020bde4cb7ae5d9… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/Cross/vm/sqImageFileAccessViaStdio.h M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Log Message: ----------- Fix a comment typo in sqImageFileAccessViaStdio.h. Fix some formatting in sqWin32FilePrims.c; if( is bad; if is a keyword, not a function. char* foo is bad; the type of bar in "char* foo, bar;" is char. This is why in K&R the asterisk is always associated with the variable, not the base type. Returns should be om their own line for breakpointing when debugging. Commit: a4cea472355eac502a3720f9558701cb161377c1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a4cea472355eac502a… Author: Nicolas Cellier <nicolas.cellier(a)sirehna.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c Log Message: ----------- Fix suspiscious check in Win32 socket plugin >/usr/x86_64-w64-mingw32/sys-root/mingw/include/WinSock2.h:1029:88: note: passing argument to parameter 'optval' here > WINSOCK_API_LINKAGE int WSAAPI setsockopt(SOCKET s,int level,int optname,const char *optval,int optlen); > ^ >../../../platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c:1758:7: warning: logical not is only applied to the left hand side of this comparison [-Wlogical-not-parentheses] > if (!opt == 0 > ^ ~~ Since opt is a pointer, !opt means (pointer is NULL)<br> Then (!opt) == 0, means (pointer is NULL) is false, hence (pointer is not NULL). So we would barf if pointer is not NULL?<br> But on next line (reached if pointer IS NULL), we would dereference the pointer...<br> Err, non-sensical. I guess the intention was to BARF if pointer is NULL. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/f25b72cb3b26...a4…

1 0

[OpenSmalltalk/opensmalltalk-vm] a69bd7: CogVM source as per VMMaker.oscog-eem.3266
by Eliot Miranda 08 Nov '22

08 Nov '22

Branch: refs/heads/virtend Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: a69bd763be1428609e8d1dcef514919b675eda8e https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/a69bd763be1428609e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-07 (Mon, 07 Nov 2022) Changed paths: M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3266 Fix hidden reference to GetAttributeString in VMProfileLinuxSupportPlugin. Eliminate all its cCode:[inSmalltalk:] uses while we're at it. Commit: f25b72cb3b2623f38db815cc75e296510de91fc1 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f25b72cb3b2623f38d… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c M src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileDialogPlugin/FileDialogPlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/GdbARMv8Plugin/GdbARMv8Plugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/Squeak3D/Squeak3D.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64AppleFFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/RiscV64FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.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 VMMaker.oscog-eem.3268 Fix several sends of [positive|signed]MachineIntegerFor: which is implemented in InterpreterPlugin, not InterpreterProxy. Refactor call logging in the ThreadedFFIPlugin to get as much of the logging code out of the critical path as possible. Fix issues with spur primitive metadata in plugin primitives. stackFloatValue: stackStringValue: et al look inside the object on the stack. stackValue: stackIntegerValue: et al do not. So extend StackInterpreter class>>isObjectAccessor: to include those stack accessors that look inside the object on the stack. This fixes the metadata calculations for things like B3DAcceleratorPlugin>>primitiveSetLights, FileDialogPlugin>>primitiveFileDialogAddFilter, etc. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/5e7245f5a0e7...f2…

1 0

[OpenSmalltalk/opensmalltalk-vm] c80633: CogVM source as per VMMaker.oscog-eem.3268
by Eliot Miranda 08 Nov '22

08 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c80633de4995150e366846fbfe8ef627793f4803 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c80633de4995150e36… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/Cross/plugins/SqueakFFIPrims/sqFFI.h M platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c M src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/BochsIA32Plugin/BochsIA32Plugin.c M src/plugins/BochsX64Plugin/BochsX64Plugin.c M src/plugins/FileDialogPlugin/FileDialogPlugin.c M src/plugins/GdbARMPlugin/GdbARMPlugin.c M src/plugins/GdbARMv8Plugin/GdbARMv8Plugin.c M src/plugins/HostWindowPlugin/HostWindowPlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/plugins/Squeak3D/Squeak3D.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64AppleFFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/RiscV64FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.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 VMMaker.oscog-eem.3268 Fix several sends of [positive|signed]MachineIntegerFor: which is implemented in InterpreterPlugin, not InterpreterProxy. Refactor call logging in the ThreadedFFIPlugin to get as much of the logging code out of the critical path as possible. Fix issues with spur primitive metadata in plugin primitives. stackFloatValue: stackStringValue: et al look inside the object on the stack. stackValue: stackIntegerValue: et al do not. So extend StackInterpreter class>>isObjectAccessor: to include those stack accessors that look inside the object on the stack. This fixes the metadata calculations for things like B3DAcceleratorPlugin>>primitiveSetLights, FileDialogPlugin>>primitiveFileDialogAddFilter, etc.

1 0

VM Maker: Cog-eem.451.mcz
by commits＠source.squeak.org 08 Nov '22

08 Nov '22

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.451.mcz ==================== Summary ==================== Name: Cog-eem.451 Author: eem Time: 8 November 2022, 12:03:41.911161 pm UUID: b66d08cf-0116-4cfb-8c05-efb499240793 Ancestors: Cog-eem.450 Fix several sends of [positive|signed]MachineIntegerFor: which is implemented in InterpreterPlugin, not InterpreterProxy. =============== Diff against Cog-eem.450 =============== Item was changed: ----- Method: ProcessorSimulatorPlugin>>primitiveNewCPU (in category 'primitives') ----- primitiveNewCPU | cpu | <var: #cpu type: #'void *'> self primitive: #primitiveNewCPU parameters: #(). cpu := self newCPU. cpu = 0 ifTrue: [^interpreterProxy primitiveFail]. + interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: (self cCoerceSimple: cpu to: #'usqIntptr_t'))! - interpreterProxy - pop: 1 - thenPush: (interpreterProxy positiveMachineIntegerFor: - (self cCoerceSimple: cpu - to: 'usqIntptr_t'))!

1 0

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

08 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3268.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3268 Author: eem Time: 8 November 2022, 11:45:51.001808 am UUID: b157851d-3135-4853-9b4a-b72296787205 Ancestors: VMMaker.oscog-eem.3267 Fix several sends of [positive|signed]MachineIntegerFor: which is implemented in InterpreterPlugin, not InterpreterProxy. Refactor call logging in the ThreadedFFIPlugin to get as much of the logging code out of the critical path as possible. =============== Diff against VMMaker.oscog-eem.3267 =============== Item was changed: ----- Method: ClipboardExtendedPlugin>>ioCreateClipboard (in category 'io') ----- ioCreateClipboard self primitive: 'ioCreateClipboard' parameters: #(). + ^self positiveMachineIntegerFor: self sqCreateClipboard asUnsignedInteger! - ^interpreterProxy positiveMachineIntegerFor: self sqCreateClipboard asUnsignedInteger! Item was changed: ----- Method: HostWindowPlugin>>primitiveSqueakWindowHandle (in category 'system primitives') ----- primitiveSqueakWindowHandle <option: #TerfVM> "Answer the native Squeak window handle, presumably a pointer, as an unsigned integer. This value should be usable in native calls to the window manager as well as the argument to primitiveNativeWindowPosition:" | handle | <var: #handle type: 'void *'> self primitive: 'primitiveSqueakWindowHandle'. handle := self ioGetWindowHandle. handle = 0 ifTrue: [^interpreterProxy primitiveFail]. + ^self positiveMachineIntegerFor: (self cCoerceSimple: handle to: #usqInt)! - ^interpreterProxy positiveMachineIntegerFor: (self cCoerceSimple: handle to: #sqInt)! Item was changed: ----- Method: IA32ABIPlugin>>primUnsignedWordAt (in category 'primitives-accessing') ----- primUnsignedWordAt "Answer the unsigned word starting at the given byte offset (little endian)." "<Alien> unsignedWordAt: index <Integer> ^<Integer> <primitive: 'primUnsignedWordAt' error: errorCode module: 'IA32ABI'>" | byteOffset rcvr startAddr value | <export: true> byteOffset := (interpreterProxy stackPositiveMachineIntegerValue: 0) - 1. rcvr := interpreterProxy stackObjectValue: 1. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self index: byteOffset length: interpreterProxy bytesPerOop inRange: rcvr) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. (startAddr := self startOfData: rcvr) = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadReceiver]. value := self cCode: [self longAt: startAddr + byteOffset] inSmalltalk: [(self alienFor: rcvr at: startAddr) unsignedWordAt: byteOffset + 1]. + ^interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: value)! - ^interpreterProxy methodReturnValue: (interpreterProxy positiveMachineIntegerFor: value)! Item was changed: ----- Method: MacMenubarPlugin>>primitiveCreateStandardWindowMenu: (in category 'system primitives') ----- primitiveCreateStandardWindowMenu: inOptions <var: #menuHandle type: #MenuHandle> | menuHandle result | self primitive: 'primitiveCreateStandardWindowMenu' parameters: #(SmallInteger). self cppIf: #'TARGET_API_MAC_CARBON' ifTrue: [result := self cCode: 'CreateStandardWindowMenu(inOptions,&menuHandle);' inSmalltalk:[0]]. + ^self positiveMachineIntegerFor: (self cCoerce: menuHandle to: #'usqIntptr_t')! - ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: #'usqIntptr_t')! Item was changed: ----- Method: MacMenubarPlugin>>primitiveGetIndMenuWithCommandID:commandID: (in category 'system primitives') ----- primitiveGetIndMenuWithCommandID: menuHandleOop commandID: aCommandID <var: #menuHandle type: #MenuHandle> <var: #commandID type: #MenuCommand> <var: #applicationMenu type: #MenuHandle> <var: #outIndex type: #MenuItemIndex> | menuHandle commandID applicationMenu outIndex | self primitive: 'primitiveGetIndMenuWithCommandID' parameters: #(Oop Oop). menuHandle := self cCoerce: (interpreterProxy positiveMachineIntegerValueOf: menuHandleOop) to: 'MenuHandle'. commandID := self cCoerce: (interpreterProxy positive32BitValueOf: aCommandID) to: 'MenuCommand'. (self ioCheckMenuHandle: menuHandle) ifFalse: [^interpreterProxy success: false]. self cppIf: #'TARGET_API_MAC_CARBON' ifTrue: [self cCode: 'GetIndMenuItemWithCommandID(menuHandle, kHICommandHide, 1, &applicationMenu, &outIndex);' inSmalltalk: [menuHandle]]. outIndex asSmallIntegerObj. "to avoid elimination of the variable..." + ^self positiveMachineIntegerFor: (self cCoerce: applicationMenu to: #'usqIntptr_t') - ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: applicationMenu to: #'usqIntptr_t') ! Item was changed: ----- Method: MacMenubarPlugin>>primitiveGetMenuBar (in category 'system primitives') ----- + primitiveGetMenuBar + self primitive: 'primitiveGetMenuBar' parameters: #(). + ^self positiveMachineIntegerFor: (self cCoerce: self GetMenuBar to: #'usqIntptr_t')! - primitiveGetMenuBar - <var: #menuHandle type: #Handle> - | menuHandle | - self primitive: 'primitiveGetMenuBar' - parameters: #(). - menuHandle := self cCode: 'GetMenuBar()' inSmalltalk:[0]. - ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: #'usqIntptr_t')! Item was changed: ----- Method: MacMenubarPlugin>>primitiveGetMenuHandle: (in category 'system primitives') ----- + primitiveGetMenuHandle: menuID - primitiveGetMenuHandle: menuID - <var: #menuHandle type: #MenuHandle> <var: #menuID type: #MenuID> + self primitive: 'primitiveGetMenuHandle' parameters: #(SmallInteger). + ^self positiveMachineIntegerFor: (self cCoerce: (self GetMenuHandle: menuID) to: #'usqIntptr_t')! - | menuHandle | - self primitive: 'primitiveGetMenuHandle' - parameters: #(SmallInteger). - menuHandle := self cCode: 'GetMenuHandle(menuID)' inSmalltalk:[0]. - ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: #'usqIntptr_t')! Item was changed: ----- Method: MacMenubarPlugin>>primitiveNewMenu:menuTitle: (in category 'system primitives') ----- primitiveNewMenu: menuID menuTitle: menuTitle - <var: #menuHandle type: #MenuHandle> - <var: #constStr255 type: #ConstStr255Param> <var: #menuID type: #MenuID> + self primitive: 'primitiveNewMenu' parameters: #(SmallInteger ByteArray). + ^self positiveMachineIntegerFor: (self cCoerce: (self NewMenu: menuID _: (self cCoerce: menuTitle to: #ConstStr255Param)) to: #'usqIntptr_t')! - | menuHandle constStr255 | - self primitive: 'primitiveNewMenu' - parameters: #(SmallInteger ByteArray). - constStr255 := self cCoerce: menuTitle to: #ConstStr255Param. - menuHandle := self cCode: 'NewMenu(menuID,constStr255)' inSmalltalk:[0]. - ^interpreterProxy positiveMachineIntegerFor: (self cCoerce: menuHandle to: #'usqIntptr_t')! Item was added: + ----- Method: ThreadedFFIPlugin>>doFFILogCallout: (in category 'symbol loading') ----- + doFFILogCallout: lit + "The non-simulation version of this lives in platforms/Cross/plugins/SqueakFFIPrims/sqFFIPlugin.c" + <doNotGenerate> + | functionName | + functionName := interpreterProxy fetchPointer: externalFunctionInstSize ofObject: lit. + (interpreterProxy isBytes: functionName) ifTrue: + ['FFI call of %.*s\n' + f: interpreterProxy transcript + printf: {interpreterProxy firstIndexableField: functionName. interpreterProxy byteSizeOf: functionName}]! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiCreateIntegralResultOop:ofAtomicType:in: (in category 'callout support') ----- ffiCreateIntegralResultOop: retVal ofAtomicType: atomicType in: calloutState <inline: #always> <var: 'calloutState' type: #'CalloutState *'> <var: 'retVal' type: #usqLong> "Support up to int64_t or uint64_t" "Callout support. Return the appropriate oop for the given atomic type" | shift value mask byteSize | <var: 'value' type: #usqLong> <var: 'mask' type: #usqLong> self deny: (self isFloatAtomicType: atomicType). atomicType = FFITypeBool ifTrue: ["Make sure bool honors the byte size requested" byteSize := calloutState ffiRetHeader bitAnd: FFIStructSizeMask. value := byteSize = (self sizeof: retVal) ifTrue: [retVal] ifFalse: [retVal bitAnd: 1 asUnsignedLongLong << (byteSize * 8) - 1]. ^value = 0 ifTrue: [interpreterProxy falseObject] ifFalse: [interpreterProxy trueObject]]. atomicType <= FFITypeSignedInt32 ifTrue: ["these are all generall integer returns" atomicType <= (BytesPerWord = 8 ifTrue: [FFITypeSignedInt32] ifFalse: [FFITypeSignedInt16]) ifTrue: ["byte/short(/int). first extract partial word, then sign extend" shift := (BytesPerWord = 8 and: [atomicType >= FFITypeUnsignedInt32]) ifTrue: [32] ifFalse: [(atomicType >> 1) * 8]. "# of significant bits" value := retVal bitAnd: (1 asUnsignedLongLong << shift - 1). (atomicType anyMask: 1) ifTrue: ["make the guy signed" mask := 1 asUnsignedLongLong << (shift-1). value := (value bitAnd: mask-1) - (value bitAnd: mask)]. ^interpreterProxy integerObjectOf: value]. "Word sized integer return" ^(atomicType anyMask: 1) + ifTrue: [self signedMachineIntegerFor: retVal] "signed return" + ifFalse: [self positiveMachineIntegerFor: retVal]]. "unsigned return" - ifTrue: [interpreterProxy signedMachineIntegerFor: retVal] "signed return" - ifFalse: [interpreterProxy positiveMachineIntegerFor: retVal]]. "unsigned return" "int64_6, uint64_t" (atomicType >> 1) = (FFITypeSignedInt64 >> 1) ifTrue: [^(atomicType anyMask: 1) ifTrue: [interpreterProxy signed64BitIntegerFor: retVal] "signed return" ifFalse: [interpreterProxy positive64BitIntegerFor: retVal]]. "unsigned return" "char" self assert: (self isCharacterAtomicType: atomicType). ^atomicType caseOf: { [FFITypeUnsignedChar8] -> [interpreterProxy characterObjectOf: (retVal bitAnd: 16rFF)]. [FFITypeSignedChar8] -> [interpreterProxy characterObjectOf: (retVal bitAnd: 16rFF)]. [FFITypeUnsignedChar16] -> [interpreterProxy characterObjectOf: (retVal bitAnd: 16rFFFF)]. [FFITypeUnsignedChar32] -> [interpreterProxy characterObjectOf: (self cCoerce: retVal to: #'unsigned int')] }! Item was changed: ----- Method: ThreadedFFIPlugin>>ffiLogCallout: (in category 'symbol loading') ----- ffiLogCallout: lit <returnTypeC: #void> + <inline: #always> + ffiLogEnabled ifTrue: [self doFFILogCallout: lit]! - "fetch the function name" - | functionName | - ffiLogEnabled ifTrue:[ - functionName := interpreterProxy fetchPointer: externalFunctionInstSize ofObject: lit. - (interpreterProxy isBytes: functionName) ifFalse:[^nil]. - self ffiLogCall: (interpreterProxy firstIndexableField: functionName) - OfLength: (interpreterProxy byteSizeOf: functionName). - ].! Item was changed: ----- Method: VMProfileMacSupportPlugin>>primitiveDLSym (in category 'primitives') ----- primitiveDLSym "Answer the address of the argument in the current process or nil if none." - | nameObj name namePtr sz addr | <export: true> - <var: #name type: #'char *'> - <var: #namePtr type: #'char *'> <var: #addr type: #'void *'> + (interpreterProxy stackEphemeralStringValue: 0) ifNotNil: + [:symbolName| | addr | + addr := self dlsym: #RTLD_SELF _: symbolName. + interpreterProxy methodReturnValue: (addr = 0 + ifTrue: [interpreterProxy nilObject] + ifFalse: [self positiveMachineIntegerFor: addr asUnsignedIntegerPtr])]! - nameObj := interpreterProxy stackValue: 0. - (interpreterProxy isBytes: nameObj) ifFalse: - [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. - sz := interpreterProxy byteSizeOf: nameObj. - name := self malloc: sz+1. - namePtr := interpreterProxy firstIndexableField: nameObj. - 0 to: sz-1 do:[:i| name at: i put: (namePtr at: i)]. - name at: sz put: 0. - addr := self cCode: 'dlsym(RTLD_SELF,name)' inSmalltalk: [0]. - self free: name. - ^interpreterProxy methodReturnValue: (addr = 0 - ifTrue: [interpreterProxy nilObject] - ifFalse: [interpreterProxy positiveMachineIntegerFor: addr asUnsignedIntegerPtr])! Item was changed: ----- Method: VMProfileMacSupportPlugin>>primitiveExecutableModulesAndOffsets (in category 'primitives') ----- primitiveExecutableModulesAndOffsets "Answer an Array of quads for executable modules (the VM executable and loaded libraries). Each quad is the module's name, its vm address relocation in memory, the (unrelocated) start address, and the size." | nimages resultObj name valueObj nameObjData slide start size | <export: true> <var: #name type: 'const char *'> <var: #nameObjData type: #'char *'> <var: #h type: 'const struct mach_header *'> <var: #h64 type: 'const struct mach_header_64 *'> <var: #s64 type: 'const struct section_64 *'> <var: #s type: 'const struct section *'> <var: #start type: 'usqIntptr_t'> <var: #slide type: 'usqIntptr_t'> <var: #size type: 'usqIntptr_t'> nimages := self _dyld_image_count. resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: nimages * 4. resultObj = 0 ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. - [^interpreterProxy primitiveFail]. interpreterProxy pushRemappableOop: resultObj. 0 to: nimages - 1 do: [:i| start := size := -1. "impossible start & size" name := self _dyld_get_image_name: i. slide := self _dyld_get_image_vmaddr_slide: i. self cppIf: #'__x86_64__' | #'__arm64__' ifTrue: [(self cCoerceSimple: (self _dyld_get_image_header: i) to: #'const struct mach_header_64 *') ifNotNil: [:h64| (self getsectbynamefromheader_64: h64 _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: [:s64| start := s64 addr. size := s64 size]]] ifFalse: [(self _dyld_get_image_header: i) ifNotNil: [:h| (self getsectbynamefromheader: h _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: [:s| start := s addr. size := s size]]]. valueObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: (self strlen: name). interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: i * 4 ofObject: interpreterProxy topRemappableOop withValue: valueObj. nameObjData := interpreterProxy arrayValueOf: valueObj. self memcpy: nameObjData _: name _: (self strlen: name). + valueObj := self signedMachineIntegerFor: slide. - valueObj := interpreterProxy signedMachineIntegerFor: slide. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: i * 4 + 1 ofObject: interpreterProxy topRemappableOop withValue: valueObj. + valueObj := self positiveMachineIntegerFor: start. - valueObj := interpreterProxy positiveMachineIntegerFor: start. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: i * 4 + 2 ofObject: interpreterProxy topRemappableOop withValue: valueObj. + valueObj := self positiveMachineIntegerFor: size. - valueObj := interpreterProxy positiveMachineIntegerFor: size. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: i * 4 + 3 ofObject: interpreterProxy topRemappableOop withValue: valueObj]. ^interpreterProxy methodReturnValue: interpreterProxy popRemappableOop! Item was changed: ----- Method: VMProfileMacSupportPlugin>>primitiveTextSymbols (in category 'primitives') ----- primitiveTextSymbols "Answer an Array of pairs of address, name, for text symbols in the n'th loaded module, as defined by the _dyld_image_count enumeration." | moduleIndex resultObj slide start end dlInfos dlInfo ndlInfos index last_saddr increment | <export: true> <var: 'nameObjData' type: #'char *'> <var: 'h' type: 'const struct mach_header *'> <var: 'h64' type: 'const struct mach_header_64 *'> <var: 's64' type: 'const struct section_64 *'> <var: 's' type: 'const struct section *'> <var: 'start' type: #'usqIntptr_t'> <var: 'slide' type: #'usqIntptr_t'> <var: 'end' type: #'usqIntptr_t'> <var: 'dlInfos' type: 'Dl_info *'> <var: 'dlInfo' type: 'Dl_info'> <var: 'last_saddr' type: #'void *'> moduleIndex := interpreterProxy stackValue: 0. ((interpreterProxy isIntegerObject: moduleIndex) and: [(moduleIndex := interpreterProxy integerValueOf: moduleIndex) >= 0 and: [(self _dyld_get_image_name: moduleIndex) notNil]]) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. start := 0. slide := self _dyld_get_image_vmaddr_slide: moduleIndex. self cppIf: #'__x86_64__' | #'__arm64__' ifTrue: [(self cCoerceSimple: (self _dyld_get_image_header: moduleIndex) to: #'const struct mach_header_64 *') ifNotNil: [:h64| (self getsectbynamefromheader_64: h64 _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: [:s64| start := s64 addr + slide. end := start + s64 size]]] ifFalse: [(self _dyld_get_image_header: moduleIndex) ifNotNil: [:h| (self getsectbynamefromheader: h _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: [:s| start := s addr. end := start + s size]]]. start = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrOperationFailed]. (dlInfos := self malloc: (self sizeof: #'Dl_info') * (ndlInfos := increment := 1024)) ifNil: [^interpreterProxy primitiveFailFor: PrimErrNoCMemory]. index := 0. last_saddr := nil. "Yes, dear reader, one could use binary search to reduce the amount of effort. But when this author attempted to do so, he achieved only a marginal improvement for a substantial increase in complexity. So KISS and do a linear scan, looking ahead 64 bytes to reduce overhead as simply as possible. 64 gave best results when tried on the VM module of an ARMv8/aarch64 VM; about 2.5x a naive step by sizeof(void *)." [start < end and: [(self dladdr: start asVoidPointer _: dlInfos + index) ~= 0]] whileTrue: [(start + 64 < end and: [(self dladdr: (start + 64) asVoidPointer _: (self addressOf: dlInfo)) ~= 0 and: [dlInfo dli_saddr = (dlInfos at: index) dli_saddr]]) ifTrue: [start := start + 64 + (self sizeof: #'void *')] ifFalse: [start := start + (self sizeof: #'void *')]. last_saddr ~= (dlInfos at: index) dli_saddr ifTrue: [last_saddr := (dlInfos at: index) dli_saddr. (index := index + 1) = ndlInfos ifTrue: [dlInfos := self reallocf: dlInfos _: (self sizeof: #'Dl_info') * (ndlInfos + increment). dlInfos ifNil: [^interpreterProxy primitiveFailFor: PrimErrNoCMemory]. ndlInfos := ndlInfos + increment. increment := increment * 2]]]. resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: index * 2. resultObj = 0 ifTrue: [self free: dlInfos. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: resultObj. ndlInfos := index. index := 0. [index < ndlInfos] whileTrue: [| valueObj nameObjData | + valueObj := self positiveMachineIntegerFor: (dlInfos at: index) dli_saddr. - valueObj := interpreterProxy positiveMachineIntegerFor: (dlInfos at: index) dli_saddr. interpreterProxy failed ifTrue: [self free: dlInfos. interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index * 2 ofObject: interpreterProxy topRemappableOop withValue: valueObj. valueObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: (self strlen: (dlInfos at: index) dli_sname). interpreterProxy failed ifTrue: [self free: dlInfos. interpreterProxy popRemappableOop. ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy storePointer: index * 2 + 1 ofObject: interpreterProxy topRemappableOop withValue: valueObj. nameObjData := interpreterProxy arrayValueOf: valueObj. self memcpy: nameObjData _: (dlInfos at: index) dli_sname _: (self strlen: (dlInfos at: index) dli_sname). index := index + 1]. self free: dlInfos. ^interpreterProxy methodReturnValue: interpreterProxy popRemappableOop!

1 0

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

08 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3267.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3267 Author: eem Time: 8 November 2022, 11:43:22.924447 am UUID: adcc856d-4794-4149-93af-5ae6cb3d31ce Ancestors: VMMaker.oscog-eem.3266 Fix issues with spur primitive metadata in plugin primitives. stackFloatValue: stackStringValue: et al look inside the object on the stack. stackValue: stackIntegerValue: et al do not. So extend StackInterpreter class>>isObjectAccessor: to include those stack accessors that look inside the object on the stack. This fixes the metadata calculations for things like B3DAcceleratorPlugin>>primitiveSetLights, FileDialogPlugin>>primitiveFileDialogAddFilter, etc. =============== Diff against VMMaker.oscog-eem.3264 =============== Item was added: + ----- Method: BitBltSimulation class>>selectorDoesntNeedMetadata: (in category 'spur primitive compilation') ----- + selectorDoesntNeedMetadata: aSelector + ^(aSelector beginsWith: 'prim') not! Item was added: + ----- Method: CCodeGenerator>>isStackAccessor: (in category 'spur primitive compilation') ----- + isStackAccessor: selector + ^self isStackAccessor: selector given: (vmClass ifNil: [StackInterpreter])! Item was removed: - ----- Method: CogVMSimulator>>primitiveGetAttribute (in category 'other primitives') ----- - primitiveGetAttribute - "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." - - | index s attribute | - index := self stackIntegerValue: 0. - self successful ifTrue: [ - attribute := systemAttributes at: index ifAbsent: [Smalltalk vm getSystemAttribute: index]. - attribute ifNil: [ ^self primitiveFail ]. - s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: attribute size. - 1 to: attribute size do: [ :i | - objectMemory storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. - self pop: 2 "rcvr, attr" thenPush: s]! Item was added: + ----- Method: FilePlugin class>>selectorDoesntNeedMetadata: (in category 'spur primitive compilation') ----- + selectorDoesntNeedMetadata: aSelector + ^(aSelector beginsWith: 'prim') not! Item was added: + ----- Method: InterpreterPlugin class>>selectorDoesntNeedMetadata: (in category 'spur primitive compilation') ----- + selectorDoesntNeedMetadata: aSelector + "Hmph. Most primitives begin with 'prim', but those in the B3DPlugin begin with b3d, + those in the ClipboardExtendedPlugin begin with io, etc. So we can't use beginning with + prim as a test to include metadata. But there are enough exceptions, e.g. the SecurityPlugin's + secCan* api, that we'd like to filter out some. It's better to filter out than filter in, cuz + plugin writers could reasonably be unaware of Spur metadata. Those anal enough to + filter out can put in the effort. So fail safe here and err on including metadata." + ^false! Item was added: + ----- Method: InterpreterPrimitives>>getAttributeString: (in category 'system control primitives') ----- + getAttributeString: index + "Fetch the system attribute with the given integer ID. The result is a string, or nil if the attribute is not defined." + <doNotGenerate> + self systemAttributes ifNotNil: + [:systemAttributes| + (systemAttributes at: index ifAbsent: []) ifNotNil: + [:attributeString| ^attributeString]]. + ^Smalltalk vm getSystemAttribute: index! Item was changed: ----- Method: InterpreterPrimitives>>primitiveBeDisplay (in category 'I/O primitives') ----- primitiveBeDisplay "Record the system Display object in the specialObjectsTable, and if possible pin the display bitmap. Further, invoke ioBeDisplay to alow the VM to record the location, width heigth & depth of the bitmap." | rcvr bitsOop depthOop heightOop widthOop | rcvr := self stackTop. ((objectMemory isPointers: rcvr) and: [(objectMemory lengthOf: rcvr) >= 4 and: [bitsOop := objectMemory fetchPointer: 0 ofObject: rcvr. ((objectMemory isWordsOrBytes: bitsOop) or: [objectMemory isIntegerObject: bitsOop]) "for surface plugin handles" and: [(objectMemory isIntegerObject: (widthOop := objectMemory fetchPointer: 1 ofObject: rcvr)) and: [(objectMemory isIntegerObject: (heightOop := objectMemory fetchPointer: 2 ofObject: rcvr)) and: [(objectMemory isIntegerObject: (depthOop := objectMemory fetchPointer: 3 ofObject: rcvr))]]]]]) ifFalse: [^self primitiveFailFor: PrimErrBadReceiver]. objectMemory splObj: TheDisplay put: rcvr. (objectMemory hasSpurMemoryManagerAPI and: [(objectMemory isNonImmediate: bitsOop) and: [(objectMemory isPinned: bitsOop) not]]) ifTrue: + [rcvr := objectMemory pinObject: bitsOop. "Answers 0 if memory required to pin but not enough memory available." - [rcvr := objectMemory pinObject: bitsOop. "Answers 0 if memory required to pin bit not enough memory available." rcvr ~= 0 ifTrue: [bitsOop := rcvr]]. self ioBeDisplay: ((objectMemory isNonImmediate: bitsOop) ifTrue: [objectMemory firstIndexableField: bitsOop] ifFalse: [bitsOop asVoidPointer]) width: (objectMemory integerValueOf: widthOop) height: (objectMemory integerValueOf: heightOop) depth: (objectMemory integerValueOf: depthOop)! Item was changed: ----- Method: InterpreterPrimitives>>primitiveGetAttribute (in category 'system control primitives') ----- primitiveGetAttribute + "Fetch the system attribute with the given integer ID. The result is a string, or nil if the attribute is not defined." + | attr | + <var: 'attributeString' type: #'const char *'> + attr := self stackTop. + (objectMemory isIntegerObject: attr) ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. + (self getAttributeString: (objectMemory integerValueOf: attr)) + ifNil: [self methodReturnValue: objectMemory nilObject] + ifNotNil: [:attributeString| self methodReturnString: attributeString]! - "Fetch the system attribute with the given integer ID. The - result is a string, which will be empty if the attribute is not - defined." - | attr sz s | - attr := self stackIntegerValue: 0. - self successful - ifTrue: [sz := self attributeSize: attr]. - self successful - ifTrue: [s := objectMemory - instantiateClass: (objectMemory splObj: ClassByteString) - indexableSize: sz. - self - getAttribute: attr - Into: s + objectMemory baseHeaderSize - Length: sz. - self pop: 2 thenPush: s]! Item was added: + ----- Method: InterpreterPrimitives>>systemAttributes (in category 'system control primitives') ----- + systemAttributes + <doNotGenerate> + ^nil! Item was added: + ----- Method: SecurityPlugin class>>selectorDoesntNeedMetadata: (in category 'spur primitive compilation') ----- + selectorDoesntNeedMetadata: aSelector + ^aSelector beginsWith: 'sec'! Item was changed: ----- Method: StackInterpreter class>>isObjectAccessor: (in category 'spur compilation support') ----- isObjectAccessor: selector "Answer if selector is one of fetchPointer:ofObject: storePointer:ofObject:withValue: + et al, or stackFloatValue:, stackStringValue: et al. - et al." - ^(InterpreterProxy whichCategoryIncludesSelector: selector) = #'object access' - or: [(SpurMemoryManager whichCategoryIncludesSelector: selector) = #'object access'] + stackValue: and stackIntegerValue: look no further than the oop (stackIntegerValue: does a + tag test). But stackFloatValue: stackStringValue: et al look inside the object fetched from the stack." + ^(selector beginsWith: 'stack') + ifTrue: + [selector last = $: "we would like to use endsWith: 'Value:' here, but e.g. stackDialogHandle: in FileDialogPlugin is an exception" + and: [(#(stackValue: stackIntegerValue: stackObjectValue:) includes: selector) not]] + ifFalse: + [(InterpreterProxy whichCategoryIncludesSelector: selector) = #'object access' + or: [(SpurMemoryManager whichCategoryIncludesSelector: selector) = #'object access']] + "This for checking. The above two protocols are somewhat disjoint." "(InterpreterProxy allMethodsInCategory: #'object access') copyWithoutAll: (SpurMemoryManager allMethodsInCategory: #'object access')" "(SpurMemoryManager allMethodsInCategory: #'object access') copyWithoutAll: (InterpreterProxy allMethodsInCategory: #'object access')"! Item was removed: - ----- Method: StackInterpreterSimulator>>primitiveGetAttribute (in category 'other primitives') ----- - primitiveGetAttribute - "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." - - | index s attribute | - index := self stackIntegerValue: 0. - self successful ifTrue: [ - attribute := systemAttributes at: index ifAbsent: [Smalltalk vm getSystemAttribute: index]. - attribute ifNil: [ ^self primitiveFail ]. - s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: attribute size. - 1 to: attribute size do: [ :i | - objectMemory storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. - self pop: 2 "rcvr, attr" thenPush: s]! Item was changed: ----- Method: TMethod>>prepareMethodIn: (in category 'transformations') ----- prepareMethodIn: aCodeGen "Record sends of builtin operators, map sends of the special selector dispatchOn:in: with case statement nodes, and map sends of caseOf:[otherwise:] to switch statements. Declare limit variables for to:[by:]do: loops with limits that potentially have side-effects. As a hack also update the types of variables introduced to implement cascades correctly. This has to be done at the same time as this is done, so why not piggy back here?" aCodeGen maybeBreakForTestToInline: selector in: self. extraVariableNumber ifNotNil: [declarations keysAndValuesDo: [:varName :decl| decl isBlock ifTrue: [self assert: ((varName beginsWith: 'cascade') and: [varName last isDigit]). locals add: varName. self declarationAt: varName put: (decl value: self value: aCodeGen), ' ', varName]]]. aCodeGen pushScope: declarations while:"N.B. nodesWithParentsDo: is bottom-up, hence replacement is destructive and conserved." [parseTree nodesWithParentsDo: [:node :parent| node isSend ifTrue: [aCodeGen ifStaticallyResolvedPolymorphicReceiverThenUpdateSelectorIn: node. (aCodeGen isBuiltinSelector: node selector) ifTrue: [node isBuiltinOperator: true. "If a to:by:do:'s limit has side-effects, declare the limit variable, otherwise delete it from the args" node selector = #to:by:do: ifTrue: [self ensureToByDoLoopLimitIsSafeAndEfficient: node in: aCodeGen]] ifFalse: + [(aCodeGen isStackAccessor: node selector) - [(StackInterpreter isStackAccessor: node selector) ifTrue: "compute and cache the accessor depth early, before inlining destroys the accessor chains" [self export ifTrue: [aCodeGen accessorDepthForMethod: self]] ifFalse: [(CaseStatements includes: node selector) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildCaseStmt: node in: aCodeGen})]. (#(caseOf: #caseOf:otherwise:) includes: node selector) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. self buildSwitchStmt: node parent: parent })]. (#(printf: fprintf: f:printf: f:wprintf:) includes: node selector) ifTrue: [self transformPrintf: node in: aCodeGen]. (node receiver isVariable and: [node receiver name = #Character and: [node selector isUnary]]) ifTrue: [parent replaceNodesIn: (Dictionary newFromPairs: { node. TConstantNode new setValue: (Character perform: node selector) })]]]]]]! Item was added: + ----- Method: ThreadedFFIPlugin class>>selectorDoesntNeedMetadata: (in category 'spur primitive compilation') ----- + selectorDoesntNeedMetadata: aSelector + ^(aSelector beginsWith: 'prim') not! Item was changed: ----- Method: VMPluginCodeGenerator>>methodNeedsMetadata: (in category 'spur primitive compilation') ----- methodNeedsMetadata: aTMethod "Answer if aTMethod really needs primitive metadata. This is a hack to filter out some functions that definitely don't need metadata." | selector | selector := aTMethod smalltalkSelector. (#(initialiseModule shutdownModule moduleUnloaded:) includes: selector) ifTrue: [^false]. (InterpreterPlugin includesSelector: selector) ifTrue: [^false]. + "Hmph. Most primitives begin with 'prim', but those in the B3DPlugin begin with b3d, + those in the ClipboardExtendedPlugin begin with io, etc. So we can't use beginning with + prim as a test to include metadata. But there are enough exceptions, e.g. the SecurityPlugin's + secCan* api, that we'd like to filter out some. It's better to filter out than filter in, cuz + plugin writers could reasonably be unaware of Spur metadata. Those anal enough to + filter out can put in the effort. So fail safe here and err on including metadata." + (pluginClass selectorDoesntNeedMetadata: selector) ifTrue: + [^false]. ^true! Item was added: + ----- Method: VMProfileLinuxSupportPlugin class>>preambleCCode (in category 'translation') ----- + preambleCCode + ^'extern const char *getAttributeString(sqInt);'! Item was added: + ----- Method: VMProfileLinuxSupportPlugin class>>structTargetKindForDeclaration: (in category 'translation') ----- + structTargetKindForDeclaration: decl "<String>" + + decl last = $* ifTrue: [^#pointer]. + ^(decl beginsWith: 'struct dl_phdr_info') ifTrue: [#struct]! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>primitiveDLSymInLibrary (in category 'primitives') ----- primitiveDLSymInLibrary "Answer the address of the symbol whose name is the first argument in the library whose name is the second argument, or nil if none." | nameObj symName libName lib sz addr ok | <export: true> <var: #symName type: #'char *'> <var: #libName type: #'char *'> <var: #lib type: #'void *'> <var: #addr type: #'void *'> nameObj := interpreterProxy stackValue: 0. (interpreterProxy isBytes: nameObj) ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. sz := interpreterProxy byteSizeOf: nameObj. libName := self malloc: sz+1. self strncpy: libName _: (interpreterProxy firstIndexableField: nameObj) _: sz. libName at: sz put: 0. nameObj := interpreterProxy stackValue: 1. (interpreterProxy isBytes: nameObj) ifFalse: [self free: libName. ^interpreterProxy primitiveFailFor: PrimErrBadArgument]. sz := interpreterProxy byteSizeOf: nameObj. symName := self malloc: sz+1. self strncpy: symName _: (interpreterProxy firstIndexableField: nameObj) _: sz. symName at: sz put: 0. lib := self dl: libName open: (#'RTLD_LAZY' bitOr: #'RTLD_NODELETE'). lib ifNil: [self free: libName; free: symName. ^interpreterProxy primitiveFailFor: PrimErrInappropriate]. self dlerror. "clear dlerror" addr := self dl: lib sym: symName. ok := self dlerror isNil. self free: symName. self free: libName. self dlclose: lib. ok ifFalse: [^interpreterProxy primitiveFailFor: PrimErrNotFound]. + ^interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: addr asUnsignedIntegerPtr)! - ^interpreterProxy methodReturnValue: (interpreterProxy positiveMachineIntegerFor: addr asUnsignedIntegerPtr)! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>primitiveExecutableModules (in category 'primitives') ----- primitiveExecutableModules "Answer an Array of pairs of strings for executable modules (the VM executable and loaded libraries). The first element in each pair is the filename of the module. The second element is either nil or the symlink's target, if the filename is a symlink." <export: true> | resultObj | numModules := 0. + self dl_iterate_phdr: #countnummodules _: 0. - self cCode: 'dl_iterate_phdr(countnummodules,0)' inSmalltalk: [0]. resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: numModules - 1 * 2. "skip the fake linux-gate.so.1" resultObj = 0 ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoMemory]. interpreterProxy pushRemappableOop: resultObj. primErr := numModules := 0. + self dl_iterate_phdr: #reapmodulesymlinks _: 0. - self cCode: 'dl_iterate_phdr(reapmodulesymlinks,0)' inSmalltalk: [0]. resultObj := interpreterProxy popRemappableOop. primErr ~= 0 ifTrue: [^interpreterProxy primitiveFailFor: primErr]. ^interpreterProxy methodReturnValue: resultObj! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>primitiveInterpretAddress (in category 'primitives') ----- primitiveInterpretAddress "Answer the address of the interpret routine." <export: true> | interpret | <var: #interpret declareC: 'extern void interpret()'> + ^interpreterProxy methodReturnValue: (self positiveMachineIntegerFor: interpret asUnsignedIntegerPtr)! - ^interpreterProxy methodReturnValue: (interpreterProxy positiveMachineIntegerFor: interpret asUnsignedIntegerPtr)! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>reap:module:names: (in category 'iteration callbacks') ----- reap: info module: size names: ignored + <var: 'info' type: #'struct dl_phdr_info *'> + <var: 'size' type: #'size_t'> + <var: 'ignored' type: #'void *'> <returnTypeC: #int> + | elfModuleName len moduleNameObj | - | elfModuleName len moduleNameObj GetAttributeString | - <var: #info type: #'struct dl_phdr_info *'> <var: 'elfModuleName' type: #'const char *'> + elfModuleName := numModules > 0 ifTrue: [info dlpi_name] ifFalse: [self getAttributeString: 0]. - <var: #GetAttributeString declareC: 'extern char *GetAttributeString(sqInt)'> - <var: #size type: #'size_t'> - <var: #ignored type: #'void *'> - self touch: GetAttributeString. - elfModuleName := self cCode: 'numModules ? info->dlpi_name : GetAttributeString(0)'. (elfModuleName isNil or: [(len := self strlen: elfModuleName) = 0]) ifTrue: [^0]. "skip the fake linux-gate.so.1" moduleNameObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: len. moduleNameObj = 0 ifTrue: [primErr := PrimErrNoMemory. ^1]. "stop iteration" self strncpy: (interpreterProxy arrayValueOf: moduleNameObj) _: elfModuleName _: len. "(char *)strncpy()" interpreterProxy storePointer: numModules ofObject: interpreterProxy topRemappableOop withValue: moduleNameObj. numModules := numModules + 1. ^0! Item was changed: ----- Method: VMProfileLinuxSupportPlugin>>reap:module:symlinks: (in category 'iteration callbacks') ----- reap: info module: size symlinks: ignored "like reap:module:names:, but follows symlinks" + <var: 'info' type: #'struct dl_phdr_info *'> + <var: 'size' type: #'size_t'> + <var: 'ignored' type: #'void *'> <returnTypeC: #int> + | elfModuleName len moduleNameObj symLinkBuf | - | elfModuleName len moduleNameObj GetAttributeString symLinkBuf | - <var: #info type: #'struct dl_phdr_info *'> <var: 'elfModuleName' type: #'const char *'> + <var: 'symLinkBuf' declareC: 'char symLinkBuf[PATH_MAX]'> + elfModuleName := numModules > 0 ifTrue: [info dlpi_name] ifFalse: [self getAttributeString: 0]. - <var: #GetAttributeString declareC: 'extern char *GetAttributeString(sqInt)'> - <var: #symLinkBuf declareC: 'char symLinkBuf[PATH_MAX]'> - <var: #size type: #'size_t'> - <var: #ignored type: #'void *'> - self touch: GetAttributeString. - elfModuleName := self cCode: 'numModules ? info->dlpi_name : GetAttributeString(0)'. (elfModuleName isNil or: [(len := self strlen: elfModuleName) = 0]) ifTrue: [^0]. "skip the fake linux-gate.so.1" moduleNameObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: len. moduleNameObj = 0 ifTrue: [primErr := PrimErrNoMemory. ^1]. "stop iteration" self strncpy: (interpreterProxy arrayValueOf: moduleNameObj) _: elfModuleName _: len. "(char *)strncpy()" interpreterProxy storePointer: numModules ofObject: interpreterProxy topRemappableOop withValue: moduleNameObj. "now dereference the symlink, if it exists" self str: symLinkBuf cpy: elfModuleName. (len := self read: elfModuleName li: symLinkBuf nk: #'PATH_MAX') > 0 ifTrue: [moduleNameObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: len. moduleNameObj = 0 ifTrue: [primErr := PrimErrNoMemory. ^1]. "stop iteration" self strncpy: (interpreterProxy arrayValueOf: moduleNameObj) _: symLinkBuf _: len. "(char *)strncpy()" interpreterProxy storePointer: numModules + 1 ofObject: interpreterProxy topRemappableOop withValue: moduleNameObj] ifFalse: [interpreterProxy storePointer: numModules + 1 ofObject: interpreterProxy topRemappableOop withValue: interpreterProxy nilObject]. numModules := numModules + 2. ^0!

1 0

[OpenSmalltalk/opensmalltalk-vm] 2c491b: CogVM source as per VMMaker.oscog-eem.3266
by Eliot Miranda 08 Nov '22

08 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 2c491b886ec117a2f4c82aa83926b6462875934f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2c491b886ec117a2f4… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-07 (Mon, 07 Nov 2022) Changed paths: M src/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3266 Fix hidden reference to GetAttributeString in VMProfileLinuxSupportPlugin. Eliminate all its cCode:[inSmalltalk:] uses while we're at it.

1 0

We *MUST* move the pharos build jobs to another workflow
by Eliot Miranda 07 Nov '22

07 Nov '22

Can we *PLEASE* either move the pharo builds to another workflow or delete them altogether? _,,,^..^,,,_ best, Eliot

2 4

[OpenSmalltalk/opensmalltalk-vm] 7f049d: Change strategy for build caches to avoid conflict...
by Marcel Taeumel 07 Nov '22

07 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 7f049d5b7e363885d87a4b5a9626ff765a7a0360 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7f049d5b7e363885d8… Author: Marcel Taeumel <marcel.taeumel(a)hpi.de> Date: 2022-11-07 (Mon, 07 Nov 2022) Changed paths: M .github/workflows/extra-arm.yml M .github/workflows/extra.yml M .github/workflows/linux-arm.yml M .github/workflows/linux.yml M .github/workflows/macos-arm.yml M .github/workflows/macos.yml M .github/workflows/win.yml Log Message: ----------- Change strategy for build caches to avoid conflicts among builds that need it and builds that do not need it

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2022