Vm-dev February 2016

vm-dev@lists.squeakfoundation.org

27 participants
141 discussions

error "please insert disk" (windows vm)
by Nicolai Hess 14 Jan '17

14 Jan '17

we have the following bug report 16928 <https://pharo.fogbugz.com/f/cases/16928/no-disk-in-the-drive-reply-to-World…> "no disk in the drive" reply to World | Save As (and other places) "On a clean Pharo4.0 #40618 image, on Windows 7 World Menu | Save As brings up a modal alert window, "There is no disk in the drive. Please insert a disk into drive <etc>" On my system, it does this 4 times. I'm assuming that each instance refers to one of the card-reader drives which are attached, but without a card inserted. This is a pain to deal with every single time a File Browser or World | Save As dialog is opened. Could the alerts either be - only raised when that specific drive is requested by a user action or, less preferably - given by a non-modal window, and fading away after a period" I was able to reproduce this error on squeaks and pharos window vm. (insert a usb card reader, with card, wait some time , remove only the card, every access on this drive, for example open a FileList and scroll to the drive letter). The solution I found is to call SetErrorMode( *SEM_FAILCRITICALERRORS)* I would like to propose the following change to sqwin32directory.c wrap the call to FindFirstFileW/FindNextFileW with UINT prevMode = SetErrorMode(SEM_FAILCRITICALERRORS); call FindFirstFileW/FindNextFileW SetErrorMode(prevMode); ... and call this functions in at least dir_lookup() (the other file/directory methods are save). Alternative solution, we could call the SetErrorMode function once at program start but I don't know if there are other "useful" errors message that we don't want to disable. I tested both solution, both seems to work fine. What do you think?

1 3

ffi-test-main.c fails on FreeBSD
by Gary Dunn 12 Aug '16

12 Aug '16

In conjunction with getting Open Cobalt running on FreeBSD I have been looking into the problems with SqueakFFIPrims on FreeBSD and have reached a point that is beyond my understanding. I am not sure if the fix should come from the VM side or the FreeBSD port maintainer. I needed to get source code back into the ports tree so I did a make in /usr/ports/lang/squeak. I already had the 3.9 tarball, so that just repopulated the source and did the initial build. In the "files" folder I found patch files typical for a FreeBSD port. These patch source files from a generic tarball to work with FreeBSD. The one of interest was patch-platforms__unix__plugins__SqueakFFIPrims__ffi-config which contains ----x-----x----- --- platforms/unix/plugins/SqueakFFIPrims/ffi-config.org Wed Apr 26 20:27:53 2006 +++ platforms/unix/plugins/SqueakFFIPrims/ffi-config Wed Apr 26 20:29:00 2006 @@ -39,6 +39,7 @@ case ${abi} in linux) abi=sysv;; + freebsd*) abi=sysv;; darwin*) abi=darwin;; *) abi=libffi; lib="-lffi";; esac -----x-----x----- I then had the folder work/Squeak-3.9-7/platforms/unix/plugins/SqueakFFIPrims In it is a file 00README which explains how to test FFI. It says to run ffi-test-config but I have no such file. It says to type "make" to build a test suite but the build failed. It says to try with make CPU=any ABI=libffi LIB=-lffi which also failed. I traced the problem to the gcc search paths for includes and libraries -- turns out FreeBSD only searches /usr/include and /usr/lib when the required files are in /usr/local/include and /usr/local/lib. After some fiddling I finally had a "main" to test. It failed: ffi-test-main.c failed at line 361. Here is a bit from that file, ending with line 361: ffiInitialize(); for (ul= 0; ul < 15; ++ul) ffiPushSingleFloat(fa[ul]); GO(FFITypeSingleFloat, many); f= ffiReturnFloatValue(); ffiCleanup(); CHECK(f - ff < FLT_EPSILON); I worked out the CHECK macro but could not find what FLT_EPSILON is. At that point I decided to stop and come to you for help. Where do I go from here? -- Gary Dunn, Honolulu osp(a)aloha.com http://openslate.net/ http://e9erust.blogspot.com/ Sent from Slate001

5 8

Tasks of the heartbeat code
by Holger Freyther 27 Jul '16

27 Jul '16

Dear Eliot, I tried to understand the basic load of the VM and I have two questions for the heartbeat code. Is it right that there are two concerns for the code? 1.) Call forceInterruptCheckFromHeartbeat periodically 2.) Update the clock as seen by the image 1st is useful to interrupt Processes like […] repeat with a pre-emptive scheduler? On a different note do backwards jumps generate interrupt checks too? 2nd is this an optimization to not have to generate the clock when the primitive is being used? thanks holger

4 12

Tracing a Spur Image from Smalltalk
by timfelgentreff 03 Jun '16

03 Jun '16

I've updated the SystemTracer package to trace a Spur-format image. This works as far as I can tell, producing a header that looks just like the header produced by the VM and the objects written also look good. I can also open the image in RSqueak, but not on Spur. It crashes immediately and produces a Smalltalk backtrace that looks like it never manages to return from the image-saving method (but the names in the Stack-trace all look ok, leading me to believe that enough objects got written ok to figure out classes, method names, find the right Process to run and so forth). Curiously, the old SystemTracer2 class that writes Cog-format images also produces images that cannot be opened by Cog VMs, only Interpreter VMs. So I assume there are other assumptions that maybe the JIT makes when starting up. So my question is, what assumptions could there be, and where could I start looking. Cheers, Tim (If you're wondering why I'm using the Smalltalk-level tracing at all - in our quest to create (with RSqueakVM) a Squeak VM that runs Squeak code fast enough that we no longer have to rely on C code from plugins or optional primitives, we're trying to see how far we can push this, and e.g. write the image from within itself, too.) -- View this message in context: http://forum.world.st/Tracing-a-Spur-Image-from-Smalltalk-tp4881224.html Sent from the Squeak VM mailing list archive at Nabble.com.

4 11

Re: [Pharo-dev] Epicea tests failure under Windows (WAS: RE: [ANN] We are in "code freeze" for Pharo 5)
by Nicolai Hess 15 May '16

15 May '16

I traced this back to Object>>withArgs:executeMethod: (primitive 188) in OpalCompiler>>#evaluate It does not happen on squeaks spur vm as far as I know (but I don't know what is the latests squeak spur vm). 2016-02-08 5:17 GMT+01:00 Martin Dias <tinchodias(a)gmail.com>: > Very interesting... > > I created case 17543 > <https://pharo.fogbugz.com/f/cases/17543/VM-crash-in-Windows-when-compiling-…>, > with Vincent's script and other quotes from this thread. I did it because > this Windows issue is independent from Epicea (whose integration only > exposed the Windows issue). > > Martin > > On Sat, Feb 6, 2016 at 6:41 AM, Max Leske <maxleske(a)gmail.com> wrote: > >> Changing the scheduler didn’t have any effect. However, it seems to me >> that the size of the input matters. I can make it work in two ways: >> 1. delete a line. If the line’s too short it won’t work though >> 2. delete a couple of characters from some symbols >> >> That would suggest that not the number of symbols / items in the array is >> significant but the number of bytes. So maybe there’s a problem with memory >> allocation in the VM. I haven’t been able to come up with an exact number, >> but the VM starts crashing at around 7096 characters. Sometimes I can go >> over 7100, other times not. Smaller numbers always work. >> >> HTH, >> Max >> >> On 06 Feb 2016, at 07:25, Ben Coman <btc(a)openInWorld.com >> <btc(a)openinworld.com>> wrote: >> >> On Sat, Feb 6, 2016 at 12:59 PM, Martin Dias <tinchodias(a)gmail.com> >> wrote: >> >> In fact, this integration step >> (https://ci.inria.fr/pharo/job/Pharo-5.0-Update-Step-2.1-Validation-M-Z) >> was >> already passed by Epicea in December. That was before spur, it might be >> related to spur. >> >> That time, the integration of Epicea revealed a bug in delay's >> scheduling... >> >> >> Was that these issues integrated in build 50466... >> https://pharo.fogbugz.com/default.asp?17066 >> https://pharo.fogbugz.com/default.asp?13756 >> >> which should have left the current scheduler as >> DelayExperimentalSpinScheduler >> but in current build 50564 "Delay delaySchedulerClass" --> >> DelayMicrosecondScheduler >> >> Maybe Delay class >> initialize has been executed since >> Scheduler ifNotNil: [ Scheduler stopTimerEventLoop ]. >> Scheduler := DelayMicrosecondScheduler new. >> Scheduler startTimerEventLoop. >> Smalltalk addToStartUpList: self. >> >> but I don't see any updates that might have invoked it. >> Anyway, maybe changing that will help. >> >> cheers -ben >> >> >> >> maybe now it's revealing some bug in Windows+spur...? >> >> Martin >> >> >> On Fri, Feb 5, 2016 at 10:09 AM, Blondeau Vincent >> <vincent.blondeau(a)worldline.com> wrote: >> >> >> If you remove any line, it stops crashing… >> >> I really don’t know what is going on… >> >> >> >> Vincent >> >> >> >> De : Pharo-dev [mailto:pharo-dev-bounces@lists.pharo.org >> <pharo-dev-bounces(a)lists.pharo.org>] De la part de >> Henrik Nergaard >> Envoyé : vendredi 5 février 2016 14:03 >> >> >> À : Pharo Development List >> Objet : Re: [Pharo-dev] Epicea tests failure under Windows (WAS: RE: [ANN] >> We are in "code freeze" for Pharo 5) >> >> >> >> Removing >> >> #(IRPrinterV2 #(visitStoreTemp: visitStoreRemoteTemp: >> visitPopIntoLiteralVariable: visitPushTemp: visitReturnLiteral: >> visitStoreInstVar: visitStoreLiteralVariable: visitPushLiteralVariable: >> visitPushInstVar: visitJump: visitPushLiteral: label: visitPushArray: >> visitPopIntoTemp: visitReturnInstVar: visitPopIntoRemoteTemp: >> visitTempVector: visitJumpIf: visitPushRemoteTemp: visitPopIntoInstVar: >> visitSend: )) >> >> And it stops crashing. >> >> >> >> - BTW, there is not crash.dmp, does it works with spur? >> >> >> >> https://pharo.fogbugz.com/f/cases/17506/when-an-Image-crashes-a-crash-dmp-f… >> >> >> >> Best regards, >> >> Henrik >> >> >> >> From: Pharo-dev [mailto:pharo-dev-bounces@lists.pharo.org] On Behalf Of >> Blondeau Vincent >> Sent: Friday, February 5, 2016 1:54 PM >> To: Pharo Development List <pharo-dev(a)lists.pharo.org> >> Subject: Re: [Pharo-dev] Epicea tests failure under Windows (WAS: RE: >> [ANN] We are in "code freeze" for Pharo 5) >> >> >> >> Very strange bug indeed that happens on windows machines that crashes the >> VM. I succeeded to reduce the problem to an evaluation of a collection… >> >> Can someone have the same issue under Windows or Mac? >> >> >> >> To reproduce : Copy paste the contents of the attached file in the >> playground and print it or do it >> >> It works on pre-spur vm. >> >> >> >> BTW, there is not crash.dmp, does it works with spur? >> >> Vincent >> >> >> >> De : Pharo-dev [mailto:pharo-dev-bounces@lists.pharo.org] De la part de >> Marcus Denker >> Envoyé : vendredi 5 février 2016 13:01 >> À : Pharo Development List >> Objet : Re: [Pharo-dev] Epicea tests failure under Windows (WAS: RE: [ANN] >> We are in "code freeze" for Pharo 5) >> >> >> >> >> >> On 05 Feb 2016, at 12:40, Marcus Denker <marcus.denker(a)inria.fr> wrote: >> >> >> >> I will try do integrate it now… >> >> >> >> >> >> >> >> No, it still fails. >> >> >> >> >> >> https://ci.inria.fr/pharo/job/Pharo-5.0-Update-Step-2.1-Validation-M-Z/labe… >> >> >> >> The last test it executed seems to be this: >> >> running suite: Refactoring-Tests-Environment >> >> starting testcase: RBBrowserEnvironmentTest>>testAndEnvironment ... >> >> Very strange... >> >> Marcus >> >> >> >> >> >> ________________________________ >> >> >> Ce message et les pièces jointes sont confidentiels et réservés à l'usage >> exclusif de ses destinataires. Il peut également être protégé par le >> secret >> professionnel. Si vous recevez ce message par erreur, merci d'en avertir >> immédiatement l'expéditeur et de le détruire. L'intégrité du message ne >> pouvant être assurée sur Internet, la responsabilité de Worldline ne >> pourra >> être recherchée quant au contenu de ce message. Bien que les meilleurs >> efforts soient faits pour maintenir cette transmission exempte de tout >> virus, l'expéditeur ne donne aucune garantie à cet égard et sa >> responsabilité ne saurait être recherchée pour tout dommage résultant d'un >> virus transmis. >> >> This e-mail and the documents attached are confidential and intended >> solely for the addressee; it may also be privileged. If you receive this >> e-mail in error, please notify the sender immediately and destroy it. As >> its >> integrity cannot be secured on the Internet, the Worldline liability >> cannot >> be triggered for the message content. Although the sender endeavours to >> maintain a computer virus-free network, the sender does not warrant that >> this transmission is virus-free and will not be liable for any damages >> resulting from any virus transmitted. >> >> >> ________________________________ >> >> Ce message et les pièces jointes sont confidentiels et réservés à l'usage >> exclusif de ses destinataires. Il peut également être protégé par le >> secret >> professionnel. Si vous recevez ce message par erreur, merci d'en avertir >> immédiatement l'expéditeur et de le détruire. L'intégrité du message ne >> pouvant être assurée sur Internet, la responsabilité de Worldline ne >> pourra >> être recherchée quant au contenu de ce message. Bien que les meilleurs >> efforts soient faits pour maintenir cette transmission exempte de tout >> virus, l'expéditeur ne donne aucune garantie à cet égard et sa >> responsabilité ne saurait être recherchée pour tout dommage résultant d'un >> virus transmis. >> >> This e-mail and the documents attached are confidential and intended >> solely for the addressee; it may also be privileged. If you receive this >> e-mail in error, please notify the sender immediately and destroy it. As >> its >> integrity cannot be secured on the Internet, the Worldline liability >> cannot >> be triggered for the message content. Although the sender endeavours to >> maintain a computer virus-free network, the sender does not warrant that >> this transmission is virus-free and will not be liable for any damages >> resulting from any virus transmitted. >> >> >> >

1 1

Re: [Pharo-dev] Proxy DNU vs CannotInterpret. (Ghost related)
by Eliot Miranda 26 Mar '16

26 Mar '16

Hi Stef, On Mon, Feb 15, 2016 at 8:18 AM, stepharo <stepharo(a)free.fr> wrote: > Hi eliot > > I think that the difference is really what guillermo explained. > With DNU you can only trapped methods that are not defined while if you > want to implement true proxy you do not want holes. > I think that also with DNU proxy there were some limits realyed to classe > but I do not remember. > As far as the VM goes, there is /one/ minor issue with special selector #== and #class (*). But the real issue is that ProtoObject implements far too much protocol. If one creates a class that inherits from nil all it needs to do is implement doersNotUnderstand: and it will catch every message (*). For this to work the debugger and basic inspectors must use the mirror primitives otherwise there will be infinite recursion of MNUs. Now the issue with special selector #== and #class is that these bytecodes are specified as no lookup. So if one uses bytecodes 182 (#==) or 199 (#class) these operate without sending messages and will compare the object or answer the object's class without sending #doesNotUnderstand:. In the VW VM I added a flag so one could turn this behaviour off, and that's certainly easy to do in our VM. Another approach is to have the bytecode compiler not send these. But given our VM it is certainly possible to use doesNotUnderstand: proxies, using a much slimmer class than ProtoObject. In fact a good project would be to try and shrink ProtoObject until it provides the minimum, which would be a #doesNotUnderstand: method that raises an error that reminds the programmer that they need to implement their own doesNotUnderstand: handler in subclasses of ProtoObject. > > Stef > > Le 15/2/16 16:06, Eliot Miranda a écrit : > > Hi Denis, > > On Feb 15, 2016, at 6:53 AM, Denis Kudriashov < <dionisiydk(a)gmail.com> > dionisiydk(a)gmail.com> wrote: > > > 2016-02-15 15:32 GMT+01:00 Mariano Martinez Peck < <marianopeck(a)gmail.com> > marianopeck(a)gmail.com>: > >> As far as I can remember (this was about 4 years ago) The use of >> #cannotInterpret: was the only way to be able to intercept everything >> without breaking the system. Subclassing from ProtoObject make your proxy >> to understand some messages. Subclassing from nil was technically possible, >> but I found out the system would simply crash as it didn't know at all how >> to handle other subclasses of nil. Even with the debugging support I added >> as you can read in the paper. Maybe things have changed. >> >> If subclassing from nil does not break the system and you can still >> inspect, debug proxies, then sure, you can give a try to Ghost using #dnu >> rather than #cannotInterpret:. In fact, I would like to have a dnu-based >> approeach that is as reliable as it was #cannotInterpret: in the sense of >> how much I can intercept. With #cannotInterpret I could trap EVERYTHING >> (everything but #==) and then decide what to do. Subclassing from nil would >> get you there too if you make it work. >> > > Actually I already implemented it many yeas ago for Mocketry. But > subclassing from nil works correctly only in VW. I got problems when > porting it to Squeak (at that time). > Now I want to give DNU another chance. It will simplify logic very much. > It will remove strange hierarchy of proxies which is needed for trick but > raises many questions. > > > There is no reason in principle why Squeak/Pharo should not be able to use > MNU proxies in the same way as VW. The key is to use the mirror > primitives in basic inspectors that are used to inspect the proxies and > in the debugger to simulate code. Without the mirror primitives many > sends to a proxy are likely to create an infinite recursion. As yet we > don't have a robust low space handler that catches infinite recursion so > debugging can be frustrating. But we can work on this. IMO the MNU > approach is to be preferred. > > > -- _,,,^..^,,,_ best, Eliot

6 9

Re: [Vm-dev] VM Maker: VMMaker.oscog-cb.1617.mcz
by Clément Bera 03 Mar '16

03 Mar '16

Ok. According to my attempts, Stack and Cog Simulators are working fine (both Spur and SqueakV3). However the VM compiled to C crashes while trying to assign a block into an instance variable. So something is still wrong. 2016-01-06 14:46 GMT+01:00 <commits(a)source.squeak.org>: > > Eliot Miranda uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-cb.1617.mcz > > ==================== Summary ==================== > > Name: VMMaker.oscog-cb.1617 > Author: cb > Time: 6 January 2016, 2:46:27.798 pm > UUID: 81fe5b89-69de-45b8-9b65-f2f4a8bd187d > Ancestors: VMMaker.oscog-rmacnak.1616 > > As Eliot ntoed, I made a dumb mistake breking instance variable stores in > the interpreter. > > This commit fixes the mistake. In addition, storing into an immutable > object in a primitive now signals a no modification error instead of > inappropriate error. > > I checked and the StackVMSimulator is working fine after this commit. > Unfortunately, the CogVMSimulator does not work in my machine, likely due > to other bugs. I am going to check that it works and that compilation to C > works right now. > > =============== Diff against VMMaker.oscog-rmacnak.1616 =============== > > Item was changed: > ----- Method: CoInterpreterPrimitives>>primitiveObjectAtPut (in category > 'object access primitives') ----- > primitiveObjectAtPut > "Store a literal into a CompiledMethod at the given index. Defined > for CompiledMethods only." > | thisReceiver rawHeader realHeader index newValue | > newValue := self stackValue: 0. > index := self stackValue: 1. > (objectMemory isNonIntegerObject: index) ifTrue: > [^self primitiveFailFor: PrimErrBadArgument]. > index := objectMemory integerValueOf: index. > thisReceiver := self stackValue: 2. > self cppIf: IMMUTABILITY > + ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: > [ ^self primitiveFailFor: PrimErrNoModification ] ]. > - ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: > [ ^self primitiveFailFor: PrimErrInappropriate ] ]. > rawHeader := self rawHeaderOf: thisReceiver. > realHeader := (self isCogMethodReference: rawHeader) > ifTrue: [(self cCoerceSimple: > rawHeader to: #'CogMethod *') methodHeader] > ifFalse: [rawHeader]. > (index > 0 > and: [index <= ((objectMemory literalCountOfMethodHeader: > realHeader) + LiteralStart)]) ifFalse: > [^self primitiveFailFor: PrimErrBadIndex]. > index = 1 > ifTrue: > [((objectMemory isNonIntegerObject: newValue) > or: [(objectMemory literalCountOfMethodHeader: > newValue) ~= (objectMemory literalCountOfMethodHeader: realHeader)]) ifTrue: > [^self primitiveFailFor: > PrimErrBadArgument]. > (self isCogMethodReference: rawHeader) > ifTrue: [(self cCoerceSimple: rawHeader > to: #'CogMethod *') methodHeader: newValue] > ifFalse: [objectMemory > storePointerUnchecked: 0 ofObject: thisReceiver withValue: newValue]] > ifFalse: > [objectMemory storePointer: index - 1 ofObject: > thisReceiver withValue: newValue]. > self pop: 3 thenPush: newValue! > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveFloatAtPut (in category > 'indexing primitives') ----- > primitiveFloatAtPut > "Provide platform-independent access to 32-bit words comprising > a Float. Map index 1 onto the most significant word and index 2 > onto the least significant word." > | rcvr index oopToStore valueToStore | > <var: #valueToStore type: #usqInt> > oopToStore := self stackTop. > valueToStore := self positive32BitValueOf: oopToStore. > self successful ifFalse: > [^self primitiveFailFor: PrimErrBadArgument]. > rcvr := self stackValue: 2. > index := self stackValue: 1. > (objectMemory isImmediateFloat: rcvr) ifTrue: > [^self primitiveFailFor: PrimErrBadReceiver]. > self cppIf: IMMUTABILITY > + ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [^self > primitiveFailFor: PrimErrNoModification] ]. > - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [^self > primitiveFailFor: PrimErrBadReceiver] ]. > index = ConstOne ifTrue: > [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [0] > ifFalse: [1]) > ofObject: rcvr > withValue: valueToStore. > ^self pop: 3 thenPush: oopToStore]. > index = ConstTwo ifTrue: > [objectMemory storeLong32: (VMBIGENDIAN ifTrue: [1] > ifFalse: [0]) > ofObject: rcvr > withValue: valueToStore. > ^self pop: 3 thenPush: oopToStore]. > self primitiveFailFor: ((objectMemory isIntegerObject: index) > ifTrue: > [PrimErrBadIndex] > ifFalse: > [PrimErrBadArgument])! > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveIntegerAtPut (in category > 'sound primitives') ----- > primitiveIntegerAtPut > "Return the 32bit signed integer contents of a words receiver" > | index rcvr sz addr value valueOop | > <var: 'value' type: 'int'> > valueOop := self stackValue: 0. > index := self stackIntegerValue: 1. > value := self signed32BitValueOf: valueOop. > self successful ifFalse: > [^self primitiveFailFor: PrimErrBadArgument]. > rcvr := self stackValue: 2. > (objectMemory isWords: rcvr) ifFalse: > [^self primitiveFailFor: PrimErrInappropriate]. > self cppIf: IMMUTABILITY "isWords: ensure non immediate" > + ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self > primitiveFailFor: PrimErrNoModification ] ]. > - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self > primitiveFailFor: PrimErrInappropriate ] ]. > sz := objectMemory lengthOf: rcvr. "number of fields" > (index >= 1 and: [index <= sz]) ifFalse: > [^self primitiveFailFor: PrimErrBadIndex]. > "4 = 32 bits / 8" > addr := rcvr + objectMemory baseHeaderSize + (index - 1 * 4). "for > zero indexing" > value := objectMemory intAt: addr put: value. > self pop: 3 thenPush: valueOop "pop all; return value" > ! > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveObjectAtPut (in category > 'object access primitives') ----- > primitiveObjectAtPut > "Store a literal into a CompiledMethod at the given index. Defined > for CompiledMethods only." > | thisReceiver index newValue | > newValue := self stackValue: 0. > index := self stackValue: 1. > ((objectMemory isNonIntegerObject: index) > or: [index = ConstOne and: [(objectMemory isNonIntegerObject: > newValue)]]) ifTrue: > [^self primitiveFailFor: PrimErrBadArgument]. > index := objectMemory integerValueOf: index. > thisReceiver := self stackValue: 2. > self cppIf: IMMUTABILITY > + ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: > [ ^self primitiveFailFor: PrimErrNoModification ] ]. > - ifTrue: [ (objectMemory isImmutable: thisReceiver) ifTrue: > [ ^self primitiveFailFor: PrimErrInappropriate ] ]. > (index > 0 and: [index <= ((objectMemory literalCountOf: > thisReceiver) + LiteralStart)]) ifFalse: > [^self primitiveFailFor: PrimErrBadIndex]. > objectMemory storePointer: index - 1 ofObject: thisReceiver > withValue: newValue. > self pop: 3 thenPush: newValue! > > Item was changed: > ----- Method: InterpreterPrimitives>>primitiveShortAtPut (in category > 'sound primitives') ----- > primitiveShortAtPut > "Treat the receiver, which can be indexible by either bytes or > words, as an array > of signed 16-bit values. Set the contents of the given index to > the given value. > Note that the index specifies the i-th 16-bit entry, not the i-th > byte or word." > > | index rcvr value | > value := self stackTop. > index := self stackValue: 1. > ((objectMemory isIntegerObject: value) > and: [(objectMemory isIntegerObject: index) > and: [value := objectMemory integerValueOf: value. > (value >= -32768) and: [value <= 32767]]]) ifFalse: > [^self primitiveFailFor: PrimErrBadArgument]. > rcvr := self stackValue: 2. > (objectMemory isWordsOrBytes: rcvr) ifFalse: > [^self primitiveFailFor: PrimErrInappropriate]. > self cppIf: IMMUTABILITY "isWordsOrBytes ensure non immediate" > + ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self > primitiveFailFor: PrimErrNoModification ] ]. > - ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^self > primitiveFailFor: PrimErrInappropriate ] ]. > index := objectMemory integerValueOf: index. > (index >= 1 and: [index <= (objectMemory num16BitUnitsOf: rcvr)]) > ifFalse: > [^self primitiveFailFor: PrimErrBadIndex]. > objectMemory storeShort16: index - 1 ofObject: rcvr withValue: > value. > self pop: 3 thenPush: (objectMemory integerObjectOf: value)! > > Item was changed: > ----- Method: SpurMemoryManager>>isOopValidBecome: (in category 'become > implementation') ----- > isOopValidBecome: oop > "Answers 0 if the oop can be become. > Answers an error code in the other case" > (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. > (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. > self > cppIf: IMMUTABILITY > + ifTrue: [ (self isImmutable: oop) ifTrue: > [^PrimErrNoModification] ]. > - ifTrue: [ (self isImmutable: oop) ifTrue: > [^PrimErrInappropriate] ]. > ^ 0! > > Item was changed: > ----- Method: StackInterpreter>>extendedStoreAndPopBytecode (in category > 'stack bytecodes') ----- > extendedStoreAndPopBytecode > <inline: true> > self extendedStoreBytecodePop: true > + "may not be reached (immutable receiver)"! > - ! > > Item was changed: > ----- Method: StackInterpreter>>extendedStoreBytecode (in category > 'stack bytecodes') ----- > extendedStoreBytecode > <inline: true> > + self extendedStoreBytecodePop: false > + "may not be reached (immutable receiver)"! > - self extendedStoreBytecodePop: false! > > Item was changed: > ----- Method: StackInterpreter>>storeAndPopReceiverVariableBytecode (in > category 'stack bytecodes') ----- > storeAndPopReceiverVariableBytecode > "Note: This code uses > storePointerUnchecked:ofObject:withValue: and does the > store check explicitely in order to help the translator > produce better code." > | rcvr top | > rcvr := self receiver. > top := self internalStackTop. > self internalPop: 1. > + self > + cCode: "Slang will inline currentBytecode to a constant so > this will work in C" > + [self fetchNextBytecode. > + objectMemory > + storePointerImmutabilityCheck: > (currentBytecode bitAnd: 7) > + ofObject: rcvr > + withValue: top] > + inSmalltalk: "But in Smalltalk we must use the > currentBytecode's value, not the next. > + We cant use the following code when generating C > code as slang > + won't inline currentBytecode correctly due to the > extra temp." > + [ | instVarIndex | > + instVarIndex := currentBytecode bitAnd: 7. > + self fetchNextBytecode. > + objectMemory > + storePointerImmutabilityCheck: instVarIndex > + ofObject: rcvr > + withValue: top]! > - self fetchNextBytecode. > - objectMemory storePointerImmutabilityCheck: (currentBytecode > bitAnd: 7) ofObject: rcvr withValue: top.! > > Item was changed: > ----- Method: StackInterpreterPrimitives>>primitiveInstVarAtPut (in > category 'object access primitives') ----- > primitiveInstVarAtPut > | newValue index rcvr hdr fmt totalLength fixedFields | > newValue := self stackTop. > index := self stackValue: 1. > rcvr := self stackValue: 2. > ((objectMemory isNonIntegerObject: index) > or: [argumentCount > 2 "e.g. object:instVarAt:put:" > and: [objectMemory isOopForwarded: rcvr]]) ifTrue: > [^self primitiveFailFor: PrimErrBadArgument]. > + (objectMemory isImmediate: rcvr) ifTrue: [ ^ self > primitiveFailFor: PrimErrInappropriate]. > + self > + cppIf: IMMUTABILITY > + ifTrue: [ (objectMemory isImmutable: rcvr) ifTrue: [ ^ > self primitiveFailFor: PrimErrNoModification] ]. > - self cppIf: IMMUTABILITY > - ifTrue: [ (objectMemory isOopImmutable: rcvr) ifTrue: > [^self primitiveFailFor: PrimErrInappropriate] ] > - ifFalse: [ (objectMemory isImmediate: rcvr) ifTrue: [^self > primitiveFailFor: PrimErrInappropriate] ]. > index := objectMemory integerValueOf: index. > hdr := objectMemory baseHeader: rcvr. > fmt := objectMemory formatOfHeader: hdr. > totalLength := objectMemory lengthOf: rcvr baseHeader: hdr format: > fmt. > fixedFields := objectMemory fixedFieldsOf: rcvr format: fmt > length: totalLength. > (index >= 1 and: [index <= fixedFields]) ifFalse: > [^self primitiveFailFor: PrimErrBadIndex]. > (fmt = objectMemory indexablePointersFormat > and: [objectMemory isContextHeader: hdr]) > ifTrue: [self externalInstVar: index - 1 ofContext: rcvr > put: newValue] > ifFalse: [self subscript: rcvr with: index storing: > newValue format: fmt]. > self pop: argumentCount + 1 thenPush: newValue! > >

3 4

Changing numArgs of primitive CompiledMethod in Spur
by Denis Kudriashov 29 Feb '16

29 Feb '16

Hi. In Pharo we have special logic to debug failure code of primitives. When debugger detects named prim it tries to create same prim method but without failure code. Then if it fails debugger step into primitive failure code. To create such cleaned primitive method Pharo uses template method like this: tryNamedPrimitiveTemplate "This method is a template that the Smalltalk simulator uses to execute primitives. See Object documentation whatIsAPrimitive." <primitive:' module:' error: errorCode> ^ Context primitiveFailTokenFor: errorCode Then it changes arguments count to be like given method: theMethod := self class tryNamedPrimitiveTemplateMethod. theMethod prepareForSimulationWith: arguments size. self setNamedPrimitiveInformationFrom: *aCompiledMethod* toMethod: theMethod. CompiledMethod>>prepareForSimulationWith: numArgs "This method changes the argument count of a CompiledMethod header to numArgs, its temporary count to numArgs + 1 and change the code handling primitive error to store the error code in the unique temporary of the method" | newHeader xpc | newHeader := (((self header bitAnd: 2r01110000000000111111111111111111) bitOr: (numArgs bitShift: 24)) bitOr: (numArgs + 1 bitShift: 18)). newHeader := newHeader + (self class headerFlagForEncoder: self encoderClass). self objectAt: 1 put: newHeader. xpc := self initialPC. "long store temp" (self at: xpc) = 129 ifTrue: [ self at: xpc + 1 put: (16r40 + numArgs). self at: xpc + 3 put: (16r10 + numArgs)] Then method executed by: theMethod flushCache theMethod valueWithReceiver: aReceiver arguments: arguments This approach works correctly on Cog and not working in Spur. In Spur result of theMethod execution become wrong when given method has arguments. Which means that changing method arguments of CompiledMethod is incorrect for Spur. Is there any solution to make it working?

2 6

[commit][3634] CogVM source as per VMMaker.oscog-eem.1703
by commits＠squeakvm.org 28 Feb '16

28 Feb '16

Revision: 3634 Author: eliot Date: 2016-02-28 13:58:34 -0800 (Sun, 28 Feb 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1703 General: Make the leak checker operational in the non-assert (& non-debug) VM. 64-bit Cogit: Fix primtive 171 (primitiveImmediateAsInteger) in the Cogit for SmallFloat. The old code only dealt with Characters. The new code replicates the rotatedFloatBitsOf: scheme in Spur64BitMemoryManager. Slang: Eliminate some C compiler warnings in the generated code. Add returns at the end of sqInt methods that don't end with a return. Improve the variable pruning to mirror dead code elimination. Fix casts of functions obtained from the SecurityPlugin which, you guessed it, should be typed using sqInt, not int. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c branches/Cog/platforms/unix/vm/aio.c branches/Cog/platforms/unix/vm/sqaio.h branches/Cog/scripts/mkspur64vmarchives branches/Cog/scripts/uploadvms branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c branches/Cog/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/CroquetPlugin/CroquetPlugin.c branches/Cog/src/plugins/DSAPrims/DSAPrims.c branches/Cog/src/plugins/DropPlugin/DropPlugin.c branches/Cog/src/plugins/FFTPlugin/FFTPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/Klatt/Klatt.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/QuicktimePlugin/QuicktimePlugin.c branches/Cog/src/plugins/RePlugin/RePlugin.c branches/Cog/src/plugins/SecurityPlugin/SecurityPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundCodecPrims/SoundCodecPrims.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/Squeak3D/Squeak3D.c branches/Cog/src/plugins/SqueakSSL/SqueakSSL.c branches/Cog/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/scripts/compileChangeHistory Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-02-27 22:26:23 UTC (rev 3633) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-02-28 21:58:34 UTC (rev 3634) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1700 uuid: 4efaff50-3cc1-4840-8195-df0e306eb5a4 + CCodeGenerator VMMaker.oscog-eem.1703 uuid: 9bd9e03b-fbe7-450c-8adc-5e20f7d76cdf */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-27 22:26:23 UTC (rev 3633) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-02-28 21:58:34 UTC (rev 3634) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1700 uuid: 4efaff50-3cc1-4840-8195-df0e306eb5a4 + CCodeGenerator VMMaker.oscog-eem.1703 uuid: 9bd9e03b-fbe7-450c-8adc-5e20f7d76cdf from - StackToRegisterMappingCogit VMMaker.oscog-eem.1700 uuid: 4efaff50-3cc1-4840-8195-df0e306eb5a4 + StackToRegisterMappingCogit VMMaker.oscog-eem.1703 uuid: 9bd9e03b-fbe7-450c-8adc-5e20f7d76cdf */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1700 uuid: 4efaff50-3cc1-4840-8195-df0e306eb5a4 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1703 uuid: 9bd9e03b-fbe7-450c-8adc-5e20f7d76cdf " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -756,6 +756,7 @@ static sqInt NoDbgRegParms genConvertBitsToSmallFloatInscratch(sqInt reg, sqInt scratch); static void NoDbgRegParms genConvertCharacterToSmallIntegerInReg(sqInt reg); static sqInt NoDbgRegParms genConvertIntegerToSmallIntegerInReg(sqInt reg); +static sqInt NoDbgRegParms genConvertSmallFloatToSmallFloatHashAsIntegerInRegscratch(sqInt reg, sqInt scratch); static void NoDbgRegParms genConvertSmallIntegerToCharacterInReg(sqInt reg); static sqInt NoDbgRegParms genConvertSmallIntegerToIntegerInReg(sqInt reg); static sqInt NoDbgRegParms genFetchIndexRegisterfrominto(sqInt indexReg, sqInt tableObj, sqInt destReg); @@ -776,6 +777,7 @@ static sqInt genPrimitiveAt(void); static sqInt genPrimitiveAtPut(void); static sqInt genPrimitiveIdentityHash(void); +static sqInt genPrimitiveImmediateAsInteger(void); static sqInt genPrimitiveMirrorNew(void); static sqInt genPrimitiveMirrorNewWithArg(void); static sqInt genPrimitiveNew(void); @@ -830,7 +832,6 @@ static sqInt NoDbgRegParms genNewArrayOfSizeinitialized(sqInt size, sqInt initialized); static sqInt NoDbgRegParms genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(sqInt bcpc, sqInt numArgs, sqInt numCopied, sqInt ctxtNumArgs, sqInt isLargeCtxt, sqInt isInBlock); static sqInt genPrimitiveAsCharacter(void); -static sqInt genPrimitiveCharacterValue(void); static sqInt NoDbgRegParms genPrimitiveIdenticalOrNotIf(sqInt orNot); static sqInt genPrimitiveObjectAt(void); static sqInt genPrimitiveSize(void); @@ -1190,6 +1191,7 @@ static sqInt ceEnclosingObjectTrampoline; void (*ceEnterCogCodePopReceiverReg)(void); static sqInt ceFetchContextInstVarTrampoline; +static void (*ceFlushICache)(unsigned long from, unsigned long to); unsigned long (*ceGetFP)(void); unsigned long (*ceGetSP)(void); static sqInt ceLargeActiveContextInBlockTrampoline; @@ -1214,7 +1216,6 @@ unsigned long (*ceTryLockVMOwner)(void); void (*ceUnlockVMOwner)(void); sqInt cFramePointerInUse; -static sqInt checkedEntryAlignment; static sqInt closedPICSize; sqInt cmEntryOffset; sqInt cmNoCheckEntryOffset; @@ -1229,13 +1230,11 @@ static sqInt debugFixupBreaks; static sqInt debugOpcodeIndices; unsigned long debugPrimCallStackOffset; -static sqInt directedSuperSendTrampolines[NumSendTrampolines]; static sqInt disassemblingMethod; static sqInt dynamicSuperSendTrampolines[NumSendTrampolines]; static AbstractInstruction * endCPICCase0; static sqInt endPC; static AbstractInstruction * entry; -static sqInt entryPointMask; static sqInt enumeratingCogMethod; static sqInt expectedFPAlignment; static sqInt expectedSPAlignment; @@ -1819,13 +1818,11 @@ static AbstractInstruction * stackCheckLabel; static AbstractInstruction * stackOverflowCall; static sqInt superSendTrampolines[NumSendTrampolines]; -static sqInt tempOop; static sqInt theIRCs; int traceFlags = 8 /* prim trace log on by default */; sqInt traceStores; static char *trampolineAddresses[NumTrampolines*2]; static sqInt trampolineTableIndex; -static sqInt uncheckedEntryAlignment; static usqInt unpairedMethodList; static usqInt youngReferrers; @@ -2516,7 +2513,6 @@ static AbstractInstruction * NoDbgRegParms gAndCqRR(sqInt quickConstant, sqInt srcReg, sqInt destReg) { - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *first; @@ -4244,7 +4240,6 @@ compileAbort(void) { AbstractInstruction *anInstruction; - sqInt callTarget; /* begin MoveCq:R: */ anInstruction = genoperandoperand(MoveCqR, 0, ReceiverResultReg); @@ -4307,6 +4302,7 @@ jmpTarget(jmp, gLabel()); compileBlockDispatchFromto(halfWay + 1, highBlockStartIndex); } + return 0; } @@ -4381,10 +4377,8 @@ static void NoDbgRegParms compileCallFornumArgsargargargargresultRegsaveRegs(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt resultRegOrNone, sqInt saveRegs) { - AbstractInstruction *abstractInstruction; AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction11; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; @@ -4593,7 +4587,6 @@ compilePICAbort(sqInt numArgs) { AbstractInstruction *anInstruction; - sqInt callTarget; sqInt callTarget1; AbstractInstruction * picMNUAbort; @@ -4640,9 +4633,12 @@ static void computeEntryOffsets(void) { + sqInt checkedEntryAlignment; + sqInt entryPointMask; sqInt fixupSize; sqInt opcodeSize; AbstractInstruction *sendMissCall; + sqInt uncheckedEntryAlignment; /* begin allocateOpcodes:bytecodes: */ numAbstractOpcodes = 24; @@ -5141,6 +5137,7 @@ ? 0 : ((((blockStart->stackCheckLabel))->address)) - ((((blockStart->fakeHeader))->address)))); } + return 0; } /* Cogit>>#fillInMethodHeader:size:selector: */ @@ -5481,9 +5478,7 @@ static sqInt genCheckForInterruptsTrampoline(void) { - sqInt address; sqInt address1; - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; zeroOpcodeIndex(); @@ -5611,12 +5606,10 @@ { sqInt address; sqInt address1; - sqInt address2; AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; - AbstractInstruction *anInstruction4; sqInt fixupSize; sqInt opcodeSize; sqInt quickConstant; @@ -6241,7 +6234,6 @@ AbstractInstruction *anInstruction; sqInt cacheValue; sqInt opcode; - sqInt selector; assert((selectorIndex < 0 ? (((-selectorIndex) >= 1) && ((-selectorIndex) <= (numSpecialSelectors()))) @@ -6258,9 +6250,7 @@ static sqInt genNonLocalReturnTrampoline(void) { - sqInt address; sqInt address1; - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; zeroOpcodeIndex(); @@ -6713,17 +6703,10 @@ void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress) { - static void (*ceFlushICache)(unsigned long from, unsigned long to); sqInt fixupSize; - sqInt fixupSize1; - sqInt fixupSize2; sqInt numberOfAbstractOpcodes; sqInt opcodeSize; - sqInt opcodeSize1; - sqInt opcodeSize2; sqInt startAddress1; - sqInt startAddress2; - sqInt startAddress3; initializeBackend(); stopsFromto(backEnd, startAddress, endAddress - 1); @@ -7564,7 +7547,7 @@ val = 0; val1 = 0; if (leakCheckFullGC()) { - assert(allMachineCodeObjectReferencesValid()); + asserta(allMachineCodeObjectReferencesValid()); } codeModified = 0; markAndTraceObjectReferencesInGeneratedRuntime(); @@ -7660,7 +7643,7 @@ cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } if (leakCheckFullGC()) { - assert(allMachineCodeObjectReferencesValid()); + asserta(allMachineCodeObjectReferencesValid()); } if (codeModified) { @@ -10453,6 +10436,7 @@ } openPIC = ((CogMethod *) ((openPIC->nextOpenPIC))); } while(1); + return 0; } @@ -10636,6 +10620,7 @@ } youngReferrers = dest; assert(kosherYoungReferrers()); + return 0; } /* CogMethodZone>>#relocateAndPruneYoungReferrers */ @@ -10677,6 +10662,7 @@ source -= BytesPerWord; } youngReferrers = dest; + return 0; } @@ -10731,6 +10717,7 @@ } prevPIC = ((CogMethod *) ((prevPIC->nextOpenPIC))); } while(1); + return 0; } /* CogMethodZone>>#removeFromUnpairedMethodList: */ @@ -10754,6 +10741,7 @@ } prevMethod = ((CogMethod *) ((prevMethod->nextMethodOrIRCs))); } + return 0; } /* CogMethodZone>>#voidYoungReferrersPostTenureAll */ @@ -11936,6 +11924,33 @@ } +/* Convert the SmallFloat in reg to its identityHash as a SmallInteger. + Rotate the sign bit from bit 3 (zero-relative) the sign bit. This + implicitly sets + SmallInteger tags (3 >> 1 = 1). c.f. + Spur64BitMemoryManager>>rotatedFloatBitsOf: */ + + /* CogObjectRepresentationFor64BitSpur>>#genConvertSmallFloatToSmallFloatHashAsIntegerInReg:scratch: */ +static sqInt NoDbgRegParms +genConvertSmallFloatToSmallFloatHashAsIntegerInRegscratch(sqInt reg, sqInt scratch) +{ + sqInt quickConstant; + + assert((((usqInt) (smallFloatTag())) >> 1) == (smallIntegerTag())); + /* begin LogicalShiftRightCq:R: */ + genoperandoperand(LogicalShiftRightCqR, 1, reg); + gAndCqRR(1LL << ((numTagBits()) - 1), reg, scratch); + /* begin SubR:R: */ + genoperandoperand(SubRR, scratch, reg); + /* begin LogicalShiftLeftCq:R: */ + quickConstant = 0x3F - ((numTagBits()) - 1); + genoperandoperand(LogicalShiftLeftCqR, quickConstant, scratch); + /* begin OrR:R: */ + genoperandoperand(OrRR, scratch, reg); + return 0; +} + + /* Convert the SmallInteger in reg to a Character, assuming the SmallInteger's value is a valid character. */ @@ -12360,7 +12375,6 @@ static AbstractInstruction * NoDbgRegParms genJumpNotSmallFloatValueBitsscratch(sqInt reg, sqInt exponent) { - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; @@ -12370,7 +12384,6 @@ AbstractInstruction *jumpTest; AbstractInstruction *jumpZeroMantissa; sqInt quickConstant; - sqInt quickConstant1; sqInt quickConstant2; sqInt quickConstant3; sqInt quickConstant4; @@ -12418,43 +12431,45 @@ other than SmallIntegers, i.e. don't branch if both aRegister and scratchA contain SmallIntegers. Answer the jump. Destroy scratchA and scratchB if required. */ -/* Map SmallIntegers to 0 in scratchA & scratchB, add and jump non-zero. */ +/* Straight-forward approach. Map SmallIntegers to 0 in scratchA & scratchB, + add and jump non-zero. */ /* CogObjectRepresentationFor64BitSpur>>#genJumpNotSmallIntegersIn:andScratch:scratch: */ static AbstractInstruction * NoDbgRegParms genJumpNotSmallIntegersInandScratchscratch(sqInt aRegister, sqInt scratchA, sqInt scratchB) { - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; - sqInt quickConstant; + AbstractInstruction *anInstruction4; sqInt quickConstant1; sqInt quickConstant2; sqInt quickConstant3; + sqInt quickConstant4; return (/* begin MoveR:R: */ genoperandoperand(MoveRR, aRegister, scratchB), /* begin SubCq:R: */ - (quickConstant2 = smallIntegerTag()), + (quickConstant3 = smallIntegerTag()), /* begin gen:quickConstant:operand: */ - (anInstruction2 = genoperandoperand(SubCqR, quickConstant2, scratchA)), + (anInstruction1 = genoperandoperand(SubCqR, quickConstant3, scratchA)), /* begin SubCq:R: */ - (quickConstant3 = smallIntegerTag()), + (quickConstant4 = smallIntegerTag()), /* begin gen:quickConstant:operand: */ - (anInstruction3 = genoperandoperand(SubCqR, quickConstant3, scratchB)), + (anInstruction2 = genoperandoperand(SubCqR, quickConstant4, scratchB)), /* begin AndCq:R: */ - (quickConstant = tagMask()), + (quickConstant1 = tagMask()), /* begin gen:quickConstant:operand: */ - (anInstruction = genoperandoperand(AndCqR, quickConstant, scratchA)), + (anInstruction3 = genoperandoperand(AndCqR, quickConstant1, scratchA)), /* begin AndCq:R: */ - (quickConstant1 = tagMask()), + (quickConstant2 = tagMask()), /* begin gen:quickConstant:operand: */ - (anInstruction1 = genoperandoperand(AndCqR, quickConstant1, scratchB)), + (anInstruction4 = genoperandoperand(AndCqR, quickConstant2, scratchB)), /* begin AddR:R: */ genoperandoperand(AddRR, scratchA, scratchB), /* begin JumpNonZero: */ genConditionalBranchoperand(JumpNonZero, ((sqInt)0))); + } @@ -13005,18 +13020,21 @@ return 0; } + +/* Arguably we should fail for immediates, but so far no one has complained, + so... + */ + /* CogObjectRepresentationFor64BitSpur>>#genPrimitiveIdentityHash */ static sqInt genPrimitiveIdentityHash(void) { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction2; AbstractInstruction *jumpImm; + AbstractInstruction *jumpNotCharacter; AbstractInstruction *jumpNotSet; - AbstractInstruction *jumpSF; sqInt quickConstant; - sqInt quickConstant1; AbstractInstruction * ret; @@ -13033,25 +13051,60 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ ret = genoperand(RetN, 0); - jmpTarget(jumpImm, gLabel()); - gAndCqRR(tagMask(), ReceiverResultReg, TempReg); + jmpTarget(jumpImm, gAndCqRR(tagMask(), ReceiverResultReg, TempReg)); /* begin CmpCq:R: */ - quickConstant = smallIntegerTag(); + quickConstant = characterTag(); /* begin gen:quickConstant:operand: */ anInstruction1 = genoperandoperand(CmpCqR, quickConstant, TempReg); - /* begin JumpZero: */ - genConditionalBranchoperand(JumpZero, ((sqInt)ret)); + /* begin JumpNonZero: */ + jumpNotCharacter = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + genConvertCharacterToSmallIntegerInReg(ReceiverResultReg); + /* begin genPrimReturn */ + assert(methodOrBlockNumArgs <= (numRegArgs())); + /* begin RetN: */ + ret = genoperand(RetN, 0); + jmpTarget(jumpNotCharacter, gCmpCqR(smallFloatTag(), TempReg)); + /* begin JumpNonZero: */ + genConditionalBranchoperand(JumpNonZero, ((sqInt)ret)); + genConvertSmallFloatToSmallFloatHashAsIntegerInRegscratch(ReceiverResultReg, TempReg); + /* begin genPrimReturn */ + assert(methodOrBlockNumArgs <= (numRegArgs())); + /* begin RetN: */ + genoperand(RetN, 0); + jmpTarget(jumpNotSet, gLabel()); + return 0; +} + + /* CogObjectRepresentationFor64BitSpur>>#genPrimitiveImmediateAsInteger */ +static sqInt +genPrimitiveImmediateAsInteger(void) +{ + AbstractInstruction *anInstruction; + AbstractInstruction *jumpNotCharacter; + sqInt quickConstant; + AbstractInstruction * ret; + + gAndCqRR(tagMask(), ReceiverResultReg, TempReg); /* begin CmpCq:R: */ - quickConstant1 = characterTag(); + quickConstant = characterTag(); /* begin gen:quickConstant:operand: */ - anInstruction2 = genoperandoperand(CmpCqR, quickConstant1, TempReg); + anInstruction = genoperandoperand(CmpCqR, quickConstant, TempReg); /* begin JumpNonZero: */ - jumpSF = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + jumpNotCharacter = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); genConvertCharacterToSmallIntegerInReg(ReceiverResultReg); - /* begin Jump: */ - genoperand(Jump, ((sqInt)ret)); - jmpTarget(jumpNotSet, jmpTarget(jumpSF, gLabel())); - return 0; + /* begin genPrimReturn */ + assert(methodOrBlockNumArgs <= (numRegArgs())); + /* begin RetN: */ + ret = genoperand(RetN, 0); + jmpTarget(jumpNotCharacter, gCmpCqR(smallFloatTag(), TempReg)); + /* begin JumpNonZero: */ + genConditionalBranchoperand(JumpNonZero, ((sqInt)ret)); + genConvertSmallFloatToSmallFloatHashAsIntegerInRegscratch(ReceiverResultReg, TempReg); + /* begin genPrimReturn */ + assert(methodOrBlockNumArgs <= (numRegArgs())); + /* begin RetN: */ + genoperand(RetN, 0); + return UnfailingPrimitive; } @@ -14794,7 +14847,6 @@ AbstractInstruction *anInstruction34; AbstractInstruction *anInstruction35; AbstractInstruction *anInstruction4; - AbstractInstruction *anInstruction5; AbstractInstruction *anInstruction6; AbstractInstruction *anInstruction7; AbstractInstruction *anInstruction8; @@ -15550,18 +15602,6 @@ return CompletePrimitive; } - /* CogObjectRepresentationForSpur>>#genPrimitiveCharacterValue */ -static sqInt -genPrimitiveCharacterValue(void) -{ - genConvertCharacterToSmallIntegerInReg(ReceiverResultReg); - /* begin genPrimReturn */ - assert(methodOrBlockNumArgs <= (numRegArgs())); - /* begin RetN: */ - genoperand(RetN, 0); - return UnfailingPrimitive; -} - /* CogObjectRepresentationForSpur>>#genPrimitiveIdenticalOrNotIf: */ static sqInt NoDbgRegParms genPrimitiveIdenticalOrNotIf(sqInt orNot) @@ -19932,8 +19972,6 @@ static AbstractInstruction * NoDbgRegParms genPushRegisterArgsForNumArgsscratchReg(AbstractInstruction * self_in_genPushRegisterArgsForNumArgsscratchReg, sqInt numArgs, sqInt scratchReg) { - AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; @@ -20859,12 +20897,6 @@ static sqInt NoDbgRegParms compileInterpreterPrimitive(void (*primitiveRoutine)(void)) { - AbstractInstruction *abstractInstruction; - AbstractInstruction *abstractInstruction1; - AbstractInstruction *abstractInstruction2; - AbstractInstruction *abstractInstruction3; - sqInt address; - sqInt address1; sqInt address10; sqInt address11; sqInt address12; @@ -20872,18 +20904,9 @@ sqInt address2; sqInt address3; sqInt address4; - sqInt address5; - sqInt address6; sqInt address7; sqInt address8; sqInt address9; - AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction10; - AbstractInstruction *anInstruction11; - AbstractInstruction *anInstruction110; - AbstractInstruction *anInstruction111; - AbstractInstruction *anInstruction112; AbstractInstruction *anInstruction12; AbstractInstruction *anInstruction13; AbstractInstruction *anInstruction14; @@ -20898,7 +20921,6 @@ AbstractInstruction *anInstruction22; AbstractInstruction *anInstruction23; AbstractInstruction *anInstruction24; - AbstractInstruction *anInstruction25; AbstractInstruction *anInstruction26; AbstractInstruction *anInstruction27; AbstractInstruction *anInstruction28; @@ -20918,7 +20940,6 @@ AbstractInstruction *jmp; AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; - sqInt literal; sqInt literal1; sqInt offset; sqInt offset1; @@ -22154,33 +22175,21 @@ static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling) { - AbstractInstruction *abstractInstruction; - sqInt address; - sqInt address1; sqInt address2; - sqInt address3; - sqInt address4; sqInt address5; sqInt address6; sqInt address7; sqInt address8; AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction10; - AbstractInstruction *anInstruction11; AbstractInstruction *anInstruction12; AbstractInstruction *anInstruction13; AbstractInstruction *anInstruction14; AbstractInstruction *anInstruction15; AbstractInstruction *anInstruction16; AbstractInstruction *anInstruction17; - AbstractInstruction *anInstruction18; - AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; - AbstractInstruction *anInstruction5; - AbstractInstruction *anInstruction6; - AbstractInstruction *anInstruction7; AbstractInstruction *anInstruction8; AbstractInstruction *anInstruction9; sqInt callTarget; @@ -22871,7 +22880,7 @@ { 0, -1 }, { genPrimitiveNotIdentical, 1 }, { genPrimitiveAsCharacter, -1 }, - { genPrimitiveCharacterValue, 0 }, + { genPrimitiveImmediateAsInteger, 0 }, { 0, -1 }, { 0, -1 }, { 0, -1 }, @@ -23612,25 +23621,15 @@ static void NoDbgRegParms adjustArgumentsForPerform(sqInt numArgs) { - AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction10; - AbstractInstruction *anInstruction11; - AbstractInstruction *anInstruction12; AbstractInstruction *anInstruction13; AbstractInstruction *anInstruction14; AbstractInstruction *anInstruction15; - AbstractInstruction *anInstruction2; - AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; AbstractInstruction *anInstruction5; - AbstractInstruction *anInstruction6; AbstractInstruction *anInstruction7; AbstractInstruction *anInstruction8; AbstractInstruction *anInstruction9; sqInt index; - sqInt literal; - sqInt quickConstant; sqInt quickConstant1; assert((numRegArgs()) <= 2); @@ -24632,13 +24631,9 @@ static sqInt genExternalizePointersForPrimitiveCall(void) { - sqInt address; - sqInt address1; sqInt address2; sqInt address3; sqInt address4; - AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; AbstractInstruction *anInstruction4; @@ -24969,7 +24964,6 @@ genMarshalledSendnumArgssendTable(sqInt selectorIndex, sqInt numArgs, sqInt *sendTable) { AbstractInstruction *anInstruction; - AbstractInstruction *anInstruction1; sqInt annotation; assert(needsFrame); @@ -25024,7 +25018,6 @@ static sqInt NoDbgRegParms genMethodAbortTrampolineFor(sqInt numArgs) { - AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; AbstractInstruction *jumpSICMiss; @@ -25517,6 +25510,9 @@ static sqInt NoDbgRegParms genSendDirectedSupernumArgs(sqInt selectorIndex, sqInt numArgs) { + sqInt directedSuperSendTrampolines[NumSendTrampolines]; + sqInt tempOop; + assert((((ssTop())->type)) == SSConstant); tempOop = ((ssTop())->constant); ssPop(1); Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-02-27 22:26:23 UTC (rev 3633) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-02-28 21:58:34 UTC (rev 3634) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1702 uuid: ca289ff1-8bc0-40d7-a4bb-42b583f02dd1 from - CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 + CoInterpreter VMMaker.oscog-eem.1702 uuid: ca289ff1-8bc0-40d7-a4bb-42b583f02dd1 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1699 uuid: 186ebd51-28ef-4e7f-8411-96b61577b777 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1702 uuid: ca289ff1-8bc0-40d7-a4bb-42b583f02dd1 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1614,8 +1614,8 @@ _iss StackPage * stackPage; _iss sqInt nilObj; _iss sqInt argumentCount; -_iss sqInt specialObjectsOop; _iss sqInt bytecodeSetSelector; +_iss sqInt specialObjectsOop; _iss sqInt messageSelector; _iss usqInt instructionPointer; _iss usqInt newMethod; @@ -1663,8 +1663,8 @@ _iss sqInt profileSemaphore; _iss sqInt classTableIndex; _iss SpurNewSpaceSpace futureSpace; -_iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; +_iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt numRememberedEphemerons; _iss sqInt jmpDepth; _iss usqInt lastFreeChunk; @@ -1765,8 +1765,6 @@ _iss sqInt refCountToShrinkRT; _iss sqInt statCoalesces; _iss usqLong statIGCDeltaUsecs; -_iss usqLong statIncrGCUsecs; -_iss sqInt statIncrGCs; _iss sqInt statPendingFinalizationSignals; _iss sqInt statRootTableOverflows; _iss usqLong statSGCDeltaUsecs; @@ -1784,8 +1782,9 @@ _iss unsigned long byteCount; _iss SpurCircularBuffer highestObjects; _iss sqInt preferredPinningSegment; -_iss char * stackMemory; _iss usqLong statFGCDeltaUsecs; +_iss usqLong statIncrGCUsecs; +_iss sqInt statIncrGCs; _iss sqInt theUnknownShort; #undef _iss #if SQ_USE_GLOBAL_STRUCT @@ -1818,7 +1817,6 @@ jmp_buf reenterInterpreter; /* private export */; sqInt checkAllocFiller; sqInt breakSelectorLength = MinSmallInteger; -sqInt inIOProcessEvents; sqInt desiredEdenBytes; sqInt desiredNumStackPages; sqInt extraVMMemory; @@ -1826,6 +1824,7 @@ unsigned long maxOldSpaceSize; char * breakSelector; usqInt heapBase; +sqInt inIOProcessEvents; void * showSurfaceFn; sqInt deferDisplayUpdates; struct VirtualMachine* interpreterProxy; @@ -2442,7 +2441,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1699"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1702"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -3594,8 +3593,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode); @@ -3631,8 +3628,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode1); @@ -3668,8 +3663,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode2); @@ -3705,8 +3698,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode3); @@ -3742,8 +3733,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode4); @@ -3779,8 +3768,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode5); @@ -3816,8 +3803,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode6); @@ -3853,8 +3838,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode7); @@ -3890,8 +3873,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode8); @@ -3927,8 +3908,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode9); @@ -3964,8 +3943,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode10); @@ -4001,8 +3978,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode11); @@ -4038,8 +4013,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode12); @@ -4075,8 +4048,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode13); @@ -4112,8 +4083,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode14); @@ -4149,8 +4118,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode15); @@ -4185,8 +4152,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode16); @@ -4221,8 +4186,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode17); @@ -4257,8 +4220,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode18); @@ -4293,8 +4254,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode19); @@ -4329,8 +4288,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode20); @@ -4365,8 +4322,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode21); @@ -4401,8 +4356,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode22); @@ -4437,8 +4390,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode23); @@ -4473,8 +4424,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode24); @@ -4509,8 +4458,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode25); @@ -4545,8 +4492,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode26); @@ -4581,8 +4526,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode27); @@ -4617,8 +4560,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode28); @@ -4653,8 +4594,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode29); @@ -4689,8 +4628,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode30); @@ -4725,8 +4662,6 @@ /* pushLiteralVariableBytecode */ { sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(pushLiteralVariableBytecode31); @@ -5693,8 +5628,6 @@ sqInt litVar; sqInt object; sqInt object1; - sqInt object2; - sqInt objOop; sqInt referent; sqInt variableIndex; sqInt variableType; @@ -6435,8 +6368,6 @@ sqInt litVar1; sqInt object; sqInt object1; - sqInt object2; - sqInt objOop; sqInt onCurrentPage; sqInt opType; sqInt rcvr; @@ -7172,24 +7103,18 @@ /* pushClosureCopyCopiedValuesBytecode */ { sqInt blockSize; - sqInt classObj; sqInt context; sqInt i; sqInt initialIP; - sqInt knownClassIndex; sqInt newClosure; sqInt newClosure1; usqInt newObj; - usqInt newObj1; sqInt numArgs; sqInt numArgsNumCopied; usqInt numBytes; - usqInt numBytes1; sqInt numCopied; sqInt numSlots; - sqInt numSlots1; sqInt objFormat; - sqInt objFormat1; char *theFP; char *theSP; @@ -12303,8 +12228,6 @@ { sqInt index; sqInt litVar; - sqInt object; - sqInt objOop; sqInt referent; VM_LABEL(extPushLiteralVariableBytecode); @@ -14336,23 +14259,17 @@ { sqInt blockSize; sqInt byte; - sqInt classObj; sqInt context; sqInt i; sqInt initialIP; - sqInt knownClassIndex; sqInt newClosure; sqInt newClosure1; usqInt newObj; - usqInt newObj1; sqInt numArgs; usqInt numBytes; - usqInt numBytes1; sqInt numCopied; sqInt numSlots; - sqInt numSlots1; sqInt objFormat; - sqInt objFormat1; char *theFP; char *theSP; @@ -14860,6 +14777,7 @@ { freeStackPageNoAssert(aPage); assert(pageListIsWellFormed()); + return 0; } @@ -15295,7 +15213,6 @@ sqInt header; sqInt methodHeader; sqInt p; - sqInt primBits; sqInt primitiveIndex; sqInt probe; @@ -15671,7 +15588,6 @@ volatile sqInt header1; volatile jmp_buf savedReenterInterpreter; volatile sqInt wasInMachineCode; - volatile sqInt xArray; /* For now, do not allow a callback unless we're in a primitiveResponse */ @@ -16606,7 +16522,6 @@ sqInt header; sqInt methodHeader; CogMethod *pic; - sqInt primBits; sqInt primitiveIndex; sqInt top; @@ -16665,7 +16580,6 @@ sqInt firstBytecode; sqInt header; sqInt methodHeader; - sqInt primBits; sqInt primitiveIndex; char *sp; sqInt tagBits; @@ -16728,6 +16642,7 @@ ? (GIV(lkupClass) = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (((long)tagBits1) << (shiftForWord())))) : (GIV(lkupClass) = fetchClassOfNonImm(rcvr)))); assert(0); + return 0; } /* CoInterpreter>>#ceNonLocalReturn: */ @@ -17858,7 +17773,6 @@ sqInt index; sqInt methodHeader; sqInt oop; - sqInt primBits; sqInt primIndex; sqInt referent; sqInt scannedStackFrame; @@ -18283,7 +18197,7 @@ GIV(statCodeCompactionUsecs) += (ioUTCMicrosecondsNow()) - startTime; if (checkForLeaks != 0) { clearLeakMapAndMapAccessibleObjects(); - assert(checkCodeIntegrity(0)); + asserta(checkCodeIntegrity(0)); } } @@ -18739,6 +18653,7 @@ else { activateNewMethod(); } + return 0; } @@ -18926,6 +18841,7 @@ if (methodHasCogMethod(methodObj)) { rewritePrimInvocationInto(cogMethodOf(methodObj), primitiveExternalCall); } + return 0; } @@ -23862,7 +23778,6 @@ primitivePropertyFlags(sqInt primIndex) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt baseFlags; - sqInt baseFlags1; /* begin primitivePropertyFlagsForSpur: */ baseFlags = PrimCallNeedsPrimitiveFunction + PrimCallNeedsNewMethod; @@ -23906,7 +23821,6 @@ sqInt address; sqInt firstBytecode; sqInt methodHeader; - sqInt primBits; sqInt primitive; sqInt theMethod; @@ -24276,6 +24190,7 @@ } } } + return 0; } /* CoInterpreter>>#printLogEntryAt: */ @@ -24478,6 +24393,7 @@ /* return self */ } } + return 0; } /* CoInterpreter>>#quickPrimitiveConstantFor: */ @@ -25199,12 +25115,7 @@ /* CoInterpreter>>#roomToPushNArgs: */ static sqInt NoDbgRegParms roomToPushNArgs(sqInt n) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt cntxSize; - sqInt header; - sqInt methodHeader; - sqInt methodObj; - +{ /* simpler code that simply insists args are <= max arg count */ return n <= (LargeContextSlots - CtxtTempFrameStart); @@ -25246,7 +25157,6 @@ sqInt errorCode; sqInt i; usqInt initialIP; - sqInt integerValue; sqInt methodHeader; sqInt methodHeader1; sqInt numArgs; @@ -25738,6 +25648,7 @@ /* begin space */ putchar(' '); shortPrintOop(rcvr); + return 0; } @@ -26364,7 +26275,6 @@ validInstructionPointerinMethodframePointer(usqInt instrPointer, usqInt aMethod, char *fp) { CogMethod *cogMethod; - sqInt header; sqInt methodField; usqInt theInstrPointer; @@ -27054,7 +26964,6 @@ sqInt i; sqInt methodHeader; sqInt oldMethod; - sqInt primBits; sqInt primIdx; sqInt probe; @@ -27174,6 +27083,7 @@ if (flushState) { siglongjmp(reenterInterpreter, ReturnToInterpreter); } + return 0; } @@ -27455,6 +27365,7 @@ if (flushState) { siglongjmp(reenterInterpreter, ReturnToInterpreter); } + return 0; } @@ -28194,7 +28105,6 @@ sqInt prevObj1; sqInt prevPrevObj; sqInt prevPrevObj1; - sqInt primBits; sqInt primIdx; sqInt probe; sqInt senderOop; @@ -28907,7 +28817,6 @@ static sqInt NoDbgRegParms magnitude64BitIntegerForneg(usqLong magnitude, sqInt isNegative) { DECL_MAYBE_SQ_GLOBAL_STRUCT - usqInt highWord; sqInt isSmall; sqInt largeClass; sqInt newLargeInteger; @@ -29045,10 +28954,6 @@ usqInt positive32BitValueOf(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt ccIndex; - sqInt fmt; - sqInt ok; - sqInt sz; sqInt value; if ((((oop) & 7) == 1)) { @@ -29533,7 +29438,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt characterCode; sqInt characterObject; - sqInt objOop; sqInt reasonCode; char *sp; @@ -29586,7 +29490,6 @@ sqInt integerValue; usqInt numSlots; usqInt numSlots1; - sqInt objOop; sqInt rcvr; sqInt reasonCode; sqInt result; @@ -29729,37 +29632,23 @@ static void primitiveAtPut(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt class; sqInt class1; - sqInt fixedFields; sqInt fixedFields1; - sqInt fmt; sqInt fmt1; - sqLong hdr; sqLong hdr1; sqInt index; - usqInt numSlots; - usqInt numSlots1; usqInt numSlots11; usqInt numSlots2; sqInt rcvr; - sqInt reasonCode; sqInt reasonCode1; - sqInt signedValueToStore; sqInt signedValueToStore1; char *sp; - sqInt sp1; sqInt sp11; - sqInt sp2; sqInt sp3; - sqInt stSize; sqInt stSize1; - sqInt totalLength; sqInt totalLength1; - usqInt unsignedValueToStore; usqInt unsignedValueToStore1; sqInt value; - sqInt value1; /* begin commonAtPut: */ GIV(primFailCode) = 0; @@ -30292,11 +30181,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong integerArgument; usqLong integerReceiver; - sqInt integerValue; sqInt oop; - sqInt oop1; char *sp; - char *sp1; integerArgument = longAt(GIV(stackPointer)); @@ -30349,11 +30235,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong integerArgument; usqLong integerReceiver; - sqInt integerValue; sqInt oop; - sqInt oop1; char *sp; - char *sp1; integerArgument = longAt(GIV(stackPointer)); @@ -30547,13 +30430,10 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong integerArgument; usqLong integerReceiver; - sqInt integerValue; sqInt oop; sqInt oop1; - sqInt oop2; char *sp; char *sp1; - char *sp2; integerArgument = longAt(GIV(stackPointer)); integerReceiver = longAt(GIV(stackPointer) + (1 * BytesPerWord)); @@ -31026,6 +30906,7 @@ oop1 = oop2; longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oop1); GIV(stackPointer) = sp; + return 0; } /* InterpreterPrimitives>>#primitiveClosureValue */ @@ -32261,6 +32142,7 @@ crashInThisOrAnotherThread(crashInThisThread); /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; + return 0; } @@ -32297,6 +32179,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; } + return 0; } /* InterpreterPrimitives>>#primitiveDiv */ @@ -32624,6 +32507,7 @@ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + return 0; } @@ -33924,7 +33808,6 @@ sqInt prevObj1; sqInt prevPrevObj; sqInt prevPrevObj1; - sqInt primBits; sqInt primIdx; sqInt slotBytes; sqInt slotBytes1; @@ -34421,6 +34304,7 @@ /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), stringOop); GIV(stackPointer) = sp; + return 0; } @@ -34578,6 +34462,7 @@ /* begin push: */ longAtput((sp = GIV(stackPointer) - BytesPerWord), labelOop); GIV(stackPointer) = sp; + return 0; } @@ -34649,6 +34534,7 @@ object = pointResult; longAtput((sp = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp; + return 0; } /* InterpreterPrimitives>>#primitiveGreaterOrEqual */ @@ -34794,6 +34680,7 @@ l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; + return 0; } @@ -34818,6 +34705,7 @@ object = positive64BitIntegerFor(ioHighResClock()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp; + return 0; } @@ -34916,6 +34804,7 @@ l1: /* end positive32BitIntegerFor: */; longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; + return 0; } @@ -35337,6 +35226,7 @@ oop = (((ioHeartbeatMilliseconds()) << 3) | 1); longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; + return 0; } @@ -35456,6 +35346,7 @@ ? GIV(trueObj) : GIV(falseObj))); GIV(stackPointer) = sp; + return 0; } @@ -35508,6 +35399,7 @@ : GIV(falseObj)); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp; + return 0; } @@ -36061,6 +35953,7 @@ /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), (((sqInt)MillisecondClockMask << 3) | 1)); GIV(stackPointer) = sp; + return 0; } /* InterpreterPrimitives>>#primitiveMod */ @@ -36379,7 +36272,6 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classFormat; sqInt classIndex; - sqInt classObj; sqInt classObj1; sqInt err; sqInt hash; @@ -36389,14 +36281,10 @@ usqInt numBytes; sqInt numSlots; sqInt obj; - sqInt oop; usqInt p; sqInt reasonCode; char *sp; - char *sp1; - sqInt spaceOkay; - spaceOkay = 0; /* For the mirror prims check that the class obj is actually a valid class. */ if (!((GIV(argumentCount) < 1) @@ -36658,21 +36546,16 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bs; sqInt ccIndex; - sqInt classObj; sqInt fmt; sqInt instSpec; sqInt obj; sqInt ok; - sqInt oop; sqInt oop1; sqInt reasonCode; unsigned long size; char *sp; - char *sp1; - sqInt spaceOkay; sqInt value; - spaceOkay = 0; /* For the mirror prims check that the class obj is actually a valid class. */ if (!((GIV(argumentCount) < 2) @@ -37088,6 +36971,7 @@ oop = ((((ioOldMSecs()) & MillisecondClockMask) << 3) | 1); longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), oop); GIV(stackPointer) = sp; + return 0; } @@ -37396,6 +37280,7 @@ /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), path); GIV(stackPointer) = sp; + return 0; } /* InterpreterPrimitives>>#primitivePerformInSuperclass */ @@ -37561,8 +37446,6 @@ sqInt argumentArray; usqInt arraySize; sqInt delta; - sqInt err; - sqInt hash; sqInt index; sqInt nItems; usqInt numSlots; @@ -37681,6 +37564,7 @@ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), GIV(profileMethod)); GIV(stackPointer) = sp; GIV(profileMethod) = GIV(nilObj); + return 0; } @@ -37706,6 +37590,7 @@ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), GIV(profileProcess)); GIV(stackPointer) = sp; GIV(profileProcess) = GIV(nilObj); + return 0; } @@ -37759,6 +37644,7 @@ /* begin pop: */ GIV(stackPointer) += 1 * BytesPerWord; } + return 0; } /* InterpreterPrimitives>>#primitiveQuit */ @@ -38362,6 +38248,7 @@ /* begin pop:thenPushInteger: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((depth << 3) | 1)); GIV(stackPointer) = sp; + return 0; } @@ -38735,6 +38622,7 @@ /* begin pop: */ GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; } + return 0; } /* InterpreterPrimitives>>#primitiveSetOrHasIdentityHash */ @@ -38877,6 +38765,7 @@ /* begin pop: */ GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; } + return 0; } @@ -38928,6 +38817,7 @@ /* begin pop: */ GIV(stackPointer) += GIV(argumentCount) * BytesPerWord; } + return 0; } @@ -40553,7 +40443,6 @@ sqInt integerValue; usqInt numSlots; usqInt numSlots1; - sqInt objOop; sqInt rcvr; sqInt reasonCode; sqInt result; @@ -40700,34 +40589,21 @@ primitiveStringAtPut(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt class; - sqInt class1; sqInt fixedFields; - sqInt fixedFields1; sqInt fmt; - sqInt fmt1; sqLong hdr; - sqLong hdr1; sqInt index; usqInt numSlots; usqInt numSlots1; - usqInt numSlots11; - usqInt numSlots2; sqInt rcvr; sqInt reasonCode; - sqInt reasonCode1; sqInt signedValueToStore; - sqInt signedValueToStore1; char *sp; sqInt sp1; - sqInt sp11; sqInt sp2; - sqInt sp3; sqInt stSize; - sqInt stSize1; sqInt totalLength; - sqInt totalLength1; usqInt unsignedValueToStore; - usqInt unsignedValueToStore1; sqInt value; sqInt value1; @@ -41483,7 +41359,6 @@ sqInt prevObj1; sqInt prevPrevObj; sqInt prevPrevObj1; - sqInt primBits; sqInt primIdx; sqInt slotBytes; sqInt slotBytes1; @@ -41817,6 +41692,7 @@ /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), resultArray); GIV(stackPointer) = sp; + return 0; } @@ -42327,6 +42203,7 @@ GIV(primFailCode) = 1; } } + return 0; } /* Spur64BitCoMemoryManager>>#ceScheduleScavenge */ @@ -43833,8 +43710,6 @@ addToEphemeronList(sqInt ephemeronCorpse) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt ephemeronListOffset; - sqInt format; - sqInt hash; assert(!(isScavengeSurvivor(keyOfEphemeron(followForwarded(ephemeronCorpse))))); ephemeronListOffset = (!(GIV(ephemeronList)) @@ -43862,8 +43737,6 @@ static void NoDbgRegParms NeverInline addToWeakList(sqInt weakCorpse) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt format; - sqInt hash; sqInt weakListOffset; weakListOffset = (!(GIV(weakList)) @@ -45236,8 +45109,6 @@ sqInt corpseOffset; sqInt ephemeron; sqInt ephemeronCorpse; - sqInt format; - sqInt hash; sqInt nextCorpseOffset; sqInt previousCorpse; sqInt referent; @@ -45433,6 +45304,7 @@ return objAfter; } } + return 0; } @@ -50682,6 +50554,7 @@ return PrimErrLimitExceeded; } } + return 0; } /* SpurMemoryManager>>#ephemeronFormat */ @@ -51599,6 +51472,7 @@ firstPage = stackOrNil; } assert(isValidObjStackAt(objStackRootIndex)); + return 0; } @@ -53062,21 +52936,16 @@ inPlaceBecomeandcopyHashFlag(sqInt obj1, sqInt obj2, sqInt copyHashFlag) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt fmt; - sqInt hash; sqLong hash1; sqLong hash2; - sqInt hashTemp; sqLong header1; sqLong header2; - sqLong headerTemp; sqInt i; sqInt iLimiT; sqInt o1HasYoung; sqInt o2HasYoung; sqLong remembered1; - sqInt remembered11; sqLong remembered2; - sqInt remembered21; sqInt temp1; sqInt temp2; @@ -61538,7 +61407,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -65189,7 +65058,7 @@ if (gcModes & GCModeFreeSpace) { reverseDisplayFromto(16, 19); clearLeakMapAndMapAccessibleFreeSpace(); - assert(checkHeapFreeSpaceIntegrity()); + asserta(checkHeapFreeSpaceIntegrity()); } } @@ -65206,10 +65075,10 @@ reverseDisplayFromto(8, 15); } clearLeakMapAndMapAccessibleObjects(); - assert(checkHeapIntegrityclassIndicesShouldBeValid(0, 1)); - assert(checkInterpreterIntegrity()); - assert(checkStackIntegrity()); - assert(checkCodeIntegrity(gcModes)); + asserta(checkHeapIntegrityclassIndicesShouldBeValid(0, 1)); + asserta(checkInterpreterIntegrity()); + asserta(checkStackIntegrity()); + asserta(checkCodeIntegrity(gcModes)); } return; } @@ -65227,10 +65096,10 @@ reverseDisplayFromto(8, 15); } clearLeakMapAndMapAccessibleObjects(); - assert(checkHeapIntegrityclassIndicesShouldBeValid(excludeUnmarkedNewSpaceObjs, classIndicesShouldBeValid)); - assert(checkInterpreterIntegrity()); - assert(checkStackIntegrity()); - assert(checkCodeIntegrity(gcModes)); + asserta(checkHeapIntegrityclassIndicesShouldBeValid(excludeUnmarkedNewSpaceObjs, classIndicesShouldBeValid)); + asserta(checkInterpreterIntegrity()); + asserta(checkStackIntegrity()); + asserta(checkCodeIntegrity(gcModes)); } } @@ -67072,6 +66941,7 @@ return (&(GIV(segments)[nextx])); } } + return 0; } @@ -67634,7 +67504,6 @@ sqInt header; sqInt methodHeader; sqInt p; - sqInt primBits; sqInt primitiveIndex; usqInt probe; @@ -67782,6 +67651,7 @@ if (!GIV(primFailCode)) { GIV(primFailCode) = 1; } + return 0; } @@ -67885,7 +67755,6 @@ canContextSwitchIfActivatingheader(sqInt theMethod, sqInt methodHeader) { sqInt firstBytecode; - sqInt primBits; sqInt primitiveIndex; if (methodHeader & AlternateHeaderHasPrimFlag) { @@ -67914,8 +67783,6 @@ sqInt characterForAscii(sqInt ascii) { - sqInt objOop; - return (((long)ascii) << (numTagBits())) + (characterTag()); } @@ -68744,25 +68611,13 @@ createActualMessageTo(sqInt lookupClass) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt argumentArray; - sqInt classObj; - sqInt classObj1; sqInt i; - sqInt knownClassIndex; - sqInt knownClassIndex1; sqInt message; usqInt newObj; usqInt newObj1; - usqInt newObj2; - usqInt newObj3; usqInt numBytes; usqInt numBytes1; - usqInt numBytes2; - usqInt numBytes3; sqInt numSlots; - sqInt numSlots1; - sqInt numSlots2; - sqInt objFormat; - sqInt objFormat1; char *sp; @@ -68963,6 +68818,7 @@ ioShowDisplay(dispBitsIndex, w, h, d, left, right, top, bottom); } } + return 0; } /* StackInterpreter>>#divorceAllFrames */ @@ -70094,6 +69950,7 @@ assert(GIV(stackPage) == (mostRecentlyUsedPage())); assert(pageListIsWellFormed()); assert(validStackPageBaseFrames()); + return 0; } @@ -70995,6 +70852,7 @@ iccFunc(); } GIV(statForceInterruptCheck) += 1; + return 0; } @@ -72968,6 +72826,7 @@ currentClass = objOop1; } error("Recursive not understood error encountered"); + return 0; } @@ -73940,7 +73799,6 @@ sqInt callerContextOrNil; sqInt context; sqInt i; - sqInt i1; sqInt index; sqInt index1; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1703.mcz
by commits＠source.squeak.org 28 Feb '16

28 Feb '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1703.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1703 Author: eem Time: 28 February 2016, 11:35:38.535648 am UUID: 9bd9e03b-fbe7-450c-8adc-5e20f7d76cdf Ancestors: VMMaker.oscog-eem.1702 64-bit Cogit: Fix primtive 171 (primitiveImmediateAsInteger) in the Cogit for SmallFloat. The old code only dealt with Characters. The new code replicates the rotatedFloatBitsOf: scheme in Spur64BitMemoryManager. =============== Diff against VMMaker.oscog-eem.1702 =============== Item was removed: - ----- Method: CogObjectRepresentation>>genPrimitiveCharacterValue (in category 'primitive generators') ----- - genPrimitiveCharacterValue - "subclasses override if they can" - ^UnimplementedPrimitive! Item was added: + ----- Method: CogObjectRepresentation>>genPrimitiveImmediateAsInteger (in category 'primitive generators') ----- + genPrimitiveImmediateAsInteger + "subclasses override if they can" + ^UnimplementedPrimitive! Item was changed: ----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveIdentityHash (in category 'primitive generators') ----- genPrimitiveIdentityHash + "Arguably we should fail for immediates, but so far no one has complained, so..." | jumpImm jumpSI jumpNotSet ret | <var: #jumpSI type: #'AbstractInstruction *'> <var: #jumpImm type: #'AbstractInstruction *'> <var: #jumpNotSet type: #'AbstractInstruction *'> jumpImm := self genJumpImmediate: ReceiverResultReg. self genGetHashFieldNonImmOf: ReceiverResultReg asSmallIntegerInto: TempReg. cogit CmpCq: ConstZero R: TempReg. jumpNotSet := cogit JumpZero: 0. cogit MoveR: TempReg R: ReceiverResultReg. ret := cogit genPrimReturn. jumpImm jmpTarget: cogit Label. jumpSI := self genJumpSmallInteger: ReceiverResultReg. jumpSI jmpTarget: ret. self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. cogit Jump: ret. jumpNotSet jmpTarget: cogit Label. ^0! Item was added: + ----- Method: CogObjectRepresentationFor32BitSpur>>genPrimitiveImmediateAsInteger (in category 'primitive generators') ----- + genPrimitiveImmediateAsInteger + ":Assume the receiuver is never a SmallInteger. One would use ^self for that." + self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. + cogit genPrimReturn. + ^UnfailingPrimitive! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genConvertSmallFloatToSmallFloatHashAsIntegerInReg:scratch: (in category 'compile abstract instructions') ----- + genConvertSmallFloatToSmallFloatHashAsIntegerInReg: reg scratch: scratch + "Convert the SmallFloat in reg to its identityHash as a SmallInteger. + Rotate the sign bit from bit 3 (zero-relative) the sign bit. This implicitly sets + SmallInteger tags (3 >> 1 = 1). c.f. Spur64BitMemoryManager>>rotatedFloatBitsOf:" + self assert: objectMemory smallFloatTag >> 1 = objectMemory smallIntegerTag. + cogit + LogicalShiftRightCq: 1 R: reg; + AndCq: 1 << (objectMemory numTagBits - 1) R: reg R: scratch; + SubR: scratch R: reg; + LogicalShiftLeftCq: 63 - (objectMemory numTagBits - 1) R: scratch; + OrR: scratch R: reg. + ^0! Item was changed: ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveIdentityHash (in category 'primitive generators') ----- genPrimitiveIdentityHash + "Arguably we should fail for immediates, but so far no one has complained, so..." + | jumpImm jumpNotSet jumpNotCharacter ret | - | jumpImm jumpSF jumpNotSet ret | - <var: #jumpSF type: #'AbstractInstruction *'> <var: #jumpImm type: #'AbstractInstruction *'> <var: #jumpNotSet type: #'AbstractInstruction *'> + <var: #jumpNotCharacter type: #'AbstractInstruction *'> jumpImm := self genJumpImmediate: ReceiverResultReg. "uses TstCqR" self genGetHashFieldNonImmOf: ReceiverResultReg asSmallIntegerInto: TempReg. cogit CmpCq: ConstZero R: TempReg. jumpNotSet := cogit JumpZero: 0. cogit MoveR: TempReg R: ReceiverResultReg. ret := cogit genPrimReturn. + jumpImm jmpTarget: (cogit AndCq: objectMemory tagMask R: ReceiverResultReg R: TempReg). + cogit CmpCq: objectMemory characterTag R: TempReg. + jumpNotCharacter := cogit JumpNonZero: 0. - jumpImm jmpTarget: cogit Label. - jumpSF := cogit "Fail SmallFloat because their hash uses rotatedFloatBitsOf: the oop" - AndCq: objectMemory tagMask R: ReceiverResultReg R: TempReg; - CmpCq: objectMemory smallIntegerTag R: TempReg; - JumpZero: ret; - CmpCq: objectMemory characterTag R: TempReg; - JumpNonZero: 0. self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. + ret := cogit genPrimReturn. + jumpNotCharacter jmpTarget: (cogit CmpCq: objectMemory smallFloatTag R: TempReg). + cogit JumpNonZero: ret. + self genConvertSmallFloatToSmallFloatHashAsIntegerInReg: ReceiverResultReg scratch: TempReg. + cogit genPrimReturn. + jumpNotSet jmpTarget: cogit Label. - cogit Jump: ret. - jumpNotSet jmpTarget: (jumpSF jmpTarget: cogit Label). ^0! Item was added: + ----- Method: CogObjectRepresentationFor64BitSpur>>genPrimitiveImmediateAsInteger (in category 'primitive generators') ----- + genPrimitiveImmediateAsInteger + | jumpNotCharacter ret | + <var: #jumpNotCharacter type: #'AbstractInstruction *'> + jumpNotCharacter := cogit + AndCq: objectMemory tagMask R: ReceiverResultReg R: TempReg; + CmpCq: objectMemory characterTag R: TempReg; + JumpNonZero: 0. + self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. + ret := cogit genPrimReturn. + jumpNotCharacter jmpTarget: + (cogit CmpCq: objectMemory smallFloatTag R: TempReg). + cogit JumpNonZero: ret. + self genConvertSmallFloatToSmallFloatHashAsIntegerInReg: ReceiverResultReg scratch: TempReg. + cogit genPrimReturn. + ^UnfailingPrimitive! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>genPrimitiveCharacterValue (in category 'primitive generators') ----- - genPrimitiveCharacterValue - self genConvertCharacterToSmallIntegerInReg: ReceiverResultReg. - cogit genPrimReturn. - ^UnfailingPrimitive! Item was added: + ----- Method: CogObjectRepresentationForSpur>>genPrimitiveImmediateAsInteger (in category 'primitive generators') ----- + genPrimitiveImmediateAsInteger + self subclassResponsibility! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForNewsqueak (in category 'class initialization') ----- initializePrimitiveTableForNewsqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter. N.B. primitives that don't have an explicit arg count (the integer following the generator) may be variadic." "SimpleStackBasedCogit initializePrimitiveTableForNewsqueak" MaxCompiledPrimitiveIndex := self objectRepresentationClass wordSize = 8 ifTrue: [555] ifFalse: [222]. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1) (10 genPrimitiveDivide 1) (11 genPrimitiveMod 1) (12 genPrimitiveDiv 1) (13 genPrimitiveQuo 1) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 genPrimitiveFloatAt)" "(39 genPrimitiveFloatAtPut)" (40 genPrimitiveAsFloat 0) (41 genPrimitiveFloatAdd 1) (42 genPrimitiveFloatSubtract 1) (43 genPrimitiveFloatLessThan 1) (44 genPrimitiveFloatGreaterThan 1) (45 genPrimitiveFloatLessOrEqual 1) (46 genPrimitiveFloatGreaterOrEqual 1) (47 genPrimitiveFloatEqual 1) (48 genPrimitiveFloatNotEqual 1) (49 genPrimitiveFloatMultiply 1) (50 genPrimitiveFloatDivide 1) "(51 genPrimitiveTruncated)" "(52 genPrimitiveFractionalPart)" "(53 genPrimitiveExponent)" "(54 genPrimitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0) "(56 genPrimitiveSine)" "(57 genPrimitiveArctan)" "(58 genPrimitiveLogN)" "(59 genPrimitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." (65 genFastPrimFail)"was primitiveNext" (66 genFastPrimFail) "was primitiveNextPut" (67 genFastPrimFail) "was primitiveAtEnd" "StorageManagement Primitives (68-79)" (68 genPrimitiveObjectAt 1) "Good for debugger/InstructionStream performance" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew) "For VMMirror support 1 argument instantiateFixedClass: as well as baiscNew" (71 genPrimitiveNewWithArg) "For VMMirror support 2 argument instantiateVariableClass:withSize: as well as baiscNew:" "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" (83 genPrimitivePerform) "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "For objectClass: and VMMirror support 1 argument classOf: as well as class" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" (169 genPrimitiveNotIdentical 1) + (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" + (171 genPrimitiveImmediateAsInteger 0) "Character>>value SmallFloat64>>asInteger" - (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" - (171 genPrimitiveCharacterValue 0) "Character>>value" "(173 primitiveSlotAt 1)" "(174 primitiveSlotAtPut 2)" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "SmallFloat primitives (540-559)" (541 genPrimitiveSmallFloatAdd 1) (542 genPrimitiveSmallFloatSubtract 1) (543 genPrimitiveSmallFloatLessThan 1) (544 genPrimitiveSmallFloatGreaterThan 1) (545 genPrimitiveSmallFloatLessOrEqual 1) (546 genPrimitiveSmallFloatGreaterOrEqual 1) (547 genPrimitiveSmallFloatEqual 1) (548 genPrimitiveSmallFloatNotEqual 1) (549 genPrimitiveSmallFloatMultiply 1) (550 genPrimitiveSmallFloatDivide 1) "(551 genPrimitiveSmallFloatTruncated 0)" "(552 genPrimitiveSmallFloatFractionalPart 0)" "(553 genPrimitiveSmallFloatExponent 0)" "(554 genPrimitiveSmallFloatTimesTwoPower 1)" (555 genPrimitiveSmallFloatSquareRoot 0) "(556 genPrimitiveSmallFloatSine 0)" "(557 genPrimitiveSmallFloatArctan 0)" "(558 genPrimitiveSmallFloatLogN 0)" "(559 genPrimitiveSmallFloatExp 0)" )! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializePrimitiveTableForSqueak (in category 'class initialization') ----- initializePrimitiveTableForSqueak "Initialize the table of primitive generators. This does not include normal primitives implemented in the coInterpreter. N.B. primitives that don't have an explicit arg count (the integer following the generator) may be variadic." "SimpleStackBasedCogit initializePrimitiveTableForSqueak" MaxCompiledPrimitiveIndex := self objectRepresentationClass wordSize = 8 ifTrue: [555] ifFalse: [222]. primitiveTable := CArrayAccessor on: (Array new: MaxCompiledPrimitiveIndex + 1). self table: primitiveTable from: #( "Integer Primitives (0-19)" (1 genPrimitiveAdd 1) (2 genPrimitiveSubtract 1) (3 genPrimitiveLessThan 1) (4 genPrimitiveGreaterThan 1) (5 genPrimitiveLessOrEqual 1) (6 genPrimitiveGreaterOrEqual 1) (7 genPrimitiveEqual 1) (8 genPrimitiveNotEqual 1) (9 genPrimitiveMultiply 1) (10 genPrimitiveDivide 1) (11 genPrimitiveMod 1) (12 genPrimitiveDiv 1) (13 genPrimitiveQuo 1) (14 genPrimitiveBitAnd 1) (15 genPrimitiveBitOr 1) (16 genPrimitiveBitXor 1) (17 genPrimitiveBitShift 1) "(18 primitiveMakePoint)" "(19 primitiveFail)" "Guard primitive for simulation -- *must* fail" "LargeInteger Primitives (20-39)" "(20 primitiveFail)" "(21 primitiveAddLargeIntegers)" "(22 primitiveSubtractLargeIntegers)" "(23 primitiveLessThanLargeIntegers)" "(24 primitiveGreaterThanLargeIntegers)" "(25 primitiveLessOrEqualLargeIntegers)" "(26 primitiveGreaterOrEqualLargeIntegers)" "(27 primitiveEqualLargeIntegers)" "(28 primitiveNotEqualLargeIntegers)" "(29 primitiveMultiplyLargeIntegers)" "(30 primitiveDivideLargeIntegers)" "(31 primitiveModLargeIntegers)" "(32 primitiveDivLargeIntegers)" "(33 primitiveQuoLargeIntegers)" "(34 primitiveBitAndLargeIntegers)" "(35 primitiveBitOrLargeIntegers)" "(36 primitiveBitXorLargeIntegers)" "(37 primitiveBitShiftLargeIntegers)" "Float Primitives (38-59)" "(38 genPrimitiveFloatAt)" "(39 genPrimitiveFloatAtPut)" (40 genPrimitiveAsFloat 0) (41 genPrimitiveFloatAdd 1) (42 genPrimitiveFloatSubtract 1) (43 genPrimitiveFloatLessThan 1) (44 genPrimitiveFloatGreaterThan 1) (45 genPrimitiveFloatLessOrEqual 1) (46 genPrimitiveFloatGreaterOrEqual 1) (47 genPrimitiveFloatEqual 1) (48 genPrimitiveFloatNotEqual 1) (49 genPrimitiveFloatMultiply 1) (50 genPrimitiveFloatDivide 1) "(51 genPrimitiveTruncated)" "(52 genPrimitiveFractionalPart)" "(53 genPrimitiveExponent)" "(54 genPrimitiveTimesTwoPower)" (55 genPrimitiveFloatSquareRoot 0) "(56 genPrimitiveSine)" "(57 genPrimitiveArctan)" "(58 genPrimitiveLogN)" "(59 genPrimitiveExp)" "Subscript and Stream Primitives (60-67)" (60 genPrimitiveAt 1) (61 genPrimitiveAtPut 2) (62 genPrimitiveSize 0) (63 genPrimitiveStringAt 1) (64 genPrimitiveStringAtPut 2) "The stream primitives no longer pay their way; normal Smalltalk code is faster." (65 genFastPrimFail)"was primitiveNext" (66 genFastPrimFail) "was primitiveNextPut" (67 genFastPrimFail) "was primitiveAtEnd" "StorageManagement Primitives (68-79)" (68 genPrimitiveObjectAt 1) "Good for debugger/InstructionStream performance" "(69 primitiveObjectAtPut)" (70 genPrimitiveNew 0) (71 genPrimitiveNewWithArg 1) "(72 primitiveArrayBecomeOneWay)" "Blue Book: primitiveBecome" "(73 primitiveInstVarAt)" "(74 primitiveInstVarAtPut)" (75 genPrimitiveIdentityHash 0) "(76 primitiveStoreStackp)" "Blue Book: primitiveAsObject" "(77 primitiveSomeInstance)" "(78 primitiveNextInstance)" (79 genPrimitiveNewMethod 2) "Control Primitives (80-89)" "(80 primitiveFail)" "Blue Book: primitiveBlockCopy" "(81 primitiveFail)" "Blue Book: primitiveValue" "(82 primitiveFail)" "Blue Book: primitiveValueWithArgs" (83 genPrimitivePerform) "(84 primitivePerformWithArgs)" "(85 primitiveSignal)" "(86 primitiveWait)" "(87 primitiveResume)" "(88 primitiveSuspend)" "(89 primitiveFlushCache)" "System Primitives (110-119)" (110 genPrimitiveIdentical 1) (111 genPrimitiveClass) "Support both class and Context>>objectClass:" "(112 primitiveBytesLeft)" "(113 primitiveQuit)" "(114 primitiveExitToDebugger)" "(115 primitiveChangeClass)" "Blue Book: primitiveOopsLeft" "(116 primitiveFlushCacheByMethod)" "(117 primitiveExternalCall)" "(118 primitiveDoPrimitiveWithArgs)" "(119 primitiveFlushCacheSelective)" (169 genPrimitiveNotIdentical 1) + (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" + (171 genPrimitiveImmediateAsInteger 0) "Character>>value SmallFloat64>>asInteger" - (170 genPrimitiveAsCharacter) "SmallInteger>>asCharacter, Character class>>value:" - (171 genPrimitiveCharacterValue 0) "Character>>value" "(173 primitiveSlotAt 1)" "(174 primitiveSlotAtPut 2)" (175 genPrimitiveIdentityHash 0) "Behavior>>identityHash" "Old closure primitives" "(186 primitiveFail)" "was primitiveClosureValue" "(187 primitiveFail)" "was primitiveClosureValueWithArgs" "Perform method directly" "(188 primitiveExecuteMethodArgsArray)" "(189 primitiveExecuteMethod)" "Unwind primitives" "(195 primitiveFindNextUnwindContext)" "(196 primitiveTerminateTo)" "(197 primitiveFindHandlerContext)" (198 genFastPrimFail "primitiveMarkUnwindMethod") (199 genFastPrimFail "primitiveMarkHandlerMethod") "new closure primitives" "(200 primitiveClosureCopyWithCopiedValues)" (201 genPrimitiveClosureValue 0) "value" (202 genPrimitiveClosureValue 1) "value:" (203 genPrimitiveClosureValue 2) "value:value:" (204 genPrimitiveClosureValue 3) "value:value:value:" (205 genPrimitiveClosureValue 4) "value:value:value:value:" "(206 genPrimitiveClosureValueWithArgs)" "valueWithArguments:" "(210 primitiveContextAt)" "(211 primitiveContextAtPut)" "(212 primitiveContextSize)" "(218 primitiveDoNamedPrimitiveWithArgs)" "(219 primitiveFail)" "reserved for Cog primitives" "(220 primitiveFail)" "reserved for Cog primitives" (221 genPrimitiveClosureValue 0) "valueNoContextSwitch" (222 genPrimitiveClosureValue 1) "valueNoContextSwitch:" "SmallFloat primitives (540-559)" (541 genPrimitiveSmallFloatAdd 1) (542 genPrimitiveSmallFloatSubtract 1) (543 genPrimitiveSmallFloatLessThan 1) (544 genPrimitiveSmallFloatGreaterThan 1) (545 genPrimitiveSmallFloatLessOrEqual 1) (546 genPrimitiveSmallFloatGreaterOrEqual 1) (547 genPrimitiveSmallFloatEqual 1) (548 genPrimitiveSmallFloatNotEqual 1) (549 genPrimitiveSmallFloatMultiply 1) (550 genPrimitiveSmallFloatDivide 1) "(551 genPrimitiveSmallFloatTruncated 0)" "(552 genPrimitiveSmallFloatFractionalPart 0)" "(553 genPrimitiveSmallFloatExponent 0)" "(554 genPrimitiveSmallFloatTimesTwoPower 1)" (555 genPrimitiveSmallFloatSquareRoot 0) "(556 genPrimitiveSmallFloatSine 0)" "(557 genPrimitiveSmallFloatArctan 0)" "(558 genPrimitiveSmallFloatLogN 0)" "(559 genPrimitiveSmallFloatExp 0)" )!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2016