Vm-dev July 2022

vm-dev@lists.squeakfoundation.org

15 participants
78 discussions

[OpenSmalltalk/opensmalltalk-vm] 1a2f81: MacOS builds:
by Eliot Miranda 18 Jul '22

18 Jul '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 1a2f8119317bc79fae9b96506a6d980ee05bd427 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1a2f8119317bc79fae… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-07-17 (Sun, 17 Jul 2022) Changed paths: M building/macos32x86/common/Makefile.flags M building/macos64ARMv8/common/Makefile.flags M building/macos64x64/common/Makefile.flags Log Message: ----------- MacOS builds: Make the setting of frameworks in building/macos*/common/Makefile.flags conditional so that a custom Makefile can make more plugins internal.

1 0

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

18 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3212.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3212 Author: eem Time: 17 July 2022, 3:04:00.266346 pm UUID: 51b19915-284d-4fdf-9d0f-f6a0802762e8 Ancestors: VMMaker.oscog-eem.3211 Extend SmartSyntaxPlugin with - Unsigned32 a 32-bit Unisgned value, now that Unsigned means a BytesPerWord-sized unsigned value. - NullTerminatedString - that does a stackEphemeralValue: to get an alloca'ed null-terminated string - WordsOrNil - that gets a void *, initialized to 0 if the argument is nil, but otherweise is like WordsOrBytes (but void *, not char *). Get Slang to constant-fold strlen applied to a constant string so that one can write e.g. ttsz := interpreterProxy byteSizeOf: trackType cPtrAsOop. newTrackFlags := (self stString: trackType ofSize: ttsz equalsCString: 'video') ifTrue: [#MP4NewTrackIsVisual] ifFalse: [(self stString: trackType ofSize: ttsz equalsCString: 'audio') ifTrue: [#MP4NewTrackIsAudio] ifFalse: [(self stString: trackType ofSize: ttsz equalsCString: 'private') ifTrue: [#MP4NewTrackIsPrivate] ifFalse: [(self stString: trackType ofSize: ttsz equalsCString: 'none') ifTrue: [0] and have strncmp invoked with the length of the string argument as a compile-time constant. Allow InterpreterPlugin subclasses to implement structTargetKindForDeclaration: on the class side for C APIs that hide pointer types behind defines. =============== Diff against VMMaker.oscog-eem.3211 =============== Item was added: + ----- Method: CCodeGenerator>>generateStrlen:on:indent: (in category 'C translation') ----- + generateStrlen: msgNode on: aStream indent: level + "Implement to do compile-time evaluation of strlen for constant strings" + + (msgNode args first isConstant + and: [msgNode args first value isString + and: [msgNode args first value class isBytes]]) + ifTrue: [aStream print: msgNode args first value size] + ifFalse: + [aStream nextPutAll: 'strlen('. + msgNode args first emitCCodeAsArgumentOn: aStream level: level generator: self. + aStream nextPut: $)]! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation support') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #abs #generateAbs:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #>>> #generateSignedShiftRight:on:indent: #, #generateComma:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert #generateBitInvert:on:indent: #bitInvert32 #generateBitInvert:on:indent: #bitInvert64 #generateBitInvert:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #even #generateEven:on:indent: #odd #generateOdd:on:indent: #byteSwap32 #generateByteSwap32:on:indent: #byteSwap64 #generateByteSwap64:on:indent: #byteSwapped32IfBigEndian: generateByteSwap32IfBigEndian:on:indent: #byteSwapped64IfBigEndian: generateByteSwap64IfBigEndian:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #timesRepeat: #generateTimesRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue:cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cppIf:ifFalse: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #asAddress:put: #generateAsAddress:on:indent: #signedIntFromLong64 #generateSignedIntFromLong64:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToLong64 #generateSignedIntToLong64:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asIntegerPtr #generateAsIntegerPtr:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asUnsignedIntegerPtr #generateAsUnsignedIntegerPtr:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asUnsignedLongLong #generateAsUnsignedLongLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #asWideString #generateAsWideString:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateAnyMask:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerOop #generateBytesPerOop:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #wordSize #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #minSmallInteger #generateSmallIntegerConstant:on:indent: #maxSmallInteger #generateSmallIntegerConstant:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #value:value:value:value: #generateValue:on:indent: #value:value:value:value:value: #generateValue:on:indent: #value:value:value:value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: + + #strlen: #generateStrlen:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: InterpreterPlugin class>>isStructType: (in category 'translation') ----- isStructType: typeName "<String>" + "Subclasses should override to answer true for struct types they use. + This API is deprecated in favour of structTargetKindForDeclaration:" - "Subclasses should override to answer trye for struct types they use." ^false! Item was added: + ----- Method: InterpreterPlugin class>>structTargetKindForDeclaration: (in category 'translation') ----- + structTargetKindForDeclaration: decl "<String>" + "Subclasses should override to answer #pointer or #struct for struct types they use. and nil for anything else." + | isPointer | + ^(self isStructType: ((isPointer := decl last == $*) + ifTrue: [decl allButLast] + ifFalse: [decl]) withBlanksTrimmed) ifTrue: + [isPointer + ifTrue: [#pointer] + ifFalse: [#struct]]! Item was added: + ----- Method: InterpreterPlugin>>object:equalsString: (in category 'comparison') ----- + object: anOop equalsString: aCString + <inline: #always> + <var: 'aCString' type: #'char *'> + ^self object: anOop equalsString: aCString ofSize: (self strlen: aCString)! Item was added: + ----- Method: InterpreterPlugin>>object:equalsString:ofSize: (in category 'comparison') ----- + object: anOop equalsString: aCString ofSize: aCStringStrlen + <inline: #always> + <var: 'aCString' type: #'char *'> + ^(interpreterProxy isBytes: anOop) + and: [(interpreterProxy byteSizeOf: anOop) = aCStringStrlen + and: [(self strncmp: aCString _: (interpreterProxy firstIndexableField: anOop) _: aCStringStrlen) = 0]]! Item was added: + ----- Method: InterpreterPlugin>>stString:equalsCString: (in category 'comparison') ----- + stString: aPointer equalsCString: aCString + <inline: #always> + <var: 'aCString' type: #'char *'> + ^self stString: aPointer equalsCString: aCString ofSize: (self strlen: aCString)! Item was added: + ----- Method: InterpreterPlugin>>stString:equalsCString:ofSize: (in category 'comparison') ----- + stString: aPointer equalsCString: aCString ofSize: aCStringStrlen + <inline: #always> + <var: 'aCString' type: #'char *'> + ^self stString: aPointer ofSize: (interpreterProxy byteSizeOf: aPointer cPtrAsOop) equalsCString: aCString ofSize: aCStringStrlen! Item was added: + ----- Method: InterpreterPlugin>>stString:ofSize:equalsCString: (in category 'comparison') ----- + stString: aPointer ofSize: byteSize equalsCString: aCString + <inline: #always> + <var: 'aCString' type: #'char *'> + ^self stString: aPointer ofSize: byteSize equalsCString: aCString ofSize: (self strlen: aCString)! Item was added: + ----- Method: InterpreterPlugin>>stString:ofSize:equalsCString:ofSize: (in category 'comparison') ----- + stString: aPointer ofSize: byteSize equalsCString: aCString ofSize: aCStringStrlen + <inline: #always> + <var: 'aCString' type: #'char *'> + ^byteSize = aCStringStrlen and: [(self strncmp: aCString _: aPointer _: aCStringStrlen) = 0]! Item was added: + Behavior subclass: #NullTerminatedString + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-SmartSyntaxPlugins'! Item was added: + ----- Method: NullTerminatedString class>>ccg:prolog:expr:index: (in category '*VMMaker-plugin generation') ----- + ccg: cg prolog: aBlock expr: aString index: anInteger + + ^cg + ccgLoad: aBlock + expr: aString + asNullTerminatedCharPtrFrom: anInteger + andThen: 'interpreterProxy failed not'! Item was added: + ----- Method: NullTerminatedString class>>ccgDeclareCForVar: (in category '*VMMaker-plugin generation') ----- + ccgDeclareCForVar: aSymbolOrString + + ^#'char *', aSymbolOrString! Item was added: + ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>assign:coerceTo:expr: (in category 'plugin generation') ----- + assign: variableName coerceTo: cType expr: expressionString + ^variableName, ' := self cCoerce: (', expressionString, ') to: ', cType storeString! Item was changed: ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgLoad:expr:asCharPtrFrom:andThen: (in category 'coercing') ----- ccgLoad: aBlock expr: aString asCharPtrFrom: stackIndex andThen: valBlock + ^stackIndex + ifNil: [self assign: aString coerceTo: #'char *' expr: valBlock] + ifNotNil: [self assign: aString coerceTo: #'char *' from: stackIndex]! - ^self assign: aString coerceTo: #'char *' from: stackIndex! Item was added: + ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgLoad:expr:asNullTerminatedCharPtrFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asNullTerminatedCharPtrFrom: stackIndex andThen: valBlock + ^aString, ' := interpreterProxy ', #stackEphemeralStringValue:, stackIndex printString! Item was added: + ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgLoad:expr:asPtrFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asPtrFrom: stackIndex andThen: valBlock + ^stackIndex + ifNil: [aString, ' := ', valBlock] + ifNotNil: [self assign: aString coerceTo: #'void *' from: stackIndex]! Item was added: + ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgValBlock:or:index: (in category 'coercing support') ----- + ccgValBlock: unarySelector or: keywordSelector index: index + ^String streamContents: + [:s| | a loadSelector | + a := self stackAccessorFor: index. + loadSelector := (keywordSelector caseOf: { + ['isWordsOrBytes:'] -> [#firstIndexableField:]. + }). + s nextPutAll: 'interpreterProxy '; nextPutAll: unarySelector; nextPutAll: ' = '; nextPutAll: a. + s nextPutAll: ' ifTrue: [0 asVoidPointer] ifFalse: [interpreterProxy '; nextPutAll: loadSelector; space; nextPutAll: a; nextPut: $]]! Item was removed: - ----- Method: SmartSyntaxPluginCodeGenerator>>ccgValBlock:or: (in category 'coercing') ----- - ccgValBlock: valString or: valorString - - ^[:index | String streamContents: - [:aStream | aStream - nextPutAll: 'interpreterProxy success: ((interpreterProxy '; - nextPutAll: valString; - nextPutAll: ': (interpreterProxy stackValue: '; - nextPutAll: index asString; - nextPutAll: ')) || (interpreterProxy '; - nextPutAll: valorString; - nextPutAll: ': (interpreterProxy stackValue: '; - nextPutAll: index asString; - nextPutAll: ')))']] ! Item was added: + ----- Method: SmartSyntaxPluginSimulator>>ccgLoad:expr:asPtrFrom:andThen: (in category 'simulation') ----- + ccgLoad: codeGen expr: exprBlock asPtrFrom: stackIndexOrNil andThen: validateBlock + stackIndexOrNil ifNil: [self halt: 'need to figure out how to simulate WordsOrNil']. + ^[:oop| + validateBlock value: oop. + interpreterProxy cCoerce: (interpreterProxy firstIndexableField: oop) asInteger to: #'int *']! Item was removed: - ----- Method: SmartSyntaxPluginSimulator>>ccgLoad:expr:asUnsigned32BitValueFrom: (in category 'simulation') ----- - ccgLoad: codeGen expr: exprBlock asUnsigned32BitValueFrom: stackIndex - ^[:oop| interpreterProxy positive32BitValueOf: oop]! Item was added: + ----- Method: SmartSyntaxPluginSimulator>>ccgLoad:expr:asUnsigned32BitValueFrom:andThen: (in category 'simulation') ----- + ccgLoad: codeGen expr: exprBlock asUnsigned32BitValueFrom: stackIndex andThen: validateBlock + ^[:oop| + validateBlock value: oop. + interpreterProxy positive32BitValueOf: oop]! Item was added: + ----- Method: SmartSyntaxPluginSimulator>>ccgValBlock:or:index: (in category 'simulation') ----- + ccgValBlock: unarySelectorString or: keywordSelector index: ignored + "unarySelector must be simple; nilObject, classArray etc. keywordSelector must be of the list below." + | unarySelector | + unarySelector := unarySelectorString asSymbol. + ^keywordSelector caseOf: { + ['isBytes'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isBytes: oop]). + oop]]. + ['isShorts'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isShorts: oop]). + oop]]. + ['isWords'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isWords: oop]). + oop]]. + ['isLong64s'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isLong64s: oop]). + oop]]. + ['isWordsOrBytes'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isWordsOrBytes: oop]). + oop]]. + ['isIndexable'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isIndexable: oop]). + oop]]. + ['isWordsOrShorts'] -> [ [:oop| + interpreterProxy success: ((interpreterProxy perform: unarySelector) = oop or: [interpreterProxy isWordsOrShorts: oop]). + oop]] }! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>namedPrimitiveProlog (in category 'specifying primitives') ----- namedPrimitiveProlog "Generate the code for a primitive:parameters:... send. This is in two parts. The first is validation; the second is coercing assignment." + | statements validator validations deferredValidations assigner assignments | - | statements validator validations deferredValidations assigner | fullArgs isEmpty ifTrue: [^#()]. validator := SmartSyntaxPluginValidationCodeGenerator new. statements := OrderedCollection new. validations := fullArgs withIndexCollect: + [:arg :i| + (parmSpecs at: i) + ccg: validator + prolog: nil + expr: arg + index: fullArgs size - i]. - [:arg :i| - (parmSpecs at: i) - ccg: validator - prolog: nil - expr: arg - index: fullArgs size - i]. validations := validations reject: [:validation| validation isNil]. deferredValidations := validations select: [:validation| validation isArray and: [validation size = 2 and: [validation first == #deferred]]]. validations := validations copyWithoutAll: deferredValidations. statements addAllLast: (self validationStatementsFor: validations). assigner := SmartSyntaxPluginAssignmentCodeGenerator new. + assignments := fullArgs withIndexCollect: + [:arg :i| + (parmSpecs at: i) + ccg: assigner + prolog: nil + expr: arg + index: fullArgs size - i]. + assignments do: + [:assignment| statements addAllLast: (self statementsFor: assignment varName: '')]. + statements addAllLast: (self validationStatementsFor: ((deferredValidations collect: #second) reject: #isNil)). - fullArgs withIndexDo: - [:arg :i| - statements addAllLast: - (self - statementsFor: - ((parmSpecs at: i) - ccg: assigner - prolog: nil - expr: arg - index: fullArgs size - i) - varName: '')]. - statements addAllLast: (self validationStatementsFor: (deferredValidations collect: #second)). ^statements! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>validationStatementsFor: (in category 'private') ----- validationStatementsFor: validations validations isEmpty ifTrue: [^#()]. ^self statementsFor: (String streamContents: [:s| s nextPut: $(. validations + do: [:validation| | parenthesize | + parenthesize := (validation includesSubstring: '). ') not. + parenthesize ifTrue: [s nextPut: $(]. + s nextPutAll: validation. + parenthesize ifTrue: [s nextPut: $)]] - do: [:validation| s nextPut: $(; nextPutAll: validation; nextPut: $)] separatedBy: [s crtab; nextPutAll: 'and: [']. s next: validations size - 1 put: $]. s nextPutAll: ') ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]']) varName: ''! Item was changed: ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgLoad:expr:asCharPtrFrom:andThen: (in category 'coercing') ----- ccgLoad: aBlock expr: aString asCharPtrFrom: stackIndex andThen: validationString + ^stackIndex + ifNil: [validationString] + ifNotNil: [validationString, (self stackAccessorFor: stackIndex)]! - ^validationString, (self stackAccessorFor: stackIndex)! Item was added: + ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgLoad:expr:asNullTerminatedCharPtrFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asNullTerminatedCharPtrFrom: stackIndex andThen: validationString + ^{#deferred. validationString}! Item was added: + ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgLoad:expr:asPtrFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asPtrFrom: stackIndex andThen: validationString + ^validationString last = $] + ifTrue: [validationString] + ifFalse: [validationString, (self stackAccessorFor: stackIndex)]! Item was added: + ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgValBlock:or:index: (in category 'coercing support') ----- + ccgValBlock: unarySelector or: keywordSelector index: index + ^String streamContents: + [:s| | a | + a := self stackAccessorFor: index. + s nextPutAll: 'interpreterProxy '; nextPutAll: unarySelector; nextPutAll: ' = '; nextPutAll: a. + s nextPutAll: ' or: [interpreterProxy '; nextPutAll: keywordSelector; space; nextPutAll: a; nextPut: $]]! Item was changed: Behavior subclass: #Unsigned instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-SmartSyntaxPlugins'! + !Unsigned commentStamp: 'eem 7/16/2022 11:43' prior: 0! + Coercion specification for machine word sized unsigned numbers within plugins. - !Unsigned commentStamp: '' prior: 0! - Coercion specification for 32-bit unsigned numbers within plugins. + Note: "x asOop: Unsigned" can cause garbage collection (but not in Spur) when x is outside SmallInteger range.! - Note: "x asOop: Unsigned" can cause garbage collection when x is outside SmallInteger range.! Item was changed: Unsigned subclass: #Unsigned32 instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-SmartSyntaxPlugins'! + + !Unsigned32 commentStamp: 'eem 7/16/2022 11:43' prior: 0! + Coercion specification for 32-bit unsigned numbers within plugins. + + Note: "x asOop: Unsigned32" can cause garbage collection (but not in Spur) when x is outside SmallInteger range.! Item was changed: ----- Method: VMPluginCodeGenerator>>structTargetKindForDeclaration: (in category 'C code generator') ----- structTargetKindForDeclaration: decl "<String>" ^(super structTargetKindForDeclaration: decl) ifNil: [pluginClass ifNotNil: + [pluginClass structTargetKindForDeclaration: decl]]! - [| isPointer | - (pluginClass isStructType: ((isPointer := decl last == $*) - ifTrue: [decl allButLast] - ifFalse: [decl]) withBlanksTrimmed) ifTrue: - [isPointer - ifTrue: [#pointer] - ifFalse: [#struct]]]]! Item was added: + Behavior subclass: #WordsOrNil + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-SmartSyntaxPlugins'! + + !WordsOrNil commentStamp: 'eem 7/16/2022 14:48' prior: 0! + Coercion specification for bits objects like ByteString, Bitmap, ByteArray, WordArray, LargePositiveInteger et al to void *, and nil to (void *)0! Item was added: + ----- Method: WordsOrNil class>>ccg:prolog:expr:index: (in category 'plugin generation') ----- + ccg: cg prolog: aBlock expr: aString index: index + + ^cg + ccgLoad: aBlock + expr: aString + asPtrFrom: nil + andThen: (cg ccgValBlock: #nilObject or: #isWordsOrBytes: index: index)! Item was added: + ----- Method: WordsOrNil class>>ccgCanConvertFrom: (in category 'plugin generation') ----- + ccgCanConvertFrom: anObject + + ^anObject class isBits or: [anObject isNil]! Item was added: + ----- Method: WordsOrNil class>>ccgDeclareCForVar: (in category 'plugin generation') ----- + ccgDeclareCForVar: aSymbolOrString + + ^#'void *', aSymbolOrString!

1 0

VM Maker: VMMaker.oscog-eem.3211.mcz
by commits＠source.squeak.org 16 Jul '22

16 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3211.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3211 Author: eem Time: 16 July 2022, 11:40:23.106379 am UUID: 189bb230-8dfb-4704-9de3-f527f6f6c314 Ancestors: VMMaker.oscog-eem.3210 Hopefully all simulating requires for Unsigned32 is this. =============== Diff against VMMaker.oscog-eem.3210 =============== Item was added: + ----- Method: SmartSyntaxPluginSimulator>>ccgLoad:expr:asUnsigned32BitValueFrom: (in category 'simulation') ----- + ccgLoad: codeGen expr: exprBlock asUnsigned32BitValueFrom: stackIndex + ^[:oop| interpreterProxy positive32BitValueOf: oop]!

1 0

VM Maker: VMMaker.oscog-eem.3210.mcz
by commits＠source.squeak.org 16 Jul '22

16 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3210.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3210 Author: eem Time: 16 July 2022, 11:16:32.951904 am UUID: a7eaf010-b7fe-4a09-8ced-6f5eb6201ec7 Ancestors: VMMaker.oscog-eem.3209 SmartSyntaxPlugins: Add Unsigned32 for type unsigned int (Unsigned got changed to sqIntptr_t in the 32-bit => 64-bit transition). This probably doesn't simulate yet, because of the use of the #deferred symbol now being allowed on code generation implementors of ccg:prolog:expr:index:. But that can be fixed later. SImulation of existing plugins remains OK. Fix passign of floats in the ThreadedRiscV64FFIPlugin, and restore the <inline: false> in ThreadedRiscV64FFIPlugin>>#ffiCall:ArgArrayOrNil:NumArgs: to acvoid massive code duplication. =============== Diff against VMMaker.oscog-eem.3209 =============== Item was added: + ----- Method: SmartSyntaxPluginAssignmentCodeGenerator>>ccgLoad:expr:asUnsigned32BitValueFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asUnsigned32BitValueFrom: stackIndex andThen: validationString + ^aString, ' := interpreterProxy positive32BitValueOf:', (self stackAccessorFor: stackIndex)! Item was changed: ----- Method: SmartSyntaxPluginCodeGenerator>>ccgLoad:expr:asPtrFrom:andThen: (in category 'coercing') ----- ccgLoad: aBlock expr: aString asPtrFrom: anInteger andThen: valBlock "Answer codestring for void pointer to first indexable field of object (without validating side-effect unless specified in valBlock), as described in comment to ccgLoad:expr:asRawOopFrom:" ^(valBlock value: anInteger), + '. ', + (aBlock value: 'interpreterProxy firstIndexableField:(interpreterProxy stackValue:', anInteger asString, ')')! - '.', - (aBlock value: 'interpreterProxy firstIndexableField:(interpreterProxy stackValue:', anInteger asString, '))')! Item was added: + ----- Method: SmartSyntaxPluginCodeGenerator>>compileToTMethodSelector:in: (in category 'utilities') ----- + compileToTMethodSelector: selector in: aClass + "Compile a method to a TMethod" + (breakSrcInlineSelectors notNil + and: [(breakSrcInlineSelectors includes: selector) not "i.e. break in the superclass method..." + and: [breakOnInline ~~ true]]) ifTrue: + [| methodNode | + methodNode := (aClass >> selector) methodNode. + methodNode block nodesDo: + [:n| + (n isMessageNode + and: [(n selector key beginsWith: #primitive:parameters:) + and: [n arguments first isLiteralNode + and: [breakSrcInlineSelectors includes: n arguments first key asSymbol]]]) ifTrue: [self halt. ^super compileToTMethodSelector: selector in: aClass]]]. + ^super compileToTMethodSelector: selector in: aClass! Item was changed: ----- Method: SmartSyntaxPluginTMethod>>namedPrimitiveProlog (in category 'specifying primitives') ----- namedPrimitiveProlog "Generate the code for a primitive:parameters:... send. This is in two parts. The first is validation; the second is coercing assignment." + | statements validator validations deferredValidations assigner | - | statements validator validations assigner | fullArgs isEmpty ifTrue: [^#()]. validator := SmartSyntaxPluginValidationCodeGenerator new. statements := OrderedCollection new. validations := fullArgs withIndexCollect: [:arg :i| (parmSpecs at: i) + ccg: validator + prolog: nil + expr: arg + index: fullArgs size - i]. - ccg: validator - prolog: nil - expr: arg - index: (fullArgs size - i)]. validations := validations reject: [:validation| validation isNil]. + deferredValidations := validations select: [:validation| validation isArray and: [validation size = 2 and: [validation first == #deferred]]]. + validations := validations copyWithoutAll: deferredValidations. + statements addAllLast: (self validationStatementsFor: validations). - validations isEmpty ifFalse: - [statements addAllLast: (self statementsFor: - (String streamContents: - [:s| - s nextPut: $(. - validations - do: [:validation| s nextPut: $(; nextPutAll: validation; nextPut: $)] - separatedBy: [s crtab; nextPutAll: 'and: [']. - s next: validations size - 1 put: $]. - s nextPutAll: ') ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]']) - varName: '')]. assigner := SmartSyntaxPluginAssignmentCodeGenerator new. fullArgs withIndexDo: [:arg :i| statements addAllLast: (self statementsFor: ((parmSpecs at: i) + ccg: assigner + prolog: nil - ccg: assigner - prolog: nil expr: arg + index: fullArgs size - i) - index: (fullArgs size - i)) varName: '')]. + statements addAllLast: (self validationStatementsFor: (deferredValidations collect: #second)). ^statements! Item was added: + ----- Method: SmartSyntaxPluginTMethod>>validationStatementsFor: (in category 'private') ----- + validationStatementsFor: validations + validations isEmpty ifTrue: [^#()]. + ^self + statementsFor: (String streamContents: + [:s| + s nextPut: $(. + validations + do: [:validation| s nextPut: $(; nextPutAll: validation; nextPut: $)] + separatedBy: [s crtab; nextPutAll: 'and: [']. + s next: validations size - 1 put: $]. + s nextPutAll: ') ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]']) + varName: ''! Item was added: + ----- Method: SmartSyntaxPluginValidationCodeGenerator>>ccgLoad:expr:asUnsigned32BitValueFrom:andThen: (in category 'coercing') ----- + ccgLoad: aBlock expr: aString asUnsigned32BitValueFrom: stackIndex andThen: validationString + ^{#deferred. validationString}! Item was removed: - ----- Method: SpurMemoryManager>>inactiveOrFailedToDeferScan: (in category 'weakness and ephemerality') ----- - inactiveOrFailedToDeferScan: anEphemeron - "Answer whether an ephemeron is inactive (has a marked key) or, - if active, failed to fit on the unscanned ephemerons stack." - | key | - self assert: (self isEphemeron: anEphemeron). - ((self isImmediate: (key := self keyOfEphemeron: anEphemeron)) - or: [self isMarked: key]) ifTrue: - [^true]. - ^(self pushOnUnscannedEphemeronsStack: anEphemeron) not! Item was changed: ----- Method: ThreadedRiscV64FFIPlugin>>ffiCall:ArgArrayOrNil:NumArgs: (in category 'callout support') ----- ffiCall: externalFunction ArgArrayOrNil: argArrayOrNil NumArgs: nArgs "Generic callout. Does the actual work. If argArrayOrNil is nil it takes args from the stack and the spec from the method. If argArrayOrNil is not nil takes args from argArrayOrNil and the spec from the receiver." | flags argTypeArray address argType oop argSpec argClass err theCalloutState calloutState requiredStackSize stackSize allocation result primNumArgs | + <inline: false> - <inline: true> <var: #theCalloutState type: #'CalloutState'> <var: #calloutState type: #'CalloutState *'> <var: #allocation type: #'char *'> primNumArgs := interpreterProxy methodArgumentCount. (interpreterProxy is: externalFunction KindOfClass: interpreterProxy classExternalFunction) ifFalse: [^self ffiFail: FFIErrorNotFunction]. "Load and check the values in the externalFunction before we call out" flags := interpreterProxy fetchInteger: ExternalFunctionFlagsIndex ofObject: externalFunction. interpreterProxy failed ifTrue: [^self ffiFail: FFIErrorBadArgs]. "This must come early for compatibility with the old FFIPlugin. Image-level code may assume the function pointer is loaded eagerly. Thanks to Nicolas Cellier." address := self ffiLoadCalloutAddress: externalFunction. interpreterProxy failed ifTrue: [^0 "error code already set by ffiLoadCalloutAddress:"]. argTypeArray := interpreterProxy fetchPointer: ExternalFunctionArgTypesIndex ofObject: externalFunction. "must be array of arg types" ((interpreterProxy isArray: argTypeArray) and: [(interpreterProxy slotSizeOf: argTypeArray) = (nArgs + 1)]) ifFalse: [^self ffiFail: FFIErrorBadArgs]. "check if the calling convention is supported" self cppIf: COGMTVM ifTrue: [(self ffiSupportsCallingConvention: (flags bitAnd: FFICallTypesMask)) ifFalse: [^self ffiFail: FFIErrorCallType]] ifFalse: "not masking causes threaded calls to fail, which is as they should if the plugin is not threaded." [(self ffiSupportsCallingConvention: flags) ifFalse: [^self ffiFail: FFIErrorCallType]]. requiredStackSize := self externalFunctionHasStackSizeSlot ifTrue: [interpreterProxy fetchInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction] ifFalse: [-1]. interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: (argArrayOrNil isNil ifTrue: [PrimErrBadMethod] ifFalse: [PrimErrBadReceiver])]. stackSize := requiredStackSize < 0 ifTrue: [DefaultMaxStackSize] ifFalse: [requiredStackSize]. self cCode: [] inSmalltalk: [theCalloutState := self class calloutStateClass new]. calloutState := self addressOf: theCalloutState. self cCode: [self memset: calloutState _: 0 _: (self sizeof: #CalloutState)]. calloutState callFlags: flags. "Fetch return type and args" argType := interpreterProxy fetchPointer: 0 ofObject: argTypeArray. argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. argClass := interpreterProxy fetchPointer: 1 ofObject: argType. (err := self ffiCheckReturn: argSpec With: argClass in: calloutState) ~= 0 ifTrue: [^self ffiFail: err]. "cannot return" "alloca the outgoing stack frame, leaving room for marshalling args, and including space for the return struct, if any. Additional space reserved for saving register args like mandated by Win64 X64 or PPC ABI, will be managed by the call itself" allocation := self alloca: stackSize + calloutState structReturnSize + self cStackAlignment. self mustAlignStack ifTrue: [allocation := self cCoerce: (allocation asUnsignedIntegerPtr bitClear: self cStackAlignment - 1) to: #'char *']. calloutState argVector: allocation; currentArg: allocation; limit: allocation + stackSize. "This next bit overrides the ARM64 code to pass return struct pointer in A0" (calloutState structReturnSize > 0 and: [self nonRegisterStructReturnIsViaImplicitFirstArgument and: [(self returnStructInRegisters: calloutState) not]]) ifTrue: [err := self ffiPushPointer: calloutState limit in: calloutState. err ~= 0 ifTrue: [self cleanupCalloutState: calloutState. self cppIf: COGMTVM ifTrue: [err = PrimErrObjectMayMove negated ifTrue: [^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry." ^self ffiFail: err]]. + "Aside from the bit above, code identical with arm64" - "Aside from the bit above, code identical with arn64" 1 to: nArgs do: [:i| argType := interpreterProxy fetchPointer: i ofObject: argTypeArray. argSpec := interpreterProxy fetchPointer: 0 ofObject: argType. argClass := interpreterProxy fetchPointer: 1 ofObject: argType. oop := argArrayOrNil isNil ifTrue: [interpreterProxy stackValue: nArgs - i] ifFalse: [interpreterProxy fetchPointer: i - 1 ofObject: argArrayOrNil]. err := self ffiArgument: oop Spec: argSpec Class: argClass in: calloutState. err ~= 0 ifTrue: [self cleanupCalloutState: calloutState. self cppIf: COGMTVM ifTrue: [err = PrimErrObjectMayMove negated ifTrue: [^PrimErrObjectMayMove]]. "N.B. Do not fail if object may move because caller will GC and retry." ^self ffiFail: err]]. "coercion failed or out of stack space" "Failures must be reported back from ffiArgument:Spec:Class:in:. Should not fail from here on in." self assert: interpreterProxy failed not. self ffiLogCallout: externalFunction. (requiredStackSize < 0 and: [self externalFunctionHasStackSizeSlot]) ifTrue: [stackSize := calloutState currentArg - calloutState argVector. interpreterProxy storeInteger: ExternalFunctionStackSizeIndex ofObject: externalFunction withValue: stackSize]. "Go out and call this guy" result := self ffiCalloutTo: address SpecOnStack: argArrayOrNil notNil in: calloutState. self cleanupCalloutState: calloutState. "Can not safely use argumentCount (via e.g. methodReturnValue:) since it may have been changed by a callback." interpreterProxy pop: primNumArgs + 1 thenPush: result. ^result! Item was added: + ----- Method: ThreadedRiscV64FFIPlugin>>ffiPushFloat32:in: (in category 'marshalling') ----- + ffiPushFloat32: value in: calloutState + <var: #value type: #float> + <var: #calloutState type: #'CalloutState *'> + <inline: #always> + "N.B. the RISCV ABI states that unused part should be -1, + [RISC-V Instruction Set Manual - Volume I: User Level ISA, + 12.2 NaN Boxing of Narrower Value" + calloutState floatRegisterIndex < NumFloatRegArgs + ifTrue: "Note: this is a 'memcopy', so size is preserved. Casting to #double changes the size" + [(self cCoerceSimple: + (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) + to: #'long *') + at: 0 + put: -1. + (self cCoerceSimple: + (self addressOf: (calloutState floatRegisters at: calloutState floatRegisterIndex)) + to: #'float *') + at: 0 + put: value. + calloutState floatRegisterIndex: calloutState floatRegisterIndex + 1] + ifFalse: + [calloutState currentArg + self wordSize > calloutState limit ifTrue: + [^FFIErrorCallFrameTooBig]. + interpreterProxy + longAt: calloutState currentArg put: -1; + storeSingleFloatAtPointer: calloutState currentArg from: value. + calloutState currentArg: calloutState currentArg + self wordSize]. + ^0! Item was added: + Unsigned subclass: #Unsigned32 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-SmartSyntaxPlugins'! Item was added: + ----- Method: Unsigned32 class>>ccg:prolog:expr:index: (in category 'plugin generation') ----- + ccg: cg prolog: aBlock expr: aString index: anInteger + + ^cg ccgLoad: aBlock expr: aString asUnsigned32BitValueFrom: anInteger andThen: 'interpreterProxy failed not'! Item was added: + ----- Method: Unsigned32 class>>ccgDeclareCForVar: (in category 'plugin generation') ----- + ccgDeclareCForVar: aSymbolOrString + + ^ #'unsigned int', ' ', aSymbolOrString!

1 0

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

13 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3209.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3209 Author: eem Time: 12 July 2022, 7:45:02.634751 pm UUID: f704c282-7c0d-4a35-8da3-48f48be3da70 Ancestors: VMMaker.oscog-eem.3208 Move ThreadedRiscV64FFIPlugin's num args accessors to the class side where they belong. =============== Diff against VMMaker.oscog-eem.3208 =============== Item was added: + ----- Method: ThreadedRiscV64FFIPlugin class>>numFloatRegArgs (in category 'accessing') ----- + numFloatRegArgs + + ^NumFloatRegArgs! Item was added: + ----- Method: ThreadedRiscV64FFIPlugin class>>numIntRegArgs (in category 'accessing') ----- + numIntRegArgs + + ^NumIntRegArgs! Item was removed: - ----- Method: ThreadedRiscV64FFIPlugin>>numFloatRegArgs (in category 'accessing') ----- - numFloatRegArgs - - ^NumFloatRegArgs! Item was removed: - ----- Method: ThreadedRiscV64FFIPlugin>>numIntRegArgs (in category 'accessing') ----- - numIntRegArgs - - ^NumIntRegArgs!

1 0

[OpenSmalltalk/opensmalltalk-vm] b5c45f: Add generated source for the ThreadedRiscV64FFIPlu...
by Eliot Miranda 13 Jul '22

13 Jul '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b5c45f245151124fd54d0afdecab988529388ac3 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b5c45f245151124fd5… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-07-12 (Tue, 12 Jul 2022) Changed paths: A src/plugins/SqueakFFIPrims/RiscV64FFIPlugin.c M src/plugins/SqueakFFIPrims/SqueakFFIPrims.c Log Message: ----------- Add generated source for the ThreadedRiscV64FFIPlugin.

1 0

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

13 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3208.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3208 Author: eem Time: 12 July 2022, 7:35:54.510226 pm UUID: 6d9f20e5-9014-4529-89d7-edfe6fb1cab2 Ancestors: VMMaker.oscog-eem.3207 Add Ken Dickey's contributed ThreadedRiscV64FFIPlugin =============== Diff against VMMaker.oscog-eem.3207 =============== Item was changed: ----- Method: VMMaker class>>generateVMPlugins (in category 'configurations') ----- generateVMPlugins ^VMMaker generatePluginsTo: self sourceTree, '/src' options: #() platformDir: self sourceTree, '/platforms' including:#(ADPCMCodecPlugin AsynchFilePlugin BalloonEnginePlugin B3DAcceleratorPlugin B3DEnginePlugin BMPReadWriterPlugin BitBltSimulation BochsIA32Plugin BochsX64Plugin GdbARMv6Plugin GdbARMv8Plugin CameraPlugin ClipboardExtendedPlugin CroquetPlugin DeflatePlugin DropPlugin "Cryptography Plugins:" DESPlugin DSAPlugin MD5Plugin SHA2Plugin FileDialogPlugin "FT2Plugin" FFTPlugin FileCopyPlugin FilePlugin FileAttributesPlugin Float64ArrayPlugin FloatArrayPlugin FloatMathPlugin GeniePlugin HostWindowPlugin IA32ABIPlugin ImmX11Plugin InternetConfigPlugin JPEGReadWriter2Plugin JPEGReaderPlugin JoystickTabletPlugin KlattSynthesizerPlugin LargeIntegersPlugin LocalePlugin MIDIPlugin MacMenubarPlugin Matrix2x3Plugin MiscPrimitivePlugin Mpeg3Plugin QuicktimePlugin RePlugin ScratchPlugin SecurityPlugin SerialPlugin SocketPlugin SoundCodecPlugin SoundGenerationPlugin SoundPlugin SqueakSSLPlugin StarSqueakPlugin ThreadedFFIPlugin ThreadedARM32FFIPlugin ThreadedARM64FFIPlugin ThreadedARM64AppleFFIPlugin ThreadedIA32FFIPlugin + ThreadedRiscV64FFIPlugin ThreadedX64SysVFFIPlugin ThreadedX64Win64FFIPlugin - ThreadedX64SysVFFIPlugin ThreadedX64Win64FFIPlugin UnicodePlugin UnixAioPlugin UUIDPlugin UnixOSProcessPlugin Win32OSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin WeDoPlugin XDisplayControlPlugin)!

1 0

[OpenSmalltalk/opensmalltalk-vm] 45cc49: CogVM source asd per VMMaker.oscog-eem.3207
by Eliot Miranda 13 Jul '22

13 Jul '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 45cc4928ed9a9d2f09ab73c6749a4f01d9bec555 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/45cc4928ed9a9d2f09… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-07-12 (Tue, 12 Jul 2022) Changed paths: M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/spur64.cog.lowcode/cogitARMv8.c Log Message: ----------- CogVM source asd per VMMaker.oscog-eem.3207 VMProfileMacSupportPlugin: Add a primitive to answer the text symbols in a module, now that modern MacOS's hide the system's dylibs and break the old nm(1) approach.

1 0

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

13 Jul '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3207.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3207 Author: eem Time: 12 July 2022, 6:21:39.357594 pm UUID: 7ff2cdc8-1f14-45a3-a63a-2d7457bc0c77 Ancestors: VMMaker.oscog-eem.3206 Add a primitive to answer the text symbols in a module, now that modern MacOS's hide the system's dylibs and break the old nm(1) approach. Slang: fix a bug in determining the struct/pointer type for an expression in a plugin that overrides InterpreterPlugin class>>#isStructType: to add its own struct types. =============== Diff against VMMaker.oscog-eem.3206 =============== Item was changed: ----- Method: TSendNode>>structTargetKindIn: (in category 'testing') ----- structTargetKindIn: aCodeGen "Answer if the recever evaluates to a struct or struct pointer and hence can be dereferenced using . or ->. Answer any of #struct #pointer or nil. Right now we don't need or support structure return so this method answers either #pointer or nil." selector == #cCoerceSimple:to: ifTrue: [^(VMStructType isTypePointerToStruct: arguments last value) ifTrue: [#pointer]]. selector == #addressOf: ifTrue: [^#pointer]. selector == #at: ifTrue: [receiver isVariable ifTrue: [(aCodeGen typeOfVariable: receiver name) ifNotNil: + [:type| - [:type| | derefType | type last = $* ifFalse: [^receiver structTargetKindIn: aCodeGen]. + (aCodeGen structTargetKindForDeclaration: type allButLast) ifNotNil: + [:kind| ^kind]]]. - (VMStructType isTypeStruct: (aCodeGen - extractTypeFor: receiver name - fromDeclaration: type allButLast)) ifTrue: - [^#struct]]]. (receiver structTargetKindIn: aCodeGen) ifNotNil: [:kind| ^kind]]. (aCodeGen selectorReturnsPointerToStruct: selector) ifTrue: [^#pointer]. (aCodeGen selectorReturnsStruct: selector) ifTrue: [^#struct]. ^nil! Item was changed: ----- Method: VMPluginCodeGenerator>>structTargetKindForDeclaration: (in category 'C code generator') ----- structTargetKindForDeclaration: decl "<String>" ^(super structTargetKindForDeclaration: decl) ifNil: [pluginClass ifNotNil: [| isPointer | (pluginClass isStructType: ((isPointer := decl last == $*) + ifTrue: [decl allButLast] + ifFalse: [decl]) withBlanksTrimmed) ifTrue: - ifTrue: [decl allButLast withBlanksTrimmed] - ifFalse: [decl])) ifTrue: [isPointer ifTrue: [#pointer] ifFalse: [#struct]]]]! Item was added: + ----- Method: VMProfileMacSupportPlugin class>>isStructType: (in category 'translation') ----- + isStructType: typeName + ^#('struct section' 'struct section_64' 'Dl_info') includes: typeName! 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. - self cppIf: #'MAC_OS_X_VERSION_MIN_REQUIRED' <= #'MAC_OS_X_VERSION_10_4' - ifTrue: "_dyld_present was deprecated in 10.5" - [(self cCode: '_dyld_present()' inSmalltalk: false) ifFalse: - [^interpreterProxy primitiveFail]]. - nimages := self cCode: '_dyld_image_count()' inSmalltalk: 0. resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: nimages * 4. resultObj = 0 ifTrue: [^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. - name := self cCode: '_dyld_get_image_name(i)' inSmalltalk: 0. - slide := self cCode: '_dyld_get_image_vmaddr_slide(i)' inSmalltalk: 0. self cppIf: #'__x86_64__' | #'__arm64__' ifTrue: + [(self cCoerceSimple: (self _dyld_get_image_header: i) + to: #'const struct mach_header_64 *') ifNotNil: - [(self cCode: '(const struct mach_header_64 *)_dyld_get_image_header(i)' inSmalltalk: nil) ifNotNil: [:h64| + (self getsectbynamefromheader_64: h64 _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: - (self cCode: 'getsectbynamefromheader_64(h64,SEG_TEXT,SECT_TEXT)' inSmalltalk: nil) ifNotNil: [:s64| + start := s64 addr. + size := s64 size]]] - start := self cCode: 's64->addr' inSmalltalk: 0. - size := self cCode: 's64->size' inSmalltalk: 0]]] ifFalse: + [(self _dyld_get_image_header: i) ifNotNil: - [(self cCode: '_dyld_get_image_header(i)' inSmalltalk: nil) ifNotNil: [:h| + (self getsectbynamefromheader: h _: #SEG_TEXT _: #SECT_TEXT) ifNotNil: - (self cCode: 'getsectbynamefromheader(h,SEG_TEXT,SECT_TEXT)' inSmalltalk: nil) ifNotNil: [:s| + start := s addr. + size := s size]]]. - start := self cCode: 's->addr' inSmalltalk: 0. - size := self cCode: 's->size' inSmalltalk: 0]]]. valueObj := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: (self strlen: name). interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. + ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. - ^interpreterProxy primitiveFail]. interpreterProxy storePointer: i * 4 ofObject: interpreterProxy topRemappableOop withValue: valueObj. nameObjData := interpreterProxy arrayValueOf: valueObj. self memcpy: nameObjData _: name _: (self strlen: name). valueObj := interpreterProxy signedMachineIntegerFor: slide. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. + ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. - ^interpreterProxy primitiveFail]. interpreterProxy storePointer: i * 4 + 1 ofObject: interpreterProxy topRemappableOop withValue: valueObj. valueObj := interpreterProxy positiveMachineIntegerFor: start. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. + ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. - ^interpreterProxy primitiveFail]. interpreterProxy storePointer: i * 4 + 2 ofObject: interpreterProxy topRemappableOop withValue: valueObj. valueObj := interpreterProxy positiveMachineIntegerFor: size. interpreterProxy failed ifTrue: [interpreterProxy popRemappableOop. + ^interpreterProxy primitiveFailFor: PrimErrNoMemory]. - ^interpreterProxy primitiveFail]. interpreterProxy storePointer: i * 4 + 3 ofObject: interpreterProxy topRemappableOop withValue: valueObj]. + ^interpreterProxy methodReturnValue: interpreterProxy popRemappableOop! - resultObj := interpreterProxy popRemappableOop. - ^interpreterProxy pop: 1 thenPush: resultObj! Item was added: + ----- 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 := 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

Microhackathon [WAS Help: Float returns on RISCV]
by ken.dickey＠whidbey.com 12 Jul '22

12 Jul '22

While I hate to call "compiler codegen bug", at this point I suspect a tool issue with gcc [Debian 10.2.1-6 2021-01-10]. I would like to try with an updated gcc and I probably need to craft a small example which either teaches me how to avoid the problem or can convince the compiler port/maintainers that there is a problem. Single stepping in gdb (stepi) just shows that the floatRet.d is not getting set to the result -- no code to do this. As as aside, the AllWinner D1 works fine but is vvvvveeeeeeeerrrrrryyy ssllllloooooowww. So building and debugging takes patience. The great news is that both Cuis and Squeak images run fine (unless you load compressed files, which yield CRC errors). I do have some time tomorrow (Saturday; 2 July) in Pacific Time Zone, but I am not sure how we might proceed to trouble-shoot the problem. It would be good to talk with you in any case. Cheers, -KenD

3 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2022