Vm-dev December 2015

vm-dev@lists.squeakfoundation.org

33 participants
207 discussions

[commit][3545] Add tweak to XSendEvent call that handles going fullscreen, per Nicolai Hess suggestion
by commits＠squeakvm.org 18 Dec '15

18 Dec '15

Revision: 3545 Author: rowledge Date: 2015-12-18 14:31:23 -0800 (Fri, 18 Dec 2015) Log Message: ----------- Add tweak to XSendEvent call that handles going fullscreen, per Nicolai Hess suggestion Modified Paths: -------------- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c Modified: branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c =================================================================== --- branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2015-12-17 17:50:55 UTC (rev 3544) +++ branches/Cog/platforms/unix/vm-display-X11/sqUnixX11.c 2015-12-18 22:31:23 UTC (rev 3545) @@ -5132,7 +5132,7 @@ xev.xclient.data.l[0] = enable; /* 1 enable, 0 disable fullscreen */ xev.xclient.data.l[1] = fullscreen; xev.xclient.data.l[2] = 0; - XSendEvent(stDisplay, DefaultRootWindow(stDisplay), False, SubstructureNotifyMask, &xev); + XSendEvent(stDisplay, DefaultRootWindow(stDisplay), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); }

1 0

Version 52... Re: version 52 of SecureSession is released
by Robert Withers 18 Dec '15

18 Dec '15

The newest version is cross-environment: squeakj & pharo, version 52. Don't run the perf test without plugins, please, to set the expectation. There is a class var to control whether RS encoding occurs (SecureSessionServer class>>#setUseFEC/useFEC:). By default it is disabled since it seriously affects performance. After profiling and cleanup, without FEC and with plugins, I consistently get over 20.5 Mbs. I think that's decent, though i am not sure where it measures with other crypto connections. 100 KB data chunks received: 22 send time: 417 ms, rate: 42.206 Mbs. receive time: 858 ms. rate: 20.513 Mbs. Hopefully we'll get RS pluginized. Then we could talk over ham radios, with non-commercial use. robert On 12/18/2015 07:15 AM, Robert Withers wrote: > Well, I must correct myself. It encodes/decodes in the absence of > errors, but it does not recover from damage, yet. It must be the > EuclideanAlgorithm it is using. I'll let you know when that's fixed, > but it is usable without damage, in the meantime. > > Sorry about that, > Robert > > On 12/18/2015 06:50 AM, Robert Withers wrote: >> SecureSession is now FEC encoded. >> >> thanks, > -- . .. .. ^,^ robert

1 0

Re: [squeak-dev] potential to include cryptography in base image
by Robert Withers 18 Dec '15

18 Dec '15

On 12/15/2015 10:02 PM, David T. Lewis wrote: > On Tue, Dec 15, 2015 at 05:00:12AM -0500, Robert Withers wrote: >> It was suggested to me that I write to the list and raise the question >> about cryptography being included in the base image. Really I have 3 >> questions I would ask you all: >> >> 1. is it desirable to include cryptography? >> 2. is it feasible to include cryptography? >> 3. what is the time frame for including cryptography? > I'm not sure whether it is a good idea to include it in the base image, > versus maintain it in an external package that can be easily loaded > from SqueakMap. Either way, I think we should get it updated on > SqueakMap first so that more people can (and hopefully will) load > it in their images, run the tests, and get experience with it. FWIW, > I personally tend to favor maintaining packages externally in cases > where we have an interest in supporting the package on various > kinds of images, such as Squeak/Cuis/Pharo. > > Robert, are you in a position to update the SqueakMap entries? Currently > they are "crypto", "Cryptography", and "Cryptography Team Package". They > are all out of date, and I'm not sure who owns which version. We should > pick one of them as the official one, and update it so that it loads the > latest version (Cryptography-rww.49) into a Squeak 4.6 or 5.0 image. > > It is of course quite easy to load Cryptography directly from squeaksource, > but there are quite a few packages in that repository that may seem confusing > for someone loading Cryptography for the first time, so I think a one-click > download from SqueakMap would be helpful. Thank you for your view of these matters. I must apologize for being forgetful about SqueakMap. I have no idea if I can login or not, it has been years. I have requested a new passwd so shortly I will be in. Do we want these artifacts on SqueakSource and SqueakMap? There are a lot of other packages in Cryptography on SqueakSource. I have cleaned up some of the packages I have in Mushroom. Some, like Blowfish, may want to be folded into the core package. Plugins will want to stay. I suppose better documentation would help, some for Pharo and some for Squeak. I got frustrated in the course of this as I think others did, as well. My apologies for simplifying a complex area and being to simplistic, at times. Regards, Robert > Dave > > -- . .. .. ^,^ robert

2 1

platforms/unix/vm-display-X11.c revision 3499 breaks use of fullscreen on Pi
by tim Rowledge 18 Dec '15

18 Dec '15

Unfortunately the recent change to vm-display-X11.c has broken the fullscreen stuff, at least on a Pi with Raspbian. The previous version worked ok. Symptom - the prim does not fail, but does not change the window size at all. It *does* change the view that the vm thinks it has as a window and `DisplayScreen actualScreenSize` reports the size we would expect the window to be. So somewhere in that change we’ve lost a crucial call to one of the myriad obscure X apis. I’m peering at the file trying to see if I can spot anything missing but it’s not very likely I can solve this one without an X-pert. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Strange OpCodes: XER: Exclusive ERror

3 7

New version (47) of SecureSession for Pharo & Squeak
by Robert Withers 18 Dec '15

18 Dec '15

Please load the SecureSession.47 and drive it about a bit. I am missing crypto plugins on Pharo, so avoid the performance test, tto stay responsive. Here are some of the changes: - frame-based pipeline - header per msg so no mutable session state - header is written with message in Asn1Der encoding. - most header fields currently optional - adding per-connection msgId to header - timeSent set also - reworked TransportEndpoint to be better scoped. Looking forward: - extend frames into the strategy utilities - events Any issues or questions, please reach out. Thanks, robert

1 0

stack overflow and crash.dmp
by Robert Withers 17 Dec '15

17 Dec '15

Eliot, Here is a crash.dmp I got from a vm crash. It is looping on INVALID RECEIVER and has been bugging me for some time. Sorry for the confusion, I hope this helps find one. -- . .. .. ^,^ robert

1 1

Re: [Vm-dev] OT: Convince me github is a wise choice
by Ben Coman 17 Dec '15

17 Dec '15

On Fri, Dec 18, 2015 at 1:29 AM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > > Hi Ben, Hi All, > > I'm quite conservative when it comes to relying on others' infrastructure so I need some help making me take the plunge. Please see below: > > On Thu, Dec 17, 2015 at 7:15 AM, Ben Coman <btc(a)openinworld.com> wrote: >> >> >> > On Wed, Dec 16, 2015 at 1:00 AM, Ben Coman <btc(a)openinworld.com> wrote: >> >> >> >> >> >> On Wed, Dec 16, 2015 at 10:43 AM, Ryan Macnak <rmacnak(a)gmail.com> wrote: >> >> > >> >> > What would be more helpful is if the VM build was fixed to work with a cross compiler, so it would compile fast enough to test ARM and MIPS on Travis CI alongside IA32 and X64. >> >> > >> >> > It would also help if the top-of-tree Intel VMs were always kept working so we'd know which change broke something. Moving the Subversion repository to a more reliable host (which likely means migrating to Git) would also cut down on the false positives Travis reports because the Subversion server has a habit of dropping connections. >> >> >> >> +1 github :) >> >> btw, Did you know that github supports subversion clients since 2011 [1]? >> Here are supported features [2]. Are these sufficient for your >> current svn workflows? >> Potentially we could have ONE repository and those liking subversion >> can stick with it and those liking git can use that. Of course, this >> would need to be proven. > > > Ah, that's interesting. So my concern is whether github is a safe long-term bet. Specifically what is there to prevent some third party from buying github, or of github going public and the board taking the decision, or github on its own, deciding to charge for hosting, keeping the data hostage to extract payment? What safeguards are in place to prevent this? > I'm not interested in "this will never happen" arguments. I'm interested in hard data please. Obviously there are no guarantees. The main safeguard is that git's distributed architecture provides by default that your local repository is a complete cache copy of the *entire* history. Your "code" data can *never* be hostage. You can push it to any other git server or peer. This would not be the case if you are using svn client, but then there'll be a dozen other people with a local cache, plus you could separately cron a git client to regularly pull to a backup location on your local system. Any of the auxiliary services like code review comments, issue tracker and wikis might be another story, but I'll wait to know how critical you consider those before I defend them. Now while an broad statement "it will never happen" cannot be relied on, it may still be worthwhile to consider some supporting reasons why the free service will 1. Today data storage is *cheap*. Consider other free services: http://www.minterest.org/onedrive-vs-dropbox-vs-google-drive/ * Google drive 15GB free * Microsoft Onedrive 15GB free * Amazon cloud 5GB free * Box 10GB free * Mega 50GB free Code as text is low overhead - particularly since git manages content by hashing thus duplicate eliminated. * Google Gmail - I see your use gmail. Are you overly concerned about google someday holding your data hostage to extract payment? 2. Github make money from auxiliary services. Profitable companies exist today that help recruit top-talent. Github are ideally placed to provide such a service from the unique contributor data available only to them. http://www.cnet.com/au/news/forget-linkedin-companies-turn-to-github-to-fin… 3. Similar Indirect Sale-Value business models apply to providing a free service and providing open source software... http://www.catb.org/esr/writings/magic-cauldron/magic-cauldron-9.html a. Loss-Leader / Market Positioner - without a free service, someone else will come along with a free service to gain some market share b. Give Away the Recipe, Open A Restaurant - sell services as *The*Expert* - much like Red Hat does. c. Freemium businees model that makes money from additional services. With 26 million repositories, 10 million users and 60 thousand organisations, you only need to convert a small percentage to be profitable - but you need to continue to keep competitors away. https://github.com/pricing https://enterprise.github.com/home So the business decision is to balance what risks, financial costs and opportunity costs are ameliorated today by using 3rd-party infrastructure, versus risks, costs and likelihood of needing to move to other servers some time in the future. cheers -ben >> [4] Provides pragmatic advice for cutting over. Esteban appears to >> have done similar to step 1 and 2 [3] - but it seem sometimes his >> modifications directly update this mirror so its not clear to see when >> that branch is an *exact* copy of the current svn trunk. So I'd love >> to see a github repository that is always an *exact* mirror of the svn >> repository, with any pharo mods occurring in a branch off that. Even >> better if the repository for svn users resides on github in place of >> that mirror. >> >> I've been googling around for problems reported using github via an >> svn client, and haven't found any smoking guns. >> Is this something we can trial? I'm willing to put some effort into >> it. A key requirement would be not interrupting Eliots work on >> Spur-64. Potentially we could stay for months on step 3 [4] with the >> CI infrastructure running on the git side, but code check-ins >> continuing onthe svn side. >> >> btw2, [5] provides a use case for the advantages of a full switch. >> >> cheers -ben >> >> [1] https://github.com/blog/966-improved-subversion-client-support >> [2] https://help.github.com/articles/support-for-subversion-clients/ >> [3] https://github.com/pharo-project/pharo-vm/network >> [4] http://blogs.atlassian.com/2013/01/atlassian-svn-to-git-migration-technical… >> [5] http://blogs.atlassian.com/2013/01/svn-to-git-how-atlassian-made-the-switch… > > > > > -- > _,,,^..^,,,_ > best, Eliot >

1 0

VM Maker: VMMaker.oscog-eem.1609.mcz
by commits＠source.squeak.org 17 Dec '15

17 Dec '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1609.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1609 Author: eem Time: 17 December 2015, 10:41:49.192 am UUID: 771cdc25-5d27-4818-8943-2ba5c0e31791 Ancestors: VMMaker.oscog-eem.1608 Cogit: Fix the (arguably bogus) register save/restore code for safe trampolines, including the ceScheduleScavenge call. =============== Diff against VMMaker.oscog-eem.1608 =============== Item was added: + ----- Method: CogARMCompiler>>genSaveRegForCCall (in category 'abi') ----- + genSaveRegForCCall + "Save the general purpose registers for a call into the C run-time from a trampoline." + "Save none, because the ARM ABI only defines callee saved registers, no caller-saved regs." + "cogit gen: STMFD operand: 16r7F"! Item was removed: - ----- Method: CogARMCompiler>>genSaveRegisters (in category 'abi') ----- - genSaveRegisters - "Save the general purpose registers for a trampoline call." - "Save none, because the ARM ABI only defines callee saved registers, no caller-saved regs." - "cogit gen: STMFD operand: 16r7F"! Item was added: + ----- Method: CogARMCompiler>>genSaveRegsForCCall (in category 'abi') ----- + genSaveRegsForCCall + "Save the general purpose registers for a trampoline call." + "Save none, because the ARM ABI only defines callee saved registers, no caller-saved regs." + "cogit gen: STMFD operand: 16r7F" + self flag: 'this will change with Sista when we hope to be able to allocate arbitrary registers'! Item was removed: - ----- Method: CogAbstractInstruction>>genSaveRegisters (in category 'abi') ----- - genSaveRegisters - "Save the general purpose registers for a trampoline call." - self subclassResponsibility! Item was changed: ----- Method: CogIA32Compiler>>genRestoreRegsExcept: (in category 'abi') ----- genRestoreRegsExcept: abstractReg | realReg | realReg := self concreteRegister: abstractReg. self assert: (EDI > EAX and: [EDI - EAX + 1 = 6]). EAX to: EDI do: [:reg| + (reg between: ESP and: EBP) ifFalse: + [realReg = reg + ifTrue: [cogit AddCq: 4 R: ESP] + ifFalse: [cogit PopR: reg]]]. - realReg = reg ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: reg]]. ^0! Item was removed: - ----- Method: CogIA32Compiler>>genSaveRegisters (in category 'abi') ----- - genSaveRegisters - "Save the general purpose registers for a trampoline call." - - self assert: (EDI > EAX and: [EDI - EAX + 1 = 8]). - EDI to: EAX by: -1 do: - [:reg| - (reg between: ESP and: EBP) ifFalse: - [cogit PushR: reg]]. - ^0! Item was added: + ----- Method: CogIA32Compiler>>genSaveRegsForCCall (in category 'abi') ----- + genSaveRegsForCCall + "Save the general purpose registers for a call into the C run-time from a trampoline." + + self assert: (EDI > EAX and: [EDI - EAX + 1 = 8]). + EDI to: EAX by: -1 do: + [:reg| + (reg between: ESP and: EBP) ifFalse: + [cogit PushR: reg]]. + ^0! Item was removed: - ----- Method: CogMIPSELCompiler>>genSaveRegisters (in category 'abi') ----- - genSaveRegisters - "This method is poorly named. Is this for a Smalltalk -> C call or C -> Smalltalk call? - If the former we don't need to do anything because all of the abstract registers are - allocated to C preserved registers." - self flag: #bogus.! Item was added: + ----- Method: CogMIPSELCompiler>>genSaveRegsForCCall (in category 'abi') ----- + genSaveRegsForCCall + "Save the general purpose registers for a call into the C run-time from a trampoline. + We don't need to do anything because all of the abstract registers are + allocated to C preserved registers." + self flag: 'this will change with Sista when we hope to be able to allocate arbitrary registers'! Item was changed: ----- Method: CogX64Compiler>>genRestoreRegs (in category 'abi') ----- genRestoreRegs "Restore the general purpose registers for a trampoline call. c.f. genSaveRegisters" + RAX to: R15 do: + [:reg| + (reg between: RSP and: RBP) ifFalse: + [cogit PopR: reg]]. - cogit - PopR: RAX; - PopR: RBX; - PopR: RCX; - PopR: RDX; - PopR: RSI; - PopR: RDI; - PopR: R8; - PopR: R9; - PopR: R10; - PopR: R11; - PopR: R12; - PopR: R13; - PopR: R14; - PopR: R15. ^0! Item was changed: ----- Method: CogX64Compiler>>genRestoreRegsExcept: (in category 'abi') ----- genRestoreRegsExcept: abstractReg | realReg | realReg := self concreteRegister: abstractReg. self assert: (R15 > RAX and: [R15 - RAX + 1 = 16]). RAX to: R15 do: [:reg| + (reg between: RSP and: RBP) ifFalse: + [realReg = reg + ifTrue: [cogit AddCq: 8 R: RSP] + ifFalse: [cogit PopR: reg]]]. - realReg = reg ifTrue: [cogit AddCq: 4 R: RSP] ifFalse: [cogit PopR: reg]]. ^0! Item was removed: - ----- Method: CogX64Compiler>>genSaveRegisters (in category 'abi') ----- - genSaveRegisters - "Save the general purpose registers for a trampoline call." - - self assert: (R15 > RAX and: [R15 - RAX + 1 = 16]). - R15 to: RAX by: -1 do: [:reg| cogit PushR: reg]. - ^0! Item was added: + ----- Method: CogX64Compiler>>genSaveRegsForCCall (in category 'abi') ----- + genSaveRegsForCCall + "Save the general purpose registers for a trampoline call." + + self assert: (R15 > RAX and: [R15 - RAX + 1 = 16]). + R15 to: RAX by: -1 do: + [:reg| + (reg between: RSP and: RBP) ifFalse: + [cogit PushR: reg]]. + ^0! Item was changed: ----- Method: Cogit>>compileCallFor:numArgs:arg:arg:arg:arg:resultReg:saveRegs: (in category 'initialization') ----- compileCallFor: aRoutine numArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3 resultReg: resultRegOrNone saveRegs: saveRegs "Generate a call to aRoutine with up to 4 arguments. If resultRegOrNone is not NoReg assign the C result to resultRegOrNone. If saveRegs, save all registers. Hack: a negative arg value indicates an abstract register, a non-negative value indicates a constant." <var: #aRoutine type: #'void *'> <inline: false> cStackAlignment > objectMemory wordSize ifTrue: [backEnd genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: cStackAlignment / objectMemory wordSize]. saveRegs ifTrue: + [backEnd genSaveRegsForCCall]. - [backEnd genSaveRegisters]. backEnd genMarshallNArgs: numArgs arg: regOrConst0 arg: regOrConst1 arg: regOrConst2 arg: regOrConst3. self CallFullRT: (self cCode: [aRoutine asUnsignedInteger] inSmalltalk: [self simulatedTrampolineFor: aRoutine]). resultRegOrNone ~= NoReg ifTrue: [backEnd genWriteCResultIntoReg: resultRegOrNone]. saveRegs ifTrue: [numArgs > 0 ifTrue: [backEnd genRemoveNArgsFromStack: numArgs]. resultRegOrNone ~= NoReg ifTrue: [backEnd genRestoreRegsExcept: resultRegOrNone] ifFalse: [backEnd genRestoreRegs]]!

1 0

Raspberry Pi Scratch with GPIO
by Ben Coman 17 Dec '15

17 Dec '15

I was just looking to show a friend at work programming for kids on the Raspberry Pi, away from my usual Smalltalk activities at home, and was surprised to find an article mentioning Scratch with GPIO and our very own Tim & Eliot, which I thought I'd share https://www.raspberrypi.org/blog/a-new-version-of-scratch-for-raspberry-pi-… cheers -ben

4 4

[commit][3544] CogVM source as per VMMaker.oscog-eem.1608
by commits＠squeakvm.org 17 Dec '15

17 Dec '15

Revision: 3544 Author: eliot Date: 2015-12-17 09:50:55 -0800 (Thu, 17 Dec 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1608 Cogit: Implement identifyingPredefinedMacros and therefore start generating C for MIPSEL alongside IA32 and ARMv5 (!!) Nuke incorrect uses of signedIntToLong on the results of callTargetFromReturnAddress: Refactor genLookupForPerformNumArgs: along the same lines as compileOpenPIC:numArgs: to use a base reg to access the method dict when outside the MoveMw:r:R: offset range. generateCaptureCStackPointers: must establish the VarBaseReg before accessing any of the stack pointer variables. x86 Cogit: Fix order of cmp in ArithCwR. Extend var base range to 1Mb Fix stupidities in concretize[Call|Jump]Full (move absolute value, not value referenced by absolute address). Fix REX byte slip in concretizeMoveCwR. Subversion: add more svn:ignore properties Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c Added Paths: ----------- branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/src/vm/cogitMIPSEL.c Property Changed: ---------------- branches/Cog/build.macos64x64/gdbarm32/ branches/Cog/build.macos64x64/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj/ branches/Cog/image/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/build.macos64x64/gdbarm32 ___________________________________________________________________ Added: svn:ignore + bfd libiberty opcodes sim zlib Property changes on: branches/Cog/build.macos64x64/squeak.cog.spur/SqueakCogSpur32x86.xcodeproj ___________________________________________________________________ Added: svn:ignore + *.pbxuser *.mode1v3 Property changes on: branches/Cog/image ___________________________________________________________________ Modified: svn:ignore - CogVMMaker* *-14.23.2987.* coglinux* cogwin Cog.app cogspurlinux* cogspurwin CogSpur.app Squeak-4.5-All-in-One.* SqueakDebug.log SqueakV41.sources __MACOSX crash.dmp package-cache prefs special-dirs + *.image *.changes *.tgz coglinux* cogwin Cog.app cogspurlinux* cogspurwin CogSpur.app Squeak-*-All-in-One.* SqueakDebug.log SqueakV41.sources __MACOSX crash.dmp package-cache prefs special-dirs Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2015-12-17 00:52:47 UTC (rev 3543) +++ branches/Cog/nsspursrc/vm/cogit.c 2015-12-17 17:50:55 UTC (rev 3544) @@ -1,5 +1,5 @@ /* Automatically generated by - Cogit VMMaker.oscog-eem.1580 uuid: 2b856f5e-e0b4-44bb-b23d-07561132f8c8 + Cogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 */ #if defined(__ARM_ARCH__) || defined(__arm__) || defined(__arm32__) || defined(ARM32) || defined(_M_ARM) @@ -10,6 +10,10 @@ # include "cogitIA32.c" +#elif defined(__MIPSEL__) + +# include "cogitMIPSEL.c" + #else # error As yet no Cogit implementation appears to exist for your platform. # error Consider implementing it, starting by adding a subclass of CogAbstractInstruction. Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-12-17 00:52:47 UTC (rev 3543) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-12-17 17:50:55 UTC (rev 3544) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef + CCodeGenerator VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-12-17 00:52:47 UTC (rev 3543) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-12-17 17:50:55 UTC (rev 3544) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef + CCodeGenerator VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef + StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -897,7 +897,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -975,6 +975,7 @@ static sqInt NoDbgRegParms compileInterpreterPrimitive(void (*primitiveRoutine)(void)); static AbstractInstruction * NoDbgRegParms compileOpenPICMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selector, sqInt shift, sqInt baseRegOrNone); static void NoDbgRegParms compileOpenPICnumArgs(sqInt selector, sqInt numArgs); +static AbstractInstruction * NoDbgRegParms compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt shift, sqInt baseRegOrNone); static sqInt extendedPushBytecode(void); static sqInt extendedStoreAndPopBytecode(void); static sqInt extendedStoreBytecode(void); @@ -1013,7 +1014,7 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static sqInt genPrimitiveEqual(void); @@ -3335,8 +3336,8 @@ sqInt index1; sqInt index2; sqInt index3; - sqInt instrOffset; - usqInt instrOffset1; + usqInt instrOffset; + sqInt instrOffset1; sqInt instrOffset10; sqInt instrOffset11; sqInt instrOffset12; @@ -3346,22 +3347,22 @@ sqInt instrOffset16; sqInt instrOffset17; sqInt instrOffset18; - sqInt instrOffset19; + usqInt instrOffset19; sqInt instrOffset2; sqInt instrOffset20; - usqInt instrOffset21; - sqInt instrOffset22; + sqInt instrOffset21; + usqInt instrOffset22; usqInt instrOffset23; sqInt instrOffset24; - usqInt instrOffset25; + sqInt instrOffset25; sqInt instrOffset26; sqInt instrOffset27; sqInt instrOffset28; - sqInt instrOffset3; - usqInt instrOffset4; + usqInt instrOffset3; + sqInt instrOffset4; sqInt instrOffset5; sqInt instrOffset6; - usqInt instrOffset7; + sqInt instrOffset7; sqInt instrOffset8; sqInt instrOffset9; sqInt invert; @@ -3694,7 +3695,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord43; - instrOffset7 = ((self_in_dispatchConcretize->machineCodeSize) = 4); + instrOffset7 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[instrOffset7 / 4] = ((AL << 28) | ((19922704 | ((0 & 1) << 5)) | ConcreteIPReg)); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset7 + 4); @@ -5106,7 +5107,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord35; - instrOffset = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); + instrOffset = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ aWord17 = addrnrm(self_in_dispatchConcretize, destReg, srcReg1, ConcreteIPReg); ((self_in_dispatchConcretize->machineCode))[16 / 4] = aWord17; @@ -5295,7 +5296,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord210; - instrOffset19 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); + instrOffset19 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ aWord119 = ldrrnplusImm(self_in_dispatchConcretize, destReg10, ConcreteIPReg, 0); ((self_in_dispatchConcretize->machineCode))[instrOffset19 / 4] = aWord119; @@ -5351,7 +5352,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord212; - instrOffset21 = ((self_in_dispatchConcretize->machineCodeSize) = 4); + instrOffset21 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); /* begin machineCodeAt:put: */ aWord121 = ldrbrnplusimm(self_in_dispatchConcretize, destReg11, ConcreteIPReg, 1, 0); ((self_in_dispatchConcretize->machineCode))[instrOffset21 / 4] = aWord121; @@ -5379,7 +5380,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord213; - instrOffset22 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); + instrOffset22 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ aWord122 = strbrnplusimm(self_in_dispatchConcretize, srcReg16, ConcreteIPReg, 1, 0); ((self_in_dispatchConcretize->machineCode))[instrOffset22 / 4] = aWord122; @@ -5542,7 +5543,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord37; - instrOffset1 = ((self_in_dispatchConcretize->machineCodeSize) = 4); + instrOffset1 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); /* begin machineCodeAt:put: */ aWord110 = ldrhrnrm(self_in_dispatchConcretize, destReg2, srcReg3, ConcreteIPReg); ((self_in_dispatchConcretize->machineCode))[instrOffset1 / 4] = aWord110; @@ -5711,7 +5712,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord39; - instrOffset3 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); + instrOffset3 = ((self_in_dispatchConcretize->machineCodeSize) = 4); /* begin machineCodeAt:put: */ aWord112 = strrnrm(self_in_dispatchConcretize, srcReg6, baseReg, ConcreteIPReg); ((self_in_dispatchConcretize->machineCode))[instrOffset3 / 4] = aWord112; @@ -5801,7 +5802,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord40; - instrOffset4 = ((self_in_dispatchConcretize->machineCodeSize) = 4); + instrOffset4 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); l12: /* end rotateable8bitBitwiseImmediate:ifTrue:ifFalse: */; /* begin machineCodeAt:put: */ @@ -5884,7 +5885,7 @@ ? 1 : 0), abs(((((self_in_dispatchConcretize->dependent))->address)) - (((self_in_dispatchConcretize->address)) + 8))); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord125; - instrOffset25 = ((self_in_dispatchConcretize->machineCodeSize) = 4); + instrOffset25 = ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 4))); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[instrOffset25 / 4] = (4115722240UL | ((ConcreteIPReg << 16) | ((1 << 23) | 0))); ((self_in_dispatchConcretize->machineCodeSize) = instrOffset25 + 4); @@ -7163,7 +7164,7 @@ assert((instructionIsB(self_in_rewriteTransferAttarget, instr)) || (instructionIsBL(self_in_rewriteTransferAttarget, instr))); longAtput(callSiteReturnAddress - 4, (instr & 0xFF000000UL) | ((callDistance / 4) & 0xFFFFFF)); - assert((((usqInt) (callTargetFromReturnAddress(self_in_rewriteTransferAttarget, callSiteReturnAddress)))) == callTargetAddress); + assert((callTargetFromReturnAddress(self_in_rewriteTransferAttarget, callSiteReturnAddress)) == callTargetAddress); return 4; } @@ -10527,6 +10528,7 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; + maybeEstablishVarBase(backEnd); if (captureFramePointer) { /* begin MoveR:Aw: */ address = cFramePointerAddress(); @@ -10765,14 +10767,14 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; - usqInt mcpc; + sqInt mcpc; length = 0; location = startAddress; @@ -16374,7 +16376,7 @@ AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsContext; AbstractInstruction *jumpNegative; - sqInt jumpNonSmallIntegerValue; + AbstractInstruction * jumpNonSmallIntegerValue; AbstractInstruction *jumpNotIndexableBits; AbstractInstruction *jumpNotIndexablePointers; AbstractInstruction * jumpNotPointers; @@ -19338,7 +19340,7 @@ } /* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) { return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1); @@ -19552,7 +19554,7 @@ } /* begin RetN: */ genoperand(RetN, retNoffset); - jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); /* begin RetN: */ genoperand(RetN, retNoffset); return 0; @@ -21961,8 +21963,8 @@ } -/* Compile one method cache probe in an OpenPIC's lookup of selector. Answer - the jump taken if the selector probe fails. */ +/* Compile one method cache probe in an OpenPIC's lookup of selector. + Answer the jump taken if the selector probe fails. */ /* SimpleStackBasedCogit>>#compileOpenPICMethodCacheProbeFor:withShift:baseRegOrNone: */ static AbstractInstruction * NoDbgRegParms @@ -22097,6 +22099,79 @@ compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, NoReg, 0); } + +/* Compile one method cache probe in a perform: primitive's lookup of + selector. Answer the jump taken if the selector probe fails. */ + + /* SimpleStackBasedCogit>>#compilePerformMethodCacheProbeFor:withShift:baseRegOrNone: */ +static AbstractInstruction * NoDbgRegParms +compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt shift, sqInt baseRegOrNone) +{ + AbstractInstruction *anInstruction; + AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction2; + AbstractInstruction *anInstruction3; + AbstractInstruction *anInstruction4; + AbstractInstruction *jumpSelectorMiss; + sqInt offset; + sqInt offset1; + + /* begin MoveR:R: */ + genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); + /* begin XorR:R: */ + genoperandoperand(XorRR, selectorReg, ClassReg); + if ((shiftForWord()) > shift) { + /* begin LogicalShiftLeftCq:R: */ + genoperandoperand(LogicalShiftLeftCqR, (shiftForWord()) - shift, ClassReg); + } + /* begin AndCq:R: */ + anInstruction = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(MethodCacheMask << (shiftForWord()))); + } + if (baseRegOrNone == NoReg) { + /* begin MoveMw:r:R: */ + offset = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); + /* begin gen:quickConstant:operand:operand: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, TempReg); + if (usesOutOfLineLiteral(anInstruction1)) { + (anInstruction1->dependent = locateLiteral(offset)); + } + } + else { + /* begin AddR:R: */ + genoperandoperand(AddRR, baseRegOrNone, ClassReg); + /* begin MoveMw:r:R: */ + anInstruction2 = genoperandoperandoperand(MoveMwrR, MethodCacheSelector << (shiftForWord()), ClassReg, TempReg); + if (usesOutOfLineLiteral(anInstruction2)) { + (anInstruction2->dependent = locateLiteral(MethodCacheSelector << (shiftForWord()))); + } + } + /* begin CmpR:R: */ + genoperandoperand(CmpRR, selectorReg, TempReg); + /* begin JumpNonZero: */ + jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + if (baseRegOrNone == NoReg) { + /* begin MoveMw:r:R: */ + offset1 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); + /* begin gen:quickConstant:operand:operand: */ + anInstruction3 = genoperandoperandoperand(MoveMwrR, offset1, ClassReg, TempReg); + if (usesOutOfLineLiteral(anInstruction3)) { + (anInstruction3->dependent = locateLiteral(offset1)); + } + } + else { + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, MethodCacheClass << (shiftForWord()), ClassReg, TempReg); + if (usesOutOfLineLiteral(anInstruction4)) { + (anInstruction4->dependent = locateLiteral(MethodCacheClass << (shiftForWord()))); + } + } + /* begin CmpR:R: */ + genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + return jumpSelectorMiss; +} + /* SimpleStackBasedCogit>>#extendedPushBytecode */ static sqInt extendedPushBytecode(void) @@ -22779,165 +22854,65 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction10; AbstractInstruction *anInstruction2; - AbstractInstruction *anInstruction3; - AbstractInstruction *anInstruction4; - AbstractInstruction *anInstruction5; - AbstractInstruction *anInstruction6; - AbstractInstruction *anInstruction7; - AbstractInstruction *anInstruction8; - AbstractInstruction *anInstruction9; + sqInt cacheBaseReg; AbstractInstruction *itsAHit; AbstractInstruction *jumpClassMiss; AbstractInstruction *jumpInterpret; AbstractInstruction *jumpSelectorMiss; sqInt offset; - sqInt offset1; - sqInt offset2; - sqInt offset3; - sqInt offset4; - sqInt offset5; - sqInt offset6; + sqInt quickConstant; + sqInt reg; /* N.B. Can't assume TempReg already contains the tag because a method can of course be invoked via the unchecked entry-point, e.g. as does perform:. */ - genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, ClassReg, 0); + genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, SendNumArgsReg, 0); flag("lookupInMethodCacheSel:classTag:"); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ClassReg, SendNumArgsReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin LogicalShiftLeftCq:R: */ - genoperandoperand(LogicalShiftLeftCqR, shiftForWord(), ClassReg); - /* begin AndCq:R: */ - anInstruction = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - if (usesOutOfLineLiteral(anInstruction)) { - (anInstruction->dependent = locateLiteral(MethodCacheMask << (shiftForWord()))); - } - /* begin MoveMw:r:R: */ - offset = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction4 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction4)) { - (anInstruction4->dependent = locateLiteral(offset)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); + cacheBaseReg = NoReg; + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 0, cacheBaseReg); /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset1 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction5 = genoperandoperandoperand(MoveMwrR, offset1, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction5)) { - (anInstruction5->dependent = locateLiteral(offset1)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); - /* begin JumpNonZero: */ jumpClassMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin Label */ - itsAHit = genoperandoperand(Label, (labelCounter += 1), bytecodePC); /* begin MoveMw:r:R: */ - offset2 = (((usqInt)(methodCacheAddress()))) + (MethodCacheMethod << (shiftForWord())); + offset = (cacheBaseReg == NoReg + ? (((usqInt)(methodCacheAddress()))) + (MethodCacheMethod << (shiftForWord())) + : MethodCacheMethod << (shiftForWord())); /* begin gen:quickConstant:operand:operand: */ - anInstruction6 = genoperandoperandoperand(MoveMwrR, offset2, ClassReg, SendNumArgsReg); - if (usesOutOfLineLiteral(anInstruction6)) { - (anInstruction6->dependent = locateLiteral(offset2)); + anInstruction2 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, SendNumArgsReg); + if (usesOutOfLineLiteral(anInstruction2)) { + (anInstruction2->dependent = locateLiteral(offset)); } + itsAHit = anInstruction2; genLoadSlotsourceRegdestReg(HeaderIndex, SendNumArgsReg, ClassReg); /* Adjust arguments and jump to the method's unchecked entry-point. */ jumpInterpret = genJumpImmediate(ClassReg); /* begin AddCq:R: */ - anInstruction1 = genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg); - if (usesOutOfLineLiteral(anInstruction1)) { - (anInstruction1->dependent = locateLiteral(cmNoCheckEntryOffset)); + anInstruction = genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(cmNoCheckEntryOffset)); } adjustArgumentsForPerform(numArgs); /* begin JumpR: */ genoperand(JumpR, ClassReg); jmpTarget(jumpSelectorMiss, jmpTarget(jumpClassMiss, gLabel())); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin LogicalShiftLeftCq:R: */ - genoperandoperand(LogicalShiftLeftCqR, (shiftForWord()) - 1, ClassReg); - /* begin AndCq:R: */ - anInstruction2 = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - if (usesOutOfLineLiteral(anInstruction2)) { - (anInstruction2->dependent = locateLiteral(MethodCacheMask << (shiftForWord()))); - } - /* begin MoveMw:r:R: */ - offset3 = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction7 = genoperandoperandoperand(MoveMwrR, offset3, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction7)) { - (anInstruction7->dependent = locateLiteral(offset3)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); - /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset4 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction8 = genoperandoperandoperand(MoveMwrR, offset4, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction8)) { - (anInstruction8->dependent = locateLiteral(offset4)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 1, cacheBaseReg); /* begin JumpZero: */ genConditionalBranchoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin AndCq:R: */ - anInstruction3 = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - if (usesOutOfLineLiteral(anInstruction3)) { - (anInstruction3->dependent = locateLiteral(MethodCacheMask << (shiftForWord()))); - } - /* begin MoveMw:r:R: */ - offset5 = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction9 = genoperandoperandoperand(MoveMwrR, offset5, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction9)) { - (anInstruction9->dependent = locateLiteral(offset5)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); - /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset6 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction10 = genoperandoperandoperand(MoveMwrR, offset6, ClassReg, TempReg); - if (usesOutOfLineLiteral(anInstruction10)) { - (anInstruction10->dependent = locateLiteral(offset6)); - } - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 1, cacheBaseReg); /* begin JumpZero: */ genConditionalBranchoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, jmpTarget(jumpInterpret, gLabel())); return 0; } - /* SimpleStackBasedCogit>>#genMoveFalseR: */ + /* SimpleStackBasedCogit>>#genMoveConstant:R: */ static AbstractInstruction * NoDbgRegParms -genMoveFalseR(sqInt reg) +genMoveConstantR(sqInt constant, sqInt reg) { AbstractInstruction *anInstruction; - sqInt constant; - /* begin genMoveConstant:R: */ - constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ @@ -26230,6 +26205,7 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); + /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-17 00:52:47 UTC (rev 3543) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-12-17 17:50:55 UTC (rev 3544) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef + CCodeGenerator VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef + StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1602 uuid: 16ff1141-4cce-41a9-a9f5-742da38970ef " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -889,6 +889,7 @@ static sqInt NoDbgRegParms compileInterpreterPrimitive(void (*primitiveRoutine)(void)); static AbstractInstruction * NoDbgRegParms compileOpenPICMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selector, sqInt shift, sqInt baseRegOrNone); static void NoDbgRegParms compileOpenPICnumArgs(sqInt selector, sqInt numArgs); +static AbstractInstruction * NoDbgRegParms compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt shift, sqInt baseRegOrNone); static sqInt extendedPushBytecode(void); static sqInt extendedStoreAndPopBytecode(void); static sqInt extendedStoreBytecode(void); @@ -927,8 +928,8 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); -static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static sqInt genPrimitiveEqual(void); static sqInt genPrimitiveFloatAdd(void); @@ -6230,7 +6231,7 @@ byteAtput(callSiteReturnAddress - 7, (((usqInt) cacheTag) >> 16) & 0xFF); byteAtput(callSiteReturnAddress - 8, (((usqInt) cacheTag) >> 8) & 0xFF); byteAtput(callSiteReturnAddress - 9, cacheTag & 0xFF); - assert((((usqInt) (callTargetFromReturnAddress(self_in_rewriteInlineCacheAttagtarget, callSiteReturnAddress)))) == callTargetAddress); + assert((callTargetFromReturnAddress(self_in_rewriteInlineCacheAttagtarget, callSiteReturnAddress)) == callTargetAddress); return 10; } @@ -9592,6 +9593,7 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; + maybeEstablishVarBase(backEnd); if (captureFramePointer) { /* begin MoveR:Aw: */ address = cFramePointerAddress(); @@ -11165,8 +11167,7 @@ literal = literalBeforeFollowingAddress(backEnd, mcpc); mappedLiteral = remapObject(literal); if (mappedLiteral != literal) { - /* begin storeLiteral:atAnnotatedAddress:using: */ - storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), mappedLiteral, mcpc); + storeLiteralbeforeFollowingAddress(backEnd, mappedLiteral, mcpc); codeModified = 1; } } @@ -13152,8 +13153,7 @@ if (couldBeObject(literal)) { mappedLiteral = remapObject(literal); if (literal != mappedLiteral) { - /* begin storeLiteral:atAnnotatedAddress:using: */ - storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), mappedLiteral, ((usqInt)mcpc)); + storeLiteralbeforeFollowingAddress(backEnd, mappedLiteral, ((usqInt)mcpc)); codeModified = 1; } if ((hasYoungPtr != 0) @@ -15362,7 +15362,7 @@ AbstractInstruction * jumpIsCompiledMethod; AbstractInstruction *jumpIsContext; AbstractInstruction *jumpNegative; - AbstractInstruction * jumpNonSmallIntegerValue; + sqInt jumpNonSmallIntegerValue; AbstractInstruction *jumpNotIndexableBits; AbstractInstruction *jumpNotIndexablePointers; AbstractInstruction * jumpNotPointers; @@ -17869,7 +17869,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveConstant:R: */ + /* begin genMoveTrueR: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -17880,7 +17880,7 @@ } /* begin RetN: */ genoperand(RetN, retNoffset); - jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); /* begin RetN: */ genoperand(RetN, retNoffset); return 0; @@ -19350,8 +19350,8 @@ } -/* Compile one method cache probe in an OpenPIC's lookup of selector. Answer - the jump taken if the selector probe fails. */ +/* Compile one method cache probe in an OpenPIC's lookup of selector. + Answer the jump taken if the selector probe fails. */ /* SimpleStackBasedCogit>>#compileOpenPICMethodCacheProbeFor:withShift:baseRegOrNone: */ static AbstractInstruction * NoDbgRegParms @@ -19465,6 +19465,64 @@ compileCallFornumArgsargargargargresultRegsaveRegs(ceSendFromInLineCacheMiss, 1, SendNumArgsReg, null, null, null, NoReg, 0); } + +/* Compile one method cache probe in a perform: primitive's lookup of + selector. Answer the jump taken if the selector probe fails. */ + + /* SimpleStackBasedCogit>>#compilePerformMethodCacheProbeFor:withShift:baseRegOrNone: */ +static AbstractInstruction * NoDbgRegParms +compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt shift, sqInt baseRegOrNone) +{ + AbstractInstruction *anInstruction; + AbstractInstruction *anInstruction1; + AbstractInstruction *anInstruction2; + AbstractInstruction *anInstruction3; + AbstractInstruction *anInstruction4; + AbstractInstruction *jumpSelectorMiss; + sqInt offset; + sqInt offset1; + + /* begin MoveR:R: */ + genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); + /* begin XorR:R: */ + genoperandoperand(XorRR, selectorReg, ClassReg); + if ((shiftForWord()) > shift) { + /* begin LogicalShiftLeftCq:R: */ + genoperandoperand(LogicalShiftLeftCqR, (shiftForWord()) - shift, ClassReg); + } + /* begin AndCq:R: */ + anInstruction = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); + if (baseRegOrNone == NoReg) { + /* begin MoveMw:r:R: */ + offset = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); + /* begin gen:quickConstant:operand:operand: */ + anInstruction1 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, TempReg); + } + else { + /* begin AddR:R: */ + genoperandoperand(AddRR, baseRegOrNone, ClassReg); + /* begin MoveMw:r:R: */ + anInstruction2 = genoperandoperandoperand(MoveMwrR, MethodCacheSelector << (shiftForWord()), ClassReg, TempReg); + } + /* begin CmpR:R: */ + genoperandoperand(CmpRR, selectorReg, TempReg); + /* begin JumpNonZero: */ + jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); + if (baseRegOrNone == NoReg) { + /* begin MoveMw:r:R: */ + offset1 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); + /* begin gen:quickConstant:operand:operand: */ + anInstruction3 = genoperandoperandoperand(MoveMwrR, offset1, ClassReg, TempReg); + } + else { + /* begin MoveMw:r:R: */ + anInstruction4 = genoperandoperandoperand(MoveMwrR, MethodCacheClass << (shiftForWord()), ClassReg, TempReg); + } + /* begin CmpR:R: */ + genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + return jumpSelectorMiss; +} + /* SimpleStackBasedCogit>>#extendedPushBytecode */ static sqInt extendedPushBytecode(void) @@ -20138,132 +20196,59 @@ { AbstractInstruction *anInstruction; AbstractInstruction *anInstruction1; - AbstractInstruction *anInstruction10; AbstractInstruction *anInstruction2; - AbstractInstruction *anInstruction3; - AbstractInstruction *anInstruction4; - AbstractInstruction *anInstruction5; - AbstractInstruction *anInstruction6; - AbstractInstruction *anInstruction7; - AbstractInstruction *anInstruction8; - AbstractInstruction *anInstruction9; + sqInt cacheBaseReg; AbstractInstruction *itsAHit; AbstractInstruction *jumpClassMiss; AbstractInstruction *jumpInterpret; AbstractInstruction *jumpSelectorMiss; sqInt offset; - sqInt offset1; - sqInt offset2; - sqInt offset3; - sqInt offset4; - sqInt offset5; - sqInt offset6; + sqInt quickConstant; + sqInt reg; /* N.B. Can't assume TempReg already contains the tag because a method can of course be invoked via the unchecked entry-point, e.g. as does perform:. */ - genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, ClassReg, 0); + genGetInlineCacheClassTagFromintoforEntry(ReceiverResultReg, SendNumArgsReg, 0); flag("lookupInMethodCacheSel:classTag:"); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, ClassReg, SendNumArgsReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin LogicalShiftLeftCq:R: */ - genoperandoperand(LogicalShiftLeftCqR, shiftForWord(), ClassReg); - /* begin AndCq:R: */ - anInstruction = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - /* begin MoveMw:r:R: */ - offset = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction4 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); + cacheBaseReg = NoReg; + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 0, cacheBaseReg); /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset1 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction5 = genoperandoperandoperand(MoveMwrR, offset1, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); - /* begin JumpNonZero: */ jumpClassMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin Label */ - itsAHit = genoperandoperand(Label, (labelCounter += 1), bytecodePC); /* begin MoveMw:r:R: */ - offset2 = (((usqInt)(methodCacheAddress()))) + (MethodCacheMethod << (shiftForWord())); + offset = (cacheBaseReg == NoReg + ? (((usqInt)(methodCacheAddress()))) + (MethodCacheMethod << (shiftForWord())) + : MethodCacheMethod << (shiftForWord())); /* begin gen:quickConstant:operand:operand: */ - anInstruction6 = genoperandoperandoperand(MoveMwrR, offset2, ClassReg, SendNumArgsReg); + anInstruction2 = genoperandoperandoperand(MoveMwrR, offset, ClassReg, SendNumArgsReg); + itsAHit = anInstruction2; genLoadSlotsourceRegdestReg(HeaderIndex, SendNumArgsReg, ClassReg); /* Adjust arguments and jump to the method's unchecked entry-point. */ jumpInterpret = genJumpImmediate(ClassReg); /* begin AddCq:R: */ - anInstruction1 = genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg); + anInstruction = genoperandoperand(AddCqR, cmNoCheckEntryOffset, ClassReg); adjustArgumentsForPerform(numArgs); /* begin JumpR: */ genoperand(JumpR, ClassReg); jmpTarget(jumpSelectorMiss, jmpTarget(jumpClassMiss, gLabel())); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin LogicalShiftLeftCq:R: */ - genoperandoperand(LogicalShiftLeftCqR, (shiftForWord()) - 1, ClassReg); - /* begin AndCq:R: */ - anInstruction2 = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - /* begin MoveMw:r:R: */ - offset3 = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction7 = genoperandoperandoperand(MoveMwrR, offset3, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); - /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset4 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction8 = genoperandoperandoperand(MoveMwrR, offset4, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 1, cacheBaseReg); /* begin JumpZero: */ genConditionalBranchoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, gLabel()); - /* begin MoveR:R: */ - genoperandoperand(MoveRR, SendNumArgsReg, ClassReg); - /* begin XorR:R: */ - genoperandoperand(XorRR, Arg0Reg, ClassReg); - /* begin AndCq:R: */ - anInstruction3 = genoperandoperand(AndCqR, MethodCacheMask << (shiftForWord()), ClassReg); - /* begin MoveMw:r:R: */ - offset5 = (((usqInt)(methodCacheAddress()))) + (MethodCacheSelector << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction9 = genoperandoperandoperand(MoveMwrR, offset5, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, Arg0Reg, TempReg); - /* begin JumpNonZero: */ - jumpSelectorMiss = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); - /* begin MoveMw:r:R: */ - offset6 = (((usqInt)(methodCacheAddress()))) + (MethodCacheClass << (shiftForWord())); - /* begin gen:quickConstant:operand:operand: */ - anInstruction10 = genoperandoperandoperand(MoveMwrR, offset6, ClassReg, TempReg); - /* begin CmpR:R: */ - genoperandoperand(CmpRR, SendNumArgsReg, TempReg); + jumpSelectorMiss = compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(Arg0Reg, 1, cacheBaseReg); /* begin JumpZero: */ genConditionalBranchoperand(JumpZero, ((sqInt)itsAHit)); jmpTarget(jumpSelectorMiss, jmpTarget(jumpInterpret, gLabel())); return 0; } - /* SimpleStackBasedCogit>>#genMoveFalseR: */ + /* SimpleStackBasedCogit>>#genMoveConstant:R: */ static AbstractInstruction * NoDbgRegParms -genMoveFalseR(sqInt reg) +genMoveConstantR(sqInt constant, sqInt reg) { AbstractInstruction *anInstruction; - sqInt constant; - /* begin genMoveConstant:R: */ - constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ @@ -20272,7 +20257,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; Added: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c (rev 0) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2015-12-17 17:50:55 UTC (rev 3544) @@ -0,0 +1,26768 @@ +/* Automatically generated by + CCodeGenerator VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 + from + StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 + */ +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1608 uuid: bf1e1bd4-7dd4-47e2-bb33-3a988cc4c276 " __DATE__ ; +char *__cogitBuildInfo = __buildInfo; + + + +#include <stddef.h> +#include "sq.h" +#include "sqCogStackAlignment.h" +#include "dispdbg.h" +#include "cogmethod.h" +#include "nssendcache.h" +#if COGMTVM +#include "cointerpmt.h" +#else +#include "cointerp.h" +#endif +#include "cogit.h" + +typedef struct _AbstractInstruction { + unsigned char opcode; + unsigned char machineCodeSize; + unsigned char maxSize; + unsigned char annotation; + unsigned long operands [3]; + unsigned long address; + struct _AbstractInstruction *dependent; + unsigned long machineCode [7]; + } AbstractInstruction; + +#define CogMIPSELCompiler AbstractInstruction +#define CogAbstractInstruction AbstractInstruction + + +typedef struct { + AbstractInstruction *fakeHeader; + AbstractInstruction *fillInstruction; + sqInt numArgs; + sqInt numCopied; + sqInt numInitialNils; + sqInt startpc; + AbstractInstruction *entryLabel; + AbstractInstruction *stackCheckLabel; + sqInt span; + sqInt hasInstVarRef; + } BlockStart; + +#define CogBlockStart BlockStart + + +typedef struct _BytecodeDescriptor { + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); + signed char stackDelta; + unsigned char opcode; + unsigned char numBytes; + unsigned isBranchTrue : 1; + unsigned isBranchFalse : 1; + unsigned isReturn : 1; + unsigned isBlockCreation : 1; + unsigned isMapped : 1; + unsigned isMappedInBlock : 1; + unsigned isExtension : 1; + unsigned isInstVarRef : 1; + unsigned hasIRC : 1; + } BytecodeDescriptor; + +#define CogBytecodeDescriptor BytecodeDescriptor + + +typedef struct { + sqInt (*primitiveGenerator )(void); + sqInt primNumArgs; + sqInt (*enabled )(sqInt); + } PrimitiveDescriptor; + +#define CogPrimitiveDescriptor PrimitiveDescriptor + + +typedef struct { + AbstractInstruction *targetInstruction; + sqInt instructionIndex; + sqInt simStackPtr; + } BytecodeFixup; + +#define CogSSBytecodeFixup BytecodeFixup +#define CogBytecodeFixup BytecodeFixup + + +typedef struct { + char type; + char spilled; + char annotateUse; + sqInt registerr; + sqInt offset; + sqInt constant; + sqInt bcptr; + } CogSimStackEntry; + + +typedef struct { + sqInt isReceiverResultRegLive; + CogSimStackEntry *ssEntry; + } CogSSOptStatus; + + + +/*** Constants ***/ +#define A0 4 +#define A1 5 +#define A2 6 +#define A3 7 +#define ADDIU 9 +#define ADDU 33 +#define AddCheckOverflowCqR 120 +#define AddCheckOverflowRR 121 +#define AddCqR 95 +#define AddCwR 103 +#define AddRdRd 110 +#define AddRR 89 +#define AlignmentNops 3 +#define AltBlockCreationBytecodeSize 3 +#define AltFirstSpecialSelector 80 +#define AltNumSpecialSelectors 32 +#define AND 36 +#define ANDI 12 +#define AndCqR 97 +#define AndCqRR 108 +#define AndCwR 105 +#define AndRR 91 +#define AnnotationShift 5 +#define Arg0Reg -7 +#define Arg1Reg -8 +#define ArithmeticShiftRightCqR 80 +#define ArithmeticShiftRightRR 81 +#define AT 1 +#define BadRegisterSet 1 +#define BEQ 4 +#define BGEZ 1 +#define BGTZ 7 +#define BLEZ 6 +#define BLTZ 0 +#define BlockCreationBytecodeSize 4 +#define BNE 5 +#define BREAK 13 +#define BranchTemp 11 +#define BrEqualRR 125 +#define BrLongEqualRR 135 +#define BrLongNotEqualRR 136 +#define BrNotEqualRR 126 +#define BrSignedGreaterEqualRR 134 +#define BrSignedGreaterRR 133 +#define BrSignedLessEqualRR 132 +#define BrSignedLessRR 131 +#define BrUnsignedGreaterEqualRR 130 +#define BrUnsignedGreaterRR 129 +#define BrUnsignedLessEqualRR 128 +#define BrUnsignedLessRR 127 +#define BytecodeSetHasDirectedSuperSend 0 +#define Call 6 +#define CallFull 7 +#define ClassArrayCompactIndex 51 +#define ClassBlockClosureCompactIndex 37 +#define ClassFloatCompactIndex 34 +#define ClassMethodContextCompactIndex 36 +#define ClassReg -5 +#define ClosureFirstCopiedValueIndex 3 +#define ClosureIndex 4 +#define ClosureNumArgsIndex 2 +#define ClosureOuterContextIndex 0 +#define ClosureStartPCIndex 1 +#define CMBlock 3 +#define CMClosedPIC 4 +#define CMFree 1 +#define CMMaxUsageCount 7 +#define CMMethod 2 +#define CMOpenPIC 5 +#define Cmp 8 +#define CmpC32R 102 +#define CmpCqR 94 +#define CmpCwR 101 +#define CmpRdRd 109 +#define CmpRR 88 +#define CompletePrimitive 4 +#define ConcreteVarBaseReg 22 +#define ConstZero 1 +#define ConvertRRd 115 +#define Debug DEBUGVM +#define DIV 26 +#define DisplacementMask 0x1F +#define DisplacementX2N 0 +#define DivRdRd 113 +#define DivRR 117 +#define DPFPReg0 -21 +#define DPFPReg1 -22 +#define DPFPReg2 -23 +#define EncounteredUnknownBytecode -6 +#define Fill32 4 +#define FirstAnnotation 64 +#define FirstJump 11 +#define FirstShortJump 15 +#define FirstSpecialSelector 176 +#define FoxCallerSavedIP 4 +#define FoxMethod -4 +#define FoxMFReceiver -12 +#define FoxSavedFP 0 +#define FoxThisContext -8 +#define FP 30 +#define FPReg -1 +#define GCModeBecome 8 +#define GCModeFull 1 +#define GCModeNewSpace 2 +#define HasBytecodePC 4 +#define HeaderIndex 0 +#define HintLoad 0 +#define HintStore 1 +#define InstanceSpecificationIndex 2 +#define InstructionPointerIndex 1 +#define InsufficientCodeSpace -2 +#define IsAbsPCReference 3 +#define IsAnnotationExtension 1 +#define IsDirectedSuperSend 9 +#define IsDisplacementX2N 0 +#define IsNSDynamicSuperSend 11 +#define IsNSSelfSend 10 +#define IsNSSendCall 6 +#define IsObjectReference 2 +#define IsRelativeCall 5 +#define IsSendCall 7 +#define IsSuperSend 8 +#define J 2 +#define JAL 3 +#define JALR 9 +#define JR 8 +#define Jump 15 +#define JumpAbove 30 +#define JumpAboveOrEqual 29 +#define JumpBelow 28 +#define JumpBelowOrEqual 31 +#define JumpCarry 22 +#define JumpFPEqual 32 +#define JumpFPGreater 36 +#define JumpFPGreaterOrEqual 37 +#define JumpFPLess 34 +#define JumpFPLessOrEqual 35 +#define JumpFPNotEqual 33 +#define JumpFPOrdered 38 +#define JumpFPUnordered 39 +#define JumpFull 11 +#define JumpGreater 26 +#define JumpGreaterOrEqual 25 +#define JumpLess 24 +#define JumpLessOrEqual 27 +#define JumpLong 12 +#define JumpLongNonZero 14 +#define JumpLongZero 13 +#define JumpNegative 18 +#define JumpNoCarry 23 +#define JumpNonNegative 19 +#define JumpNonZero 17 +#define JumpNoOverflow 21 +#define JumpOverflow 20 +#define JumpR 9 +#define JumpZero 16 +#define Label 1 +#define LargeContextSlots 62 +#define LastJump 39 +#define LB 32 +#define LBU 36 +#define LH 33 +#define LHU 37 +#define LinkReg -17 +#define Literal 2 +#define LiteralStart 1 +#define LoadEffectiveAddressMwrR 77 +#define LogicalShiftLeftCqR 84 +#define LogicalShiftLeftRR 85 +#define LogicalShiftRightCqR 82 +#define LogicalShiftRightRR 83 +#define LookupRuleDynamicSuper 0x101 +#define LookupRuleImplicit 0x100 +#define LookupRuleSelf 0 +#define LUI 15 +#define LW 35 +#define MapEnd 0 +#define MaxCompiledPrimitiveIndex 222 +#define MaxMethodSize 65535 +#define MaxNegativeErrorCode -8 +#define MaxNumArgs 15 +#define MaxStackAllocSize 1572864 +#define MaxStackCheckOffset 0xFFF +#define MaxX2NDisplacement 992 +#define MethodCacheClass 2 +#define MethodCacheMask 0x7FC +#define MethodCacheMethod 3 +#define MethodCacheSelector 1 +#define MethodIndex 3 +#define MethodTooBig -4 +#define MFHI 16 +#define MFLO 18 +#define MFMethodFlagHasContextFlag 1 +#define MFMethodFlagIsBlockFlag 2 +#define MoveAbR 43 +#define MoveAwR 41 +#define MoveC32R 65 +#define MoveCqR 63 +#define MoveCwR 64 +#define MoveHighR 119 +#define MoveLowR 118 +#define MoveM16rR 51 +#define MoveM64rRd 70 +#define MoveMbrR 59 +#define MoveMwrR 45 +#define MoveRAb 44 +#define MoveRAw 42 +#define MoveRdM64r 71 +#define MoveRdRd 69 +#define MoveRMbr 60 +#define MoveRMwr 46 +#define MoveRR 40 +#define MoveRXbrR 62 +#define MoveRXwrR 48 +#define MoveXbrRR 61 +#define MoveXwrRR 47 +#define MULT 24 +#define MULTIPLEBYTECODESETS 1 +#define MulCheckOverflowRR 122 +#define MulRdRd 112 +#define MulRR 116 +#define NegateR 79 +#define NewspeakVM 1 +#define Nop 5 +#define NoReg null +#define NotFullyInitialized -1 +#define NSCClassTagIndex 0 +#define NSCEnclosingObjectIndex 1 +#define NSCNumArgsIndex 4 +#define NSCTargetIndex 2 +#define NumObjRefsInRuntime 0 +#define NumOopsPerNSC 6 +#define NumSendTrampolines 4 +#define NumSpecialSelectors 32 +#define NumTrampolines 72 +#define OneInstruction 4 +#define OR 37 +#define ORI 13 +#define OrCqR 98 +#define OrCwR 106 +#define OrRR 92 +#define Overflow 8 +#define OverflowTemp1 9 +#define OverflowTemp2 10 +#define PCReg -19 +#define PopR 72 +#define PREF 51 +#define PrefetchAw 76 +#define PrimCallCollectsProfileSamples 8 +#define PrimCallDoNotJIT 32 +#define PrimCallMayCallBack 4 +#define PrimCallNeedsNewMethod 1 +#define PrimCallNeedsPrimitiveFunction 2 +#define PrimErrWritePastObject 17 +#define PushCq 74 +#define PushCw 75 +#define PushR 73 +#define R0 0 +#define R31 31 +#define RA 31 +#define REGIMM 1 +#define ReceiverIndex 5 +#define ReceiverResultReg -3 +#define RetN 8 +#define RISCTempReg -18 +#define S0 16 +#define S1 17 +#define S2 18 +#define S3 19 +#define S4 20 +#define S5 21 +#define S6 22 +#define S7 23 +#define SB 40 +#define Scratch0Reg -9 +#define SelectorCannotInterpret 34 +#define SelectorDoesNotUnderstand 20 +#define SenderIndex 0 +#define SendNumArgsReg -6 +#define SH 41 +#define ShouldNotJIT -8 +#define SistaVM 0 +#define SLL 0 +#define SLLV 4 +#define SLT 42 +#define SLTI 10 +#define SLTIU 11 +#define SLTU 43 +#define SmallContextSlots 22 +#define SP 29 +#define SPECIAL 0 +#define SPReg -2 +#define SqrtRd 114 +#define SRA 3 +#define SRAV 7 +#define SRL 2 +#define SRLV 6 +#define SSBaseOffset 1 +#define SSConstant 2 +#define SSRegister 3 +#define SSSpill 4 +#define StackPointerIndex 2 +#define Stop 10 +#define SUBU 35 +#define SubCheckOverflowCqR 123 +#define SubCheckOverflowRR 124 +#define SubCqR 96 +#define SubCwR 104 +#define SubRdRd 111 +#define SubRR 90 +#define SW 43 +#define T2 10 +#define TargetReg 25 +#define TempReg -4 +#define TstCqR 99 +#define UnfailingPrimitive 3 +#define UnimplementedPrimitive -7 +#define V0 2 @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
...
21
Older →

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 December 2015