Vm-dev August 2020

vm-dev@lists.squeakfoundation.org

15 participants
109 discussions

Errored: OpenSmalltalk/opensmalltalk-vm#2138 (Cog - 985c770)
by Travis CI 17 Aug '20

17 Aug '20

Build Update for OpenSmalltalk/opensmalltalk-vm ------------------------------------- Build: #2138 Status: Errored Duration: 23 mins and 34 secs Commit: 985c770 (Cog) Author: Eliot Miranda Message: CogVM source as per VMMaker.oscog-eem.2790 Interpreter cleanup Eliminate assertClassOf:is:. Delete obsolete primitiveVMProfileInfoInto. Simplify bytecodePrimPointX/Y to avoid primFailCode. Provide the InterpreterPlugin>>stackStringValue: convenience. Simplify the SecurityPlugin using methodReturnString: View the changeset: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/2a7b21ed7570...98… View the full build log and details: https://travis-ci.org/github/OpenSmalltalk/opensmalltalk-vm/builds/71846132… -- 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] 985c77: CogVM source as per VMMaker.oscog-eem.2790
by Eliot Miranda 17 Aug '20

17 Aug '20

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 985c7706236e8cb34b668496b6883a969875c57b https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/985c7706236e8cb34b… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2020-08-16 (Sun, 16 Aug 2020) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h 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 platforms/Cross/vm/sq.h M platforms/iOS/vm/iPhone/Classes/sqSqueakIPhoneApplication.m M platforms/minheadless/generic/sqPlatformSpecific-Generic.c M platforms/minheadless/unix/sqPlatformSpecific-Unix.c M platforms/minheadless/windows/sqPlatformSpecific-Win32.c M platforms/win32/vm/sqWin32VMProfile.c M spur64src/vm/cogit.h 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/cointerp.c M spurlowcode64src/vm/cointerp.h M spurlowcode64src/vm/gcc3x-cointerp.c M spurlowcodesrc/vm/cogit.h 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/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h 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/ckformat.c M src/plugins/SecurityPlugin/SecurityPlugin.c M src/plugins/SoundPlugin/SoundPlugin.c M src/vm/cogit.h 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.2790 Interpreter cleanup Eliminate assertClassOf:is:. Delete obsolete primitiveVMProfileInfoInto. Simplify bytecodePrimPointX/Y to avoid primFailCode. Provide the InterpreterPlugin>>stackStringValue: convenience. Simplify the SecurityPlugin using methodReturnString:

1 0

VM Maker: VMMaker.oscog-eem.2790.mcz
by commits＠source.squeak.org 17 Aug '20

17 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2790.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2790 Author: eem Time: 16 August 2020, 4:25:54.430017 pm UUID: c254cfd5-e456-417a-bad8-bb026d11b73e Ancestors: VMMaker.oscog-eem.2789 Interpreter cleanup Eliminate assertClassOf:is:. Delete obsolete primitiveVMProfileInfoInto. Simplify bytecodePrimPointX/Y to avoid primFailCode. =============== Diff against VMMaker.oscog-eem.2789 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveImageName (in category 'other primitives') ----- primitiveImageName + "When called with a single string argument, record the string as the current image file name. + When called with zero arguments, return a string containing the current image file name." - "When called with a single string argument, record the string as the current image file name. When called with zero arguments, return a string containing the current image file name." + | s isString sCRIfn okToRename sz | + <var: #sCRIfn type: #'void *'> + argumentCount = 1 ifTrue: + [s := self stackTop. + isString := self isInstanceOfClassByteString: s. + isString ifFalse: + [^self primitiveFailFor: PrimErrBadArgument]. - | s sz sCRIfn okToRename | - <var: #sCRIfn type: 'void *'> - argumentCount = 1 ifTrue: [ "If the security plugin can be loaded, use it to check for rename permission. + If not, assume it's ok" - If not, assume it's ok" sCRIfn := self ioLoadFunction: 'secCanRenameImage' From: 'SecurityPlugin'. sCRIfn ~= 0 ifTrue: [okToRename := self cCode: '((sqInt (*)(void))sCRIfn)()' inSmalltalk: [self dispatchMappedPluginEntry: sCRIfn]. + okToRename ifFalse: + [^self primitiveFailFor: PrimErrUnsupported]]. + self imageNamePut: (s + objectMemory baseHeaderSize) Length: (objectMemory numBytesOf: s). + ^self pop: 1]. "pop s, leave rcvr on stack" + + "A char *ioImageName(void) style interface would be less cumbersome." + sz := self imageNameSize. + s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: sz. + self imageNameGet: (s + objectMemory baseHeaderSize) Length: sz. + self methodReturnValue: s! - okToRename ifFalse: - [^self primitiveFail]]. - s := self stackTop. - self assertClassOf: s is: (objectMemory splObj: ClassByteString). - self successful ifTrue: [ - sz := self stSizeOf: s. - self imageNamePut: (s + objectMemory baseHeaderSize) Length: sz. - self pop: 1. "pop s, leave rcvr on stack" - ]. - ] ifFalse: [ - sz := self imageNameSize. - s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: sz. - self imageNameGet: (s + objectMemory baseHeaderSize) Length: sz. - self pop: 1 thenPush: s - ]! Item was removed: - ----- Method: InterpreterPrimitives>>primitiveVMProfileInfoInto (in category 'process primitives') ----- - primitiveVMProfileInfoInto - "Primitive. Answer whether the profiler is running or not. - If the argument is an Array of suitable size fill it with the following information: - 1. the addresses of the first element of the VM histogram (the first address in the executable) - 2. the address following the last element (the last address in the executable, excluding dynamically linked libraries) - 3. the size of the VM histogram in bins (each bin is a 4 byte unsigned long) - 4. the size of the VM histogram in bins (each bin is a 4 byte unsigned long)" - | info running exeStart exeLimit vmBins easBins | - <var: #exeStart type: #'char *'> - <var: #exeLimit type: #'char *'> - <var: #vmBins type: #long> - <var: #easBins type: #long> - self success: argumentCount = 1. - self successful ifTrue: - [info := self stackObjectValue: 0]. - self successful ifTrue: - [info ~= objectMemory nilObject ifTrue: - [self assertClassOf: info is: (objectMemory splObj: ClassArray). - self success: (objectMemory numSlotsOf: info) >= 4]]. - self successful ifFalse: - [^nil]. - - self cCode: 'ioProfileStatus(&running,&exeStart,&exeLimit,0,&vmBins,0,&easBins)' - inSmalltalk: [running := exeStart := exeLimit := vmBins := easBins := 0]. - info ~= objectMemory nilObject ifTrue: - [objectMemory storePointerUnchecked: 0 - ofObject: info - withValue: (objectMemory integerObjectOf: (self oopForPointer: exeStart)). - objectMemory storePointerUnchecked: 1 - ofObject: info - withValue: (objectMemory integerObjectOf: (self oopForPointer: exeLimit)). - objectMemory storePointerUnchecked: 2 - ofObject: info - withValue: (objectMemory integerObjectOf: vmBins). - objectMemory storePointerUnchecked: 3 - ofObject: info - withValue: (objectMemory integerObjectOf: easBins)]. - self pop: 2 thenPushBool: running! Item was removed: - ----- Method: StackInterpreter>>assertClassOf:is: (in category 'utilities') ----- - assertClassOf: oop is: classOop - "Succeed if oop is an instance of the given class. Fail if the object is an integer." - | ok | - <inline: true> - ok := objectMemory isNonImmediate: oop. - ok ifTrue: - [ok := objectMemory isClassOfNonImm: oop equalTo: classOop]. - self success: ok! Item was changed: ----- Method: StackInterpreter>>bytecodePrimPointX (in category 'common selector sends') ----- bytecodePrimPointX + | rcvr ok | - | rcvr | self initPrimCall. rcvr := self internalStackTop. + (objectMemory isNonImmediate: rcvr) ifTrue: + [ok := objectMemory isClassOfNonImm: rcvr equalTo: (objectMemory splObj: ClassPoint). + ok ifTrue: + [self internalStackTopPut: (objectMemory fetchPointer: XIndex ofObject: rcvr). + ^self fetchNextBytecode]]. - self assertClassOf: rcvr is: (objectMemory splObj: ClassPoint). - self successful ifTrue: - [self internalStackTopPut: (objectMemory fetchPointer: XIndex ofObject: rcvr). - ^self fetchNextBytecode "success"]. - primFailCode := 0. messageSelector := self specialSelector: 30. argumentCount := 0. self normalSend! Item was changed: ----- Method: StackInterpreter>>bytecodePrimPointY (in category 'common selector sends') ----- bytecodePrimPointY + | rcvr ok | - | rcvr | self initPrimCall. rcvr := self internalStackTop. + (objectMemory isNonImmediate: rcvr) ifTrue: + [ok := objectMemory isClassOfNonImm: rcvr equalTo: (objectMemory splObj: ClassPoint). + ok ifTrue: + [self internalStackTopPut: (objectMemory fetchPointer: YIndex ofObject: rcvr). + ^self fetchNextBytecode]]. - self assertClassOf: rcvr is: (objectMemory splObj: ClassPoint). - self successful ifTrue: - [self internalStackTopPut: (objectMemory fetchPointer: YIndex ofObject: rcvr). - ^self fetchNextBytecode "success"]. - primFailCode := 0. messageSelector := self specialSelector: 31. argumentCount := 0. self normalSend!

1 0

Re: [Vm-dev] [squeak-dev] Has anyone gotten FFI working on squeak on a Mac lately?
by Eliot Miranda 16 Aug '20

16 Aug '20

Hi Lawson, > On Aug 15, 2020, at 1:54 PM, LawsonEnglish <LEnglish5(a)cox.net> wrote: > > A followup issue is that simply getting the “External module not found” error the way I do eventually caues either a freeze, or a crash on startup. > > That’s happened with 3 different all-in-one Squeak 5.3’s. > > The debug VM also eventually freezes it seems, when I left it unattended overnight after trying to run that FFI call and getting that error. So far we haven’t figured out where to put a break in the C code to halt just before that error emerges, but just getting that error enough times seems to have its own bad effects on squeak, even if it takes a while to show up. Remember that if you run the vm from a terminal window then when it freezes up you can open another terminal and attach to the process using lldb abd then start exploring, eg using call printAllStacks() and call dumpPrimTraceLog() to find out what state it is in and what was the last external primitive it executed before locking up. You can also simply open a terminal and use pushOutputFile to send output to the new terminal, but that’s a bit involved. > L > >> On Aug 14, 2020, at 9:19 PM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> >> Hi Lawson, >> >>>> On Aug 14, 2020, at 6:21 PM, LawsonEnglish <LEnglish5(a)cox.net> wrote: >>> >>> I’m not saying it isn’t stable. >> >> I know. I was just saying I don’t think anything has been broken recently, so the issue is not in the FFI per se. >> >>> However, the test functions are in the FFI plugin, which is a .bundle. I’ve been trying to use a .dylib. >> >> There’s a SqueakFFIPlugin dylib (a dylib in all but name) in SqueakFFIPlugin.bundle/Contents/MacOS/SqueakFFIPlugin. That’s what the FFI actually loads. >> >>> I realize that this should. make no difference, and yet, as I said, Craig Latta watched me do the whole thing from scratch via skype screensharing and he didn’t see an error. >>> >>> SO again: has anyone used a non-Squeak distribution/non-bundle with FFI lately? >> >> Yes. >> >>> I tested it on both Catlaina and Mojave and I get teh External module not found error, even with my own .dylib that isn’t hardcoded to sit in a specific directory. >>> >>> WHich leads to a suggestion: if it really is a Mac OS x issue, rather than my own stupidity, it may be necessary to start testing against a library that is merely sitting in the Resource directory, rather than inside a .bundle. >>> >>> WHich is why I’m still asking: has anyone used their own library (outside a .bundle) with FFI lately on Mac OS X, Catalina OR Mojave? >> >> Yes, and it is extremely tricky. I’ve been using libav and libffmpeg and others. I’ve found one has to examine carefully the output of otool -L and use install_name_tool to change the hard-coded paths of any other non-system Dublin’s a Bykov depends on and make sure one understands and uses @rpath. If your dylib uses any other dylib you’re going to have to do the same exploration. >> >>> >>> I’m still trying to figure out how to PUT a library into a .bundle, or I’d test my theory. >> >> Look at the vm build makefiles for macos; they do this and they can be configured to generate dylibs in a directory, etc. >> >> So first question, what’s the output of >> otool -L mylib >> >> (You can omit all the /System/Library ones) >> >>> L >>> >>>> On Aug 14, 2020, at 6:14 PM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >>>> >>>> Hi Lawson, >>>> >>>>>> On Aug 14, 2020, at 6:04 PM, LawsonEnglish <LEnglish5(a)cox.net> wrote: >>>>> >>>>> I realize that the test library works, but I can’t use ANY kind of library user specified/user made library for FFI with Squeak on Catalina OR Mojave, and I can’t tell what I am doing wrong. >>>>> >>>>> I let Craig Latta watch me, via screen sharing on skype, set up the whole thing from scratch, and his response was to start to coach me in how to create and use the VM with a c-debugger. >>>>> >>>>> So I don’t think I’m doing anything obviously wrong or at least Craig didn’t catch it while he watched. >>>>> >>>>> Still don’t have the VM working, so I thought I ask if anyone has actually done it lately? The FFIPrim libray is in a .bundle, which may or may not be signficiant to this issue. >>>> >>>> The FFI tests work out if the biz for me on MacOS 64-bit. The test functions are included in the FFI plugin. I haven’t tried x86/32-bit in a while but I’d be surprised if this was broken. The code is stable. >>>> >>>>> >>>>> >>>>> L >>>>> >>>> >>> >>> >> > >

1 0

vm-display-fbdev on Aarch64/RasPi
by ken.dickey＠whidbey.com 15 Aug '20

15 Aug '20

Greetings, While I like the idea of SqueakNOS (Squeak on Bare Metal), having a short life I prefer to work on value added. The (old) idea being to use a "shim" OS which takes care of memory, networking, USB drivers and which I do not have to support. I basically develop on aarch64/arm64 chips, so naturally took a look at revitalizing the framebuffer display: vm-display-fbdev. Progress so far: I can run both Cuis and Squeak images on Rasperry Pi 3 under Alpine Linux, which is a very slim Linux using MUSL (vs libc) and busybox (vs many separate commands). Both stack and Cog VMs run. The VM _is_ the window system. You will need to build the VM. If any intrepid explorers out there wish to help out or just take a look, I have a repository with instructions and the fb-display-fbdev code: https://github.com/KenDickey/FBDevVM Also, the complete build tree for aarch64+MUSL+libevdev with updated mvm's: https://github.com/KenDickey/opensmalltalk-vm Bug reports (or better yet, fixes!) and help cleaning up the C code is very much appreciated! Enjoy! -KenD PS: Yes, the cursor looks funny. Early days..

2 1

Has anyone gotten FFI working on squeak on a Mac lately?
by LawsonEnglish 15 Aug '20

15 Aug '20

I realize that the test library works, but I can’t use ANY kind of library user specified/user made library for FFI with Squeak on Catalina OR Mojave, and I can’t tell what I am doing wrong. I let Craig Latta watch me, via screen sharing on skype, set up the whole thing from scratch, and his response was to start to coach me in how to create and use the VM with a c-debugger. So I don’t think I’m doing anything obviously wrong or at least Craig didn’t catch it while he watched. Still don’t have the VM working, so I thought I ask if anyone has actually done it lately? The FFIPrim libray is in a .bundle, which may or may not be signficiant to this issue. L

1 0

VM Maker: VMMaker.oscog-eem.2789.mcz
by commits＠source.squeak.org 14 Aug '20

14 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2789.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2789 Author: eem Time: 14 August 2020, 2:36:34.720705 pm UUID: 62e4213d-c35b-4aa0-8d16-49d19f53b989 Ancestors: VMMaker.oscog-eem.2788 Provide the InterpreterPlugin>>stackStringValue: convenience. Simplify and ake simulateable the SecurityPlugin using methodReturnString: =============== Diff against VMMaker.oscog-eem.2788 =============== Item was added: + ----- Method: InterpreterPlugin>>stackStringValue: (in category 'API access') ----- + stackStringValue: index + "Convenience to answer a given argument as a C string. + Fails if the argument is not a string or there is no memory." + <returnTypeC: #'char *'> + | obj sz dstPtr | + <var: 'dstPtr' type: #'char *'> + obj := interpreterProxy stackValue: index. + (interpreterProxy isBytes: obj) ifFalse: + [interpreterProxy primitiveFailFor: PrimErrBadArgument. + ^nil]. + sz := interpreterProxy byteSizeOf: obj. + dstPtr := self malloc: sz+1. + dstPtr ifNil: + [interpreterProxy primitiveFailFor: PrimErrNoCMemory. + ^nil]. + self memcpy: dstPtr _: (interpreterProxy firstIndexableField: obj) _: sz. + dstPtr at: sz put: 0. + ^dstPtr! Item was added: + ----- Method: SecurityPlugin>>ioCanWriteImage (in category 'simulation') ----- + ioCanWriteImage + <doNotGenerate> + ^true! Item was added: + ----- Method: SecurityPlugin>>ioDisableImageWrite (in category 'simulation') ----- + ioDisableImageWrite + <doNotGenerate>! Item was added: + ----- Method: SecurityPlugin>>ioGetSecureUserDirectory (in category 'simulation') ----- + ioGetSecureUserDirectory + <doNotGenerate> + ^SecurityManager default primSecureUserDirectory! Item was added: + ----- Method: SecurityPlugin>>ioGetUntrustedUserDirectory (in category 'simulation') ----- + ioGetUntrustedUserDirectory + <doNotGenerate> + ^SecurityManager default primUntrustedUserDirectory! Item was changed: ----- Method: SecurityPlugin>>primitiveCanWriteImage (in category 'primitives') ----- primitiveCanWriteImage <export: true> + interpreterProxy methodReturnBool: self ioCanWriteImage! - interpreterProxy pop: 1. - interpreterProxy pushBool: (self cCode:'ioCanWriteImage()' inSmalltalk:[true])! Item was changed: ----- Method: SecurityPlugin>>primitiveDisableImageWrite (in category 'primitives') ----- primitiveDisableImageWrite <export: true> + self ioDisableImageWrite! - self cCode: 'ioDisableImageWrite()'! Item was changed: ----- Method: SecurityPlugin>>primitiveGetSecureUserDirectory (in category 'primitives') ----- primitiveGetSecureUserDirectory "Primitive. Return the secure directory for the current user." + | dirName | - | dirName dirLen dirOop dirPtr | <export: true> + <var: #dirName type: #'char *'> + dirName := self ioGetSecureUserDirectory. + interpreterProxy failed ifFalse: + [interpreterProxy methodReturnString: dirName]! - <var: #dirName type: 'char *'> - <var: #dirPtr type: 'char *'> - dirName := self cCode: 'ioGetSecureUserDirectory()' inSmalltalk: [nil]. - (dirName == nil or:[interpreterProxy failed]) - ifTrue:[^interpreterProxy primitiveFail]. - dirLen := self strlen: dirName. - dirOop := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: dirLen. - interpreterProxy failed ifTrue:[^nil]. - dirPtr := interpreterProxy firstIndexableField: dirOop. - 0 to: dirLen-1 do:[:i| - dirPtr at: i put: (dirName at: i)]. - interpreterProxy pop: 1 thenPush: dirOop.! Item was changed: ----- Method: SecurityPlugin>>primitiveGetUntrustedUserDirectory (in category 'primitives') ----- primitiveGetUntrustedUserDirectory "Primitive. Return the untrusted user directory name." + | dirName | - | dirName dirLen dirOop dirPtr | <export: true> + <var: #dirName type: #'char *'> + dirName := self ioGetUntrustedUserDirectory. + interpreterProxy failed ifFalse: + [interpreterProxy methodReturnString: dirName]! - <var: #dirName type: 'char *'> - <var: #dirPtr type: 'char *'> - dirName := self cCode:'ioGetUntrustedUserDirectory()' inSmalltalk:[nil]. - (dirName == nil or:[interpreterProxy failed]) - ifTrue:[^interpreterProxy primitiveFail]. - dirLen := self strlen: dirName. - dirOop := interpreterProxy instantiateClass: interpreterProxy classString indexableSize: dirLen. - interpreterProxy failed ifTrue:[^nil]. - dirPtr := interpreterProxy firstIndexableField: dirOop. - 0 to: dirLen-1 do:[:i| - dirPtr at: i put: (dirName at: i)]. - interpreterProxy pop: 1 thenPush: dirOop.!

1 0

VM Maker: VMMaker.oscog-eem.2788.mcz
by commits＠source.squeak.org 14 Aug '20

14 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2788.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2788 Author: eem Time: 14 August 2020, 2:03:27.285203 pm UUID: 415b0c73-efcf-4a0f-b6dc-d7bf2fce2663 Ancestors: VMMaker.oscog-eem.2787 ...and apply it to the SoundPlugin. =============== Diff against VMMaker.oscog-eem.2787 =============== Item was changed: ----- Method: SoundPlugin>>primitiveGetDefaultSoundPlayer (in category 'primitives') ----- primitiveGetDefaultSoundPlayer "Answer a String with the operating system name of the default output device, or nil" "no arguments" <export: true> + self methodReturnStringOrNil: self getDefaultSoundPlayer! - | cDeviceName | - <var: #cDeviceName type: #'char*'> - - "Get the answer." - cDeviceName := self getDefaultSoundPlayer. - cDeviceName = 0 ifTrue: - [^interpreterProxy methodReturnValue: interpreterProxy nilObject]. - - ^interpreterProxy methodReturnString: cDeviceName! Item was changed: ----- Method: SoundPlugin>>primitiveGetDefaultSoundRecorder (in category 'primitives') ----- primitiveGetDefaultSoundRecorder "Answer a String with the operating system name of the default input device, or nil" "no arguments" <export: true> + self methodReturnStringOrNil: self getDefaultSoundRecorder! - | cDeviceName | - <var: #cDeviceName type: #'char*'> - - "Get the answer." - cDeviceName := self getDefaultSoundRecorder. - cDeviceName = 0 ifTrue: - [^interpreterProxy methodReturnValue: interpreterProxy nilObject]. - - ^interpreterProxy methodReturnString: cDeviceName! Item was changed: ----- Method: SoundPlugin>>primitiveGetSoundPlayerDeviceName (in category 'primitives') ----- primitiveGetSoundPlayerDeviceName "arguments: name(type, stack offset) deviceNumber(Integer, 0)" "answers a string or nil" <export: true> + | deviceNumber | - | deviceNumber cDeviceName | - <var: #cDeviceName type: #'char *'> "Parse arguments" interpreterProxy methodArgumentCount = 1 ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. deviceNumber := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + self methodReturnStringOrNil: (self getSoundPlayerDeviceName: deviceNumber - 1)! - "Get the answer." - cDeviceName := self getSoundPlayerDeviceName: deviceNumber - 1. - cDeviceName = 0 ifTrue: - [^interpreterProxy methodReturnValue: interpreterProxy nilObject]. - - ^interpreterProxy methodReturnString: cDeviceName! Item was changed: ----- Method: SoundPlugin>>primitiveGetSoundRecorderDeviceName (in category 'primitives') ----- primitiveGetSoundRecorderDeviceName "arguments: name(type, stack offset) deviceNumber(Integer, 0)" "answers a string or nil" <export: true> + | deviceNumber | - | deviceNumber cDeviceName | - <var: #cDeviceName type: #'char *'> "Parse arguments" interpreterProxy methodArgumentCount = 1 ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadNumArgs]. deviceNumber := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 0). interpreterProxy failed ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + self methodReturnStringOrNil: (self getSoundRecorderDeviceName: deviceNumber - 1)! - "Get the answer." - cDeviceName := self getSoundRecorderDeviceName: deviceNumber - 1. - cDeviceName = 0 ifTrue: - [^interpreterProxy methodReturnValue: interpreterProxy nilObject]. - - ^interpreterProxy methodReturnString: cDeviceName!

1 0

VM Maker: VMMaker.oscog-eem.2787.mcz
by commits＠source.squeak.org 14 Aug '20

14 Aug '20

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2787.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2787 Author: eem Time: 14 August 2020, 1:54:50.995494 pm UUID: a81bc75b-4cf1-42bc-969e-85d46c9f2a4c Ancestors: VMMaker.oscog-eem.2786 Add another convenience to InterpreterPlugin. methodReturnStringOrNil: answers nil for a null string, instead of failing. =============== Diff against VMMaker.oscog-eem.2786 =============== Item was added: + ----- Method: InterpreterPlugin>>methodReturnStringOrNil: (in category 'API access') ----- + methodReturnStringOrNil: cString + "methodReturnString: fails for a nil value; this convenience answers nil for a nil value." + <var: 'cString' type: #'char *'> + <inline: #always> + cString + ifNil: [interpreterProxy methodReturnValue: interpreterProxy nilObject] + ifNotNil: [interpreterProxy methodReturnString: cString]!

1 0

VM Maker: VMMaker-dtl.418.mcz
by commits＠source.squeak.org 13 Aug '20

13 Aug '20

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.418.mcz ==================== Summary ==================== Name: VMMaker-dtl.418 Author: dtl Time: 12 August 2020, 10:35:02.257 pm UUID: 39e895ba-407a-4226-ab73-3634b979ea77 Ancestors: VMMaker-dtl.417 VMMaker 4.19.2 In ObjectMemory, the expression "self sizeMask + self size4Bit)" is constant regardless of bytesPerWord, see interp.h for the declarations. In all cases, SIZE_MASK + SIZE_4_BIT equals 16rFC. Simplify accordingly. =============== Diff against VMMaker-dtl.417 =============== Item was changed: ----- Method: NewObjectMemory>>eeInstantiateAndInitializeClass:indexableSize: (in category 'interpreter access') ----- eeInstantiateAndInitializeClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change. Will *not* cause a GC. The instantiated object is initialized." | hash header1 header2 cClass byteSize format binc header3 hdrSize sizeHiBits bm1 classFormat | <inline: false> "cannot have a negative indexable field count" self assert: size >= 0. hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash bitAnd: HashMaskUnshifted) << HashBitsOffset. header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" + byteSize := (classFormat bitAnd: 16rFC) + sizeHiBits. - byteSize := (classFormat bitAnd: self sizeMask + self size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (self shiftForWord-2). format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := self bytesPerWord-1. byteSize := byteSize + (size * 4) + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * self bytesPerWord) "Arrays and 64-bit bitmaps"] ] ifFalse: ["Strings and Methods" bm1 := self bytesPerWord-1. byteSize := byteSize + size + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. header3 > 0 ifTrue: ["requires full header" hdrSize := 3] ifFalse: [cClass = 0 ifTrue: [hdrSize := 2] ifFalse: [hdrSize := 1]]. ^self eeAllocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3 doFill: true format: format! Item was changed: ----- Method: NewObjectMemory>>eeInstantiateClass:indexableSize: (in category 'interpreter access') ----- eeInstantiateClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change. Will *not* cause a GC. Note that the instantiated object IS NOT FILLED and must be completed before returning it to Smalltalk. Since this call is used in routines that do just that we are safe. Break this rule and die." <api> | hash header1 header2 cClass byteSize format binc header3 hdrSize sizeHiBits bm1 classFormat | <inline: false> "cannot have a negative indexable field count" self assert: size >= 0. hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash bitAnd: HashMaskUnshifted) << HashBitsOffset. header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" + byteSize := (classFormat bitAnd: 16rFC) + sizeHiBits. - byteSize := (classFormat bitAnd: self sizeMask + self size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (self shiftForWord-2). format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := self bytesPerWord-1. byteSize := byteSize + (size * 4) + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * self bytesPerWord) "Arrays and 64-bit bitmaps"] ] ifFalse: ["Strings and Methods" bm1 := self bytesPerWord-1. byteSize := byteSize + size + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. header3 > 0 ifTrue: ["requires full header" hdrSize := 3] ifFalse: [cClass = 0 ifTrue: [hdrSize := 2] ifFalse: [hdrSize := 1]]. ^self eeAllocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3! Item was changed: ----- Method: NewObjectMemory>>eeInstantiateSmallClass:sizeInBytes: (in category 'interpreter access') ----- eeInstantiateSmallClass: classPointer sizeInBytes: sizeInBytes "This version of instantiateClass assumes that the total object size is under 256 bytes, the limit for objects with only one or two header words. Note that the size is specified in bytes and should include 4 or 8 bytes for the base header word. NOTE this code will only work for sizes that are an integral number of words (like not a 32-bit LargeInteger in a 64-bit system). Will *not* cause a GC. Note that the created small object IS NOT FILLED and must be completed before returning it to Squeak. Since this call is used in routines that do just that we are safe. Break this rule and die." | hash header1 header2 hdrSize | "size must be integral number of words" self assert: (sizeInBytes bitAnd: (self bytesPerWord-1)) = 0. hash := self newObjectHash. header1 := (hash bitAnd: HashMaskUnshifted) << HashBitsOffset bitOr: (self formatOfClass: classPointer). header2 := classPointer. hdrSize := (header1 bitAnd: CompactClassMask) > 0 "is this a compact class" ifTrue: [1] ifFalse: [2]. + header1 := header1 + (sizeInBytes - (header1 bitAnd: 16rFC)). - header1 := header1 + (sizeInBytes - (header1 bitAnd: self sizeMask+self size4Bit)). ^self eeAllocate: sizeInBytes headerSize: hdrSize h1: header1 h2: header2 h3: 0! Item was changed: ----- Method: ObjectMemory>>instantiateClass:indexableSize: (in category 'interpreter access') ----- instantiateClass: classPointer indexableSize: size "NOTE: This method supports the backward-compatible split instSize field of the class format word. The sizeHiBits will go away and other shifts change by 2 when the split fields get merged in an (incompatible) image change." | hash header1 header2 cClass byteSize format binc header3 hdrSize fillWord newObj sizeHiBits bm1 classFormat | <inline: false> DoAssertionChecks ifTrue: [size < 0 ifTrue: [self error: 'cannot have a negative indexable field count']]. hash := self newObjectHash. classFormat := self formatOfClass: classPointer. "Low 2 bits are 0" header1 := (classFormat bitAnd: 16r1FF00) bitOr: (hash << HashBitsOffset bitAnd: HashBits). header2 := classPointer. header3 := 0. sizeHiBits := (classFormat bitAnd: 16r60000) >> 9. cClass := header1 bitAnd: CompactClassMask. "compact class field from format word" + byteSize := (classFormat bitAnd: 16rFC) + sizeHiBits. - byteSize := (classFormat bitAnd: self sizeMask + self size4Bit) + sizeHiBits. "size in bytes -- low 2 bits are 0" "Note this byteSize comes from the format word of the class which is pre-shifted to 4 bytes per field. Need another shift for 8 bytes per word..." byteSize := byteSize << (self shiftForWord - 2). format := classFormat >> 8 bitAnd: 15. self flag: #sizeLowBits. format < 8 ifTrue: [format = 6 ifTrue: ["long32 bitmaps" bm1 := self bytesPerWord - 1. byteSize := byteSize + (size * 4) + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - ((size * 4) + bm1 bitAnd: bm1). "odd bytes" "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)] ifFalse: [byteSize := byteSize + (size * self bytesPerWord) "Arrays and 64-bit bitmaps"] ] ifFalse: ["Strings and Methods" bm1 := self bytesPerWord - 1. byteSize := byteSize + size + bm1 bitAnd: self longSizeMask. "round up" binc := bm1 - (size + bm1 bitAnd: bm1). "odd bytes" "low bits of byte size go in format field" header1 := header1 bitOr: (binc bitAnd: 3) << 8. "extra low bit (4) for 64-bit VM goes in 4-bit (betw hdr bits and sizeBits)" header1 := header1 bitOr: (binc bitAnd: 4)]. byteSize > 255 ifTrue: ["requires size header word" header3 := byteSize. header1 := header1] ifFalse: [header1 := header1 bitOr: byteSize]. header3 > 0 ifTrue: ["requires full header" hdrSize := 3] ifFalse: [cClass = 0 ifTrue: [hdrSize := 2] ifFalse: [hdrSize := 1]]. format <= 4 ifTrue: ["if pointers, fill with nil oop" fillWord := nilObj] ifFalse: [fillWord := 0]. newObj := self allocate: byteSize headerSize: hdrSize h1: header1 h2: header2 h3: header3 doFill: true with: fillWord. ^ newObj! Item was changed: ----- Method: ObjectMemory>>instantiateSmallClass:sizeInBytes: (in category 'interpreter access') ----- instantiateSmallClass: classPointer sizeInBytes: sizeInBytes "This version of instantiateClass assumes that the total object size is under 256 bytes, the limit for objects with only one or two header words. Note that the size is specified in bytes and should include 4 or 8 bytes for the base header word. NOTE this code will only work for sizes that are an integral number of words (like not a 32-bit LargeInteger in a 64-bit system). May cause a GC. Note that the created small object IS NOT FILLED and must be completed before returning it to Squeak. Since this call is used in routines that do jsut that we are safe. Break this rule and die." | hash header1 header2 hdrSize | (sizeInBytes bitAnd: (self bytesPerWord - 1)) = 0 ifFalse: [self error: 'size must be integral number of words']. hash := self newObjectHash. header1 := (hash << HashBitsOffset bitAnd: HashBits) bitOr: (self formatOfClass: classPointer). header2 := classPointer. (header1 bitAnd: CompactClassMask) > 0 "is this a compact class" ifTrue: [hdrSize := 1] ifFalse: [hdrSize := 2]. + header1 := header1 + (sizeInBytes - (header1 bitAnd: 16rFC)). - header1 := header1 + (sizeInBytes - (header1 bitAnd: self sizeMask + self size4Bit)). ^ self allocate: sizeInBytes headerSize: hdrSize h1: header1 h2: header2 h3: 0 doFill: false with: 0! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.19.2'! - ^'4.19.1'!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2020