Vm-dev July 2020

vm-dev@lists.squeakfoundation.org

21 participants
122 discussions

VM Maker: VMMaker.oscog-eem.2781.mcz
by commits＠source.squeak.org 26 Jul '20

26 Jul '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2781.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2781 Author: eem Time: 25 July 2020, 8:55:54.857642 pm UUID: 8de36fd4-d64f-4396-8948-140acaa8cdb4 Ancestors: VMMaker.oscog-eem.2780 Miscellaneous tweaks. InterpreterPrimitives: fix some similation slips in canBeImmutable:. Have primitiveHighBit use cppIf:ifTrue:cppIf:ifTrue:ifFalse:. Sionara asIEEE64BitWord; it's now in trunk. Harmonise the two simulator primitiveExecuteMethodArgsArray's, adding a useful doit to turn off the halt. Slang: add some potentially useful names to namesDefinedAtCompileTime =============== Diff against VMMaker.oscog-eem.2780 =============== Item was changed: ----- Method: CogVMSimulator>>primitiveExecuteMethodArgsArray (in category 'control primitives') ----- primitiveExecuteMethodArgsArray (InitializationOptions at: #haltOnExecuteMethod ifAbsent: [true]) ifTrue: [self halt: thisContext selector]. + ^super primitiveExecuteMethodArgsArray + + "InitializationOptions at: #haltOnExecuteMethod put: false"! - ^super primitiveExecuteMethodArgsArray! Item was removed: - ----- Method: Float>>asIEEE64BitWord (in category '*VMMaker-Cog tests') ----- - asIEEE64BitWord - ^((self basicAt: 1) bitShift: 32) + (self basicAt: 2)! Item was changed: ----- Method: InterpreterPrimitives>>canBeImmutable: (in category 'object access primitives') ----- canBeImmutable: oop <option: #IMMUTABILITY> | scheduler processLists | self assert: (objectMemory isNonImmediate: oop). "For now we fail the primitive for contexts to we ensure there are no immutable contexts. Later we can consider having immutable contexts and send cannotReturn callback when returning to an immutable context. That would mean that setting a context to immutable would require a divorce and returns to immutable context are necessarily across stack pages" + (objectMemory isContext: oop) ifTrue: [^ false]. - (objectMemory isContext: oop) ifTrue: [ ^ false ]. "Weak structures can't be immutable" (objectMemory isEphemeron: oop) ifTrue: [^ false]. (objectMemory isWeakNonImm: oop) ifTrue: [^ false]. "No clue what is going on for semaphores so they can't be immutable" (objectMemory isSemaphoreObj: oop) ifTrue: [^ false]. "Simple version of process management: we forbid Process and LinkedList instances to be immutable as well as the Processor and the array of activeProcess" + scheduler := objectMemory fetchPointer: ValueIndex ofObject: (objectMemory splObj: SchedulerAssociation). - scheduler := self fetchPointer: ValueIndex ofObject: (objectMemory splObj: SchedulerAssociation). processLists := objectMemory fetchPointer: ProcessListsIndex ofObject: scheduler. + oop = scheduler ifTrue: [^ false]. + oop = processLists ifTrue: [^ false]. - oop = scheduler ifTrue: [ ^ false ]. - oop = processLists ifTrue: [ ^ false ]. "Is it a linkedList ?" + (objectMemory classIndexOf: (objectMemory fetchPointer: 1 ofObject: processLists)) = (objectMemory classIndexOf: oop) ifTrue: [^ false]. - (objectMemory classIndexOf: (objectMemory fetchPointer: 1 ofObject: processLists)) = (objectMemory classIndexOf: oop) ifTrue: [ ^ false ]. "is it a Process ?" + (objectMemory classIndexOf: (objectMemory fetchPointer: ActiveProcessIndex ofObject: scheduler)) = (objectMemory classIndexOf: oop) ifTrue: [^ false]. - (objectMemory classIndexOf: (objectMemory fetchPointer: ActiveProcessIndex ofObject: scheduler)) = (objectMemory classIndexOf: oop) ifTrue: [ ^ false ]. "The rest of the code is relative to process management: the Processor (the active process scheduler) can't be immutable, as well as all the objects relative to Process management " "scheduler := self fetchPointer: ValueIndex ofObject: (self splObj: SchedulerAssociation). processLists := objectMemory fetchPointer: ProcessListsIndex ofObject: scheduler. ((objectMemory formatOf: oop) = objectMemory nonIndexablePointerFormat) ifFalse: + [ (objectMemory isArrayNonImm: oop) ifFalse: [^ true]. - [ (objectMemory isArrayNonImm: oop) ifFalse: [ ^ true ]. ^ (oop = processLists) not ]. + (objectMemory numSlotsOf: oop) >= 2 ifFalse: [^ true]. - (objectMemory numSlotsOf: oop) >= 2 ifFalse: [ ^ true ]. ""is the oop the scheduler itself ?"" + oop = scheduler ifTrue: [^ false]. - oop = scheduler ifTrue: [ ^ false ]. 1 to: (objectMemory numSlotsOf: processLists) do: [ :i | ""is the oop one of the linked lists ?"" (list := processLists at: i) = oop ifTrue: [^ false]. ""is the oop one of the runnable process ?"" first := objectMemory fetchPointer: FirstLinkIndex ofObject: list. first = objectMemory nilObject ifFalse: [ last := objectMemory fetchPointer: LastLinkIndex ofObject: list. link := first. [ link = last ] whileFalse: + [ link = oop ifTrue: [^ false]. - [ link = oop ifTrue: [ ^ false ]. link := objectMemory fetchPointer: NextLinkIndex ofObject: link. ] ] ]." ^ true! Item was changed: ----- Method: InterpreterPrimitives>>primitiveHighBit (in category 'arithmetic integer primitives') ----- primitiveHighBit | integerReceiverOop leadingZeroCount highestBitZeroBased | integerReceiverOop := self stackTop. "Convert the receiver Oop to use a single tag bit" objectMemory numSmallIntegerTagBits > 1 ifTrue: [integerReceiverOop := (integerReceiverOop >>> (objectMemory numSmallIntegerTagBits-1) bitOr: 1)]. self cppIf: #'__GNUC__' defined ifTrue: ["Note: in gcc, result is undefined if input is zero (for compatibility with BSR fallback when no CLZ instruction available). but input is never zero because we pass the oop with tag bits set, so we are safe" objectMemory wordSize = 4 ifTrue: [leadingZeroCount := self __builtin_clz: integerReceiverOop] ifFalse: [leadingZeroCount := self __builtin_clzll: integerReceiverOop]. + leadingZeroCount = 0 ifTrue: "highBit is not defined for negative Integer" + [self primitiveFail]. + "Nice bit trick: 1-based high-bit is (32 - clz) - 1 to account for tag bit. + This is like two-complement - clz - 1 on 5 bits, or in other words a bit-invert operation clz ^16r1F" + self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))] + cppIf: #'_MSC_VER' defined | #'__ICC' defined - leadingZeroCount = 0 - ifTrue: - ["highBit is not defined for negative Integer" - self primitiveFail] - ifFalse: - ["Nice bit trick: 1-based high-bit is (32 - clz) - 1 to account for tag bit. - This is like two-complement - clz - 1 on 5 bits, or in other words a bit-invert operation clz ^16r1F" - self pop: 1 thenPushInteger: (leadingZeroCount bitXor: (BytesPerWord * 8 - 1))]. - ^self]. - self cppIf: #'__GNUC__' defined not & (#'_MSC_VER' defined | #'__ICC' defined) ifTrue: ["In MSVC, _lzcnt and _lzcnt64 builtins do not fallback to BSR when not supported by CPU Instead of messing with __cpuid() we always use the BSR intrinsic" "Trick: we test the oop sign rather than the integerValue. Assume oop are signed (so far, they are, sqInt are signed)" + integerReceiverOop < 0 ifTrue: + [^self primitiveFail]. - integerReceiverOop < 0 ifTrue: [self primitiveFail] ifFalse: [ "Setting this variable is useless, but VMMaker will generate an automatic initialization at a worse place if this isn't initialized explicitly." highestBitZeroBased := 0. "We do not even test the return value, because integerReceiverOop is never zero" + objectMemory wordSize = 4 - self cCode: [objectMemory wordSize = 4 ifTrue: [self _BitScanReverse: (self addressOf: highestBitZeroBased) _: integerReceiverOop] + ifFalse: [self _BitScanReverse64: (self addressOf: highestBitZeroBased) _: integerReceiverOop]. - ifFalse: [self _BitScanReverse64: (self addressOf: highestBitZeroBased) _: integerReceiverOop]] - inSmalltalk: [highestBitZeroBased := integerReceiverOop highBit - 1]. "thanks to the tag bit, the +1 operation for getting 1-based rank is not necessary" + self pop: 1 thenPushInteger: highestBitZeroBased] + ifFalse: + ["not gcc/clang, nor MSVC/ICC, you have to implement if your compiler provides useful builtins" - self pop: 1 thenPushInteger: highestBitZeroBased]. - ^self]. - self cppIf: #'__GNUC__' defined not & #'_MSC_VER' defined not & #'__ICC' defined not - ifTrue: - ["not gcc/clang, nor MSVC/ICC, you have to implement if your compiler provide useful builtins" self cCode: [self primitiveFail] + inSmalltalk: "Simulate so that the simulator is closer to the actual VM" + [integerReceiverOop < 0 ifTrue: + [^self primitiveFail]. + self pop: 1 thenPushInteger: integerReceiverOop highBit - 1]]! - inSmalltalk: "Simulate so that the simulatror is closer to the actual VM" - [integerReceiverOop < 0 - ifTrue: [self primitiveFail] - ifFalse: [self pop: 1 thenPushInteger: integerReceiverOop highBit - 1]]]! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveExecuteMethodArgsArray (in category 'control primitives') ----- primitiveExecuteMethodArgsArray + (InitializationOptions at: #haltOnExecuteMethod ifAbsent: [true]) ifTrue: + [self halt: thisContext selector]. + ^super primitiveExecuteMethodArgsArray + + "InitializationOptions at: #haltOnExecuteMethod put: false"! - self halt: thisContext selector. - "(objectMemory isOopCompiledMethod: self stackTop) ifFalse: - [self halt]." - ^super primitiveExecuteMethodArgsArray! Item was changed: ----- Method: VMBasicConstants class>>namesDefinedAtCompileTime (in category 'C translation') ----- namesDefinedAtCompileTime "Answer the set of names for variables that should be defined at compile time. Some of these get default values during simulation, and hence get defaulted in the various initializeMiscConstants methods. But that they have values should /not/ cause the code generator to do dead code elimination based on their default values. In particular, methods marked with <option: ANameDefinedAtCompileTime> + will be emitted within #if defined(ANameDefinedAtCompileTime)...#endif. + + And of course this is backwards. We'd like to define names that are defined at translation time." + ^#(VMBIGENDIAN - will be emitted within #if defined(ANameDefinedAtCompileTime)...#endif." - ^#( VMBIGENDIAN IMMUTABILITY STACKVM COGVM COGMTVM SPURVM PharoVM "Pharo vs Squeak" TerfVM "Terf vs Squeak" EnforceAccessControl "Newspeak" CheckRememberedInTrampoline "IMMUTABILITY" BIT_IDENTICAL_FLOATING_POINT LLDB "As of lldb-370.0.42 Swift-3.1, passing function parameters to printOopsSuchThat fails with Internal error [IRForTarget]: Couldn't rewrite one of the arguments of a function call. Turning off link time optimization with -fno-lto has no effect. hence we define some debugging functions as being <option: LLDB>" "processor related" __ARM_ARCH__ __arm__ __arm32__ ARM32 __arm64__ ARM64 _M_I386 _X86_ i386 i486 i586 i686 __i386__ __386__ X86 I386 x86_64 __amd64 __x86_64 __amd64__ __x86_64__ _M_AMD64 _M_X64 + __mips__ __mips + __powerpc __powerpc__ __powerpc64__ __POWERPC__ + __ppc__ __ppc64__ __PPC__ __PPC64__ + __sparc__ __sparc __sparc_v8__ __sparc_v9__ __sparcv8 __sparcv9 "Compiler brand related" + __ACK__ + __CC_ARM + __clang__ __GNUC__ _MSC_VER __ICC + __SUNPRO_C "os related" ACORN + _AIX + __ANDROID__ + __BEOS__ __linux__ __MINGW32__ + __FreeBSD__ __NetBSD__ __OpenBSD__ - __OpenBSD__ __osf__ + EPLAN9 + __unix__ __unix UNIX - UNIX WIN32 _WIN32 _WIN32_WCE WIN64 _WIN64 _WIN64_WCE)!

1 0

Errored: OpenSmalltalk/opensmalltalk-vm#2124 (Cog - c53070d)
by Travis CI 25 Jul '20

25 Jul '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2124 Status: Errored Duration: 20 mins and 46 secs Commit: c53070d (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2780/ClosedVMMaker-eem.96 ARMv8 Cogit: Update initial cache flushing to accomodate Apple silicon. Slang: Implement and support cppIf:ifTrue:cppIf:ifTrue:ifFalse: for ARMv8 cache flushing. Due to the changes to generateInlineCppIfElse:asArgument:on:indent: clean-up generating indents and terminating semicolons. Clean up generating switches, avoiding emitting a bogus newline before hand, and a newline before break jumps. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/bbbe44d700a8...c5… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/71180933… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] c53070: CogVM source as per VMMaker.oscog-eem.2780/ClosedV...
by Eliot Miranda 25 Jul '20

25 Jul '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c53070d0c2e2bb09fe156cb6809b8138e816e22f https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c53070d0c2e2bb09fe… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-07-25 (Sat, 25 Jul 2020) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitARMv8.c M nsspur64src/vm/cogitX64SysV.c M nsspur64src/vm/cogitX64WIN64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitARMv8.c M spur64src/vm/cogitX64SysV.c M spur64src/vm/cogitX64WIN64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/cointerpmt.c M spur64src/vm/cointerpmt.h M spur64src/vm/gcc3x-cointerp.c M spur64src/vm/gcc3x-cointerpmt.c M spurlowcode64src/vm/cogit.h M spurlowcode64src/vm/cogitARMv8.c M spurlowcode64src/vm/cogitX64SysV.c M spurlowcode64src/vm/cogitX64WIN64.c M spurlowcode64src/vm/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h M spurlowcodesrc/vm/cogitARMv5.c M spurlowcodesrc/vm/cogitIA32.c M spurlowcodesrc/vm/cogitMIPSEL.c M spurlowcodesrc/vm/cointerp.c M spurlowcodesrc/vm/cointerp.h M spurlowcodesrc/vm/gcc3x-cointerp.c M spurlowcodestack64src/vm/gcc3x-interp.c M spurlowcodestack64src/vm/interp.c M spurlowcodestacksrc/vm/gcc3x-interp.c M spurlowcodestacksrc/vm/interp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitARMv8.c M spursista64src/vm/cogitX64SysV.c M spursista64src/vm/cogitX64WIN64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/cointerpmt.c M spursrc/vm/cointerpmt.h M spursrc/vm/gcc3x-cointerp.c M spursrc/vm/gcc3x-cointerpmt.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstack64src/vm/validImage.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M spurstacksrc/vm/validImage.c M src/plugins/BitBltPlugin/BitBltPlugin.c M src/plugins/FileAttributesPlugin/FileAttributesPlugin.c M src/plugins/FilePlugin/FilePlugin.c M src/plugins/IA32ABI/IA32ABI.c M src/plugins/LargeIntegers/LargeIntegers.c M src/plugins/MacMenubarPlugin/MacMenubarPlugin.c M src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c M src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c M src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c M src/plugins/SqueakFFIPrims/IA32FFIPlugin.c M src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c M src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c M src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c M src/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c M src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2780/ClosedVMMaker-eem.96 ARMv8 Cogit: Update initial cache flushing to accomodate Apple silicon. Slang: Implement and support cppIf:ifTrue:cppIf:ifTrue:ifFalse: for ARMv8 cache flushing. Due to the changes to generateInlineCppIfElse:asArgument:on:indent: clean-up generating indents and terminating semicolons. Clean up generating switches, avoiding emitting a bogus newline before hand, and a newline before break jumps.

1 0

VM Maker: VMMaker.oscog-eem.2780.mcz
by commits＠source.squeak.org 25 Jul '20

25 Jul '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2780.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2780 Author: eem Time: 25 July 2020, 1:44:44.159824 pm UUID: 5e381464-117c-4633-8fe7-a95973208436 Ancestors: VMMaker.oscog-eem.2779 Slang: Make the necessary changes to TCaseStmtNode for the last commit (already done for TSwitchStmtNode). Fix the formatting of generateRemapOopIn:on:indent: given those canges. =============== Diff against VMMaker.oscog-eem.2779 =============== Item was changed: ----- Method: TCaseStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen | indent | indent := String new: level withAll: Character tab. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'; cr. cases withIndexDo: [:case :i| + (firsts at: i) to: (lasts at: i) do: - (firsts at: i) to: (lasts at: i) do: [ :caseIndex | aStream nextPutAll: indent; nextPutAll: 'case '; print: caseIndex; nextPut: $:; cr]. + case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen. + (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: + [aStream crtab: level + 1; nextPutAll: 'break;']. + aStream cr]. - case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen. - (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: - [aStream crtab: level + 1; nextPutAll: 'break;']]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1; nextPutAll: 'error("Case not found");'. aNodeOrNil ifNotNil: [aStream crtab: level + 1. (aNodeOrNil copy setExpression: (TConstantNode new setValue: -1)) emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $;]. aStream crtab: level; nextPut: $}! Item was changed: ----- Method: TSendNode>>needsTrailingSemicolon (in category 'testing') ----- needsTrailingSemicolon "Answer if, when emitted as a statement (in particular in a TStmtList), the receiver needs a trailing semicolon. Preprocessor directives and special expansions do not." ^(self isPreprocessorDirective or: [self isValueExpansion or: [self isConditionalSend + or: [selector == #expandDereferenceInterpreterProxyFunctionTable + or: [selector == #remapOop:in:]]]]) not! - or: [selector == #expandDereferenceInterpreterProxyFunctionTable]]]) not! Item was changed: ----- Method: VMPluginCodeGenerator>>generateRemapOopIn:on:indent: (in category 'C translation') ----- generateRemapOopIn: aNode on: aStream indent: level "Generate the C code for this message onto the given stream." | arm | "Avoid nesting #if SPURVM...#else...#endif within arms of an outer #if SPURVM...#else...#endif." (Notification new tag: #inRemapOopInArm; signal) ifNotNil: [:inRemapOopInArm| ^inRemapOopInArm ifTrue: [self generateSpurRemapOopIn: aNode on: aStream indent: level] ifFalse: [self generateV3RemapOopIn: aNode on: aStream indent: level]]. [aStream cr; nextPutAll: '#if SPURVM'; cr. arm := true. self generateSpurRemapOopIn: aNode on: aStream indent: level. + aStream ensureCr; nextPutAll: '#else /* SPURVM */'; cr. - aStream cr; nextPutAll: '#else /* SPURVM */'; cr. arm := false. self generateV3RemapOopIn: aNode on: aStream indent: level. aStream cr; nextPutAll: '#endif /* SPURVM */'; cr] on: Notification do: [:ex| ex tag == #inRemapOopInArm ifTrue: [ex resume: arm] ifFalse: [ex pass]]! Item was changed: ----- Method: VMPluginCodeGenerator>>generateV3RemapOopIn:on:indent: (in category 'C translation') ----- generateV3RemapOopIn: aNode on: aStream indent: level "Generate call on remapOop: for the variable oopOrList (or all of the variables in oopOrList) before evaluating aBlock, and restore them after. This keeps the oops valid if, as V3 will, there is a GC on allocation." | idList | pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. idList := aNode args first nameOrValue. idList class == Array ifFalse: [idList := Array with: idList]. idList do: [:each | aStream tab: level; nextPutAll: 'pushRemappableOop('; nextPutAll: each asString; nextPutAll: ');'] separatedBy: [aStream cr]. aStream cr. aNode args second emitCCodeOn: aStream level: level generator: self. - level timesRepeat: [aStream tab]. idList reversed do: [:each | aStream tab: level; nextPutAll: each asString; nextPutAll: ' = popRemappableOop();'] separatedBy: [aStream cr]!

1 0

VM Maker: VMMaker.oscog-eem.2779.mcz
by commits＠source.squeak.org 25 Jul '20

25 Jul '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2779.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2779 Author: eem Time: 25 July 2020, 1:02:37.771342 pm UUID: 69eafb1b-0a60-46f9-ad35-00f4a863fe8a Ancestors: VMMaker.oscog-eem.2778 Slang: Implement and support cppIf:ifTrue:cppIf:ifTrue:ifFalse: for ARMv8 cache flushing. As a result of the changes to generateInlineCppIfElse:asArgument:on:indent: clean-up generating indents and terminating semicolons. In particular don't add a trailing semicolo to a statement list when prepending, leaving it to the sender. Clean up generating switches, avoiding emitting a bogus newline before hand, and a newline before break jumps. Change generateV3RemapOopIn:on:indent: to terminate the last statement with a semicolon. =============== Diff against VMMaker.oscog-eem.2778 =============== Item was changed: ----- Method: CCodeGenerator>>generateInlineCppIfElse:asArgument:on:indent: (in category 'C translation') ----- generateInlineCppIfElse: msgNode asArgument: asArgument on: aStream indent: level "Generate the C code for this message onto the given stream." + | putStatement allAlternativesWereDeterminable expr pos | - | expr putStatement | "Compile-time expansion for constants set in the options dictionary, e.g. to cut down on noise for MULTIPLEBYTECODESETS." putStatement := asArgument ifTrue: "emitCCodeAsArgumentOn: doesn't indent, the code needs indenting if it takes multiple lines, so post-process." [[:node| | expansion | expansion := String streamContents: [:s| node emitCCodeAsArgumentOn: s level: level generator: self]. aStream nextPutAll: ((expansion includes: Character cr) ifTrue: [(String streamContents: [:s| s position > 0 ifTrue: [s tab: level + 1]. node emitCCodeAsArgumentOn: s level: level generator: self]) copyReplaceAll: (String with: Character cr) with: (String with: Character cr), (String new: level + 1 withAll: Character tab)] ifFalse: [expansion])]] ifFalse: [[:node| | expansion | expansion := String streamContents: [:s| node emitCCodeOn: s level: level generator: self]. "Remove tabs from first line to avoid indenting a second time" expansion ifNotEmpty: [expansion := expansion allButFirst: (expansion findFirst: [:c| c ~~ Character tab]) - 1]. aStream nextPutAll: expansion]]. + "First attempt to expand statically..." + allAlternativesWereDeterminable := true. + 1 to: msgNode args size - 1 by: 2 do: "Deal with cppIf:ifTrue:, cppIf:ifTrue:ifFalse:, cppIf:ifTrue:cppIf:ifTrue:ifFalse:, etc" + [:conditionIndex| + (self nilOrBooleanConditionFor: (msgNode args at: conditionIndex)) + ifNil: [allAlternativesWereDeterminable := false] + ifNotNil: + [:condition| + condition ifTrue: + [putStatement value: (msgNode args at: conditionIndex + 1). + ^self]]]. + allAlternativesWereDeterminable ifTrue: + [msgNode args size odd ifTrue: "there is an ifFalse:" + [putStatement value: msgNode args last]. - (self nilOrBooleanConditionFor: msgNode args first) ifNotNil: - [:condition| - condition - ifTrue: - [putStatement value: msgNode args second] - ifFalse: - [msgNode args size >= 3 ifTrue: - [putStatement value: msgNode args third]]. ^self]. + "Expand for compile-time evaluation. Full #if ... #else..." - "Full #if ... #else..." putStatement := asArgument ifTrue: "emitCCodeAsArgumentOn: doesn't indent, the code needs indenting in this case, so post-process." [[:node| aStream nextPutAll: ((String streamContents: [:s| s next: level + 1 put: Character tab. node emitCCodeAsArgumentOn: s level: level generator: self]) copyReplaceAll: (String with: Character cr) with: (String with: Character cr), (String new: level + 1 withAll: Character tab))]] ifFalse: [[:node| node emitCCodeOn: aStream level: level generator: self]]. + 1 to: msgNode args size - 1 by: 2 do: "Deal with cppIf:ifTrue:, cppIf:ifTrue:ifFalse:, cppIf:ifTrue:cppIf:ifTrue:ifFalse:, etc" + [:conditionIndex| | condition | + condition := String streamContents: + [:es| + (msgNode args at: conditionIndex) + emitCCodeAsArgumentOn: es + level: 0 + generator: self]. + [condition last isSeparator] whileTrue: + [condition := condition allButLast]. + aStream + ensureCr; + nextPut: $#; next: level * 2 put: Character space; nextPutAll: (conditionIndex = 1 ifTrue: ['if '] ifFalse: ['elif ']); nextPutAll: condition; cr. - expr := String streamContents: - [:es| - msgNode args first - emitCCodeAsArgumentOn: es - level: 0 - generator: self]. - [expr last isSeparator] whileTrue: - [expr := expr allButLast]. - aStream - ensureCr; - nextPut: $#; next: level * 2 put: Character space; nextPutAll: 'if '; nextPutAll: expr; cr. + pos := aStream position. + self with: (msgNode args at: conditionIndex) + ifAppropriateSetTo: true + do: [putStatement value: (msgNode args at: conditionIndex + 1)]. + expr := (expr ifNil: [' /* '] ifNotNil: [expr, ' || ']), condition]. + expr := expr, ' */'. + msgNode args size odd ifTrue: "there is an ifFalse:" - self with: msgNode args first - ifAppropriateSetTo: true - do: [putStatement value: msgNode args second]. - expr := ' /* ', expr, ' */'. - msgNode args size >= 3 ifTrue: [aStream ensureCr; + nextPut: $#; next: level * 2 put: Character space; nextPutAll: 'else'. + aStream position - pos >= 128 ifTrue: + [aStream nextPutAll: expr]. + aStream cr. + pos := aStream position. + msgNode args size <= 3 + ifTrue: "ifTrue:ifFalse:, so negate condition for ifFalse:" + [self with: msgNode args last + ifAppropriateSetTo: false + do: [putStatement value: msgNode args third]] + ifFalse: + [putStatement value: msgNode args last]]. - nextPut: $#; next: level * 2 put: Character space; nextPutAll: 'else'; nextPutAll: expr; - cr. - self with: msgNode args first - ifAppropriateSetTo: false - do: [putStatement value: msgNode args third]]. aStream ensureCr; + nextPut: $#; next: level * 2 put: Character space; nextPutAll: 'endif'. + aStream position - pos >= 128 ifTrue: + [aStream nextPutAll: expr]. + aStream cr. - nextPut: $#; next: level * 2 put: Character space; nextPutAll: 'endif'; nextPutAll: expr; - cr. asArgument ifTrue: [aStream next: level + 1 put: Character tab]! Item was changed: ----- Method: CCodeGenerator>>generateToByDo:on:indent: (in category 'C translation') ----- generateToByDo: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." "N.B. MessageNode>>asTranslatorNodeIn: adds the limit var as a hidden fourth argument." | blockExpr iterationVar limitExpr mayHaveSideEffects limitVar step | blockExpr := msgNode args third. blockExpr args size = 1 ifFalse: [self error: 'wrong number of block arguments']. iterationVar := blockExpr args first. limitExpr := msgNode args first. aStream nextPutAll: 'for (', iterationVar, ' = '. self noteUsedVariableName: iterationVar. self emitCExpression: msgNode receiver on: aStream. mayHaveSideEffects := msgNode args size = 4. "See TMethod>>prepareMethodIn:" mayHaveSideEffects ifTrue: [limitVar := msgNode args last. aStream nextPutAll: ', ', limitVar name, ' = '. self emitCExpression: limitExpr on: aStream. limitExpr := limitVar]. aStream nextPutAll: '; ', iterationVar. step := msgNode args at: 2. self generateToByDoLimitExpression: limitExpr negative: (self stepExpressionIsNegative: step) on: aStream. aStream nextPutAll: '; ', iterationVar, ' += '. self emitCExpression: step on: aStream. aStream nextPutAll: ') {'; cr. blockExpr emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}! - aStream tab: level. - aStream nextPut: $}! Item was changed: ----- Method: CCodeGenerator>>generateToDo:on:indent: (in category 'C translation') ----- generateToDo: msgNode on: aStream indent: level "Generate the C code for this message onto the given stream." | iterationVar | (msgNode args last args size = 1) ifFalse: [ self error: 'wrong number of block arguments'. ]. iterationVar := msgNode args last args first. aStream nextPutAll: 'for (', iterationVar, ' = '. self emitCExpression: msgNode receiver on: aStream. aStream nextPutAll: '; ', iterationVar. self generateToByDoLimitExpression: msgNode args first negative: false on: aStream. aStream nextPutAll: '; ', iterationVar, '++) {'; cr. msgNode args last emitCCodeOn: aStream level: level + 1 generator: self. + aStream tab: level; nextPut: $}! - level timesRepeat: [ aStream tab ]. - aStream nextPutAll: '}'.! 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: #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: - #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: - #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:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: - #cppIf:ifTrue: #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: - #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: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #allMask: #generateAllMask:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: + #touch: #generateTouch: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: #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 #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: - #subclassResponsibility #generateSmalltalkMetaError: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: - #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: - #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: TCaseStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen | indent | indent := String new: level withAll: Character tab. - aStream crtab: level. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'; cr. cases withIndexDo: [:case :i| (firsts at: i) to: (lasts at: i) do: [ :caseIndex | aStream nextPutAll: indent; nextPutAll: 'case '; print: caseIndex; nextPut: $:; cr]. case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen. (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: [aStream crtab: level + 1; nextPutAll: 'break;']]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1; nextPutAll: 'error("Case not found");'. aNodeOrNil ifNotNil: [aStream crtab: level + 1. (aNodeOrNil copy setExpression: (TConstantNode new setValue: -1)) emitCCodeOn: aStream level: level generator: aCodeGen. aStream nextPut: $;]. aStream crtab: level; nextPut: $}! Item was changed: ----- Method: TMethod>>statementsListsForInliningIn: (in category 'inlining') ----- statementsListsForInliningIn: aCodeGen "Answer a collection of statement list nodes that are candidates for inlining. Currently, we cannot inline into the argument blocks of and: and or: messages. We do not want to inline code strings within cCode:inSmalltalk: blocks (those with a proper block for the cCode: argument are inlined in MessageNode>>asTranslatorNodeIn:). We do not want to inline code within assert: sends (because we want the assert to read nicely)." | stmtLists | stmtLists := OrderedCollection new: 10. parseTree nodesDo: [:node| node isStmtList ifTrue: [stmtLists add: node]] unless: [:node| node isSend and: [node selector == #cCode:inSmalltalk: or: [aCodeGen isAssertSelector: node selector]]]. parseTree nodesDo: [:node| node isSend ifTrue: [node selector = #cCode:inSmalltalk: ifTrue: [node nodesDo: [:ccisNode| stmtLists remove: ccisNode ifAbsent: []]]. + (node selector beginsWith: #cppIf:ifTrue:) ifTrue: - (node selector = #cppIf:ifTrue:ifFalse: or: [node selector = #cppIf:ifTrue:]) ifTrue: [node args first nodesDo: [:inCondNode| stmtLists remove: inCondNode ifAbsent: []]]. ((node selector = #and:) or: [node selector = #or:]) ifTrue: "Note: the PP 2.3 compiler produces two arg nodes for these selectors" [stmtLists remove: node args first ifAbsent: []. stmtLists remove: node args last ifAbsent: []]. (#( #ifTrue: #ifFalse: #ifTrue:ifFalse: #ifFalse:ifTrue: #ifNil: #ifNotNil: #ifNil:ifNotNil: #ifNotNil:ifNil: ) includes: node selector) ifTrue: [stmtLists remove: node receiver ifAbsent: []]. (#(whileTrue whileTrue: whilefalse whileFalse:) includes: node selector) ifTrue: "Allow inlining if it is a [...] whileTrue/whileFalse. This is identified by having more than one statement in the receiver block in which case the C code wouldn't work anyways" [node receiver statements size = 1 ifTrue: [stmtLists remove: node receiver ifAbsent: []]]. (node selector = #to:do:) ifTrue: [stmtLists remove: node receiver ifAbsent: []. stmtLists remove: node args first ifAbsent: []]. (node selector = #to:by:do:) ifTrue: [stmtLists remove: node receiver ifAbsent: []. stmtLists remove: node args first ifAbsent: []. stmtLists remove: node args second ifAbsent: []]]. node isCaseStmt ifTrue: "don't inline cases" [node cases do: [:case| stmtLists remove: case ifAbsent: []]]]. ^stmtLists! Item was changed: ----- Method: TSendNode>>isPreprocessorDirective (in category 'testing') ----- isPreprocessorDirective + ^#(cPreprocessorDirective: cppIf:ifTrue: cppIf:ifTrue:ifFalse: cppIf:ifTrue:cppIf:ifTrue:ifFalse:) includes: selector! - ^#(cPreprocessorDirective: cppIf:ifTrue:ifFalse: cppIf:ifTrue:) includes: selector! Item was changed: ----- Method: TSendNode>>needsTrailingSemicolon (in category 'testing') ----- needsTrailingSemicolon "Answer if, when emitted as a statement (in particular in a TStmtList), the receiver needs a trailing semicolon. Preprocessor directives and special expansions do not." ^(self isPreprocessorDirective or: [self isValueExpansion + or: [self isConditionalSend + or: [selector == #expandDereferenceInterpreterProxyFunctionTable]]]) not! - or: [selector == #expandDereferenceInterpreterProxyFunctionTable]]) not! Item was changed: ----- Method: TStmtListNode>>emitCCodeOn:prependToEnd:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen | statementToElide | self emitCCommentOn: aStream level: level generator: aCodeGen. (aNodeOrNil notNil or: [statements isEmpty or: [statements last hasEffect]]) ifFalse: [statementToElide := statements last]. statements withIndexDo: + [:s :idx| | position lastWhilePrepending | - [:s :idx| | position | s emitCCommentOn: aStream level: level generator: aCodeGen. (s == statementToElide or: [s isLeaf and: [s isLabel not and: [aNodeOrNil isNil or: [idx < statements size]]]]) ifFalse: + [((s isSend and: [s isPreprocessorDirective]) or: [aStream peekLast == Character tab]) ifFalse: - [aStream peekLast ~~ Character tab ifTrue: [aStream tab: level]. position := aStream position. + (lastWhilePrepending := aNodeOrNil notNil and: [idx = statements size]) + ifTrue: [s emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen] + ifFalse: [s emitCCodeOn: aStream level: level generator: aCodeGen]. - (aNodeOrNil notNil - and: [idx = statements size]) - ifTrue: - [s emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen] - ifFalse: - [s emitCCodeOn: aStream level: level generator: aCodeGen]. aStream position > position ifTrue: [(self stream: aStream endsWithAnyOf: '};') ifFalse: [s needsTrailingSemicolon ifTrue: [aStream nextPut: $;]]. + (lastWhilePrepending or: [aStream peekLast == Character cr]) ifFalse: - aStream peekLast ~~ Character cr ifTrue: [aStream cr]]]]! Item was changed: ----- Method: TSwitchStmtNode>>emitCCodeOn:addToEndOfCases:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream addToEndOfCases: aNodeOrNil level: level generator: aCodeGen - aStream crtab: level. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'. cases do: [:tuple| [:labels :case| labels do: [:label| aStream crtab: level; nextPutAll: 'case '. label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. aStream nextPut: $:]. aStream crtab: level + 1. case emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] valueWithArguments: tuple. + (aNodeOrNil notNil and: [aNodeOrNil isReturn]) + ifTrue: [(self stream: aStream endsWithAnyOf: ';}') ifFalse: [aStream nextPut: $;]] + ifFalse: [aStream crtab: level + 1; nextPutAll: 'break;']. + aStream cr]. - (aNodeOrNil notNil and: [aNodeOrNil isReturn]) ifFalse: - [aStream crtab: level + 1; nextPutAll: 'break;']]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1. otherwiseOrNil ifNotNil: [otherwiseOrNil emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level + 1 generator: aCodeGen] + ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause")'. - ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");'. aNodeOrNil ifNotNil: [| defaultExpr type | + aStream nextPut: $;; crtab: level + 1. - aStream crtab: level + 1. defaultExpr := TConstantNode new setValue: -1. (aNodeOrNil isAssignment and: [(type := aCodeGen typeFor: aNodeOrNil variable in: aCodeGen currentMethod) notNil and: [aCodeGen isPointerCType: type]]) ifTrue: [defaultExpr := TSendNode new setSelector: #cCoerceSimple:to: receiver: (TVariableNode new setName: 'self') arguments: {defaultExpr. TConstantNode new setValue: type}]. (aNodeOrNil copy setExpression: defaultExpr) + emitCCodeOn: aStream level: level generator: aCodeGen]]. - emitCCodeOn: aStream level: level generator: aCodeGen. - aStream nextPut: $;]]. aStream + nextPut: $;; crtab: level; nextPut: $}! Item was changed: ----- Method: TSwitchStmtNode>>emitCCodeOn:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream level: level generator: aCodeGen - aStream crtab: level. aStream nextPutAll: 'switch ('. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. aStream nextPutAll: ') {'. cases do: [:tuple| [:labels :case| labels do: [:label| aStream crtab: level; nextPutAll: 'case '. label emitCCodeAsArgumentOn: aStream level: level + 1 generator: aCodeGen. aStream nextPut: $:]. aStream crtab: level + 1. case emitCCodeOn: aStream level: level + 1 generator: aCodeGen. case endsWithReturn ifFalse: [aStream tab: level + 1; nextPutAll: 'break;']] valueWithArguments: tuple]. aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1. otherwiseOrNil ifNotNil: [otherwiseOrNil emitCCodeOn: aStream level: level + 1 generator: aCodeGen. (self stream: aStream endsWithAnyOf: '};') ifFalse: [aStream nextPut: $;]] ifNil: [aStream nextPutAll: 'error("Case not found and no otherwise clause");']. aStream crtab: level; nextPut: $}! Item was changed: ----- Method: TSwitchStmtNode>>printOn:level: (in category 'printing') ----- printOn: aStream level: level - aStream crtab: level. aStream nextPutAll: 'switch ('. expression printOn: aStream level: level. aStream nextPutAll: ') {'. cases do: [:tuple| [:labels :case| labels do: [:label| aStream crtab: level; nextPutAll: 'case '. label printOn: aStream level: level + 1. aStream nextPut: $:]. aStream crtab: level + 1. case printOn: aStream level: level + 1. aStream crtab: level + 1; nextPutAll: 'break;'] valueWithArguments: tuple]. otherwiseOrNil ifNotNil: [aStream crtab: level; nextPutAll: 'default:'; crtab: level + 1. otherwiseOrNil printOn: aStream level: level + 1]. aStream crtab: level; nextPut: $}! Item was added: + ----- Method: VMClass>>cppIf:ifTrue:cppIf:ifTrue:ifFalse: (in category 'translation support') ----- + cppIf: firstCondition ifTrue: firstExpression cppIf: secondCondition ifTrue: secondExpression ifFalse: falseExpression + <doNotGenerate> + ^self cppIf: firstCondition + ifTrue: firstExpression + ifFalse: + [self cppIf: secondCondition ifTrue: secondExpression ifFalse: falseExpression]! Item was changed: ----- Method: VMPluginCodeGenerator>>generateV3RemapOopIn:on:indent: (in category 'C translation') ----- generateV3RemapOopIn: aNode on: aStream indent: level "Generate call on remapOop: for the variable oopOrList (or all of the variables in oopOrList) before evaluating aBlock, and restore them after. This keeps the oops valid if, as V3 will, there is a GC on allocation." | idList | pluginFunctionsUsed add: #pushRemappableOop:; add: #popRemappableOop. idList := aNode args first nameOrValue. idList class == Array ifFalse: [idList := Array with: idList]. idList do: [:each | aStream tab: level; nextPutAll: 'pushRemappableOop('; nextPutAll: each asString; nextPutAll: ');'] separatedBy: [aStream cr]. aStream cr. aNode args second emitCCodeOn: aStream level: level generator: self. level timesRepeat: [aStream tab]. idList reversed do: [:each | + aStream + tab: level; - aStream nextPutAll: each asString; + nextPutAll: ' = popRemappableOop();'] + separatedBy: [aStream cr]! - nextPutAll: ' = popRemappableOop()'] - separatedBy: [aStream nextPut: $;; crtab: level]!

1 0

[OpenSmalltalk/opensmalltalk-vm] bbbe44: Mac Webcam doc & typo fix. [ci skip]
by Eliot Miranda 24 Jul '20

24 Jul '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: bbbe44d700a83cc3ea336212bd3a8b969a1e2891 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bbbe44d700a83cc3ea… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-07-24 (Fri, 24 Jul 2020) Changed paths: M platforms/iOS/plugins/CameraPlugin/AVFoundationVideoGrabber.m Log Message: ----------- Mac Webcam doc & typo fix. [ci skip]

1 0

Build completed: opensmalltalk-vm 1.0.2121
by AppVeyor 24 Jul '20

24 Jul '20

1 0

Build failed: opensmalltalk-vm 1.0.2120
by AppVeyor 24 Jul '20

24 Jul '20

1 0

Errored: OpenSmalltalk/opensmalltalk-vm#2123 (Cog - b046a0a)
by Travis CI 24 Jul '20

24 Jul '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2123 Status: Errored Duration: 20 mins and 0 secs Commit: b046a0a (Cog) Author: Eliot Miranda Message: And of course the Mac CameraPlgin doesn't need to use numberWithDouble: for camera dimensions. View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/582b86e5211a...b0… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/71130585… -- You can unsubscribe from build emails from the OpenSmalltalk/opensmalltalk-vm repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=8795279&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

[OpenSmalltalk/opensmalltalk-vm] b046a0: And of course the Mac CameraPlgin doesn't need to ...
by Eliot Miranda 24 Jul '20

24 Jul '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b046a0a01416fdc97254626d47ccd2ac02906a67 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b046a0a01416fdc972… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-07-23 (Thu, 23 Jul 2020) Changed paths: M platforms/iOS/plugins/CameraPlugin/AVFoundationVideoGrabber.m Log Message: ----------- And of course the Mac CameraPlgin doesn't need to use numberWithDouble: for camera dimensions.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2020