Vm-dev November 2022

vm-dev@lists.squeakfoundation.org

11 participants
72 discussions

[OpenSmalltalk/opensmalltalk-vm] 5a9222: CogVM source as per VMMaker.oscog-eem.3275
by Eliot Miranda 09 Nov '22

09 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5a9222cd164d368885105edb95c7a29eab08081c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5a9222cd164d368885… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/ImmX11Plugin/ImmX11Plugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c M src/plugins/LocalePlugin/LocalePlugin.c M src/plugins/SocketPlugin/SocketPlugin.c M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.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/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.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/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.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/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.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/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.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/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.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/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.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.3275 Transform better expressions returning integers, floats or booleans in SmartSyntaxInterpreterPlugin methods. Fix an old bug in isBinaryArithmeticOrConditional that is failing to spot effect-free code. Have TSendNode>>hasEffect answer false for sizeof:. Use sizeof: directly in JPEGReadWriter2Plugin to get less junk code.

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3275.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3275 Author: eem Time: 8 November 2022, 10:18:41.590469 pm UUID: 86b52edc-43a4-467b-9f26-1eec38a0726b Ancestors: VMMaker.oscog-eem.3274 ...and fix a regression now that the code generator defers to vmClass to determine a stack accessor (so Cogit class has to implement the method also). =============== Diff against VMMaker.oscog-eem.3274 =============== Item was added: + ----- Method: Cogit class>>isStackAccessor: (in category 'spur primitive compilation') ----- + isStackAccessor: selector + ^CoInterpreter isStackAccessor: selector!

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3274.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3274 Author: eem Time: 8 November 2022, 10:07:17.602603 pm UUID: 84bfb378-bbd5-45c7-9ca4-4d2aa64d326b Ancestors: VMMaker.oscog-eem.3273 Transform better expressions returning integers, floats or booleans in SmartSyntaxInterpreterPlugin methods. Fix an old bug in isBinaryArithmeticOrConditional that is failing to spot effect-free code. Fix printing of TSendNode instances to parenthesize better. =============== Diff against VMMaker.oscog-eem.3273 =============== Item was changed: ----- Method: SmartSyntaxPluginTMethod>>fixUpReturnOneStmt:previous:on: (in category 'transforming') ----- fixUpReturnOneStmt: stmt previous: previousStmtOrNil on: sStream | expr exprRetStmts "p t" | stmt isReturn ifFalse: [^sStream nextPut: stmt]. expr := stmt expression. (self resultExpressionAlwaysFails: expr) ifTrue: ["failure returns" returnType = #sqInt ifTrue: [sStream nextPut: (TReturnNode new setExpression: expr)] ifFalse: [sStream nextPut: expr; nextPut: self nullReturnExpr]. ^nil]. (expr isVariable and: ['nil' = expr name]) ifTrue: ["^ nil -- this is never right unless automatically generated" sStream nextPut: stmt. ^nil]. (expr isVariable and: ['self' = expr name]) ifTrue: ["^ self" (previousStmtOrNil notNil and: [self resultExpressionAlwaysFails: previousStmtOrNil]) ifFalse: [fullArgs isEmpty ifFalse: [sStream nextPut: (self statementGuardedWithSuccess: (self popExpr: fullArgs size))]]. sStream nextPut: self nullReturnExpr. ^nil]. (expr isVariable or: [expr isConstant]) ifTrue: ["^ variable or ^ constant without guardchecking" sStream nextPut: (sStream isEmpty "No statements to cause failure, therefore no need for failure guard." ifTrue: [self pop: fullArgs size + 1 thenReturnExpr: expr] ifFalse: [self statementGuardedWithSuccess: (self pop: fullArgs size + 1 thenReturnExpr: expr)]); nextPut: self nullReturnExpr. ^nil]. "^ expr with necessary guard checking" "p := sStream position." exprRetStmts := Array streamContents: [:ersStream| (self resultExpressionCanFail: expr) ifTrue: ["t := 1." + self maybeTransform: expr assignedTo: (self oopVariable: '_return_value') forReturnInto: + [:valueExpr :returnExpr :variable| + ersStream + nextPut: (self assign: variable expression: valueExpr); + nextPut: (self statementGuardedWithSuccess: (self pop: fullArgs size + 1 + thenReturnExpr: returnExpr))]] - ersStream - nextPut: (self assign: (self oopVariable: '_return_value') expression: expr); - nextPut: (self statementGuardedWithSuccess: (self pop: fullArgs size + 1 - thenReturnExpr: (self oopVariable: '_return_value')))] ifFalse: ["t := 2." ersStream nextPut: (self pop: fullArgs size + 1 thenReturnExpr: expr)]]. sStream isEmpty "No statements to cause failure, therefore no need for an initial failure guard." ifTrue: [sStream nextPutAll: exprRetStmts] ifFalse: ["t := t + 2." sStream nextPut: (self statementGuardedWithSuccess: exprRetStmts)]. sStream nextPut: self nullReturnExpr. "Them := Dictionary new" "(Them at: t ifAbsentPut: [Dictionary new]) at: self selector put: (sStream originalContents copyFrom: p + 1 to: sStream position)"! Item was added: + ----- Method: SmartSyntaxPluginTMethod>>maybeTransform:assignedTo:forReturnInto: (in category 'transformations') ----- + maybeTransform: aTParseNode assignedTo: aTVariableNode forReturnInto: aTrinaryBlock + "Evaluate aTrinaryBlock with the value to be returned via assignment to aTVariableNode. + Transform to allow for using the most efficient form of methodReturnFoo: expression. + For example transform + expr asBooleanObj + *not* to + var := expr asBooleanObj. ^var + but to + var := expr. ^var asBooleanObj + which allows it to be returned via methodReturnBool:" + (aTParseNode isSend + and: [#(asSmallIntegerObj asBooleanObj asFloatObj) includes: aTParseNode selector]) ifTrue: + [^aTrinaryBlock + value: aTParseNode receiver + value: (TSendNode new + setSelector: aTParseNode selector + receiver: aTVariableNode + arguments: #()) + value: aTVariableNode]. + ^aTrinaryBlock + value: aTParseNode + value: aTVariableNode + value: aTVariableNode! Item was changed: ----- Method: TSendNode>>isBinaryArithmeticOrConditional (in category 'testing') ----- isBinaryArithmeticOrConditional + ^arguments size = 1 - ^arguments size = 2 and: [#(+ - * / // \\ mod: quo: << >> bitShift: bitAnd: bitOr: bitXor: = == ~= ~~ > >= < <= & | and: or:) includes: selector]! Item was changed: ----- Method: TSendNode>>printParenthetically:on:level: (in category 'printing') ----- printParenthetically: node on: aStream level: level node ifNil: [aStream print: node] ifNotNil: [(node isAssignment + or: [node isSend and: [node selector precedence > selector precedence]]) - or: [node isSend and: [node selector precedence >= 3]]) ifTrue: [aStream nextPut: $(. node printOn: aStream level: level. aStream nextPut: $)] ifFalse: [node printOn: aStream level: level]]!

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3273.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3273 Author: eem Time: 8 November 2022, 6:34:50.040353 pm UUID: 30e9f70f-d76a-4d63-810b-6059fd62055e Ancestors: VMMaker.oscog-eem.3272 Have TSendNode>>hasEffect answer false for sizeof:. Use sizeof: directly in JPEGReadWriter2Plugin to get less junk code. =============== Diff against VMMaker.oscog-eem.3272 =============== Item was removed: - ----- Method: JPEGReadWriter2Plugin>>compressStructSize (in category 'plugin support') ----- - compressStructSize - <inline: #always> - ^self - cCode: [self sizeof: #'struct jpeg_compress_struct'] - inSmalltalk: [JPEGReadWriter2 new primJPEGCompressStructSize]! Item was removed: - ----- Method: JPEGReadWriter2Plugin>>decompressStructSize (in category 'plugin support') ----- - decompressStructSize - <inline: #always> - ^self - cCode: [self sizeof: #'struct jpeg_decompress_struct'] - inSmalltalk: [JPEGReadWriter2 new primJPEGDecompressStructSize]! Item was removed: - ----- Method: JPEGReadWriter2Plugin>>errorMgr2StructSize (in category 'plugin support') ----- - errorMgr2StructSize - <inline: #always> - ^self - cCode: [self sizeof: #'struct error_mgr2'] - inSmalltalk: [JPEGReadWriter2 new primJPEGErrorMgr2StructSize]! Item was changed: ----- Method: JPEGReadWriter2Plugin>>isValidCompressionStruct: (in category 'plugin support') ----- isValidCompressionStruct: aByteArray <inline: #always> + ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= (self sizeof: #'struct jpeg_compress_struct')! - ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= self compressStructSize! Item was changed: ----- Method: JPEGReadWriter2Plugin>>isValidDecompressionStruct: (in category 'plugin support') ----- isValidDecompressionStruct: aByteArray <inline: #always> + ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= (self sizeof: #'struct jpeg_decompress_struct')! - ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= self decompressStructSize! Item was changed: ----- Method: JPEGReadWriter2Plugin>>isValidErrorMessageStruct: (in category 'plugin support') ----- isValidErrorMessageStruct: aByteArray <inline: #always> + ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= (self sizeof: #'struct error_mgr2')! - ^(interpreterProxy byteSizeOf: aByteArray cPtrAsOop) >= self errorMgr2StructSize! Item was changed: ----- Method: JPEGReadWriter2Plugin>>primJPEGCompressStructSize (in category 'primitives') ----- primJPEGCompressStructSize <export: true> self primitive: #primJPEGCompressStructSize parameters: #(). + ^(self sizeof: #'struct jpeg_compress_struct') asSmallIntegerObj! - ^self compressStructSize asOop: SmallInteger! Item was changed: ----- Method: JPEGReadWriter2Plugin>>primJPEGDecompressStructSize (in category 'primitives') ----- primJPEGDecompressStructSize <export: true> self primitive: #primJPEGDecompressStructSize parameters: #(). + ^(self sizeof: #'struct jpeg_decompress_struct') asSmallIntegerObj! - ^self decompressStructSize asOop: SmallInteger! Item was changed: ----- Method: JPEGReadWriter2Plugin>>primJPEGErrorMgr2StructSize (in category 'primitives') ----- primJPEGErrorMgr2StructSize <export: true> self primitive: #primJPEGErrorMgr2StructSize parameters: #(). + ^(self sizeof: #'struct error_mgr2') asSmallIntegerObj! - ^self errorMgr2StructSize asOop: SmallInteger! Item was added: + ----- Method: JPEGReadWriter2Plugin>>sizeof: (in category 'simulation') ----- + sizeof: aSymbol + <doNotGenerate> + ^aSymbol + caseOf: { + [self sizeof: #'struct jpeg_compress_struct'] -> [JPEGReadWriter2 new primJPEGCompressStructSize]. + [self sizeof: #'struct jpeg_decompress_struct'] -> [JPEGReadWriter2 new primJPEGDecompressStructSize]. + [self sizeof: #'struct error_mgr2'] -> [JPEGReadWriter2 new primJPEGErrorMgr2StructSize] } + otherwise: [super sizeof: aSymbol]! Item was changed: ----- Method: TSendNode>>hasEffect (in category 'testing') ----- hasEffect "Answer if this node has an effect on execution state (does something). Statements that don't have any effect can be elided if their value is unused." selector == #not ifTrue: [^receiver hasEffect]. selector == #cCode:inSmalltalk: ifTrue: [^(arguments first isConstant and: [arguments first value isString and: [arguments first value notEmpty]]) or: [arguments first hasEffect]]. self isBinaryArithmeticOrConditional ifTrue: [^receiver hasEffect or: [arguments first hasEffect]]. self isUnaryCast ifTrue: [^receiver hasEffect]. + (self isBinaryCast or: [selector == #sizeof:]) ifTrue: - self isBinaryCast ifTrue: [^arguments first hasEffect]. ^true!

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3272.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3272 Author: eem Time: 8 November 2022, 6:18:42.856696 pm UUID: ca692078-9694-4a01-8119-7a560f9060f4 Ancestors: VMMaker.oscog-eem.3271 Fix extreme optimism in resultExpressionCanFail:. The comversion may not fail, but the thing it is applied to can fail. Hence if the receiver hasEffect we have to allow for potential failure. Alas the fixup is done before inlining, which may result in an expression being foind not to have an effect (e.g. JPEGReadWriter2Plugin>>#compressStructSize) but that's the way the cookie crumbles. Hence write ioHasClipboardData:inFormat: in a more natural form. =============== Diff against VMMaker.oscog-eem.3271 =============== Item was changed: ----- Method: ClipboardExtendedPlugin>>ioHasClipboardData:inFormat: (in category 'io') ----- ioHasClipboardData: clipboard inFormat: format - | hasFormat | self primitive: 'ioHasClipboardDataInFormat' parameters: #(Unsigned Oop). (interpreterProxy isIntegerObject: format) ifTrue: + [^(self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy integerValueOf: format)) asBooleanObj]. - [hasFormat := self - sqPasteboard: clipboard asVoidPointer - hasDataInFormat: (interpreterProxy integerValueOf: format). - interpreterProxy failed ifFalse: - [^hasFormat asBooleanObj]]. (interpreterProxy isBytes: format) ifTrue: + [^(self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy firstIndexableField: format) + formatLength: (interpreterProxy byteSizeOf: format)) asBooleanObj]. - [hasFormat := self - sqPasteboard: clipboard asVoidPointer - hasDataInFormat: (interpreterProxy firstIndexableField: format) - formatLength: (interpreterProxy byteSizeOf: format). - interpreterProxy failed ifFalse: - [^hasFormat asBooleanObj]]. interpreterProxy primitiveFailFor: PrimErrBadArgument! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>resultExpressionCanFail: (in category 'private') ----- resultExpressionCanFail: aTParseNode "Neither asSmallIntegerObj nor asBooleanObj nor asPositiveIntegerObj can fail. asPositiveIntegerObj maps to positive32BitIntegerFor: which uses eeInstantiateSmallClassIndex:format:numSlots: which does not GC and does not fail." aTParseNode isSend ifFalse: [^true]. (#(asSmallIntegerObj asPositiveIntegerObj asBooleanObj nilObject trueObject falseObject) includes: aTParseNode selector) ifTrue: + [^aTParseNode receiver hasEffect]. - [^false]. (aTParseNode selector == #asOop: and: [aTParseNode args first isVariable and: [#('SmallInteger' 'Boolean') includes: aTParseNode args first name]]) ifTrue: + [^aTParseNode receiver hasEffect]. - [^false]. ^true!

1 0

[OpenSmalltalk/opensmalltalk-vm] 1f4728: CogVM source as per VMMaker.oscog-eem.3270
by Eliot Miranda 09 Nov '22

09 Nov '22

Branch: refs/heads/virtend Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 1f47282c979197a3f413f04f26268808d46e0b7d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1f47282c979197a3f4… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m M platforms/win32/plugins/ClipboardExtendedPlugin/sqWin32ExtendedClipboard.c M src/plugins/AsynchFilePlugin/AsynchFilePlugin.c M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/ImmX11Plugin/ImmX11Plugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/LocalePlugin/LocalePlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3270 Do a better job eliminating redundant failed checks in SmartSyntaxInterpreterPlugin methods. Add a more convenient typer interrogator for the ClipboardExtendedPlugin (implementation to follow). Commit: 01a2a6411ff5759f6e500897ce440d2643d62b0f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/01a2a6411ff5759f6e… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m M platforms/win32/plugins/ClipboardExtendedPlugin/sqWin32ExtendedClipboard.c M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3271 Implement ioHasClipboardData:inFormat: for macOS & WIndows. Either of the two flavours of ioHasClipboardData:inFormat: may fail (be unimplemented). Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/a4cea472355e...01…

1 0

[OpenSmalltalk/opensmalltalk-vm] e9b9a1: CogVM source as per VMMaker.oscog-eem.3271
by Eliot Miranda 09 Nov '22

09 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: e9b9a133cc9856e465ef9f0f4607d28d98e53be8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/e9b9a133cc9856e465… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m M platforms/win32/plugins/ClipboardExtendedPlugin/sqWin32ExtendedClipboard.c M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3271 Implement ioHasClipboardData:inFormat: for macOS & WIndows. Either of the two flavours of ioHasClipboardData:inFormat: may fail (be unimplemented).

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3271.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3271 Author: eem Time: 8 November 2022, 3:55:27.878812 pm UUID: 720839b5-3779-4885-a0dc-f804b7404cea Ancestors: VMMaker.oscog-eem.3270 Either of the two flavours of ioHasClipboardData:inFormat: may fail (be unimplemented). =============== Diff against VMMaker.oscog-eem.3270 =============== Item was changed: ----- Method: ClipboardExtendedPlugin>>ioHasClipboardData:inFormat: (in category 'io') ----- ioHasClipboardData: clipboard inFormat: format + | hasFormat | self primitive: 'ioHasClipboardDataInFormat' parameters: #(Unsigned Oop). (interpreterProxy isIntegerObject: format) ifTrue: + [hasFormat := self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy integerValueOf: format). + interpreterProxy failed ifFalse: + [^hasFormat asBooleanObj]]. - [^(self - sqPasteboard: clipboard asVoidPointer - hasDataInFormat: (interpreterProxy integerValueOf: format)) asBooleanObj]. (interpreterProxy isBytes: format) ifTrue: + [hasFormat := self + sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy firstIndexableField: format) + formatLength: (interpreterProxy byteSizeOf: format). + interpreterProxy failed ifFalse: + [^hasFormat asBooleanObj]]. - [^(self - sqPasteboard: clipboard asVoidPointer - hasDataInFormat: (interpreterProxy firstIndexableField: format) - formatLength: (interpreterProxy byteSizeOf: format)) asBooleanObj]. interpreterProxy primitiveFailFor: PrimErrBadArgument!

1 0

[OpenSmalltalk/opensmalltalk-vm] 5b3fb7: CogVM source as per VMMaker.oscog-eem.3270
by Eliot Miranda 09 Nov '22

09 Nov '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 5b3fb723997dad9f15c5c79e1879bbfbe2dd5c08 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5b3fb723997dad9f15… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-11-08 (Tue, 08 Nov 2022) Changed paths: M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.h M platforms/iOS/plugins/ClipboardExtendedPlugin/sqMacExtendedClipboard.m M platforms/win32/plugins/ClipboardExtendedPlugin/sqWin32ExtendedClipboard.c M src/plugins/AsynchFilePlugin/AsynchFilePlugin.c M src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c M src/plugins/GeniePlugin/GeniePlugin.c M src/plugins/ImmX11Plugin/ImmX11Plugin.c M src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/LocalePlugin/LocalePlugin.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Mpeg3Plugin/Mpeg3Plugin.c M src/plugins/QuicktimePlugin/QuicktimePlugin.c M src/plugins/SerialPlugin/SerialPlugin.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3270 Do a better job eliminating redundant failed checks in SmartSyntaxInterpreterPlugin methods. Add a more convenient typer interrogator for the ClipboardExtendedPlugin (implementation to follow).

1 0

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

09 Nov '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3270.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3270 Author: eem Time: 8 November 2022, 3:16:38.381899 pm UUID: 2ed5e56f-f39f-4da9-9403-c83acc745010 Ancestors: VMMaker.oscog-eem.3269 Write ClipboardExtendedPlugin>>ioHasClipboardData:inFormat: in a supported form. Do a better job eliminating redundant failed checks in SmartSyntaxInterpreterPlugin methods. =============== Diff against VMMaker.oscog-eem.3269 =============== Item was changed: ----- Method: ClipboardExtendedPlugin>>ioHasClipboardData:inFormat: (in category 'io') ----- ioHasClipboardData: clipboard inFormat: format self primitive: 'ioHasClipboardDataInFormat' parameters: #(Unsigned Oop). (interpreterProxy isIntegerObject: format) ifTrue: + [^(self - [^interpreterProxy methodReturnBool: - (self sqPasteboard: clipboard asVoidPointer + hasDataInFormat: (interpreterProxy integerValueOf: format)) asBooleanObj]. - hasDataInFormat: (interpreterProxy integerValueOf: format))]. (interpreterProxy isBytes: format) ifTrue: + [^(self - [^interpreterProxy methodReturnBool: - (self sqPasteboard: clipboard asVoidPointer hasDataInFormat: (interpreterProxy firstIndexableField: format) + formatLength: (interpreterProxy byteSizeOf: format)) asBooleanObj]. - formatLength: (interpreterProxy byteSizeOf: format))]. interpreterProxy primitiveFailFor: PrimErrBadArgument! Item was removed: - ----- Method: SmartSyntaxPluginTMethod>>fixUpReturnOneStmt:on: (in category 'transforming') ----- - fixUpReturnOneStmt: stmt on: sStream - | expr exprRetStmts "p t" | - stmt isReturn ifFalse: [^sStream nextPut: stmt]. - expr := stmt expression. - (expr isSend - and: [self resultSendAlwaysFails: expr]) ifTrue: - ["failure returns" - returnType = #sqInt - ifTrue: [sStream nextPut: (TReturnNode new setExpression: expr)] - ifFalse: [sStream nextPut: expr; nextPut: self nullReturnExpr]. - ^nil]. - (expr isVariable and: ['nil' = expr name]) ifTrue: - ["^ nil -- this is never right unless automatically generated" - sStream nextPut: stmt. - ^nil]. - (expr isVariable and: ['self' = expr name]) ifTrue: - ["^ self" - fullArgs isEmpty ifFalse: - [sStream nextPut: (self statementGuardedWithSuccess: (self popExpr: fullArgs size))]. - sStream nextPut: self nullReturnExpr. - ^nil]. - (expr isVariable or: [expr isConstant]) ifTrue: - ["^ variable or ^ constant without guardchecking" - sStream - nextPut: (sStream isEmpty "No statements to cause failure, therefore no need for failure guard." - ifTrue: - [self pop: fullArgs size + 1 thenReturnExpr: expr] - ifFalse: - [self statementGuardedWithSuccess: - (self pop: fullArgs size + 1 thenReturnExpr: expr)]); - nextPut: self nullReturnExpr. - ^nil]. - "^ expr with necessary guard checking" - "p := sStream position." - exprRetStmts := Array streamContents: - [:ersStream| - (self resultExpressionCanFail: expr) - ifTrue: - ["t := 1." - ersStream - nextPut: (self assign: (self oopVariable: '_return_value') expression: expr); - nextPut: (self statementGuardedWithSuccess: (self pop: fullArgs size + 1 - thenReturnExpr: (self oopVariable: '_return_value')))] - ifFalse: - ["t := 2." - ersStream nextPut: (self pop: fullArgs size + 1 thenReturnExpr: expr)]]. - sStream isEmpty "No statements to cause failure, therefore no need for an initial failure guard." - ifTrue: [sStream nextPutAll: exprRetStmts] - ifFalse: - ["t := t + 2." - sStream nextPut: (self statementGuardedWithSuccess: exprRetStmts)]. - sStream nextPut: self nullReturnExpr. - "Them := Dictionary new" - "(Them at: t ifAbsentPut: [Dictionary new]) - at: self selector - put: (sStream originalContents copyFrom: p + 1 to: sStream position)"! Item was added: + ----- Method: SmartSyntaxPluginTMethod>>fixUpReturnOneStmt:previous:on: (in category 'transforming') ----- + fixUpReturnOneStmt: stmt previous: previousStmtOrNil on: sStream + | expr exprRetStmts "p t" | + stmt isReturn ifFalse: [^sStream nextPut: stmt]. + expr := stmt expression. + (self resultExpressionAlwaysFails: expr) ifTrue: + ["failure returns" + returnType = #sqInt + ifTrue: [sStream nextPut: (TReturnNode new setExpression: expr)] + ifFalse: [sStream nextPut: expr; nextPut: self nullReturnExpr]. + ^nil]. + (expr isVariable and: ['nil' = expr name]) ifTrue: + ["^ nil -- this is never right unless automatically generated" + sStream nextPut: stmt. + ^nil]. + (expr isVariable and: ['self' = expr name]) ifTrue: + ["^ self" + (previousStmtOrNil notNil + and: [self resultExpressionAlwaysFails: previousStmtOrNil]) ifFalse: + [fullArgs isEmpty ifFalse: + [sStream nextPut: (self statementGuardedWithSuccess: (self popExpr: fullArgs size))]]. + sStream nextPut: self nullReturnExpr. + ^nil]. + (expr isVariable or: [expr isConstant]) ifTrue: + ["^ variable or ^ constant without guardchecking" + sStream + nextPut: (sStream isEmpty "No statements to cause failure, therefore no need for failure guard." + ifTrue: + [self pop: fullArgs size + 1 thenReturnExpr: expr] + ifFalse: + [self statementGuardedWithSuccess: + (self pop: fullArgs size + 1 thenReturnExpr: expr)]); + nextPut: self nullReturnExpr. + ^nil]. + "^ expr with necessary guard checking" + "p := sStream position." + exprRetStmts := Array streamContents: + [:ersStream| + (self resultExpressionCanFail: expr) + ifTrue: + ["t := 1." + ersStream + nextPut: (self assign: (self oopVariable: '_return_value') expression: expr); + nextPut: (self statementGuardedWithSuccess: (self pop: fullArgs size + 1 + thenReturnExpr: (self oopVariable: '_return_value')))] + ifFalse: + ["t := 2." + ersStream nextPut: (self pop: fullArgs size + 1 thenReturnExpr: expr)]]. + sStream isEmpty "No statements to cause failure, therefore no need for an initial failure guard." + ifTrue: [sStream nextPutAll: exprRetStmts] + ifFalse: + ["t := t + 2." + sStream nextPut: (self statementGuardedWithSuccess: exprRetStmts)]. + sStream nextPut: self nullReturnExpr. + "Them := Dictionary new" + "(Them at: t ifAbsentPut: [Dictionary new]) + at: self selector + put: (sStream originalContents copyFrom: p + 1 to: sStream position)"! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>fixUpReturns (in category 'transforming') ----- fixUpReturns "Replace each return statement in this method with (a) the given postlog, (b) code to pop the receiver and the given number of arguments, and (c) code to push the integer result and return." self endsWithMethodReturnExpression ifTrue: [parseTree statements last isSend ifFalse: [parseTree setStatements: parseTree statements allButLast]]. parseTree nodesDo: [:node | node isStmtList ifTrue: [node setStatements: (Array streamContents: + [:sStream | | prevStmt | - [:sStream | node statements do: + [:stmt | + self fixUpReturnOneStmt: stmt previous: prevStmt on: sStream. + prevStmt := stmt]])]]! - [:stmt | self fixUpReturnOneStmt: stmt on: sStream]])]]! Item was added: + ----- Method: SmartSyntaxPluginTMethod>>resultExpressionAlwaysFails: (in category 'private') ----- + resultExpressionAlwaysFails: aTParseNode + ^aTParseNode isSend + and: [(#(primitiveFail primitiveFailFor: primitiveFailForFFIException:at: primitiveFailForOSError:) includes: aTParseNode selector) + or: [aTParseNode selector == #success: + and: [aTParseNode args first isConstant + and: [aTParseNode args first value == false]]]]! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>resultExpressionCanFail: (in category 'private') ----- + resultExpressionCanFail: aTParseNode - resultExpressionCanFail: aTSendNode "Neither asSmallIntegerObj nor asBooleanObj nor asPositiveIntegerObj can fail. asPositiveIntegerObj maps to positive32BitIntegerFor: which uses eeInstantiateSmallClassIndex:format:numSlots: which does not GC and does not fail." + aTParseNode isSend ifFalse: + [^true]. + (#(asSmallIntegerObj asPositiveIntegerObj asBooleanObj nilObject trueObject falseObject) includes: aTParseNode selector) ifTrue: + [^false]. + (aTParseNode selector == #asOop: + and: [aTParseNode args first isVariable + and: [#('SmallInteger' 'Boolean') includes: aTParseNode args first name]]) ifTrue: + [^false]. + ^true! - ^(#(asSmallIntegerObj asPositiveIntegerObj asBooleanObj nilObject trueObject falseObject) includes: aTSendNode selector) not! Item was removed: - ----- Method: SmartSyntaxPluginTMethod>>resultSendAlwaysFails: (in category 'private') ----- - resultSendAlwaysFails: aTSendNode - ^(#(primitiveFail primitiveFailFor: primitiveFailForFFIException:at: primitiveFailForOSError:) includes: aTSendNode selector) - or: [aTSendNode selector == #success: - and: [aTSendNode args first isConstant - and: [aTSendNode args first value == false]]]!

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