Vm-dev June 2022

vm-dev@lists.squeakfoundation.org

16 participants
87 discussions

[OpenSmalltalk/opensmalltalk-vm] 67660c: Get the cogits to compile given that they now need...
by Eliot Miranda 25 Jun '22

25 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 67660c5c59defffb825a23d1b8b0074fd8018a95 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/67660c5c59defffb82… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-25 (Sat, 25 Jun 2022) Changed paths: M platforms/Cross/vm/sq.h M platforms/Cross/vm/sqMemoryAccess.h M platforms/win32/vm/sqWin32Window.c Log Message: ----------- Get the cogits to compile given that they now need the null define. Implement reporting the trace flags on Windows.

1 0

[OpenSmalltalk/opensmalltalk-vm] 083a49: CogVM source as per VMMaker.oscog-eem.3200
by Eliot Miranda 25 Jun '22

25 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 083a49007d9899805b52d5121bb6974b45665f59 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/083a49007d9899805b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-25 (Sat, 25 Jun 2022) Changed paths: M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3200 Add a scheme to report the traceFlags in usage() on the command-line. traceFlagsMeanings is a null-terminated array of strings as per argv. Redefine the flags so that the newspeak-only & simulation-only ones come at the end so avoid reporting unused entries.

1 0

VM Maker: VMMaker.oscog-eem.3200.mcz
by commits＠source.squeak.org 25 Jun '22

25 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3200.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3200 Author: eem Time: 25 June 2022, 1:31:19.003777 pm UUID: dcd3d040-95e7-43b9-a0e7-4ad384662520 Ancestors: VMMaker.oscog-eem.3199 Add a scheme to report the traceFlags in usage() on the command-line. traceFlagsMeanings is a null-terminated array of strings as per argv. Redefine the flags so that the newspeak-only & simulation-only ones come at the end so avoid reporting unused entries. =============== Diff against VMMaker.oscog-eem.3199 =============== Item was added: + ----- Method: CogVMSimulator>>primitivePropertyFlagsForSpur:numArgs: (in category 'multi-threading simulation switch') ----- + primitivePropertyFlagsForSpur: primIndex numArgs: numArgs + "This method includes or excludes CoInterpreterMT methods as required. + Auto-generated by CogVMSimulator>>ensureMultiThreadingOverridesAreUpToDate" + + ^self perform: #primitivePropertyFlagsForSpur:numArgs: + withArguments: {primIndex. numArgs} + inSuperclass: (cogThreadManager ifNil: [CoInterpreterPrimitives] ifNotNil: [CoInterpreterMT])! Item was changed: ----- Method: Cogit class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator | backEnd | backEnd := CogCompilerClass basicNew. #( 'coInterpreter' 'objectMemory' 'methodZone' 'objectRepresentation' 'cogBlockMethodSurrogateClass' 'cogMethodSurrogateClass' 'nsSendCacheSurrogateClass' 'threadManager' 'processor' 'lastNInstructions' 'simulatedAddresses' 'ioHighResClock' 'simulatedTrampolines' 'simulatedVariableGetters' 'simulatedVariableSetters' 'processorFrameValid' 'printRegisters' 'printInstructions' 'clickConfirm' 'clickStepping' 'singleStep' 'codeZoneIsExecutableNotWritable' 'debugAPISelector' 'shortCutTrampolineBlocks' 'perMethodProfile' 'instructionProfile') do: [:simulationVariableUnusedByRealVM| aCCodeGenerator removeVariable: simulationVariableUnusedByRealVM]. NewspeakVM ifFalse: [#( 'selfSendTrampolines' 'dynamicSuperSendTrampolines' 'implicitReceiverSendTrampolines' 'outerSendTrampolines' 'ceEnclosingObjectTrampoline' 'numIRCs' 'indexOfIRC' 'theIRCs') do: [:variableNotNeededInNormalVM| aCCodeGenerator removeVariable: variableNotNeededInNormalVM]]. aCCodeGenerator removeConstant: #COGMTVM. "this should be defined at compile time" "N.B. We *do not* include sq.h; it pulls in conflicting definitions now that sqVirtualMachine.h declares cointerp's functions, and declares some of them inaccurately for histrical reasons. We pull in CoInterpreter's api via cointerp.h which is accurate." aCCodeGenerator addHeaderFile:'"sqConfig.h"'; "config.h must be first on linux" addHeaderFile:'<stddef.h>'; "for e.g. offsetof" addHeaderFile:'<stdio.h>'; addHeaderFile:'<stdlib.h>'; addHeaderFile:'<string.h>'; addHeaderFile:'"sqPlatformSpecific.h"'; "e.g. solaris overrides things for sqCogStackAlignment.h" addHeaderFile:'"sqMemoryAccess.h"'; addHeaderFile:'"sqCogStackAlignment.h"'; addHeaderFile:'"dispdbg.h"'; "must precede cointerp.h & cogit.h otherwise NoDbgRegParms gets screwed up" addHeaderFile:'"cogmethod.h"'. NewspeakVM ifTrue: [aCCodeGenerator addHeaderFile:'"nssendcache.h"']. aCCodeGenerator addHeaderFile:'#if COGMTVM'; addHeaderFile:'"cointerpmt.h"'; addHeaderFile:'#else'; addHeaderFile:'"cointerp.h"'; addHeaderFile:'#endif'; addHeaderFile:'"cogit.h"'. aCCodeGenerator var: #ceGetFP declareC: 'usqIntptr_t (*ceGetFP)(void)'; var: #ceGetSP declareC: 'usqIntptr_t (*ceGetSP)(void)'; var: #ceCaptureCStackPointers declareC: 'void (*ceCaptureCStackPointers)(void)'; var: #ceInvokeInterpret declareC: 'void (*ceInvokeInterpret)(void)'; var: #ceEnterCogCodePopReceiverReg declareC: 'void (*ceEnterCogCodePopReceiverReg)(void)'; var: #realCEEnterCogCodePopReceiverReg declareC: 'void (*realCEEnterCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverReg declareC: 'void (*ceCallCogCodePopReceiverReg)(void)'; var: #realCECallCogCodePopReceiverReg declareC: 'void (*realCECallCogCodePopReceiverReg)(void)'; var: #ceCallCogCodePopReceiverAndClassRegs declareC: 'void (*ceCallCogCodePopReceiverAndClassRegs)(void)'; var: #realCECallCogCodePopReceiverAndClassRegs declareC: 'void (*realCECallCogCodePopReceiverAndClassRegs)(void)'; var: #postCompileHook declareC: 'void (*postCompileHook)(CogMethod *)'; var: #openPICList declareC: 'CogMethod *openPICList = 0'; var: #maxMethodBefore type: #'CogBlockMethod *'; var: 'enumeratingCogMethod' type: #'CogMethod *'. aCCodeGenerator var: #ceTryLockVMOwner declareC: '#if COGMTVM\usqIntptr_t (*ceTryLockVMOwner)(usqIntptr_t)\#endif'. backEnd numICacheFlushOpcodes > 0 ifTrue: [aCCodeGenerator var: #ceFlushICache declareC: 'static void (*ceFlushICache)(usqIntptr_t from, usqIntptr_t to)']. aCCodeGenerator var: #ceFlushDCache declareC: '#if DUAL_MAPPED_CODE_ZONE\static void (*ceFlushDCache)(usqIntptr_t from, usqIntptr_t to)\#endif'; var: #codeToDataDelta declareC: '#if DUAL_MAPPED_CODE_ZONE\static sqInt codeToDataDelta\#else\# define codeToDataDelta 0\#endif'; var: #cFramePointerInUse declareC: '#if !!defined(cFramePointerInUse)\sqInt cFramePointerInUse\#endif'. aCCodeGenerator declareVar: 'aMethodLabel' type: #'AbstractInstruction'; "Has to come lexicographically before backEnd & methodLabel" var: #backEnd declareC: 'AbstractInstruction * const backEnd = &aMethodLabel'; var: #methodLabel declareC: 'AbstractInstruction * const methodLabel = &aMethodLabel'. self declareC: #(abstractOpcodes stackCheckLabel blockEntryLabel blockEntryNoContextSwitch stackOverflowCall sendMiss entry noCheckEntry selfSendEntry dynSuperEntry fullBlockNoContextSwitchEntry fullBlockEntry picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 cPICEndOfCodeLabel) as: #'AbstractInstruction *' in: aCCodeGenerator. aCCodeGenerator declareVar: #cPICPrototype type: #'CogMethod *'; declareVar: #blockStarts type: #'BlockStart *'; declareVar: #fixups type: #'BytecodeFixup *'; declareVar: #methodZoneBase type: #usqInt. aCCodeGenerator var: #ordinarySendTrampolines declareC: 'sqInt ordinarySendTrampolines[NumSendTrampolines]'; var: #superSendTrampolines declareC: 'sqInt superSendTrampolines[NumSendTrampolines]'. BytecodeSetHasDirectedSuperSend ifTrue: [aCCodeGenerator var: #directedSuperSendTrampolines declareC: 'sqInt directedSuperSendTrampolines[NumSendTrampolines]'; var: #directedSuperBindingSendTrampolines declareC: 'sqInt directedSuperBindingSendTrampolines[NumSendTrampolines]']. NewspeakVM ifTrue: [aCCodeGenerator var: #selfSendTrampolines declareC: 'sqInt selfSendTrampolines[NumSendTrampolines]'; var: #dynamicSuperSendTrampolines declareC: 'sqInt dynamicSuperSendTrampolines[NumSendTrampolines]'; var: #implicitReceiverSendTrampolines declareC: 'sqInt implicitReceiverSendTrampolines[NumSendTrampolines]'; var: #outerSendTrampolines declareC: 'sqInt outerSendTrampolines[NumSendTrampolines]']. aCCodeGenerator addConstantForBinding: self bindingForNumTrampolines; var: #trampolineAddresses declareC: 'static char *trampolineAddresses[NumTrampolines*2]'; var: #objectReferencesInRuntime declareC: 'static usqInt objectReferencesInRuntime[NumObjRefsInRuntime+1]'; var: #labelCounter type: #int; var: #traceFlags declareC: 'int traceFlags = 8 /* prim trace log on by default */'; + declareVar: #traceFlagsMeanings type: #'const char *'; + var: #traceFlagsMeanings + declareC: (CCodeGenerator new arrayInitializerCalled: #traceFlagsMeanings for: ((Cogit basicNew sendTrace: -1)) sizeString: nil type: #'const char *'); var: #cStackAlignment declareC: 'const int cStackAlignment = STACK_ALIGN_BYTES'. aCCodeGenerator declareVar: #minValidCallAddress type: #'usqIntptr_t'. aCCodeGenerator vmClass generatorTable ifNotNil: [:bytecodeGenTable| aCCodeGenerator var: #generatorTable declareC: 'static BytecodeDescriptor generatorTable[', bytecodeGenTable size printString, ']', (self tableInitializerFor: bytecodeGenTable in: aCCodeGenerator)]. "In C the abstract opcode names clash with the Smalltalk generator syntactic sugar. Most of the syntactic sugar is inlined, but alas some remains. Rename the syntactic sugar to avoid the clash." (self organization listAtCategoryNamed: #'abstract instructions') do: [:s| aCCodeGenerator addSelectorTranslation: s to: 'g', (aCCodeGenerator cFunctionNameFor: s)]. aCCodeGenerator addSelectorTranslation: #halt: to: 'haltmsg'. self declareFlagVarsAsByteIn: aCCodeGenerator! Item was changed: ----- Method: Cogit class>>mustBeGlobal: (in category 'translation') ----- mustBeGlobal: var "Answer if a variable must be global and exported. Used for inst vars that are accessed from VM support code, or that need visibility at the gdb/lldb level." ^(#('ceBaseFrameReturnTrampoline' ceCaptureCStackPointers 'ceCheckForInterruptTrampoline' ceEnterCogCodePopReceiverReg realCEEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg realCECallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs realCECallCogCodePopReceiverAndClassRegs ceInvokeInterpret 'ceReturnToInterpreterTrampoline' 'ceCannotResumeTrampoline' ceTryLockVMOwner 'cmEntryOffset' 'cmNoCheckEntryOffset' 'cmDynSuperEntryOffset' 'cmSelfSendEntryOffset' 'missOffset' 'cbEntryOffset' 'cbNoSwitchEntryOffset' 'blockNoContextSwitchOffset' breakPC ceGetFP ceGetSP cFramePointerInUse methodZoneBase + traceFlags traceFlagsMeanings traceStores) - traceFlags traceStores) includes: var) or: [self activeCompilerClass mustBeGlobal: var]! Item was changed: ----- Method: Cogit>>breakOnImplicitReceiver (in category 'debugging') ----- breakOnImplicitReceiver <api> + <cmacro: '() (traceFlags & 256)'> + ^(traceFlags bitAnd: 256) ~= 0! - <cmacro: '() (traceFlags & 64)'> - ^(traceFlags bitAnd: 64) ~= 0! Item was changed: ----- Method: Cogit>>checkStackDepthOnSend (in category 'debugging') ----- checkStackDepthOnSend <doNotGenerate> + ^(traceFlags bitAnd: 512) ~= 0! - ^(traceFlags bitAnd: 128) ~= 0! Item was changed: ----- Method: Cogit>>compileSendTrace (in category 'debugging') ----- compileSendTrace + "2 is trace sends; 64 is traceLinkedSends" - "2 is trace sends; 256 is traceLinkedSends" <inline: #always> + ^traceFlags allMask: 64! - ^traceFlags allMask: 256! Item was changed: ----- Method: Cogit>>recordFastCCallPrimTrace (in category 'debugging') ----- recordFastCCallPrimTrace <api> + <cmacro: '() (traceFlags & 128)'> + ^(traceFlags bitAnd: 128) ~= 0! - <cmacro: '() (traceFlags & 512)'> - ^(traceFlags bitAnd: 512) ~= 0! Item was changed: ----- Method: Cogit>>sendTrace: (in category 'debugging') ----- sendTrace: aBooleanOrInteger <doNotGenerate> + "traceFlags is a set of flags. Answer an Array of strings describing them for command-line usage info via Cogit class>>#declareCVarsIn:. - "traceFlags is a set of flags. 1 => print trace (if something below is selected) 2 => trace sends 4 => trace block activations 8 => trace interpreter primitives (on by default; see Cogit class>>#declareCVarsIn:) 16 => trace events (context switches, GCs, etc) 32 => trace stack overflow + 64 => trace linked sends + 128 => trace fast C call interpreter primitives (off by default) + 256 => send breakpoint on implicit receiver (Newspeak VM only) + 512 => check stack depth on send (simulation only)" - 64 => send breakpoint on implicit receiver (Newspeak VM only) - 128 => check stack depth on send (simulation only) - 256 => trace linked sends - 512 => trace fast C call interpreter primitives (off by default)" traceFlags := aBooleanOrInteger isInteger ifTrue: [aBooleanOrInteger] + ifFalse: [aBooleanOrInteger ifTrue: [traceFlags bitOr: 6] ifFalse: [traceFlags bitClear: 6]]. + ^#('1: print trace' + '2: trace sends' + '4: trace block activations' + '8: trace interpreter primitives' + '16: trace events (context switches, GCs, etc)' + '32: trace stack overflow (poll for events hook)' + '64: trace linked sends' + '128: trace fast C call interpreter primitives'), + (NewspeakVM + ifTrue: [#('256: send breakpoint on implicit receiver' nil)] + ifFalse: [#(nil)])! - ifFalse: [aBooleanOrInteger ifTrue: [traceFlags bitOr: 6] ifFalse: [traceFlags bitClear: 6]]!

1 0

[OpenSmalltalk/opensmalltalk-vm] f61689: Get compilation of the 32-bit VM to work on 64-bit...
by Eliot Miranda 25 Jun '22

25 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: f6168979413e73051a3217c7f3494537db23104a https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f6168979413e73051a… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-25 (Sat, 25 Jun 2022) Changed paths: M building/win32x86/common/Makefile.msvc M building/win32x86/common/Makefile.msvc.flags M building/win32x86/common/Makefile.msvc.tools Log Message: ----------- Get compilation of the 32-bit VM to work on 64-bits under msvc (mkNamedPrims.exe must be an x64 executable).

1 0

VM Maker: ImageFormat-dtl.54.mcz
by commits＠source.squeak.org 25 Jun '22

25 Jun '22

David T. Lewis uploaded a new version of ImageFormat to project VM Maker: http://source.squeak.org/VMMaker/ImageFormat-dtl.54.mcz ==================== Summary ==================== Name: ImageFormat-dtl.54 Author: dtl Time: 25 June 2022, 9:50:07.52 am UUID: 8a01d097-350c-48a7-9124-4fba1aa0e22f Ancestors: ImageFormat-dtl.53 Fix an editing slip in ImageFileHeader class>>fromFile: =============== Diff against ImageFormat-dtl.53 =============== Item was changed: ----- Method: ImageFileHeader class>>fromFile: (in category 'instance creation') ----- fromFile: imageFile "Answer a new instance from a saved image file." "ImageFileHeader fromFile: Smalltalk imageName" | fs | + fs := (FileStream readOnlyFileNamed: imageFile) binary. - fs := (FileStream readOnlyFileNamed: Smalltalk imageName) binary. ^ ([ImageFileHeader readFrom: fs] ensure: [fs close]) !

1 0

Re: [Vm-dev] [squeak-dev] Backing a Form with e.g. mmap() or shm
by Eliot Miranda 24 Jun '22

24 Jun '22

On Thu, Jun 23, 2022 at 10:28 AM Tony Garnock-Jones < tonyg(a)leastfixedpoint.com> wrote: > On 6/23/22 18:15, Eliot Miranda wrote: > > Can you say more about your use case? > > I've been implementing the X11 protocol in pure Smalltalk and I want to > use a little bit of FFI to shmget/shmat and use that to get the pixels > over to the X server. At present XPutImage is working but flooding the > server with XPutImage seems to run into a rate limit from time to time > so it's not very usable. Best to switch to mmap/shm if I can. > Technical: So in this use including the header in the first page would be ok? Would the mapping be read-only from the perspective of the X server? Do you need shmget to be run via the FFI or would it be OK to invoke it implicitly as part of a mapping allocation primitive? Would it be better to create the mapping via the FFI and provide the mapping to the allocation primitive? How should the mapping be taken down? Windows folks, how portable is this idea to other OS's, especially windows? (I'm guessing this is a standard facility on most leading OS's). So would it be worth evolving towards a cross-platform abstraction? Procedural: Would you be prepared to build the VM to test this? Perhaps even generate it from sources? To what extent would you be able to collaborate with e.g. Tom & myself in implementing this? _,,,^..^,,,_ best, Eliot

3 3

[OpenSmalltalk/opensmalltalk-vm] f5b648: [unix] fix memory leak in unix scale factor goveno...
by Tobias Pape 24 Jun '22

24 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: f5b6485efb8064f834dcdcd7c910f3c3750db835 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f5b6485efb8064f834… Author: Tobias Pape <tobias(a)netshed.de> Date: 2022-06-24 (Fri, 24 Jun 2022) Changed paths: M platforms/unix/vm-display-X11/sqUnixX11Scale.c Log Message: ----------- [unix] fix memory leak in unix scale factor govenor detection Thanks to @smalltalking and @edoneel. Fixes #642

1 0

X11 Memory leak on some linux systems - for the release?
by Bruce O'Neel 24 Jun '22

24 Jun '22

Hi, On some linux systems, Ubuntu especially, with an attached display has quite the impressive memory leak. Sometime this spring between change 20981 and change 21617 there were changes made to the screen resolution code that changed how often, it seems, we call display_ioScreenScaleFactor. Before it must have been rarely called like on startup and resize or whatever and now it is called often, sometimes many times per second. The X11 code, being X11 code for Linux, has multiple ways of doing something and this holds true for the code to get the screen scale factor. Which path was followed depended on some things but on assorted Ubuntu systems the path followed called scale_Xftdpi_usable. This called XrmGetStringDatabase every time it entered but if Xft.dpi was there then it returned without calling XrmDestroyDatabase. Ergo the memory leaked. I don't think much memory leaked per call, but, it is called often. The patch is in the OpenSmalltalk/opensmalltalk-vm issue 642. It's one line. I had thought this was an image side issue and therefore would not need touching for the release, but, this kind of eats memory for users who user Squeak interactively on some Linux systems, most notably Ubuntu systems including 18.04 and 22.04. cheers bruce

1 0

[OpenSmalltalk/opensmalltalk-vm] c0f832: CogVM source as per VMMaker.oscog-eem.3199
by Eliot Miranda 24 Jun '22

24 Jun '22

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: c0f832f0e27c36e75166a90f43a2a95df7af98f8 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/c0f832f0e27c36e751… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2022-06-23 (Thu, 23 Jun 2022) Changed paths: M building/linux64ARMv8/HowToBuild M building/linux64ARMv8/gdbarm32/conf.COG M building/linux64ARMv8/gdbarm64/conf.COG M building/linux64ARMv8/makeallsqueak R building/linux64ARMv8/squeak.stack.spur/makealldirty A building/linux64ARMv8/squeak.stack.spur/makedirty M platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c M platforms/iOS/plugins/GdbARMPlugin/Makefile M platforms/unix/plugins/GdbARMPlugin/Makefile.inc M platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c M src/spur32.cog.lowcode/cogit.h M src/spur32.cog.lowcode/cogitARMv5.c M src/spur32.cog.lowcode/cogitIA32.c M src/spur32.cog.lowcode/cointerp.c M src/spur32.cog.lowcode/cointerp.h M src/spur32.cog.lowcode/gcc3x-cointerp.c M src/spur32.cog/cogit.h M src/spur32.cog/cogitARMv5.c M src/spur32.cog/cogitIA32.c M src/spur32.cog/cointerp.c M src/spur32.cog/cointerp.h M src/spur32.cog/cointerpmt.c M src/spur32.cog/cointerpmt.h M src/spur32.cog/gcc3x-cointerp.c M src/spur32.cog/gcc3x-cointerpmt.c M src/spur32.sista/cogit.h M src/spur32.sista/cogitARMv5.c M src/spur32.sista/cogitIA32.c M src/spur32.sista/cointerp.c M src/spur32.sista/cointerp.h M src/spur32.sista/gcc3x-cointerp.c M src/spur32.stack.lowcode/gcc3x-interp.c M src/spur32.stack.lowcode/interp.c M src/spur32.stack/gcc3x-interp.c M src/spur32.stack/interp.c M src/spur32.stack/validImage.c M src/spur64.cog.lowcode/cogit.h M src/spur64.cog.lowcode/cogitARMv8.c M src/spur64.cog.lowcode/cogitX64SysV.c M src/spur64.cog.lowcode/cogitX64WIN64.c M src/spur64.cog.lowcode/cointerp.c M src/spur64.cog.lowcode/cointerp.h M src/spur64.cog.lowcode/gcc3x-cointerp.c M src/spur64.cog/cogit.h M src/spur64.cog/cogitARMv8.c M src/spur64.cog/cogitX64SysV.c M src/spur64.cog/cogitX64WIN64.c M src/spur64.cog/cointerp.c M src/spur64.cog/cointerp.h M src/spur64.cog/cointerpmt.c M src/spur64.cog/cointerpmt.h M src/spur64.cog/gcc3x-cointerp.c M src/spur64.cog/gcc3x-cointerpmt.c M src/spur64.sista/cogit.h M src/spur64.sista/cogitARMv8.c M src/spur64.sista/cogitX64SysV.c M src/spur64.sista/cogitX64WIN64.c M src/spur64.sista/cointerp.c M src/spur64.sista/cointerp.h M src/spur64.sista/gcc3x-cointerp.c M src/spur64.stack.lowcode/gcc3x-interp.c M src/spur64.stack.lowcode/interp.c M src/spur64.stack/gcc3x-interp.c M src/spur64.stack/interp.c M src/spur64.stack/validImage.c M src/v3.cog/cogit.h M src/v3.cog/cogitARMv5.c M src/v3.cog/cogitIA32.c M src/v3.cog/cointerp.c M src/v3.cog/cointerp.h M src/v3.cog/gcc3x-cointerp.c M src/v3.stack/gcc3x-interp.c M src/v3.stack/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.3199 Eliminate some printf format/parameter warnings, in particular by casting length parameters to int. Get the GdbARMPlugin to compile (but not yet link) on Manjaro ARMv8 linux.

1 0

VM Maker: VMMaker.oscog-eem.3199.mcz
by commits＠source.squeak.org 23 Jun '22

23 Jun '22

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.3199.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.3199 Author: eem Time: 23 June 2022, 2:16:20.958945 pm UUID: 3866dedc-ccfd-4fc1-a487-85095ada8bba Ancestors: VMMaker.oscog-eem.3198 Eliminate some printf format/parameter warnings, in particular by casting length parameters to int. =============== Diff against VMMaker.oscog-eem.3198 =============== Item was changed: ----- Method: CoInterpreter>>printMethodCacheFor: (in category 'debug printing') ----- printMethodCacheFor: thing <export: true> "useful for VM debugging; use export: not api, so it will be accessible on win32 and won't be written to cointerp.h" | n | n := 0. 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: [:i | | s c m p | s := methodCache at: i + MethodCacheSelector. c := methodCache at: i + MethodCacheClass. m := methodCache at: i + MethodCacheMethod. p := methodCache at: i + MethodCachePrimFunction. ((thing = -1 or: [s = thing or: [c = thing or: [p = thing or: [m = thing or: [(objectMemory addressCouldBeObj: m) and: [(self maybeMethodHasCogMethod: m) and: [(self cogMethodOf: m) asInteger = thing]]]]]]]) and: [(objectMemory addressCouldBeOop: s) and: [c ~= 0 and: [(self addressCouldBeClassObj: c) or: [self addressCouldBeClassObj: (objectMemory classForClassTag: c)]]]]) ifTrue: [n := n + 1. self cCode: [] inSmalltalk: [self transcript ensureCr]. '%ld %lx\n\t' f: transcript printf: { i. i }. (objectMemory isBytesNonImm: s) + ifTrue: ['%P %.*s\n' f: transcript printf: { s asVoidPointer. objectMemory numBytesOfBytes: s. objectMemory firstIndexableField: s }] - ifTrue: ['%P %.*s\n' f: transcript printf: { s asVoidPointer. (objectMemory numBytesOfBytes: s) signedIntFromLong. objectMemory firstIndexableField: s }] ifFalse: [self shortPrintOop: s]. self tab. (self addressCouldBeClassObj: c) ifTrue: [self shortPrintOop: c] ifFalse: [self printNum: c; space; printHexnp: c; space; shortPrintOop: (objectMemory classForClassTag: c)]. self tab; shortPrintOop: m; tab. self cCode: [p > 1024 ifTrue: [self printHexnp: p] ifFalse: [self printNum: p]] inSmalltalk: [p isSymbol ifTrue: [self print: p] ifFalse: [self printNum: p]]. self cr]]. n > 1 ifTrue: [self printNum: n; cr]! Item was changed: ----- Method: CoInterpreter>>printPrimLogEntryAt:hasParameter: (in category 'debug support') ----- printPrimLogEntryAt: i hasParameter: hasParameter <inline: false> "print the entry and answer if it takes a parameter (as the following entry)" | entryOop className length | entryOop := primTraceLog at: i. hasParameter ifTrue: [(objectMemory addressCouldBeObj: entryOop) ifTrue: [className := self nameOfClass: entryOop lengthInto: (self addressOf: length put: [:v| length := v])] ifFalse: [className := 'bad class'. length := 9]. '%.*s\n' f: transcript printf: { length. className }. ^false]. (objectMemory isImmediate: entryOop) ifTrue: [entryOop = TraceIncrementalGC ifTrue: [self print: '**IncrementalGC**\n'. ^false]. entryOop = TraceFullGC ifTrue: [self print: '**FullGC**\n'. ^false]. entryOop = TraceCodeCompaction ifTrue: [self print: '**CompactCode**\n'. ^false]. entryOop = TraceStackOverflow ifTrue: [self print: '**StackOverflow**\n'. ^false]. entryOop = TracePrimitiveFailure ifTrue: [self print: '**PrimitiveFailure** '. ^true]. entryOop = TracePrimitiveRetry ifTrue: [self print: '**PrimitiveRetry**\n'. ^false]. self print: '???\n'] ifFalse: [(objectMemory addressCouldBeObj: entryOop) + ifFalse: ['%ld!!!!!!\n' f: transcript printf: i] - ifFalse: ['%d!!!!!!\n' f: transcript printf: i] ifTrue: [(objectMemory isCompiledMethod: entryOop) ifTrue: [| methodClass methodSel | className := '???'. length := 3. methodClass := self safeMethodClassOf: entryOop. methodClass ~= objectMemory nilObject ifTrue: [className := self nameOfClass: methodClass lengthInto: (self addressOf: length put: [:v| length := v])]. methodSel := self findSelectorOfMethod: entryOop. methodSel = objectMemory nilObject ifTrue: ['%.*s>>bad selector %p\n' f: transcript printf: { length. className. methodSel }] ifFalse: ['%.*s>>#%.*s\n' f: transcript printf: { length. className. objectMemory numBytesOfBytes: methodSel. objectMemory firstIndexableField: methodSel }]] ifFalse: [objectMemory safePrintStringOf: entryOop. self cr]]]. ^false! Item was changed: ----- Method: Cogit>>warnMultiple:selectors: (in category 'debug printing') ----- warnMultiple: cogMethod selectors: aSelectorOop <inline: true> <var: 'cogMethod' type: #'CogMethod *'> 'Warning, attempt to use method with selector %.*s and selector %.*s\n' f: #stderr + printf: {objectMemory numBytesOf: cogMethod selector. + objectMemory firstIndexableField: cogMethod selector. + objectMemory numBytesOf: aSelectorOop. + objectMemory firstIndexableField: aSelectorOop }! - printf: {self cCoerceSimple: (objectMemory numBytesOf: cogMethod selector) to: #int. - self cCoerceSimple: (objectMemory firstIndexableField: cogMethod selector) to: #'char *'. - self cCoerceSimple: (objectMemory numBytesOf: aSelectorOop) to: #int. - self cCoerceSimple: (objectMemory firstIndexableField: aSelectorOop) to: #'char *' }! Item was changed: ----- Method: InterpreterPrimitives>>traceInputEvent: (in category 'I/O primitive support') ----- traceInputEvent: evtBuf <var: #evtBuf declareC: 'sqIntptr_t evtBuf[8]'> | eventTypeNames | eventTypeNames := self cCoerce: #('None' 'Mouse' 'Keyboard' 'DragDropFiles' 'Menu' 'Window' 'Complex' 'MouseWheel' 'Plugin') to: #'char **'. + 'Event%s/%ld @ %u\t\t%ld/%x %ld/%x\n\t%ld/%x %ld/%x\t %ld/%x %p\n' - 'Event%s/%d @ %u\t\t%d/%x %d/%x\n\t%d/%x %d/%x\t %d/%x %p\n' f: #stderr printf: { ((evtBuf at: 0) between: 0 and: 8) ifTrue: [eventTypeNames at: (evtBuf at: 0)] ifFalse: ['?']. evtBuf at: 0. evtBuf at: 1. "timestamp" evtBuf at: 2. evtBuf at: 2. evtBuf at: 3. evtBuf at: 3. evtBuf at: 4. evtBuf at: 4. evtBuf at: 5. evtBuf at: 5. evtBuf at: 6. evtBuf at: 6. (evtBuf at: 7) asVoidPointer } "windowIndex"! Item was changed: ----- Method: NewObjectMemory>>printMemField:name:size: (in category 'debug printing') ----- printMemField: memField name: name size: length <var: #memField type: #usqInt> <var: #name type: #'char *'> '%s\t%P/%ld sz: %p' f: coInterpreter getTranscript printf: { name. memField asVoidPointer. memField. length }. length ~= 0 ifTrue: + ['/%lu' f: coInterpreter getTranscript printf: length]. - ['/%ld' f: coInterpreter getTranscript printf: length]. coInterpreter cr! Item was added: + ----- Method: PrintfFormatDescriptor>>isNumberHolder (in category '*VMMaker-testing') ----- + isNumberHolder + ^false! Item was added: + ----- Method: PrintfNumberHolderDescriptor>>isNumberHolder (in category '*VMMaker-testing') ----- + isNumberHolder + ^true! Item was changed: ----- Method: SpurMemoryManager>>printOopsFrom:to: (in category 'debug printing') ----- printOopsFrom: startAddress to: endAddress <export: true> "useful for VM debugging; use export: not api, so it will be accessible on win32 and won't be written to cointerp.h" | oop limit firstNonEntity inEmptySpace lastNonEntity | oop := self objectBefore: startAddress. limit := endAddress asUnsignedIntegerPtr min: endOfMemory. oop := oop ifNil: [startAddress] ifNotNil: [(self objectAfter: oop) = startAddress ifTrue: [startAddress] ifFalse: [oop]]. inEmptySpace := false. [self oop: oop isLessThan: limit] whileTrue: [self printEntity: oop. [oop := self objectAfter: oop. (self long64At: oop) = 0] whileTrue: [inEmptySpace ifFalse: [inEmptySpace := true. firstNonEntity := oop]. lastNonEntity := oop]. inEmptySpace ifTrue: [inEmptySpace := false. coInterpreter + print: 'skipped empty space from '; printHexnp: firstNonEntity; + print:' to '; printHexnp: lastNonEntity; cr. - print: 'skipped empty space from '; printHexPtrnp: firstNonEntity; - print:' to '; printHexPtrnp: lastNonEntity; cr. oop := self objectStartingAt: oop]]! Item was changed: ----- Method: StackInterpreter>>printFrameThing:at: (in category 'debug printing') ----- printFrameThing: name at: address <inline: #always> + <var: #name type: #'char *'> + <var: #address type: #'char *'> self printFrameThing: name at: address extraString: (self cCoerceSimple: nil to: #'char *')! Item was changed: ----- Method: StackInterpreter>>printStackPage:useCount: (in category 'debug printing') ----- printStackPage: page useCount: n <inline: false> <var: #page type: #'StackPage *'> self print: 'page '; printHexPtrnp: (self cCode: [page] inSmalltalk: [page baseAddress]); print: ' ('; printNum: (stackPages pageIndexFor: page realStackLimit). n >= 0 ifTrue: [self print: ','; printNum: n]. self print: ') (trace: '; printNum: page trace; printChar: $). (stackPages isFree: page) ifTrue: [self print: ' (free)']. page = stackPages mostRecentlyUsedPage ifTrue: [self print: ' (MRU)']. page prevPage = stackPages mostRecentlyUsedPage ifTrue: [self print: ' (LRU)']. self cr; tab; print: 'ba: '; + printHexPtrnp: page baseAddress; print: ' - sl: '; + printHexPtrnp: page realStackLimit; print: ' - sl-so: '; + printHexPtrnp: page realStackLimit - self stackLimitOffset; print: ' - la:'; + printHexPtrnp: page lastAddress. - printHex: page baseAddress; print: ' - sl: '; - printHex: page realStackLimit; print: ' - sl-so: '; - printHex: page realStackLimit - self stackLimitOffset; print: ' - la:'; - printHex: page lastAddress. (stackPages isFree: page) ifFalse: [self cr; tab; print: 'baseFP '; printHexPtrnp: page baseFP. self "cr;" tab; print: 'headFP '; printHexPtrnp: page headFP. self "cr;" tab; print: 'headSP '; printHexPtrnp: page headSP]. self cr; tab; print: 'prev '; printHexPtrnp: (self cCode: 'page->prevPage' inSmalltalk: [page prevPage baseAddress]); print: ' ('; printNum: (stackPages pageIndexFor: page prevPage realStackLimit); printChar: $). self tab; print: 'next '; printHexPtrnp: (self cCode: 'page->nextPage' inSmalltalk: [page nextPage baseAddress]); print: ' ('; printNum: (stackPages pageIndexFor: page nextPage realStackLimit); printChar: $). self cr! Item was changed: ----- Method: TVarArgsSendNode>>transformPrintfFor:in: (in category 'transformations') ----- transformPrintfFor: aTMethod in: aCodeGen "Handle forms of f:printf: & printf:. f:printf: is either logFile f: formatLiteral printf: args or formatLiteral f: streamName printf: args printf is formatLiteral printf: args" + | formatNode map newArgs fileParameterIndex | - | map newArgs | "precicely one of the arguments will be the format string. nodesDo: is top-down, left-to-right, so it will encounter the format string first." map := Dictionary new. self nodesDo: [:subNode| (map isEmpty and: [subNode isConstant and: [subNode value isString and: [subNode value includes: $%]]]) ifTrue: + [map at: subNode put: (formatNode := subNode asPrintfFormatStringNode)]]. - [map at: subNode put: subNode asPrintfFormatStringNode]]. self replaceNodesIn: map. "inline any brace of arguments..." newArgs := OrderedCollection new. arguments do: [:arg| arg isBrace ifTrue: [newArgs addAllLast: arg elements] ifFalse: [newArgs addLast: arg]]. + fileParameterIndex := 0. + "ensure that the FILE * arg, if any, is first." - "ensure that the FILE * arg is first" selector first == $f ifTrue: [| originalReceiver | "format string will either be receiver or first argument. Use type of FILE * argument to determine which. This is because of the pst: hook in frame printing." self assert: ((self isFileParameter: receiver for: aTMethod in: aCodeGen) or: [self isFileParameter: arguments first for: aTMethod in: aCodeGen]). originalReceiver := receiver. receiver := TVariableNode new setName: 'self'. (self isFileParameter: originalReceiver for: aTMethod in: aCodeGen) ifTrue: "transcript f: fmt printf: args => self f: transcript printf: fmt _: args" + [newArgs addFirst: originalReceiver. fileParameterIndex := 1] - [newArgs addFirst: originalReceiver] ifFalse: "fmt f: transcript printf: args => self f: transcript printf: fmt _: args" + [newArgs add: originalReceiver afterIndex: 1. fileParameterIndex := 2]]. + + "Automatically cast length arguments to int to avoid compiler warnings." + formatNode notNil ifTrue: + [| format | + format := PrintfFormatString new setFormat: (formatNode value copyReplaceAll: '%WP' with: '%p'). + newArgs withIndexDo: + [:paramNode :index| | formatDescriptor | + (index > fileParameterIndex + and: [(formatDescriptor := format nextFormat) notNil + and: [formatDescriptor isNumberHolder + and: [(paramNode typeOrNilFrom: aCodeGen in: aTMethod) ~= #int]]]) ifTrue: + [newArgs at: index put: (TSendNode new + setSelector: #signedIntFromLong + receiver: paramNode + arguments: #())]]]. + - [newArgs add: originalReceiver afterIndex: 1]]. arguments := newArgs!

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 June 2022