Vm-dev August 2018

vm-dev@lists.squeakfoundation.org

20 participants
87 discussions

VM Maker: VMMakerCompatibilityForPharo6-eem.4.mcz
by commits＠source.squeak.org 18 Aug '18

18 Aug '18

Eliot Miranda uploaded a new version of VMMakerCompatibilityForPharo6 to project VM Maker: http://source.squeak.org/VMMaker/VMMakerCompatibilityForPharo6-eem.4.mcz ==================== Summary ==================== Name: VMMakerCompatibilityForPharo6-eem.4 Author: eem Time: 17 August 2018, 7:20:11.114764 pm UUID: 0d8c7b0d-0e30-0d00-adaa-684a0e5da6b0 Ancestors: VMMakerCompatibilityForPharo6-EliotMiranda.3 Stream compatibility methods for ThreadSafeTranscript which I shouldmn;'t have to implement (it's supposed to be a WriteStream). Initial support for Slang TMehtod creation from RBProgramNodes. =============== Diff against VMMakerCompatibilityForPharo6-EliotMiranda.3 =============== Item was added: + ----- Method: RBAssignmentNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + | varNode valueNode | + varNode := variable asTranslatorNodeIn: aTMethod. + valueNode := value asTranslatorNodeIn: aTMethod. + valueNode isStmtList ifFalse: + [^TAssignmentNode new + setVariable: varNode + expression: valueNode; + comment: comment]. + "This is a super expansion. We are in trouble if any statement other than the last is a return." + (self anyReturns: valueNode statements allButLast) ifTrue: + [self error: 'haven''t implemented pushing down assignments into other than the last return']. + "As of 6/25/2012 19:30 superExpansionNodeFor:args: elides the final return." + self assert: valueNode statements last isReturn not. + ^TStmtListNode new + setStatements: valueNode statements allButLast, + { TAssignmentNode new + setVariable: varNode + expression: valueNode statements last; + comment: comment }; + yourself! Item was added: + ----- Method: RBBlockNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + | statementList | + statementList := OrderedCollection new. + body statements do: + [:s | | newS | + newS := s asTranslatorNodeIn: aTMethod. + "inline the statement list returned when a CascadeNode is translated and/or when ifNotNil: is transformed" + newS isStmtList + ifTrue: [statementList addAll: newS statements] + ifFalse: [statementList add: newS]]. + ^TStmtListNode new + setArguments: (arguments asArray collect: [:arg | arg key]) + statements: statementList; + comment: self missingCommentNeededForCTranslation! Item was added: + ----- Method: RBBlockNode>>isBlockNode (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isBlockNode + ^true! Item was added: + ----- Method: RBCascadeNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me." + ^TStmtListNode new + setArguments: #() + statements: + (Array streamContents: + [:s| | receiverNode | + receiverNode := receiver asTranslatorNodeIn: aTMethod. + "don't expand the receiver if it is a send to get an implicit receiver, + e.g self interpreter printHex: oop => printHex(oop), /not/ printHex(cascade0,oop)." + (receiverNode isSend and: [aTMethod definingClass isNonArgumentImplicitReceiverVariableName: receiverNode selector]) ifTrue: + [receiverNode := TVariableNode new setName: receiverNode selector]. + receiverNode isLeaf ifFalse: + [| varNode | + varNode := aTMethod newCascadeTempFor: receiverNode. + s nextPut: (TAssignmentNode new + setVariable: varNode + expression: receiverNode). + receiverNode := varNode]. + messages do: + [ :msg | s nextPut: ((msg asTranslatorNodeIn: aTMethod) receiver: receiverNode)]]); + comment: comment! Item was added: + ----- Method: RBLiteralNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + + ^TConstantNode new setValue: key! Item was added: + ----- Method: RBMessageNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + "selector is sometimes a Symbol, sometimes a SelectorNode!! + On top of this, numArgs is needed due to the (truly grody) use of + arguments as a place to store the extra expressions needed to generate + code for in-line to:by:do:, etc. see below, where it is used. + + Expand super nodes in place. Elide sends of halt so that halts can be + sprinkled through the simulator but will be eliminated from the generated C." + | rcvrOrNil sel args ifNotNilBlock | + rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. + (rcvrOrNil notNil + and: [rcvrOrNil isVariable + and: [rcvrOrNil name = 'super']]) ifTrue: + [^aTMethod superExpansionNodeFor: selector key args: arguments]. + sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. + sel == #halt ifTrue: [^rcvrOrNil]. + (sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." + or: [sel == #cCode:]) ifTrue: + [arguments first isBlockNode ifTrue: + [| block | + ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 + ifTrue: [block statements first] + ifFalse: [block]]. + (arguments first isLiteralNode + and: [arguments first key isString + and: [arguments first key isEmpty]]) ifTrue: + [^arguments first asTranslatorNodeIn: aTMethod]]. + args := arguments + select: [:arg| arg notNil] + thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. + (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: + ["Restore limit expr that got moved by transformToDo:" + args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. + args second. + args third. "add the limit var as a hidden extra argument; we may need it later" + TVariableNode new setName: arguments first key}]. + (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: + [sel := #ifFalse:. args := {args last}]. + (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: + [sel := #ifTrue:. args := {args first}]. + (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: + [sel := #ifTrue:. args := {args last}]. + (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: + [sel := #ifTrue:. args := {args first}]. + ((sel == #ifFalse: or: [sel == #or:]) + and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: + ["Restore argument block that got moved by transformOr: or transformIfFalse:" + args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. + (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" + ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" + self assert: args size - sel numArgs = 1. + self assert: (args last isStmtList + and: [args last statements size = 1 + and: [(args last statements first isVariable + or: [args last statements first isConstant]) + and: [#('nil' true false) includes: args last statements first nameOrValue]]]). + args := args first: sel numArgs]. + "For the benefit of later passes, e.g. value: inlining, + transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], + which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." + ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) + and: [receiver notNil + and: [receiver isAssignmentEqualsEqualsNil + and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: + [ifNotNilBlock setArguments: #(). + ^TStmtListNode new + setArguments: #() + statements: + { receiver receiver asTranslatorNodeIn: aTMethod. + TSendNode new + setSelector: sel + receiver: (TSendNode new + setSelector: #== + receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) + arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) + arguments: args }]. + ((CCodeGenerator isVarargsSelector: sel) + and: [args last isCollection + and: [args last isSequenceable]]) ifTrue: + [args := args allButLast, args last]. + ^TSendNode new + setSelector: sel + receiver: rcvrOrNil + arguments: args! Item was added: + ----- Method: RBMethodNode>>asTranslationMethodOfClass: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslationMethodOfClass: aTMethodClass + "Answer a TMethod (or subclass) derived from the receiver." + ^aTMethodClass new + setSelector: selector + definingClass: scope instanceScope outerScope class + args: arguments + locals: ((self allDefinedVariables copyWithoutAll: arguments) collect: [:string| string -> string]) + block: body + primitive: ((pragmas ifNotNil: + [pragmas detect: [:pragmaNode| pragmaNode selector beginsWith: #primitve:] ifNone: []]) + ifNil: [0] + ifNotNil: [:pragmaNode| pragmaNode arguments first value]) + properties: (properties ifNil: [AdditionalMethodState new]) + comment: self missingCommentNeededForCTranslation! Item was added: + ----- Method: RBProgramNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + self subclassResponsibility! Item was added: + ----- Method: RBProgramNode>>isBlockNode (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isBlockNode + ^false! Item was added: + ----- Method: RBProgramNode>>missingCommentNeededForCTranslation (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + missingCommentNeededForCTranslation + "So far the RBProgramNode hierarchy omits/elides comments :-(" + ^nil! Item was added: + ----- Method: RBReturnNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of a return." + | exprTranslation lastExpr | + exprTranslation := expr asTranslatorNodeIn: aTMethod. + (expr isMessage + and: [expr receiver isVariableNode + and: [expr receiver key = 'super' + and: [exprTranslation isStmtList]]]) ifTrue: + ["super expansions containing returns are fine, and (as of 6/25/2012 19:27) the last + return is elided from the expansion by TMethod>>superExpansionNodeFor:args:. + So we need to ensure the last expression is a return and simply reuse any other + returns in the expansion." + lastExpr := exprTranslation statements last. + (lastExpr isReturn + or: [lastExpr isReturningIf]) ifFalse: + [exprTranslation statements + at: exprTranslation statements size + put: + (TReturnNode new + setExpression: lastExpr; + comment: comment; + yourself)]. + ^exprTranslation]. + ^TReturnNode new + setExpression: exprTranslation; + comment: comment; + yourself! Item was added: + ----- Method: RBSequenceNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + | statementList | + statementList := OrderedCollection new. + statements do: + [:s | | newS | + newS := s asTranslatorNodeIn: aTMethod. + "inline the statement list returned when a CascadeNode is translated and/or when ifNotNil: is transformed" + newS isStmtList + ifTrue: [statementList addAll: newS statements] + ifFalse: [statementList add: newS]]. + ^TStmtListNode new + setArguments: (parent arguments asArray collect: [:arg | arg key]) + statements: statementList; + comment: self missingCommentNeededForCTranslation! Item was added: + ----- Method: RBVariableNode>>asTranslatorNodeIn: (in category '*VMMakerCompatibilityForPharo6-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + name = 'true' ifTrue: [^ TConstantNode new setValue: true]. + name = 'false' ifTrue: [^ TConstantNode new setValue: false]. + ^ TVariableNode new setName: name! Item was added: + ----- Method: ThreadSafeTranscript>>crtab (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + crtab + self critical: [stream crtab]! Item was added: + ----- Method: ThreadSafeTranscript>>ensureCr (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + ensureCr + (stepContents notEmpty and: [stepContents last ~~ Character cr]) ifTrue: + [ self nextPut: Character cr]! Item was added: + ----- Method: ThreadSafeTranscript>>next:put: (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + next: anInteger put: anObject + "This is supposed to be a fucking WriteStream. Why am I doing donkey work like this??" + self critical: [stream next: anInteger put: anObject]!

1 0

VM Maker: VMMaker.oscog-eem.2430.mcz
by commits＠source.squeak.org 16 Aug '18

16 Aug '18

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2430.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2430 Author: eem Time: 15 August 2018, 6:43:58.396178 pm UUID: 4966a4b7-293a-4911-8f2d-396a7b97d82a Ancestors: VMMaker.oscog-eem.2429 Slang: Send asTranslationMethodOfClass: to CompiledMethods dirctly, allowing CompiledMehtod to choose between Smalltalk-80 parse trees and RefactoringBrowser parse trees. Add a simple test for the Slang conversion to C =============== Diff against VMMaker.oscog-eem.2429 =============== Item was changed: ----- Method: AssignmentNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" - "make a CCodeGenerator equivalent of me" | varNode valueNode | varNode := variable asTranslatorNodeIn: aTMethod. valueNode := value asTranslatorNodeIn: aTMethod. valueNode isStmtList ifFalse: [^TAssignmentNode new setVariable: varNode expression: valueNode; comment: comment]. "This is a super expansion. We are in trouble if any statement other than the last is a return." (self anyReturns: valueNode statements allButLast) ifTrue: [self error: 'haven''t implemented pushing down assignments into other than the last return']. "As of 6/25/2012 19:30 superExpansionNodeFor:args: elides the final return." self assert: valueNode statements last isReturn not. ^TStmtListNode new setStatements: valueNode statements allButLast, { TAssignmentNode new setVariable: varNode expression: valueNode statements last; comment: comment }; yourself! Item was changed: ----- Method: BlockNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" - "make a CCodeGenerator equivalent of me" | statementList | statementList := OrderedCollection new. statements do: [:s | | newS | newS := s asTranslatorNodeIn: aTMethod. "inline the statement list returned when a CascadeNode is translated and/or when ifNotNil: is transformed" newS isStmtList ifTrue: [statementList addAll: newS statements] ifFalse: [statementList add: newS]]. ^TStmtListNode new setArguments: (arguments asArray collect: [:arg | arg key]) statements: statementList; comment: comment! Item was changed: ----- Method: BraceNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me." - "make a CCodeGenerator equivalent of me." "This is for case statements" (elements allSatisfy: [:elem| elem isMessageNode and: [elem selector key = #->]]) ifTrue: [self assert: (elements allSatisfy: [:elem| elem receiver isBlockNode and: [elem arguments first isBlockNode and: [elem receiver isPotentialCCaseLabelIn: aTMethod]]]). ^TBraceCaseNode new caseLabels: (elements collect: [:elem| elem receiver asTranslatorNodeIn: aTMethod]); cases: (elements collect: [:elem| elem arguments first asTranslatorNodeIn: aTMethod]); comment: comment]. "This is for varargs selectors (variants of printf:)" ^elements collect: [:elem| elem asTranslatorNodeIn: aTMethod]! Item was changed: ----- Method: CCodeGenerator>>compileToTMethodSelector:in: (in category 'utilities') ----- compileToTMethodSelector: selector in: aClass "Compile a method to a TMethod" + ^(aClass >> selector) asTranslationMethodOfClass: self translationMethodClass + + "was: | implementingClass | implementingClass := aClass. ^(Compiler new parse: ([aClass sourceCodeAt: selector] on: KeyNotFound + do: [:ex| ""Quick hack for simulating Pharo images..."" - do: [:ex| "Quick hack for simulating Pharo images..." (PharoVM and: [aClass == String class and: [selector == #findSubstringViaPrimitive:in:startingAt:matchTable:]]) ifFalse: [ex pass]. + (implementingClass := ByteString) sourceCodeAt: #findSubstring:in:startingAt:matchTable:]) - (implementingClass := ByteString) sourceCodeAt: #findSubstring:in:startingAt:matchTable:]) in: implementingClass notifying: nil) + asTranslationMethodOfClass: self translationMethodClass"! - asTranslationMethodOfClass: self translationMethodClass! Item was changed: ----- Method: CCodeGenerator>>initializerForInstVar:in: (in category 'inlining') ----- initializerForInstVar: varName in: aClass | instVarIndex | instVarIndex := aClass instVarIndexFor: varName ifAbsent: [^nil]. aClass selectorsAndMethodsDo: [:s :m| | tmeth | ((s beginsWith: 'initialize') and: [m writesField: instVarIndex]) ifTrue: + [tmeth := m asTranslationMethodOfClass: TMethod. - [tmeth := m methodNode asTranslationMethodOfClass: TMethod. tmeth parseTree nodesDo: [:node| | exprOrAssignment | (node isAssignment and: [node variable name = varName]) ifTrue: [exprOrAssignment := node. [exprOrAssignment isAssignment] whileTrue: [exprOrAssignment := exprOrAssignment expression]. ^exprOrAssignment]]]]. ^nil! Item was changed: ----- Method: CascadeNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me." - "make a CCodeGenerator equivalent of me." ^TStmtListNode new setArguments: #() statements: (Array streamContents: [:s| | receiverNode | receiverNode := receiver asTranslatorNodeIn: aTMethod. "don't expand the receiver if it is a send to get an implicit receiver, e.g self interpreter printHex: oop => printHex(oop), /not/ printHex(cascade0,oop)." (receiverNode isSend and: [aTMethod definingClass isNonArgumentImplicitReceiverVariableName: receiverNode selector]) ifTrue: [receiverNode := TVariableNode new setName: receiverNode selector]. receiverNode isLeaf ifFalse: [| varNode | varNode := aTMethod newCascadeTempFor: receiverNode. s nextPut: (TAssignmentNode new setVariable: varNode expression: receiverNode). receiverNode := varNode]. messages do: [ :msg | s nextPut: ((msg asTranslatorNodeIn: aTMethod) receiver: receiverNode)]]); comment: comment! Item was added: + ----- Method: CompiledMethod>>asTranslationMethodOfClass: (in category '*VMMaker-C translation') ----- + asTranslationMethodOfClass: aTMethodClass + "Answer a TMethod (or subclass) derived from the receiver." + ^((CompiledMethod includesSelector: #ast) + ifTrue: [self ast] "Pharo Opal Bytecode Compiler" + ifFalse: [self methodNode]) "Squeak Smalltalk-80 Bytecode Compiler" + asTranslationMethodOfClass: aTMethodClass! Item was changed: ----- Method: LiteralNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" - "make a CCodeGenerator equivalent of me" ^TConstantNode new setValue: key! Item was changed: ----- Method: MessageNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" - "make a CCodeGenerator equivalent of me" "selector is sometimes a Symbol, sometimes a SelectorNode!! On top of this, numArgs is needed due to the (truly grody) use of arguments as a place to store the extra expressions needed to generate code for in-line to:by:do:, etc. see below, where it is used. Expand super nodes in place. Elide sends of halt so that halts can be sprinkled through the simulator but will be eliminated from the generated C." | rcvrOrNil sel args ifNotNilBlock | rcvrOrNil := receiver ifNotNil: [receiver asTranslatorNodeIn: aTMethod]. (rcvrOrNil notNil and: [rcvrOrNil isVariable and: [rcvrOrNil name = 'super']]) ifTrue: [^aTMethod superExpansionNodeFor: selector key args: arguments]. sel := selector isSymbol ifTrue: [selector] ifFalse: [selector key]. sel == #halt ifTrue: [^rcvrOrNil]. (sel == #cCode:inSmalltalk: "extracting here rather than in translation allows inlining in the block." or: [sel == #cCode:]) ifTrue: [arguments first isBlockNode ifTrue: [| block | ^(block := arguments first asTranslatorNodeIn: aTMethod) statements size = 1 ifTrue: [block statements first] ifFalse: [block]]. (arguments first isLiteralNode and: [arguments first key isString and: [arguments first key isEmpty]]) ifTrue: [^arguments first asTranslatorNodeIn: aTMethod]]. args := arguments select: [:arg| arg notNil] thenCollect: [:arg| arg asTranslatorNodeIn: aTMethod]. (sel = #to:by:do: and: [arguments size = 7 and: [(arguments at: 7) notNil]]) ifTrue: ["Restore limit expr that got moved by transformToDo:" args := {(arguments at: 7) value asTranslatorNodeIn: aTMethod. args second. args third. "add the limit var as a hidden extra argument; we may need it later" TVariableNode new setName: arguments first key}]. (sel == #ifTrue:ifFalse: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifFalse:. args := {args last}]. (sel == #ifTrue:ifFalse: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. (sel == #ifFalse:ifTrue: and: [arguments first isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args last}]. (sel == #ifFalse:ifTrue: and: [arguments last isJust: NodeNil]) ifTrue: [sel := #ifTrue:. args := {args first}]. ((sel == #ifFalse: or: [sel == #or:]) and: [arguments size = 2 and: [(arguments at: 2) notNil]]) ifTrue: ["Restore argument block that got moved by transformOr: or transformIfFalse:" args := {(arguments at: 2) asTranslatorNodeIn: aTMethod}]. (args size > sel numArgs and: [sel ~~ #to:by:do:]) ifTrue: "to:by:do: has iLimiT hidden in last arg" ["prune the extra blocks left by ifTrue:, ifFalse:, and: & or:" self assert: args size - sel numArgs = 1. self assert: (args last isStmtList and: [args last statements size = 1 and: [(args last statements first isVariable or: [args last statements first isConstant]) and: [#('nil' true false) includes: args last statements first nameOrValue]]]). args := args first: sel numArgs]. "For the benefit of later passes, e.g. value: inlining, transform e ifNotNil: [:v| ...] into v := e. v ifNotNil: [...], which in fact means transforming (v := e) ifTrue: [:v|...] into v := e. v ifTrue: [...]." ((sel == #ifTrue: or: [sel == #ifFalse: or: [sel == #ifTrue:ifFalse: or: [sel == #ifFalse:ifTrue:]]]) and: [receiver notNil and: [receiver isAssignmentEqualsEqualsNil and: [(ifNotNilBlock := args detect: [:arg| arg isStmtList and: [arg args size = 1]] ifNone: []) notNil]]]) ifTrue: [ifNotNilBlock setArguments: #(). ^TStmtListNode new setArguments: #() statements: { receiver receiver asTranslatorNodeIn: aTMethod. TSendNode new setSelector: sel receiver: (TSendNode new setSelector: #== receiver: (receiver receiver variable asTranslatorNodeIn: aTMethod) arguments: {receiver arguments first asTranslatorNodeIn: aTMethod}) arguments: args }]. ((CCodeGenerator isVarargsSelector: sel) and: [args last isCollection and: [args last isSequenceable]]) ifTrue: [args := args allButLast, args last]. ^TSendNode new setSelector: sel receiver: rcvrOrNil arguments: args! Item was changed: ----- Method: MethodNode>>asTranslationMethodOfClass: (in category '*VMMaker-C translation') ----- asTranslationMethodOfClass: aClass + "Answer a TMethod (or subclass) derived from the receiver." + ^aClass new - - ^ aClass new setSelector: selectorOrFalse definingClass: encoder associationForClass value args: arguments locals: encoder tempsAndBlockArgs block: block primitive: primitive properties: properties + comment: comment! - comment: comment - ! Item was added: + ----- Method: ParseNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- + asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" + self subclassResponsibility! Item was changed: ----- Method: ReturnNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of a return." - "Make a CCodeGenerator equivalent of a return." | exprTranslation lastExpr | exprTranslation := expr asTranslatorNodeIn: aTMethod. (expr isMessage and: [expr receiver isVariableNode and: [expr receiver key = 'super' and: [exprTranslation isStmtList]]]) ifTrue: ["super expansions containing returns are fine, and (as of 6/25/2012 19:27) the last return is elided from the expansion by TMethod>>superExpansionNodeFor:args:. So we need to ensure the last expression is a return and simply reuse any other returns in the expansion." lastExpr := exprTranslation statements last. (lastExpr isReturn or: [lastExpr isReturningIf]) ifFalse: [exprTranslation statements at: exprTranslation statements size put: (TReturnNode new setExpression: lastExpr; comment: comment; yourself)]. ^exprTranslation]. ^TReturnNode new setExpression: exprTranslation; comment: comment; yourself! Item was added: + TestCase subclass: #SlangTests + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMaker-Tests'! Item was added: + ----- Method: SlangTests>>testSimpleMethod (in category 'tests') ----- + testSimpleMethod + | codeGenerator tMethod code | + codeGenerator := CCodeGenerator new. + tMethod := codeGenerator compileToTMethodSelector: #extBBytecode in: StackInterpreter. + self assert: #( #'[' + byte #':=' self fetchByte #'.' + self fetchNextBytecode #'.' + extB #':=' #(numExtB #= 0 and: #'[' byte #> 127 #']') + ifTrue: #'[' byte #- 256 #']' + ifFalse: #'[' #(extB bitShift: 8) #+ byte #']' #'.' + numExtB #':=' numExtB #+ 1 #'.' + #'^' self + #']') + equals: (Scanner new scanTokens: tMethod parseTree printString). + code := String streamContents: [:s| tMethod emitCCodeOn: s generator: codeGenerator]. + code := code allButFirst: (code indexOfSubCollection: 'sqInt') - 1. + self assert: #('sqInt' 'extBBytecode(void)' '{' 'sqInt' 'byte;' + 'byte' '=' 'fetchByte();' + 'fetchNextBytecode();' + 'extB' '=' '((numExtB' '==' '0)' '&&' '(byte' '>' '0x7F)' + '?' 'byte' '-' '256' + ':' '(((usqInt)' 'extB' '<<' '8))' '+' 'byte);' + 'numExtB' '+=' '1;' 'return' 'self;' '}') + equals: (code findTokens: Character separators) asArray ! Item was changed: ----- Method: TMethod>>superExpansionNodeFor:args: (in category 'inlining') ----- superExpansionNodeFor: aSelector args: argumentNodes "Answer the expansion of a super send. Merge the super expansion's locals, properties and comment into this method's properties." (definingClass superclass lookupSelector: aSelector) ifNil: [self error: 'superclass does not define super method'] ifNotNil: [:superMethod| | superTMethod commonVars varMap | + superTMethod := superMethod asTranslationMethodOfClass: self class. - superTMethod := superMethod methodNode asTranslationMethodOfClass: self class. ((argumentNodes allSatisfy: [:parseNode| parseNode isVariableNode]) and: [(argumentNodes asOrderedCollection collect: [:parseNode| parseNode key]) = superTMethod args]) ifFalse: [self error: definingClass name, '>>',selector, ' args ~= ', superTMethod definingClass name, '>>', aSelector, (String with: $. with: Character cr), 'For super expansions to be translated correctly each argument must be a variable with the same name as the corresponding argument in the super method.']. (commonVars := superTMethod locals intersection: self locals) notEmpty ifTrue: [varMap := Dictionary new. commonVars do: [:k| varMap at: k put: (superTMethod unusedNamePrefixedBy: k avoiding: self allLocals)]. superTMethod renameVariablesUsing: varMap]. self mergePropertiesOfSuperMethod: superTMethod. self assert: (superTMethod locals allSatisfy: [:var| (self locals includes: var) not]). locals addAll: superTMethod locals. superTMethod declarations keysAndValuesDo: [:var :decl| self declarationAt: var put: decl]. superTMethod comment ifNotNil: [:superComment| comment := comment ifNil: [superComment] ifNotNil: [superComment, comment]]. superTMethod extraVariableNumber ifNotNil: [:scvn| extraVariableNumber := extraVariableNumber ifNil: [scvn] ifNotNil: [:cvn| cvn + scvn]]. superTMethod elideAnyFinalReturn. ^superTMethod parseTree]! Item was changed: ----- Method: VMPluginCodeGenerator>>accessorsAndAssignmentsForSubMethodNamed:actuals:depth:interpreterClass:into: (in category 'spur primitive compilation') ----- accessorsAndAssignmentsForSubMethodNamed: selector actuals: actualParameters depth: depth interpreterClass: interpreterClass into: aTrinaryBlock "Evaluate aTrinaryBlock with the root accessor sends, accessor sends and assignments in the sub-method named selector." | method map | (inProgressSelectors includes: selector) ifTrue: [^nil]. inProgressSelectors add: selector. method := self methodNamed: selector. "this is unsatisfactory. a pluggable scheme that asks the relevant plugin the right question would be better but for now the only cross-plugin load is for loadBitBltFrom:warping: and variants." (#(loadBitBltFrom: loadWarpBltFrom: loadBitBltFrom:warping:) includes: selector) ifTrue: [(method isNil or: [method definingClass ~~ BitBltSimulation]) ifTrue: + [method := (BitBltSimulation >> selector) asTranslationMethodOfClass: TMethod]]. - [method := (BitBltSimulation >> selector) methodNode asTranslationMethodOfClass: TMethod]]. method ifNil: [^nil]. map := Dictionary new. method args do: [:var| map at: var put: depth asString, var]. method locals do: [:var| map at: var put: depth asString, var]. ^self accessorsAndAssignmentsForMethod: (method copy renameVariablesUsing: map) actuals: actualParameters depth: depth + 1 interpreterClass: interpreterClass into: aTrinaryBlock! Item was changed: ----- Method: VariableNode>>asTranslatorNodeIn: (in category '*VMMaker-C translation') ----- asTranslatorNodeIn: aTMethod + "Answer a TParseNode subclass equivalent of me" - "make a CCodeGenerator equivalent of me" name = 'true' ifTrue: [^ TConstantNode new setValue: true]. name = 'false' ifTrue: [^ TConstantNode new setValue: false]. + ^TVariableNode new setName: name! - ^ TVariableNode new setName: name!

1 0

VM Maker: VMMakerCompatibilityForPharo6-EliotMiranda.3.mcz
by commits＠source.squeak.org 16 Aug '18

16 Aug '18

Eliot Miranda uploaded a new version of VMMakerCompatibilityForPharo6 to project VM Maker: http://source.squeak.org/VMMaker/VMMakerCompatibilityForPharo6-EliotMiranda… ==================== Summary ==================== Name: VMMakerCompatibilityForPharo6-EliotMiranda.3 Author: EliotMiranda Time: 15 August 2018, 6:25:07.316818 pm UUID: 4dd7e00c-e52f-0d00-a920-37300bb88c17 Ancestors: VMMakerCompatibilityForPharo6-eem.2 Support for embeddedBlockClosures and schematicTempNamesString because these are used currently to interface to the JIT's code decoration facilities. =============== Diff against VMMakerCompatibilityForPharo6-eem.2 =============== Item was changed: SystemOrganization addCategory: #VMMakerCompatibilityForPharo6! + SystemOrganization addCategory: 'VMMakerCompatibilityForPharo6-Kernel-Methods'! SystemOrganization addCategory: 'VMMakerCompatibilityForPharo6-System'! Item was added: + ----- Method: BytecodeEncoder class>>extensionsAt:in:into: (in category '*VMMakerCompatibilityForPharo6-instruction stream support') ----- + extensionsAt: pc in: aCompiledMethod into: trinaryBlock + "If the bytecode at pc is an extension then evaluate aTrinaryBlock + with the values of extA and extB and number of extension *bytes*. + If the bytecode at pc is not an extension then evaluate with 0, 0, 0." + + self subclassResponsibility! Item was added: + InstructionClient subclass: #ClosureExtractor + instanceVariableNames: 'action scanner currentContext' + classVariableNames: '' + poolDictionaries: '' + category: 'VMMakerCompatibilityForPharo6-Kernel-Methods'! + + !ClosureExtractor commentStamp: 'mha 9/21/2010 11:16' prior: 0! + A ClosureExtractor is a utility class that is used to extract all BlockClosures from a CompiledMethod. It inherits from InstructionClient and understands only one single message, namely that corresponding to the push closure bytecode instruction. Being sent this message, a ClosureExtractor will create a BlockClosure instance and evaluate the block it holds as an instance variable with that closure as parameter.! Item was added: + ----- Method: ClosureExtractor class>>withAction:andScanner: (in category 'instance creation') ----- + withAction: aBlock andScanner: anInstructionStream + "The passed block must accept one value, which will be a BlockClosure." + ^ self new action: aBlock; scanner: anInstructionStream! Item was added: + ----- Method: ClosureExtractor>>action (in category 'accessing') ----- + action + ^ action! Item was added: + ----- Method: ClosureExtractor>>action: (in category 'accessing') ----- + action: aBlock + action := aBlock! Item was added: + ----- Method: ClosureExtractor>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + currentContext := currentContext sender! Item was added: + ----- Method: ClosureExtractor>>blockReturnTop (in category 'instruction decoding') ----- + blockReturnTop + currentContext := currentContext sender! Item was added: + ----- Method: ClosureExtractor>>pushClosureCopyNumCopiedValues:numArgs:blockSize: (in category 'instruction decoding') ----- + pushClosureCopyNumCopiedValues: numCopied numArgs: numArgs blockSize: blockSize + "Create a BlockClosure corresponding to the closure bytecode + and execute the action block with it. The created BlockClosure is only a pseudo value, + it is not populated with meaningful context and argument information." + | block | + block := BlockClosure + outerContext: currentContext + startpc: scanner pc + numArgs: numArgs + copiedValues: (Array new: numCopied).. + currentContext := block asContextWithSender: currentContext. + action value: block! Item was added: + ----- Method: ClosureExtractor>>pushFullClosure:numCopied: (in category 'instruction decoding') ----- + pushFullClosure: aCompiledBlock numCopied: numCopied + "Create a BlockClosure corresponding to the closure bytecode + and execute the action block with it. The created BlockClosure is only a pseudo value, + it is not populated with meaningful context and argument information." + | block | + block := FullBlockClosure + receiver: nil + outerContext: currentContext + method: aCompiledBlock + copiedValues: (Array new: numCopied). + currentContext := block asContextWithSender: currentContext. + action value: block! Item was added: + ----- Method: ClosureExtractor>>scanner (in category 'accessing') ----- + scanner + ^ scanner! Item was added: + ----- Method: ClosureExtractor>>scanner: (in category 'accessing') ----- + scanner: anInstructionStream + scanner := anInstructionStream. + currentContext := Context + sender: nil + receiver: nil + method: scanner method + arguments: (Array new: scanner method numArgs)! Item was added: + ----- Method: CompiledCode>>isCompiledCode (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isCompiledCode + ^true! Item was added: + ----- Method: CompiledMethod>>embeddedBlockClosures (in category '*VMMakerCompatibilityForPharo6-closures') ----- + embeddedBlockClosures + | bms extractor scanner endPC encoderClass | + bms := OrderedCollection new. + scanner := self scanner. + extractor := ClosureExtractor withAction: [:c| bms add: c] andScanner: scanner. + endPC := self endPC. + encoderClass := self encoderClass. + [scanner pc <= endPC] whileTrue: + [encoderClass interpretNextInstructionFor: extractor in: scanner]. + ^bms! Item was added: + ----- Method: EncoderForSistaV1 class>>extensionsAt:in:into: (in category '*VMMakerCompatibilityForPharo6-compiled method support') ----- + extensionsAt: bcpc in: method into: aTrinaryBlock + "If the bytecode at pc is an extension then evaluate aBinaryBlock with the values of extA and extB and number of extension *bytes*. + If the bytecode at pc is not extended then evaluate aBinaryBlock with 0 and 0. + 224 11100000 aaaaaaaa Extend A (Ext A = Ext A prev * 256 + Ext A) + 225 11100001 bbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B)" + + | scanpc byte extByte extA extB | + scanpc := bcpc. + "There may be an extension (it could be a false positive). We must scan as fast as possible..." + extA := extB := 0. + [byte := method at: scanpc. + byte >= 224 and: [byte <= 225]] whileTrue: + [extByte := method at: scanpc + 1. + scanpc := scanpc + 2. + byte = 224 + ifTrue: + [extA := (extA bitShift: 8) + extByte] + ifFalse: + [extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]]. + ^aTrinaryBlock value: extA value: extB value: scanpc - bcpc + + + "Why use + byte >= 224 and: [byte <= 225] + and not + (byte bitAnd: 16rFE) = 16rE0 + ? + | n | + n := 100000000. + #(0 224) collect: + [:byte| + { Time millisecondsToRun: [1 to: n do: [:i| (byte >= 224 and: [byte <= 225]) ifTrue: []]]. + Time millisecondsToRun: [1 to: n do: [:i| (byte bitAnd: 16rFE) = 16rE0 ifTrue: []]] }] #(#(297 599) #(702 671))"! Item was added: + ----- Method: EncoderForV3 class>>extensionsAt:in:into: (in category '*VMMakerCompatibilityForPharo6-instruction stream support') ----- + extensionsAt: pc in: aCompiledMethod into: trinaryBlock + "If the bytecode at pc is an extension then evaluate aTrinaryBlock + with the values of extA and extB and number of extension *bytes*. + If the bytecode at pc is not an extension then evaluate with 0, 0, 0. + There are no extensions in the SqueakV3/Smalltalk-80 bytecode set, so..." + ^trinaryBlock value: 0 value: 0 value: 0! Item was added: + ----- Method: OCAbstractScope>>childrenDo:after:suchThat: (in category '*VMMakerCompatibilityForPharo6-results') ----- + childrenDo: aBlock after: pBlock suchThat: selectBlock + children ifNotNil: + [children do: + [:child| + (selectBlock value: child) ifTrue: + [aBlock value: child. + child childrenDo: aBlock after: pBlock suchThat: selectBlock. + pBlock value: child]]]! Item was added: + ----- Method: OCAbstractScope>>childrenDo:suchThat: (in category '*VMMakerCompatibilityForPharo6-results') ----- + childrenDo: aBlock suchThat: selectBlock + children ifNotNil: + [children do: + [:child| + (selectBlock value: child) ifTrue: + [aBlock value: child. + child childrenDo: aBlock suchThat: selectBlock]]]! Item was added: + ----- Method: Object>>isCompiledCode (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isCompiledCode + ^false! Item was added: + ----- Method: RBMethodNode>>printSchematicTempsFor:in:on: (in category '*VMMakerCompatibilityForPharo6-results') ----- + printSchematicTempsFor: blockNode in: blockScope on: stream + | startPos vectorStartPos | + startPos := stream position. + blockNode arguments do: + [:n| + stream position > startPos ifTrue: [stream space]. + stream nextPutAll: n name]. + blockScope isBlockScope ifTrue: + [(blockScope copiedVars "filter out remotes, e.g. 0vector0" + reject: [:var| var name first isDigit]) do: + [:var| + stream position > startPos ifTrue: [stream space]. + stream nextPutAll: var name]]. + (blockNode temporaries reject: [:var| (blockScope lookupVar: var name) isRemote]) do: + [:var| + stream position > startPos ifTrue: [stream space]. + stream nextPutAll: var name]. + vectorStartPos := stream position. + (blockNode temporaries select: [:var| (blockScope lookupVar: var name) isRemote]) do: + [:var| + stream position = vectorStartPos ifTrue: + [vectorStartPos > startPos ifTrue: [stream space]. + stream nextPut: $(]. + stream nextPutAll: var name]. + stream position > vectorStartPos ifTrue: [stream nextPut: $)]! Item was added: + ----- Method: RBMethodNode>>schematicTempNamesString (in category '*VMMakerCompatibilityForPharo6-results') ----- + schematicTempNamesString + scope ifNil: [self generateIR]. + ^String streamContents: + [:s| + self printSchematicTempsFor: self in: scope on: s. + scope + childrenDo: + [:childBlockScope| + childBlockScope isOptimizedBlockScope ifFalse: + [s nextPut: $[. + self printSchematicTempsFor: childBlockScope node in: childBlockScope on: s]] + after: + [:childBlockScope| + childBlockScope isOptimizedBlockScope ifFalse: + [s nextPut: $]]] + suchThat: [:childScope| childScope isBlockScope]] + !

1 0

Accessing ux2sqPath and sq2uxPath
by Alistair Grant 15 Aug '18

15 Aug '18

Hi Everyone, So that path names are encoded correctly on MacOS, the FileAttributesPlugin needs to use ux2sqPath() and sq2uxPath(). On linux this "just works". If I've read the build log correctly the functions are included in vm.a, which is included when linking external plugins. However I'm not able to get the symbols resolved on MacOS. The routines are defined in: platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.c declared in: platforms/Mac OS/plugins/FilePlugin/sqMacUnixFileInterface.h and are accessed in: platforms/Mac OS/vm/sqMacNSPluginUILogic2.c platforms/Mac OS/vm/sqMacImageIO.c platforms/Mac OS/vm/sqMacMain.c The following lines in build.macos64x64/common/Makefile.vm look like they provide the required magic: PluginIncludes := FilePlugin HostWindowPlugin SoundPlugin OSPluginIncludes := FilePlugin HostWindowPlugin SoundPlugin I attempted to create a plugin makefile: platforms/Mac OS/plugins/FileAttributesPlugin/Makefile.plugin: # # FileAttributesPlugin uses sq2uxPath() and ux2sqPath(), provided by FilePlugin # # include ../common/Makefile.plugin PluginIncludes += FilePlugin however this still results in: Undefined symbols for architecture x86_64: "_sq2uxPath", referenced from: _squeakPathtoUnixmaxLen in FileAttributesPlugin.lib(FileAttributesPlugin.o) "_ux2sqPath", referenced from: _primitiveReaddir in FileAttributesPlugin.lib(FileAttributesPlugin.o) ld: symbol(s) not found for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) make: *** [build/vm/Squeak] Error 1 The full source is available at: https://github.com/akgrant43/opensmalltalk-vm/tree/FileAttributes133 Any suggestions? Thanks very much, Alistair

2 2

Visual Studio 2017 Linux development with C++
by Ben Coman 15 Aug '18

15 Aug '18

I was looking around how to use plain Makefiles with VIsual Studio and bumped into a demo of driving compilation and debugging on Linux from Windows Visual Studio. So intriguing I had to share... https://blogs.msdn.microsoft.com/vcblog/2016/03/30/visual-c-for-linux-devel… I see the possibility of Windows Visual Studio debugging the VM while it runs inside Windows Subsystem For Linux** displaying its graphical windows in a Windows xclient. Great when only a single machine will do, like multi-platform coding while drinking daiquiris on a Caribbean beach. cheers -ben ** e.g. Unbuntu, Centos7 (could not get Centos6 working)

1 1

VM Maker: VMMakerCompatibilityForPharo6-eem.2.mcz
by commits＠source.squeak.org 14 Aug '18

14 Aug '18

Eliot Miranda uploaded a new version of VMMakerCompatibilityForPharo6 to project VM Maker: http://source.squeak.org/VMMaker/VMMakerCompatibilityForPharo6-eem.2.mcz ==================== Summary ==================== Name: VMMakerCompatibilityForPharo6-eem.2 Author: EliotMiranda Time: 14 August 2018, 12:49:06.545844 pm UUID: 99835c3d-cc2f-0d00-8d4a-fc380db6fb3c Ancestors: VMMakerCompatibilityForPharo6-eem.1 isCompiledBlock and bytesPerElement =============== Diff against VMMakerCompatibilityForPharo6-eem.1 =============== Item was added: + ----- Method: ArrayedCollection>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + | bytesPerElementOrZero | + bytesPerElementOrZero := #[0 0 0 0 0 0 0 0 8 4 4 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1] at: self class instSpec. + ^bytesPerElementOrZero = 0 + ifTrue: [Smalltalk wordSize] + ifFalse: [bytesPerElementOrZero]! Item was added: + ----- Method: ByteArray>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 1! Item was added: + ----- Method: ColorArray>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + + ^4! Item was added: + ----- Method: CompiledBlock>>isCompiledBlock (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isCompiledBlock + ^true! Item was added: + ----- Method: CompiledCode>>isCompiledBlock (in category '*VMMakerCompatibilityForPharo6-testing') ----- + isCompiledBlock + ^false! Item was added: + ----- Method: MatrixTransform2x3>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + + ^ 4! Item was added: + ----- Method: ShortIntegerArray>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + ^2! Item was added: + ----- Method: ShortRunArray>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + + ^ 4! Item was added: + ----- Method: SmalltalkImage>>primitiveErrorTable (in category '*VMMakerCompatibilityForPharo6-special objects') ----- + primitiveErrorTable + "Smalltalk primitiveErrorTable" + ^self specialObjectsArray at: 52! Item was added: + ----- Method: WordArray>>bytesPerElement (in category '*VMMakerCompatibilityForPharo6-accessing') ----- + bytesPerElement + "Number of bytes in each item. This multiplied by (self size)*8 gives the number of bits stored." + ^ 4!

1 0

VM Maker: VMMakerCompatibilityForPharo6-eem.1.mcz
by commits＠source.squeak.org 14 Aug '18

14 Aug '18

Eliot Miranda uploaded a new version of VMMakerCompatibilityForPharo6 to project VM Maker: http://source.squeak.org/VMMaker/VMMakerCompatibilityForPharo6-eem.1.mcz ==================== Summary ==================== Name: VMMakerCompatibilityForPharo6-eem.1 Author: eem Time: 13 August 2018, 4:11:01.718248 pm UUID: f1ffa3f1-ba2f-0d00-8b88-25d10cb2214f Ancestors: Compatibility methods and classes for VMMaker when loaded into Pharo6. Right now gets around EndianDetector and the lack of MethodReference. ==================== Snapshot ==================== SystemOrganization addCategory: #VMMakerCompatibilityForPharo6! SystemOrganization addCategory: 'VMMakerCompatibilityForPharo6-System'! ----- Method: SmalltalkImage>>endianness (in category '*VMMakerCompatibilityForPharo6-accessing') ----- endianness "Pluralitas non est ponenda sine necessitate..." ^EndianDetector endianness! Object subclass: #MethodReference instanceVariableNames: 'classSymbol classIsMeta methodSymbol stringVersion category environment' classVariableNames: 'InvalidReference' poolDictionaries: '' category: 'VMMakerCompatibilityForPharo6-System'! !MethodReference commentStamp: 'eem 8/13/2018 15:59' prior: 0! A MethodReference is is a lightweight proxy for a CompiledMethod. Has methods for pointed to the CompileMethod's source statements, byte codes. Is heavily used by Tools. Instance Variables classIsMeta: Boolean class vs. instance classSymbol: Symbol for method's class (without class keyword if meta) methodSymbol: Symbol for method's selector stringVersion: 'Class>>selector:' format! ----- Method: MethodReference class>>class:selector: (in category 'instance creation') ----- class: aClass selector: aSelector ^ self class: aClass selector: aSelector environment: aClass environment.! ----- Method: MethodReference class>>class:selector:environment: (in category 'instance creation') ----- class: aClass selector: aSelector environment: anEnvironment ^ self new setStandardClass: aClass methodSymbol: aSelector environment: anEnvironment.! ----- Method: MethodReference class>>cleanUp: (in category 'class initialization') ----- cleanUp: aggressive aggressive ifTrue: [InvalidReference := nil].! ----- Method: MethodReference class>>invalid (in category 'instance creation') ----- invalid "Creates an invalid method reference to avoid the usage of nil." ^ InvalidReference ifNil: [ InvalidReference := self new setClassSymbol: #NonExistentClass classIsMeta: false methodSymbol: #nonExistentSelector stringVersion: '<The Invalid Method Reference>']! ----- Method: MethodReference>><= (in category 'comparing') ----- <= anotherMethodReference classSymbol < anotherMethodReference classSymbol ifTrue: [^true]. classSymbol > anotherMethodReference classSymbol ifTrue: [^false]. classIsMeta = anotherMethodReference classIsMeta ifFalse: [^classIsMeta not]. ^methodSymbol <= anotherMethodReference methodSymbol! ----- Method: MethodReference>>= (in category 'comparing') ----- = anotherMethodReference "Answer whether the receiver and the argument represent the same object." ^ self species == anotherMethodReference species and: [self classSymbol = anotherMethodReference classSymbol and: [self classIsMeta = anotherMethodReference classIsMeta and: [self methodSymbol = anotherMethodReference methodSymbol and: [self environment == anotherMethodReference environment]]]]! ----- Method: MethodReference>>actualClass (in category 'accessing') ----- actualClass ^self environment at: classSymbol ifPresent: [ :actualClass | classIsMeta ifTrue: [ actualClass classSide ] ifFalse: [ actualClass ] ]! ----- Method: MethodReference>>asCodeReference (in category 'converting') ----- asCodeReference ^ self! ----- Method: MethodReference>>asString (in category 'converting') ----- asString ^(stringVersion ifNil: [ self stringVersionDefault ]) asString! ----- Method: MethodReference>>asStringOrText (in category 'converting') ----- asStringOrText ^stringVersion ifNil: [ self stringVersionDefault ]! ----- Method: MethodReference>>asValid (in category 'converting') ----- asValid "Sometimes persistent MethodReferences may become stale after a refactoring which moved some methods to a superclass. This method answers the new valid MethodReference if that happened." ^ self isValid ifTrue: [ self ] ifFalse: [ | cm | cm := self actualClass lookupSelector: self selector. cm ifNotNil: [ cm methodReference ] ]! ----- Method: MethodReference>>category (in category 'accessing') ----- category "Answers the class category (cached for reuse via MC and other tools)" ^ category ifNil: [category := self actualClass organization categoryOfElement: methodSymbol]! ----- Method: MethodReference>>category: (in category 'initialize-release') ----- category: aSymbol category := aSymbol! ----- Method: MethodReference>>classIsMeta (in category 'testing') ----- classIsMeta ^classIsMeta! ----- Method: MethodReference>>classSymbol (in category 'accessing') ----- classSymbol ^classSymbol! ----- Method: MethodReference>>compiledMethod (in category 'accessing') ----- compiledMethod ^self actualClass compiledMethodAt: methodSymbol ifAbsent: nil! ----- Method: MethodReference>>environment (in category 'accessing') ----- environment ^ environment ifNil: [ "We will probably have MethodReferences already instantiated when this commit lands. We lazily move these over to the new, Environment aware, order of things." environment := Smalltalk globals].! ----- Method: MethodReference>>hash (in category 'comparing') ----- hash "Answer a SmallInteger whose value is related to the receiver's identity." ^ (self species hash bitXor: self classSymbol hash) bitXor: self methodSymbol hash! ----- Method: MethodReference>>isClassReference (in category 'testing') ----- isClassReference ^ false! ----- Method: MethodReference>>isMethodReference (in category 'testing') ----- isMethodReference ^ true! ----- Method: MethodReference>>isValid (in category 'testing') ----- isValid "Answer whether the receiver represents a current selector or Comment" | aClass | methodSymbol isDoIt ifTrue: [^ false]. (aClass := self actualClass) ifNil: [^ false]. ^ (aClass includesSelector: methodSymbol) or: [methodSymbol == #Comment]! ----- Method: MethodReference>>methodSymbol (in category 'accessing') ----- methodSymbol ^methodSymbol! ----- Method: MethodReference>>printOn: (in category 'printing') ----- printOn: aStream | actualClass | "Print the receiver on a stream" actualClass := classSymbol asString. classIsMeta ifTrue: [actualClass := actualClass, ' class']. super printOn: aStream. aStream nextPutAll: ' ', actualClass, ' >> ', methodSymbol printString.! ----- Method: MethodReference>>selector (in category 'accessing') ----- selector ^methodSymbol! ----- Method: MethodReference>>setClass:methodSymbol:stringVersion: (in category 'initialize-release') ----- setClass: aClass methodSymbol: methodSym stringVersion: aString classSymbol := aClass theNonMetaClass name. classIsMeta := aClass isMeta. methodSymbol := methodSym. environment := aClass environment. stringVersion := aString.! ----- Method: MethodReference>>setClassAndSelectorIn: (in category 'initialize-release') ----- setClassAndSelectorIn: csBlock ^csBlock value: self actualClass value: methodSymbol! ----- Method: MethodReference>>setClassSymbol:classIsMeta:methodSymbol:stringVersion: (in category 'initialize-release') ----- setClassSymbol: classSym classIsMeta: isMeta methodSymbol: methodSym stringVersion: aString classSymbol := classSym. classIsMeta := isMeta. methodSymbol := methodSym. stringVersion := aString.! ----- Method: MethodReference>>setStandardClass:methodSymbol: (in category 'initialize-release') ----- setStandardClass: aClass methodSymbol: methodSym classSymbol := aClass theNonMetaClass name. environment := aClass environment. classIsMeta := aClass isMeta. methodSymbol := methodSym. stringVersion := nil.! ----- Method: MethodReference>>setStandardClass:methodSymbol:environment: (in category 'initialize-release') ----- setStandardClass: aClass methodSymbol: aSelector environment: anEnvironment classSymbol := aClass theNonMetaClass name. classIsMeta := aClass isMeta. methodSymbol := aSelector. environment := anEnvironment. stringVersion := nil.! ----- Method: MethodReference>>source (in category 'accessing') ----- source ^ (self actualClass sourceCodeAt: methodSymbol) asString withSqueakLineEndings! ----- Method: MethodReference>>sourceCode (in category 'accessing') ----- sourceCode ^ self actualClass sourceCodeAt: self methodSymbol! ----- Method: MethodReference>>sourceString (in category 'accessing') ----- sourceString ^ self sourceCode asString! ----- Method: MethodReference>>stringVersion (in category 'accessing') ----- stringVersion ^stringVersion ifNil: [self asStringOrText]! ----- Method: MethodReference>>stringVersion: (in category 'accessing') ----- stringVersion: aString stringVersion := aString! ----- Method: MethodReference>>stringVersionDefault (in category 'accessing') ----- stringVersionDefault ^classSymbol, (classIsMeta ifTrue: [ ' class ' ] ifFalse: [' ']), methodSymbol ! ----- Method: MethodReference>>timeStamp (in category 'accessing') ----- timeStamp ^ self compiledMethod timeStamp!

3 3

[OpenSmalltalk/opensmalltalk-vm] 274: Update primitiveFileStdioHandles error handling. (#278)
by akgrant43 14 Aug '18

14 Aug '18

Previously validMask = -1 was considered an error. Now validMask < 0 is considered an error and the value is returned to the image with primitiveFailForOSError(). This is more robust against word length in the VM and provides a general mechanism for the plugin to provide error information back to the image. You can view, comment on, or merge this pull request online at: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/278 -- Commit Summary -- * 274: Update primitiveFileStdioHandles error handling. -- File Changes -- M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c (3) M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c (3) M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c (3) M src/plugins/FilePlugin/FilePlugin.c (22) -- Patch Links -- https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/278.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/278.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/278

1 1

[OpenSmalltalk/opensmalltalk-vm] 22424a: 274: Update primitiveFileStdioHandles error handli...
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 22424a64ebadf34e285b42700562db82ba0808d7 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/22424a64ebadf34e28… Author: AlistairGrant <akgrant0710(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- 274: Update primitiveFileStdioHandles error handling. Previously validMask = -1 was considered an error. Now validMask < 0 is considered an error and the value is returned to the image with primitiveFailForOSError(). This is more robust against word length in the VM and provides a general mechanism for the plugin to provide error information back to the image. Commit: 3b5449618856b605dc1d5e3d17f1dac86141a39d https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/3b5449618856b605dc… Author: akgrant43 <akgrant(a)gmail.com> Date: 2018-08-14 (Tue, 14 Aug 2018) Changed paths: M platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/RiscOS/plugins/FilePlugin/sqFilePluginBasicPrims.c M platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c M src/plugins/FilePlugin/FilePlugin.c Log Message: ----------- Merge pull request #278 from akgrant43/Issue274 274: Update primitiveFileStdioHandles error handling. Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/41e53768dcf9...3b… **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

[OpenSmalltalk/opensmalltalk-vm] 41e537: Minor corrections to the new Pharo load script.
by GitHub 14 Aug '18

14 Aug '18

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 41e53768dcf91c5dbf51719ff123633aa1fd3912 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/41e53768dcf91c5dbf… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2018-08-13 (Mon, 13 Aug 2018) Changed paths: M image/BuildPharo6VMMakerImage.st M image/PharoWorkspace.text Log Message: ----------- Minor corrections to the new Pharo load script. **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2018