Vm-dev January 2015

vm-dev@lists.squeakfoundation.org

22 participants
111 discussions

Re: compiled squeakjs
by Bert Freudenberg 19 Jan '15

19 Jan '15

Hi Florin, this sounds extremely interesting. In particular the part about using continuations to model execution flow, that thought had not occurred to me yet. Indeed, non-local returns and interruptability are the hardest to map to JS. I will have to think about this idea a while :) SqueakJS does compilation, too, by now. It has a (very simple) JIT compiler that compiles bytecodes into equivalent JavaScript, on a method-by-method basis. Read the initial comment at https://github.com/bertfreudenberg/SqueakJS/blob/master/jit.js To see it in action, open your browser's JS console and evaluate "SqueakJS.vm.method.compiled" which is the compiled version of the currently executing method. Or, if you're running a JS profiler, the generated methods will show up in that profile, too, and you can see their source. This is not a high-performance JIT yet, but it helps a lot compared to the simple interpreter. Here's the numbers on Chrome's V8: with JIT: 82315112 bytecodes/sec; 902155 sends/sec no JIT: 2775850 bytecodes/sec; 137439 sends/sec Also interesting - no JIT, before V8 deoptimization kicks in: 11494252 bytecodes/sec; 523121 sends/sec With the JIT, the code is more distributed, less polymorphic, so V8 can optimize better. Beware microbenchmarks etc, but it pays hugely to make your code "friendly" for the JS VM. Amber for example, on the same machine in the same browser, reports '2214839.4241417497 bytecodes/sec; 229042.45283018867 sends/sec' even though it directly compiles to JavaScript and does not have full Smalltalk semantics (e.g. no real thisContext, no become). I suspect deoptimization in V8. Indeed, on FireFox it reports '3007518.796992481 bytecodes/sec; 408234.4251766217 sends/sec', which is roughly the same as SqueakJS (40327662 bytecodes/sec; 516034 sends/sec). So since you're after the highest performance, it may pay off to do some experiments first. Btw, here is a very interesting talk about how to make Smalltalk-style method invocation be fast on V8. video: http://2014.jsconf.eu/speakers/vyacheslav-egorov-invokedynamic-js.html slides: http://mrale.ph/talks/jsconfeu2014/ I did not fully understand your proposal about the object memory layout, and how become would work. Also, allInstances/weak refs and finalization isn't accounted for. Do you intend this to be a fully compatible VM for Squeak? That was my goal with SqueakJS, performance being secondary (although not unimportant). SqueakJS does fully implement Squeak's execution semantics, including thisContext, non-local return, stack unwinding, DNU, process switching etc. and the object memory semantics too, including allObjects/allInstances, weak refs and finalization. Your proposed mapping to JS Arrays/Maps etc. seems to imply that it would not be fully compatible, right? Rather a Smalltalk-for-the-web with fewer compromises than Amber? Or is this even only meant as a deployment step, not as a fully self-hosted development environment? - Bert - On 18.01.2015, at 18:32, Florin Mateoc <florin.mateoc(a)gmail.com> wrote: > Hi, > > Inspired by Bert's project, I started thinking about how to get Smalltalk compiled to Javascript instead of interpreted. > I do have previous experience in compiling Smalltalk to Java (after type inference, which we thankfully don't need > here). But, the requirements are a bit tighter here: we have to take an unknown image, get it translated on the fly, > completely automatically, and even allow the translated image to self-modify. Plus we cannot just decree that become: > cannot be used > > Given that the input is an image, not sources, we'd better rely on the decompiler, so I started there. I think I fixed > it, so that it can now decompile everything correctly. > I also implemented a few AST transformations (similar to the ones that were necessary for Java, like normalizing the > various boolean constructs and making them statements). > I then started to write a Javascript pretty-printer, but I stopped when I realized that there were a few things missing: > while non-local returns and resumable exceptions can be implemented using exceptions and an explicit stack of handlers, > preemption (and Smalltalk's processes in general) were harder. After some research I came to the conclusion that this > was doable if, instead of doing a direct pretty-printing of the Smalltalk nodes to Javascript, we also used the > translation process to transform the code in continuation passing style. Then non-local returns become trivial and > preemption can be implemented with closures, without needing access to the underlying execution stack. > An interrupted context would have a no-arg closure representing the continuation instead of a pc. In general, only > preemption points (which all have a corresponding continuation closure) would have to be mapped, and this would happen > at image read time as well. The exception would be the debugger - I am not sure about that one yet. > The primitive code would be inlined in the primitive methods, followed by a preemption point and the failure code. > Unfortunately invocation would still not be direct, but looked up (and invoking DNU if needed), but I would store all > the translated methods directly in the class prototype, so there would be no need for explicit superclass chain lookup. > The instvars would also be stored directly in the class prototype (but with a prefix, to not conflict with the methods > or with reserved keywords), and they would be accessed directly (with dot notation), except for assignments, which would > record the owner (and the index in the owner), for all non-primitive types (not sure what to do about strings). > Every method (and formerly Smalltalk block closure) would have a single temp called "thisContext", which would be an > owner for the actual temps. The owners info would be used for implementing become: and allReferences. > > The ProtoObject and Object methods coming from Smalltalk would be stored in Object.prototype. Proxy classes would have > their prototypes cleared and only contain the ProtoObject methods. > Primitive type classes would have to be massaged a little: Number would have a union of methods from the Smalltalk > Number subclasses, as well as the methods inherited from Magnitude. > String would also have the methods inherited from Collection and SequenceableCollection, as well as from Character (and > Magnitude) and Symbol - this one could be a little nastier, but I think it could be made to work. > I would also map Array to Array, IdentitySet to Set and IdentityDictionary to Map. Weak collections are harder, because > Javascript decided to make them not enumerable. Because of this, allInstances would also be a challenge. > > I am not sure yet about the bootstrap process. I just have a fuzzy feeling that Craig's Context running under SqueakJS > might make it easier. > > I hope this gives a general idea about the approach. Please do point out weaknesses that I may have missed. For me this > is fun and I will proceed slowly, as time permits, since I cannot do it at work. > Of course, I am very interested to hear Bert's opinion :) > > Florin

1 0

[commit][3232] Fix stupid, stupid bug in copying vm profile samples between buffers when the
by commits＠squeakvm.org 19 Jan '15

19 Jan '15

Revision: 3232 Author: eliot Date: 2015-01-18 19:36:05 -0800 (Sun, 18 Jan 2015) Log Message: ----------- Fix stupid, stupid bug in copying vm profile samples between buffers when the circular buffer index has wrapped. No longer build the newspeak.cog.v3 installers. Modified Paths: -------------- branches/Cog/build.macos32x86/makeproductinstall branches/Cog/build.win32x86/makeproductinstall branches/Cog/platforms/unix/vm/sqUnixVMProfile.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/makeproductinstall =================================================================== --- branches/Cog/build.macos32x86/makeproductinstall 2015-01-18 01:07:07 UTC (rev 3231) +++ branches/Cog/build.macos32x86/makeproductinstall 2015-01-19 03:36:05 UTC (rev 3232) @@ -6,7 +6,7 @@ | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` TAG=`date +%y.%U.`$REV set -- Newspeak\ Virtual\ Machine Newspeak\ Spur\ Virtual\ Machine -for td in newspeak.cog.v3 newspeak.cog.spur; do +for td in newspeak.cog.spur; do d=$td/installer PRODUCT=$1-$TAG.dmg if test -d "$d"; then Modified: branches/Cog/build.win32x86/makeproductinstall =================================================================== --- branches/Cog/build.win32x86/makeproductinstall 2015-01-18 01:07:07 UTC (rev 3231) +++ branches/Cog/build.win32x86/makeproductinstall 2015-01-19 03:36:05 UTC (rev 3232) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -for d in newspeak.cog.spur/installer newspeak.cog.v3/installer; do +for d in newspeak.cog.spur/installer; do if test -d "$d"; then (cd $d;make) else Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jan 17 17:06:40 PST 2015 + Sun Jan 18 19:36:21 PST 2015 Modified: branches/Cog/platforms/unix/vm/sqUnixVMProfile.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2015-01-18 01:07:07 UTC (rev 3231) +++ branches/Cog/platforms/unix/vm/sqUnixVMProfile.c 2015-01-19 03:36:05 UTC (rev 3232) @@ -250,7 +250,7 @@ memcpy(sampleBuffer, pc_buffer + pc_buffer_index, (pc_buffer_size - pc_buffer_index) * sizeof(pctype)); - memcpy((pctype *)sampleBuffer + pc_buffer_index, + memcpy((pctype *)sampleBuffer + (pc_buffer_size - pc_buffer_index), pc_buffer, pc_buffer_index * sizeof(pctype)); return pc_buffer_size;

1 0

Re: [squeak-dev] compiled squeakjs
by Eliot Miranda 19 Jan '15

19 Jan '15

Hi Florin, On Jan 18, 2015, at 9:32 AM, Florin Mateoc <florin.mateoc(a)gmail.com> wrote: > Hi, > > Inspired by Bert's project, I started thinking about how to get Smalltalk compiled to Javascript instead of interpreted. > I do have previous experience in compiling Smalltalk to Java (after type inference, which we thankfully don't need > here). But, the requirements are a bit tighter here: we have to take an unknown image, get it translated on the fly, > completely automatically, and even allow the translated image to self-modify. Plus we cannot just decree that become: > cannot be used > > Given that the input is an image, not sources, we'd better rely on the decompiler, so I started there. I think I fixed > it, so that it can now decompile everything correctly. > I also implemented a few AST transformations (similar to the ones that were necessary for Java, like normalizing the > various boolean constructs and making them statements). > I then started to write a Javascript pretty-printer, but I stopped when I realized that there were a few things missing: > while non-local returns and resumable exceptions can be implemented using exceptions and an explicit stack of handlers, > preemption (and Smalltalk's processes in general) were harder. After some research I came to the conclusion that this > was doable if, instead of doing a direct pretty-printing of the Smalltalk nodes to Javascript, we also used the > translation process to transform the code in continuation passing style. Then non-local returns become trivial and > preemption can be implemented with closures, without needing access to the underlying execution stack. > An interrupted context would have a no-arg closure representing the continuation instead of a pc. In general, only > preemption points (which all have a corresponding continuation closure) would have to be mapped, and this would happen > at image read time as well. The exception would be the debugger - I am not sure about that one yet. > The primitive code would be inlined in the primitive methods, followed by a preemption point and the failure code. > Unfortunately invocation would still not be direct, but looked up (and invoking DNU if needed), but I would store all > the translated methods directly in the class prototype, so there would be no need for explicit superclass chain lookup. > The instvars would also be stored directly in the class prototype (but with a prefix, to not conflict with the methods > or with reserved keywords), and they would be accessed directly (with dot notation), except for assignments, which would > record the owner (and the index in the owner), for all non-primitive types (not sure what to do about strings). > Every method (and formerly Smalltalk block closure) would have a single temp called "thisContext", which would be an > owner for the actual temps. The owners info would be used for implementing become: and allReferences. > > The ProtoObject and Object methods coming from Smalltalk would be stored in Object.prototype. Proxy classes would have > their prototypes cleared and only contain the ProtoObject methods. > Primitive type classes would have to be massaged a little: Number would have a union of methods from the Smalltalk > Number subclasses, as well as the methods inherited from Magnitude. > String would also have the methods inherited from Collection and SequenceableCollection, as well as from Character (and > Magnitude) and Symbol - this one could be a little nastier, but I think it could be made to work. > I would also map Array to Array, IdentitySet to Set and IdentityDictionary to Map. Weak collections are harder, because > Javascript decided to make them not enumerable. Because of this, allInstances would also be a challenge. > > I am not sure yet about the bootstrap process. I just have a fuzzy feeling that Craig's Context running under SqueakJS > might make it easier. > > I hope this gives a general idea about the approach. Please do point out weaknesses that I may have missed. For me this > is fun and I will proceed slowly, as time permits, since I cannot do it at work. > Of course, I am very interested to hear Bert's opinion :) I like your approach, that if making everything work, not taking the simpe approach of translating what will work directly and disallowing the rest (as does Amber and Clamato etc). You might want to talk to Ryan Macnak and Gilad Bracha about their Newspeak implementation above JavaScript (they're also doing one above Dart). I do think Bert's approach is fun, too. But I do feel extremely frustrated that no one is taking the obvious route of making a plugin to allow the Cog VM to be used directly, gaining much higher performance and reducing the number of execution platforms we have to support. A plugin would use JavaScript to collect events, to render and to access the DOM (all of this code can be stolen from Bert's VM). The JavaScript component would connect to the VM via a socket. The VM itself would be quite small (it's already only around a megabyte of executable). For me arguments about the inconvenience and slowness of downloading and installing are not compelling given the ubiquity of Flash. And then there really is /no/ difference in the execution semantics, and /no/ performance degradation, and the code is as portable as Bert's VM provided Cig runs on the platform. I'd be doing this myself if I weren't working on getting Spur released, getting 64-but Spur working, working with Clément on Sista and looking at hosting Cog over Xen. Come on folks; someone out there must think this is useful and interesting. > Florin

5 8

[commit][3231] CogVM source as per VMMaker.oscog-eem.1023
by commits＠squeakvm.org 18 Jan '15

18 Jan '15

Revision: 3231 Author: eliot Date: 2015-01-17 17:07:07 -0800 (Sat, 17 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1023 Spur: Rename and correct ensureSemaphoreForwardedThroughContext: to ensureSemaphoreUnforwardedThroughContext:, its intended function. Make shouldRemapObj: filter-out objects already in newSpace since mapStackPages, via mapInterpreterOops, can visit objects twice in a scavenge, GC, compact sequence. General: Speed up assert engines by using addressIsInPage: instead of stackPageFor:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.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/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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-01-18 01:07:07 UTC (rev 3231) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 from - CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2101,7 +2101,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1022"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1023"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4835,7 +4835,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4853,7 +4852,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l300: /* end baseFrameReturn */; goto l299; } @@ -13472,10 +13471,9 @@ sqInt methodField1; sqInt theIP; - assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); + assertl(addressIsInPage(GIV(stackPage), lifp), ln); assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); - assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); assertl(lisp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset())), ln); @@ -20379,7 +20377,7 @@ null; return 0; } - /* begin ensureSemaphoreForwardedThroughContext: */ + /* begin ensureSemaphoreUnforwardedThroughContext: */ return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -22723,12 +22721,10 @@ ok = 0; } if (asserta(!(isFree(page)))) { - if (!(asserta((stackPageFor((page->baseFP))) == page))) { + if (!(asserta((addressIsInPage(page, (page->baseFP))) + && (addressIsInPage(page, (page->headSP)))))) { ok = 0; } - if (!(asserta((stackPageFor((page->headSP))) == page))) { - ok = 0; - } } else { ok = 0; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-01-18 01:07:07 UTC (rev 3231) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-18 01:07:07 UTC (rev 3231) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 from - CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2104,7 +2104,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1022"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1023"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4844,7 +4844,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4862,7 +4861,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l300: /* end baseFrameReturn */; goto l299; } @@ -13481,10 +13480,9 @@ sqInt methodField1; sqInt theIP; - assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); + assertl(addressIsInPage(GIV(stackPage), lifp), ln); assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); - assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); assertl(lisp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset())), ln); @@ -20388,7 +20386,7 @@ null; return 0; } - /* begin ensureSemaphoreForwardedThroughContext: */ + /* begin ensureSemaphoreUnforwardedThroughContext: */ return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -22732,12 +22730,10 @@ ok = 0; } if (asserta(!(isFree(page)))) { - if (!(asserta((stackPageFor((page->baseFP))) == page))) { + if (!(asserta((addressIsInPage(page, (page->baseFP))) + && (addressIsInPage(page, (page->headSP)))))) { ok = 0; } - if (!(asserta((stackPageFor((page->headSP))) == page))) { - ok = 0; - } } else { ok = 0; Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-01-18 01:07:07 UTC (rev 3231) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 from - CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2354,7 +2354,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.1022"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1023"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8860,7 +8860,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8920,7 +8920,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11606,7 +11606,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11666,7 +11666,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -14617,10 +14617,9 @@ sqInt methodField1; sqInt theIP; - assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); + assertl(addressIsInPage(GIV(stackPage), lifp), ln); assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); - assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); assertl(lisp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset())), ln); @@ -18998,8 +18997,8 @@ if ((selector != 0) && (((selector & 3) == 0) && ((((longAt(selector)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selector)))), - isReallyYoungObject(selector)))))) { + || ((isReallyYoungObject(selector)) + && (!(oopisGreaterThanOrEqualToandLessThan(selector, ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -19009,8 +19008,8 @@ if ((selector != 0) && (((selector & 3) == 0) && ((((longAt(selector)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selector)))), - isReallyYoungObject(selector)))))) { + || ((isReallyYoungObject(selector)) + && (!(oopisGreaterThanOrEqualToandLessThan(selector, ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -19061,8 +19060,8 @@ oop = longAt(theSP); if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { longAtput(theSP, remapObj(oop)); } theSP += BytesPerWord; @@ -19071,8 +19070,8 @@ ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { if ((((longAt(longAt(theFP + FoxThisContext))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(longAt(theFP + FoxThisContext))))), - isReallyYoungObject(longAt(theFP + FoxThisContext))))) { + || ((isReallyYoungObject(longAt(theFP + FoxThisContext))) + && (!(oopisGreaterThanOrEqualToandLessThan(longAt(theFP + FoxThisContext), ((futureSpace()).start), futureSurvivorStart()))))) { longAtput(theFP + FoxThisContext, remapObj(longAt(theFP + FoxThisContext))); } assert((isMarriedOrWidowedContext(frameContext(theFP))) @@ -19081,8 +19080,8 @@ } if (!((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()))) { if ((((longAt(longAt(theFP + FoxMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(longAt(theFP + FoxMethod))))), - isReallyYoungObject(longAt(theFP + FoxMethod))))) { + || ((isReallyYoungObject(longAt(theFP + FoxMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(longAt(theFP + FoxMethod), ((futureSpace()).start), futureSurvivorStart()))))) { if (theIPPtr != 0) { theIP = longAt(theIPPtr); if (theIP == (ceReturnToInterpreterPC())) { @@ -19110,8 +19109,8 @@ oop = longAt(theSP); if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { longAtput(theSP, remapObj(oop)); } theSP += BytesPerWord; @@ -19147,15 +19146,15 @@ intOrClass = GIV(traceLog)[i]; if (((intOrClass & 3) == 0) && ((((longAt(intOrClass)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(intOrClass)))), - isReallyYoungObject(intOrClass))))) { + || ((isReallyYoungObject(intOrClass)) + && (!(oopisGreaterThanOrEqualToandLessThan(intOrClass, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(traceLog)[i] = (remapObj(intOrClass)); } selectorOrMethod = GIV(traceLog)[i + 1]; if (((selectorOrMethod & 3) == 0) && ((((longAt(selectorOrMethod)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selectorOrMethod)))), - isReallyYoungObject(selectorOrMethod))))) { + || ((isReallyYoungObject(selectorOrMethod)) + && (!(oopisGreaterThanOrEqualToandLessThan(selectorOrMethod, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(traceLog)[i + 1] = (remapObj(selectorOrMethod)); } } @@ -24791,7 +24790,10 @@ static sqInt synchronousSignal(sqInt aSemaphore) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt ctxt; sqInt excessSignals; + sqInt proc; + sqInt referent; if (isEmptyList(aSemaphore)) { @@ -24813,14 +24815,39 @@ null; return 0; } - /* begin ensureSemaphoreForwardedThroughContext: */ - if (isForwarded(longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))))) { + /* begin ensureSemaphoreUnforwardedThroughContext: */ + proc = longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + if (((longAt(proc)) & (0x3FFFFF - 8)) == 0) { + followForwardedObjectFieldstoDepth(aSemaphore, 1); + proc = longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + } + assert(!((isForwarded(proc)))); + ctxt = longAt((proc + BaseHeaderSize) + (SuspendedContextIndex << (shiftForWord()))); + if (((longAt(ctxt)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(ctxt)); + referent = longAt((ctxt + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + ctxt = referent; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(proc))); + if (isOldObject(proc)) { - /* 0 = aSemaphore, 1 = aProcess. Hence references to suspendedContext will /not/ be forwarded. */ + /* most stores into young objects */ - followForwardedObjectFieldstoDepth(aSemaphore, 1); + if (((ctxt & 3) == 0) + && ((((usqInt) ctxt)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(proc))) >> 29) & 1) != 0)) { + remember(proc); + } + } + } + longAtput((proc + BaseHeaderSize) + (SuspendedContextIndex << (shiftForWord())), ctxt); } - assert(!((isForwarded(fetchPointerofObject(SuspendedContextIndex, fetchPointerofObject(FirstLinkIndex, aSemaphore)))))); return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -27583,12 +27610,10 @@ ok = 0; } if (asserta(!(isFree(page)))) { - if (!(asserta((stackPageFor((page->baseFP))) == page))) { + if (!(asserta((addressIsInPage(page, (page->baseFP))) + && (addressIsInPage(page, (page->headSP)))))) { ok = 0; } - if (!(asserta((stackPageFor((page->headSP))) == page))) { - ok = 0; - } } else { ok = 0; @@ -29341,7 +29366,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29388,7 +29413,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -42045,8 +42070,8 @@ mapInterpreterOops(); /* begin mapExtraRoots */ if ((((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(specialObjectsOop))))), - isReallyYoungObject(GIV(specialObjectsOop))))) { + || ((isReallyYoungObject(GIV(specialObjectsOop))) + && (!(isInFutureSpace(GIV(specialObjectsOop)))))) { GIV(specialObjectsOop) = remapObj(GIV(specialObjectsOop)); } assert(GIV(remapBufferCount) == 0); @@ -42055,8 +42080,8 @@ if (!(((oop & 3) != 0) || (((longAt(oop)) & 0x3FFFFF) == 0))) { if ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))) { + || ((isReallyYoungObject(oop)) + && (!(isInFutureSpace(oop))))) { (GIV(extraRoots)[i])[0] = (remapObj(oop)); } } @@ -49721,14 +49746,21 @@ && ((((longAt(objOop)) & 0x3FFFFF) == 0) && ((oopisLessThanOrEqualTo(addressAfter(objOop), GIV(endOfMemory))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) - && (((bytesInObject(objOop)) < (32 * 8)) + || (((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0))) + && ((!((bytesInObject(objOop)) >= (32 * 8))) || (((((chunk = longAt((objOop + BaseHeaderSize) + (2 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (3 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && ((((chunk = longAt((objOop + BaseHeaderSize) + (4 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)))))))); + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))))))))); } @@ -60358,14 +60390,19 @@ /* Answer if the obj should be scavenged (or simply followed). The method is - called shouldRemapObj: for compatibility with ObjectMemory. */ + called shouldRemapObj: for compatibility with ObjectMemory. We test for + being already + scavenged because mapStackPages via mapInterpeeterOops may be applied + twice in the context of a global GC where a scavenge, followed by a + scan-mark-free, and + final compaction passes may result in scvenged fields being visited twice. */ sqInt shouldRemapObj(sqInt objOop) { return (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(objOop)))), - isReallyYoungObject(objOop))); + || ((isReallyYoungObject(objOop)) + && (!(oopisGreaterThanOrEqualToandLessThan(objOop, ((futureSpace()).start), futureSurvivorStart())))); } @@ -60377,8 +60414,8 @@ { return ((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))); + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart()))))); } @@ -67685,8 +67722,8 @@ mapPrimTraceLog(); /* begin mapVMRegisters */ if ((((longAt(GIV(method))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(method))))), - isReallyYoungObject(GIV(method))))) { + || ((isReallyYoungObject(GIV(method))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(method), ((futureSpace()).start), futureSurvivorStart()))))) { /* i.e. interpreter instructionPointer in method as opposed to machine code? */ @@ -67700,8 +67737,8 @@ } if (((GIV(newMethod) & 3) == 0) && ((((longAt(GIV(newMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(newMethod))))), - isReallyYoungObject(GIV(newMethod)))))) { + || ((isReallyYoungObject(GIV(newMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(newMethod), ((futureSpace()).start), futureSurvivorStart())))))) { /* maybe oop due to object-as-method */ @@ -67709,18 +67746,18 @@ } /* begin mapProfileState */ if ((((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileProcess))))), - isReallyYoungObject(GIV(profileProcess))))) { + || ((isReallyYoungObject(GIV(profileProcess))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileProcess), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileProcess) = remapObj(GIV(profileProcess)); } if ((((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileMethod))))), - isReallyYoungObject(GIV(profileMethod))))) { + || ((isReallyYoungObject(GIV(profileMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileMethod), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileSemaphore))))), - isReallyYoungObject(GIV(profileSemaphore))))) { + || ((isReallyYoungObject(GIV(profileSemaphore))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileSemaphore), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileSemaphore) = remapObj(GIV(profileSemaphore)); } sqLowLevelMFence(); @@ -67730,8 +67767,8 @@ } else { if ((((longAt(GIV(longRunningPrimitiveCheckMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(longRunningPrimitiveCheckMethod))))), - isReallyYoungObject(GIV(longRunningPrimitiveCheckMethod))))) { + || ((isReallyYoungObject(GIV(longRunningPrimitiveCheckMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(longRunningPrimitiveCheckMethod), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(longRunningPrimitiveCheckMethod) = remapObj(GIV(longRunningPrimitiveCheckMethod)); } } @@ -67739,8 +67776,8 @@ } if (!(GIV(longRunningPrimitiveCheckSemaphore) == null)) { if ((((longAt(GIV(longRunningPrimitiveCheckSemaphore))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(longRunningPrimitiveCheckSemaphore))))), - isReallyYoungObject(GIV(longRunningPrimitiveCheckSemaphore))))) { + || ((isReallyYoungObject(GIV(longRunningPrimitiveCheckSemaphore))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(longRunningPrimitiveCheckSemaphore), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(longRunningPrimitiveCheckSemaphore) = remapObj(GIV(longRunningPrimitiveCheckSemaphore)); } } @@ -67749,29 +67786,29 @@ oop = GIV(suspendedCallbacks)[i]; if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(suspendedCallbacks)[i] = (remapObj(oop)); } oop = GIV(suspendedMethods)[i]; if ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart()))))) { GIV(suspendedMethods)[i] = (remapObj(oop)); } } if ((GIV(tempOop) != 0) && (((GIV(tempOop) & 3) == 0) && ((((longAt(GIV(tempOop))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(tempOop))))), - isReallyYoungObject(GIV(tempOop))))))) { + || ((isReallyYoungObject(GIV(tempOop))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(tempOop), ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(tempOop) = remapObj(GIV(tempOop)); } if ((GIV(tempOop2) != 0) && (((GIV(tempOop2) & 3) == 0) && ((((longAt(GIV(tempOop2))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(tempOop2))))), - isReallyYoungObject(GIV(tempOop2))))))) { + || ((isReallyYoungObject(GIV(tempOop2))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(tempOop2), ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(tempOop2) = remapObj(GIV(tempOop2)); } } Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-01-18 01:07:07 UTC (rev 3231) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-01-18 01:07:07 UTC (rev 3231) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 from - CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2357,7 +2357,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.1022"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1023"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -8869,7 +8869,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8929,7 +8929,7 @@ null; goto l76; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -11615,7 +11615,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -11675,7 +11675,7 @@ null; goto l183; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -14626,10 +14626,9 @@ sqInt methodField1; sqInt theIP; - assertl(GIV(stackPage) == (stackPageFor(lifp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); + assertl(addressIsInPage(GIV(stackPage), lifp), ln); assert(deferStackLimitSmashAroundwith(assertValidStackLimits, ln)); - assertl(lifp < ((GIV(stackPage)->baseAddress)), ln); assertl(lisp < lifp, ln); assertl(lifp > lisp, ln); assertl(lisp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset())), ln); @@ -19007,8 +19006,8 @@ if ((selector != 0) && (((selector & 3) == 0) && ((((longAt(selector)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selector)))), - isReallyYoungObject(selector)))))) { + || ((isReallyYoungObject(selector)) + && (!(oopisGreaterThanOrEqualToandLessThan(selector, ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -19018,8 +19017,8 @@ if ((selector != 0) && (((selector & 3) == 0) && ((((longAt(selector)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selector)))), - isReallyYoungObject(selector)))))) { + || ((isReallyYoungObject(selector)) + && (!(oopisGreaterThanOrEqualToandLessThan(selector, ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -19070,8 +19069,8 @@ oop = longAt(theSP); if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { longAtput(theSP, remapObj(oop)); } theSP += BytesPerWord; @@ -19080,8 +19079,8 @@ ? ((longAt(theFP + FoxMethod)) & MFMethodFlagHasContextFlag) != 0 : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { if ((((longAt(longAt(theFP + FoxThisContext))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(longAt(theFP + FoxThisContext))))), - isReallyYoungObject(longAt(theFP + FoxThisContext))))) { + || ((isReallyYoungObject(longAt(theFP + FoxThisContext))) + && (!(oopisGreaterThanOrEqualToandLessThan(longAt(theFP + FoxThisContext), ((futureSpace()).start), futureSurvivorStart()))))) { longAtput(theFP + FoxThisContext, remapObj(longAt(theFP + FoxThisContext))); } assert((isMarriedOrWidowedContext(frameContext(theFP))) @@ -19090,8 +19089,8 @@ } if (!((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()))) { if ((((longAt(longAt(theFP + FoxMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(longAt(theFP + FoxMethod))))), - isReallyYoungObject(longAt(theFP + FoxMethod))))) { + || ((isReallyYoungObject(longAt(theFP + FoxMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(longAt(theFP + FoxMethod), ((futureSpace()).start), futureSurvivorStart()))))) { if (theIPPtr != 0) { theIP = longAt(theIPPtr); if (theIP == (ceReturnToInterpreterPC())) { @@ -19119,8 +19118,8 @@ oop = longAt(theSP); if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { longAtput(theSP, remapObj(oop)); } theSP += BytesPerWord; @@ -19156,15 +19155,15 @@ intOrClass = GIV(traceLog)[i]; if (((intOrClass & 3) == 0) && ((((longAt(intOrClass)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(intOrClass)))), - isReallyYoungObject(intOrClass))))) { + || ((isReallyYoungObject(intOrClass)) + && (!(oopisGreaterThanOrEqualToandLessThan(intOrClass, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(traceLog)[i] = (remapObj(intOrClass)); } selectorOrMethod = GIV(traceLog)[i + 1]; if (((selectorOrMethod & 3) == 0) && ((((longAt(selectorOrMethod)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(selectorOrMethod)))), - isReallyYoungObject(selectorOrMethod))))) { + || ((isReallyYoungObject(selectorOrMethod)) + && (!(oopisGreaterThanOrEqualToandLessThan(selectorOrMethod, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(traceLog)[i + 1] = (remapObj(selectorOrMethod)); } } @@ -24800,7 +24799,10 @@ static sqInt synchronousSignal(sqInt aSemaphore) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt ctxt; sqInt excessSignals; + sqInt proc; + sqInt referent; if (isEmptyList(aSemaphore)) { @@ -24822,14 +24824,39 @@ null; return 0; } - /* begin ensureSemaphoreForwardedThroughContext: */ - if (isForwarded(longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))))) { + /* begin ensureSemaphoreUnforwardedThroughContext: */ + proc = longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + if (((longAt(proc)) & (0x3FFFFF - 8)) == 0) { + followForwardedObjectFieldstoDepth(aSemaphore, 1); + proc = longAt((aSemaphore + BaseHeaderSize) + (FirstLinkIndex << (shiftForWord()))); + } + assert(!((isForwarded(proc)))); + ctxt = longAt((proc + BaseHeaderSize) + (SuspendedContextIndex << (shiftForWord()))); + if (((longAt(ctxt)) & (0x3FFFFF - 8)) == 0) { + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(ctxt)); + referent = longAt((ctxt + BaseHeaderSize) + (0 << (shiftForWord()))); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + BaseHeaderSize) + (0 << (shiftForWord()))); + } + ctxt = referent; + /* begin storePointer:ofObject:withValue: */ + assert(!(isForwarded(proc))); + if (isOldObject(proc)) { - /* 0 = aSemaphore, 1 = aProcess. Hence references to suspendedContext will /not/ be forwarded. */ + /* most stores into young objects */ - followForwardedObjectFieldstoDepth(aSemaphore, 1); + if (((ctxt & 3) == 0) + && ((((usqInt) ctxt)) < (((usqInt) GIV(newSpaceLimit))))) { + /* begin possibleRootStoreInto: */ + if (!(((((usqInt) (longAt(proc))) >> 29) & 1) != 0)) { + remember(proc); + } + } + } + longAtput((proc + BaseHeaderSize) + (SuspendedContextIndex << (shiftForWord())), ctxt); } - assert(!((isForwarded(fetchPointerofObject(SuspendedContextIndex, fetchPointerofObject(FirstLinkIndex, aSemaphore)))))); return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -27592,12 +27619,10 @@ ok = 0; } if (asserta(!(isFree(page)))) { - if (!(asserta((stackPageFor((page->baseFP))) == page))) { + if (!(asserta((addressIsInPage(page, (page->baseFP))) + && (addressIsInPage(page, (page->headSP)))))) { ok = 0; } - if (!(asserta((stackPageFor((page->headSP))) == page))) { - ok = 0; - } } else { ok = 0; @@ -29350,7 +29375,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -29397,7 +29422,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -42054,8 +42079,8 @@ mapInterpreterOops(); /* begin mapExtraRoots */ if ((((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(specialObjectsOop))))), - isReallyYoungObject(GIV(specialObjectsOop))))) { + || ((isReallyYoungObject(GIV(specialObjectsOop))) + && (!(isInFutureSpace(GIV(specialObjectsOop)))))) { GIV(specialObjectsOop) = remapObj(GIV(specialObjectsOop)); } assert(GIV(remapBufferCount) == 0); @@ -42064,8 +42089,8 @@ if (!(((oop & 3) != 0) || (((longAt(oop)) & 0x3FFFFF) == 0))) { if ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))) { + || ((isReallyYoungObject(oop)) + && (!(isInFutureSpace(oop))))) { (GIV(extraRoots)[i])[0] = (remapObj(oop)); } } @@ -49730,14 +49755,21 @@ && ((((longAt(objOop)) & 0x3FFFFF) == 0) && ((oopisLessThanOrEqualTo(addressAfter(objOop), GIV(endOfMemory))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) - && (((bytesInObject(objOop)) < (32 * 8)) + || (((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0))) + && ((!((bytesInObject(objOop)) >= (32 * 8))) || (((((chunk = longAt((objOop + BaseHeaderSize) + (2 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (3 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && ((((chunk = longAt((objOop + BaseHeaderSize) + (4 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)))))))); + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))))))))); } @@ -60367,14 +60399,19 @@ /* Answer if the obj should be scavenged (or simply followed). The method is - called shouldRemapObj: for compatibility with ObjectMemory. */ + called shouldRemapObj: for compatibility with ObjectMemory. We test for + being already + scavenged because mapStackPages via mapInterpeeterOops may be applied + twice in the context of a global GC where a scavenge, followed by a + scan-mark-free, and + final compaction passes may result in scvenged fields being visited twice. */ sqInt shouldRemapObj(sqInt objOop) { return (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(objOop)))), - isReallyYoungObject(objOop))); + || ((isReallyYoungObject(objOop)) + && (!(oopisGreaterThanOrEqualToandLessThan(objOop, ((futureSpace()).start), futureSurvivorStart())))); } @@ -60386,8 +60423,8 @@ { return ((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))); + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart()))))); } @@ -67694,8 +67731,8 @@ mapPrimTraceLog(); /* begin mapVMRegisters */ if ((((longAt(GIV(method))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(method))))), - isReallyYoungObject(GIV(method))))) { + || ((isReallyYoungObject(GIV(method))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(method), ((futureSpace()).start), futureSurvivorStart()))))) { /* i.e. interpreter instructionPointer in method as opposed to machine code? */ @@ -67709,8 +67746,8 @@ } if (((GIV(newMethod) & 3) == 0) && ((((longAt(GIV(newMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(newMethod))))), - isReallyYoungObject(GIV(newMethod)))))) { + || ((isReallyYoungObject(GIV(newMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(newMethod), ((futureSpace()).start), futureSurvivorStart())))))) { /* maybe oop due to object-as-method */ @@ -67718,18 +67755,18 @@ } /* begin mapProfileState */ if ((((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileProcess))))), - isReallyYoungObject(GIV(profileProcess))))) { + || ((isReallyYoungObject(GIV(profileProcess))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileProcess), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileProcess) = remapObj(GIV(profileProcess)); } if ((((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileMethod))))), - isReallyYoungObject(GIV(profileMethod))))) { + || ((isReallyYoungObject(GIV(profileMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileMethod), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileSemaphore))))), - isReallyYoungObject(GIV(profileSemaphore))))) { + || ((isReallyYoungObject(GIV(profileSemaphore))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileSemaphore), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileSemaphore) = remapObj(GIV(profileSemaphore)); } sqLowLevelMFence(); @@ -67739,8 +67776,8 @@ } else { if ((((longAt(GIV(longRunningPrimitiveCheckMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(longRunningPrimitiveCheckMethod))))), - isReallyYoungObject(GIV(longRunningPrimitiveCheckMethod))))) { + || ((isReallyYoungObject(GIV(longRunningPrimitiveCheckMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(longRunningPrimitiveCheckMethod), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(longRunningPrimitiveCheckMethod) = remapObj(GIV(longRunningPrimitiveCheckMethod)); } } @@ -67748,8 +67785,8 @@ } if (!(GIV(longRunningPrimitiveCheckSemaphore) == null)) { if ((((longAt(GIV(longRunningPrimitiveCheckSemaphore))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(longRunningPrimitiveCheckSemaphore))))), - isReallyYoungObject(GIV(longRunningPrimitiveCheckSemaphore))))) { + || ((isReallyYoungObject(GIV(longRunningPrimitiveCheckSemaphore))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(longRunningPrimitiveCheckSemaphore), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(longRunningPrimitiveCheckSemaphore) = remapObj(GIV(longRunningPrimitiveCheckSemaphore)); } } @@ -67758,29 +67795,29 @@ oop = GIV(suspendedCallbacks)[i]; if (((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop))))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart())))))) { GIV(suspendedCallbacks)[i] = (remapObj(oop)); } oop = GIV(suspendedMethods)[i]; if ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isReallyYoungObject(oop)))) { + || ((isReallyYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart()))))) { GIV(suspendedMethods)[i] = (remapObj(oop)); } } if ((GIV(tempOop) != 0) && (((GIV(tempOop) & 3) == 0) && ((((longAt(GIV(tempOop))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(tempOop))))), - isReallyYoungObject(GIV(tempOop))))))) { + || ((isReallyYoungObject(GIV(tempOop))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(tempOop), ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(tempOop) = remapObj(GIV(tempOop)); } if ((GIV(tempOop2) != 0) && (((GIV(tempOop2) & 3) == 0) && ((((longAt(GIV(tempOop2))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(tempOop2))))), - isReallyYoungObject(GIV(tempOop2))))))) { + || ((isReallyYoungObject(GIV(tempOop2))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(tempOop2), ((futureSpace()).start), futureSurvivorStart()))))))) { GIV(tempOop2) = remapObj(GIV(tempOop2)); } } Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-15 21:47:03 UTC (rev 3230) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-01-18 01:07:07 UTC (rev 3231) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 from - StackInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac + StackInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1023 uuid: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2102,7 +2102,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1022"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1023"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -26289,12 +26289,10 @@ ok = 0; } if (asserta(!(isFree(page)))) { - if (!(asserta((stackPageFor((page->baseFP))) == page))) { + if (!(asserta((addressIsInPage(page, (page->baseFP))) + && (addressIsInPage(page, (page->headSP)))))) { ok = 0; } - if (!(asserta((stackPageFor((page->headSP))) == page))) { - ok = 0; - } } else { ok = 0; @@ -28231,8 +28229,8 @@ mapInterpreterOops(); /* begin mapExtraRoots */ if ((((longAt(GIV(specialObjectsOop))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(specialObjectsOop))))), - isYoungObject(GIV(specialObjectsOop))))) { + || ((isYoungObject(GIV(specialObjectsOop))) + && (!(isInFutureSpace(GIV(specialObjectsOop)))))) { GIV(specialObjectsOop) = remapObj(GIV(specialObjectsOop)); } assert(GIV(remapBufferCount) == 0); @@ -28241,8 +28239,8 @@ if (!(((oop & 3) != 0) || (((longAt(oop)) & 0x3FFFFF) == 0))) { if ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isYoungObject(oop)))) { + || ((isYoungObject(oop)) + && (!(isInFutureSpace(oop))))) { (GIV(extraRoots)[i])[0] = (remapObj(oop)); } } @@ -35964,14 +35962,21 @@ && ((((longAt(objOop)) & 0x3FFFFF) == 0) && ((oopisLessThanOrEqualTo(addressAfter(objOop), GIV(endOfMemory))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (0 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) - && (((bytesInObject(objOop)) < (32 * 8)) + || (((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0))) + && ((!((bytesInObject(objOop)) >= (32 * 8))) || (((((chunk = longAt((objOop + BaseHeaderSize) + (2 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && (((((chunk = longAt((objOop + BaseHeaderSize) + (3 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)) + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))) && ((((chunk = longAt((objOop + BaseHeaderSize) + (4 << (shiftForWord()))))) == 0) - || (((longAt(chunk)) & 0x3FFFFF) == 0)))))))); + || ((((chunk & 3) == 0) + && (((longAt(chunk)) & 0x3FFFFF) == 0)) + && ((bytesInObject(chunk)) >= (32 * 8)))))))))); } @@ -46457,14 +46462,19 @@ /* Answer if the obj should be scavenged (or simply followed). The method is - called shouldRemapObj: for compatibility with ObjectMemory. */ + called shouldRemapObj: for compatibility with ObjectMemory. We test for + being already + scavenged because mapStackPages via mapInterpeeterOops may be applied + twice in the context of a global GC where a scavenge, followed by a + scan-mark-free, and + final compaction passes may result in scvenged fields being visited twice. */ sqInt shouldRemapObj(sqInt objOop) { return (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(objOop)))), - isYoungObject(objOop))); + || ((isYoungObject(objOop)) + && (!(oopisGreaterThanOrEqualToandLessThan(objOop, ((futureSpace()).start), futureSurvivorStart())))); } @@ -46476,8 +46486,8 @@ { return ((oop & 3) == 0) && ((((longAt(oop)) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(oop)))), - isYoungObject(oop)))); + || ((isYoungObject(oop)) + && (!(oopisGreaterThanOrEqualToandLessThan(oop, ((futureSpace()).start), futureSurvivorStart()))))); } @@ -48667,14 +48677,13 @@ assertValidExecutionPointersimbarline(usqInt lip, char *lfp, char *lsp, sqInt inInterpreter, sqInt ln) { DECL_MAYBE_SQ_GLOBAL_STRUCT assertl(inInterpreter, ln); - assertl(GIV(stackPage) == (stackPageFor(lfp)), ln); assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); /* begin assertValidStackLimits: */ assertl((GIV(stackLimit) == ((GIV(stackPage)->realStackLimit))) || (GIV(stackLimit) == (((char *) (((usqInt) -1))))), ln); assertl((((GIV(stackPage)->stackLimit)) == ((GIV(stackPage)->realStackLimit))) || (((GIV(stackPage)->stackLimit)) == (((char *) (((usqInt) -1))))), ln); - assertl(lfp < ((GIV(stackPage)->baseAddress)), ln); + assertl(addressIsInPage(GIV(stackPage), lfp), ln); assertl(lsp < lfp, ln); assertl(lfp > lsp, ln); assertl(lsp >= (((GIV(stackPage)->realStackLimit)) - (stackLimitOffset())), ln); @@ -54701,8 +54710,8 @@ /* begin mapTraceLogs */ /* begin mapVMRegisters */ if ((((longAt(GIV(method))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(method))))), - isYoungObject(GIV(method))))) { + || ((isYoungObject(GIV(method))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(method), ((futureSpace()).start), futureSurvivorStart()))))) { /* *rel to method */ @@ -54712,8 +54721,8 @@ } if (((GIV(newMethod) & 3) == 0) && ((((longAt(GIV(newMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(newMethod))))), - isYoungObject(GIV(newMethod)))))) { + || ((isYoungObject(GIV(newMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(newMethod), ((futureSpace()).start), futureSurvivorStart())))))) { /* maybe oop due to object-as-method */ @@ -54721,18 +54730,18 @@ } /* begin mapProfileState */ if ((((longAt(GIV(profileProcess))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileProcess))))), - isYoungObject(GIV(profileProcess))))) { + || ((isYoungObject(GIV(profileProcess))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileProcess), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileProcess) = remapObj(GIV(profileProcess)); } if ((((longAt(GIV(profileMethod))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileMethod))))), - isYoungObject(GIV(profileMethod))))) { + || ((isYoungObject(GIV(profileMethod))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileMethod), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileMethod) = remapObj(GIV(profileMethod)); } if ((((longAt(GIV(profileSemaphore))) & (0x3FFFFF - 8)) == 0) - || ((assert(!((isInFutureSpace(GIV(profileSemaphore))))), - isYoungObject(GIV(profileSemaphore))))) { + || ((isYoungObject(GIV(profileSemaphore))) + && (!(oopisGreaterThanOrEqualToandLessThan(GIV(profileSemaphore), ((futureSpace()).start), futureSurvivorStart()))))) { GIV(profileSemaphore) = remapObj(GIV(profileSemaphore)); } sqLowLevelMFence(); @@ -54742,8 +54751,8 @@ } else { if ((((longAt(GIV(longRunningPrimitiveCheckMethod))) & (0x3FFFFF - 8)) == 0) @@ Diff output truncated at 50000 characters. @@

1 0

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

17 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1023.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1023 Author: eem Time: 17 January 2015, 2:06:56.3 pm UUID: 3b0b931e-e8b1-4155-ac38-8a078ddcec98 Ancestors: VMMaker.oscog-eem.1022 Spur: Rename and correct ensureSemaphoreForwardedThroughContext: to ensureSemaphoreUnforwardedThroughContext:, its intended function. Make shouldRemapObj: filter-out objects already in newSpace since mapStackPages, va mapInterpreterOops, can visit objects twice in a scavenge, GC, compact sequence. General: Speed up assert engines by using addressIsInPage: instead of stackPageFor:. =============== Diff against VMMaker.oscog-eem.1022 =============== Item was changed: ----- Method: CoInterpreter>>assertValidExecutionPointe:r:s:imbar:line: (in category 'debug support') ----- assertValidExecutionPointe: lip r: lifp s: lisp imbar: inInterpreter line: ln <var: #lip type: #usqInt> <var: #lifp type: #'char *'> <var: #lisp type: #'char *'> | methodField cogMethod theIP | <var: #cogMethod type: #'CogMethod *'> - self assert: stackPage = (stackPages stackPageFor: lifp) l: ln. self assert: stackPage = stackPages mostRecentlyUsedPage l: ln. + self assert: (stackPage addressIsInPage: lifp) l: ln. self assert: (self deferStackLimitSmashAround: #assertValidStackLimits: asSymbol with: ln). - self assert: lifp < stackPage baseAddress l: ln. self assert: lisp < lifp l: ln. self assert: lifp > lisp l: ln. self assert: lisp >= (stackPage realStackLimit - self stackLimitOffset) l: ln. self assert: (lifp - lisp) / objectMemory bytesPerOop < LargeContextSlots l: ln. methodField := self frameMethodField: lifp. inInterpreter ifTrue: [self assert: (self isMachineCodeFrame: lifp) not l: ln. self assert: method = methodField l: ln. self cppIf: MULTIPLEBYTECODESETS ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256) l: ln]. (self asserta: (objectMemory cheapAddressCouldBeInHeap: methodField) l: ln) ifTrue: [theIP := lip = cogit ceReturnToInterpreterPC ifTrue: [self iframeSavedIP: lifp] ifFalse: [lip]. self assert: (theIP >= (methodField + (objectMemory lastPointerOf: methodField)) and: [theIP < (methodField + (objectMemory numBytesOf: methodField) + objectMemory baseHeaderSize - 1)]) l: ln]. self assert: ((self iframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self iframeReceiver: lifp)]) l: ln] ifFalse: [self assert: (self isMachineCodeFrame: lifp) l: ln. ((self asserta: methodField asUnsignedInteger >= cogit minCogMethodAddress l: ln) and: [self asserta: methodField asUnsignedInteger < cogit maxCogMethodAddress l: ln]) ifTrue: [cogMethod := self mframeHomeMethod: lifp. self assert: (lip > (methodField + ((self mframeIsBlockActivation: lifp) ifTrue: [self sizeof: CogBlockMethod] ifFalse: [self sizeof: CogMethod])) and: [lip < (methodField + cogMethod blockSize)]) l: ln]. self assert: ((self mframeIsBlockActivation: lifp) or: [(self pushedReceiverOrClosureOfFrame: lifp) = (self mframeReceiver: lifp)]) l: ln]. (self isBaseFrame: lifp) ifTrue: [self assert: (self frameHasContext: lifp) l: ln. self assert: (self frameContext: lifp) = (stackPages longAt: stackPage baseAddress - objectMemory wordSize) l: ln]! Item was changed: ----- Method: CoInterpreter>>synchronousSignal: (in category 'process primitive support') ----- synchronousSignal: aSemaphore "Signal the given semaphore from within the interpreter. Answer if the current process was preempted. Override to add tracing info." | excessSignals | <inline: false> (self isEmptyList: aSemaphore) ifTrue: ["no process is waiting on this semaphore" excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore. self storeInteger: ExcessSignalsIndex ofObject: aSemaphore withValue: excessSignals + 1. ^false]. + objectMemory ensureSemaphoreUnforwardedThroughContext: aSemaphore. - objectMemory ensureSemaphoreForwardedThroughContext: aSemaphore. ^self resume: (self removeFirstLinkOfList: aSemaphore) preemptedYieldingIf: preemptionYields from: CSSignal! Item was changed: ----- Method: CoInterpreterStackPages>>pageListIsWellFormed (in category 'assertions') ----- pageListIsWellFormed "Answer if the stack page list is well-formed. MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" | ok page count limit | <inline: false> <var: #page type: #'StackPage *'> ok := true. page := mostRecentlyUsedPage nextPage. count := 1. limit := coInterpreter numStkPages * 2. [page isFree and: [page ~= mostRecentlyUsedPage and: [count <= limit]]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. page := page nextPage. count := count + 1]. [page ~= mostRecentlyUsedPage and: [count <= limit]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. (self asserta: page isFree not) ifTrue: + [(self asserta: ((page addressIsInPage: page baseFP) + and: [page addressIsInPage: page headSP])) ifFalse: - [(self asserta: (self stackPageFor: page baseFP) == page) ifFalse: - [ok := false]. - (self asserta: (self stackPageFor: page headSP) == page) ifFalse: [ok := false]] ifFalse: [ok := false]. page := page nextPage. count := count + 1]. (self asserta: count = coInterpreter numStkPages) ifFalse: [ok := false]. ^ok! Item was changed: ----- Method: InterpreterStackPages>>pageListIsWellFormed (in category 'assertions') ----- pageListIsWellFormed "Answer if the stack page list is well-formed. MRUP-->used page<->used page<->used page<->used page<--LRUP ^ <-next-prev-> ^ | | v <-prev-next-> v free page<->free page<->free page<->free page" | ok page count limit | <inline: false> <var: #page type: #'StackPage *'> ok := true. page := mostRecentlyUsedPage nextPage. count := 1. limit := numPages * 2. [page isFree and: [page ~= mostRecentlyUsedPage and: [count <= limit]]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. page := page nextPage. count := count + 1]. [page ~= mostRecentlyUsedPage and: [count <= limit]] whileTrue: [(self asserta: page nextPage prevPage == page) ifFalse: [ok := false]. (self asserta: page isFree not) ifTrue: + [(self asserta: ((page addressIsInPage: page baseFP) + and: [page addressIsInPage: page headSP])) ifFalse: - [(self asserta: (self stackPageFor: page baseFP) == page) ifFalse: - [ok := false]. - (self asserta: (self stackPageFor: page headSP) == page) ifFalse: [ok := false]] ifFalse: [ok := false]. page := page nextPage. count := count + 1]. (self asserta: count = numPages) ifFalse: [ok := false]. ^ok! Item was removed: - ----- Method: ObjectMemory>>ensureSemaphoreForwardedThroughContext: (in category 'forward compatibility') ----- - ensureSemaphoreForwardedThroughContext: aSemaphore - "Compatibility with SpurMemoryManager" - <inline: true>! Item was added: + ----- Method: ObjectMemory>>ensureSemaphoreUnforwardedThroughContext: (in category 'forward compatibility') ----- + ensureSemaphoreUnforwardedThroughContext: aSemaphore + "Compatibility with SpurMemoryManager" + <inline: true>! Item was removed: - ----- Method: SpurMemoryManager>>ensureSemaphoreForwardedThroughContext: (in category 'interpreter access') ----- - ensureSemaphoreForwardedThroughContext: aSemaphore - "Make sure that the aSemaphore is forwarded through to the suspendedContext of the first link." - <inline: true> - (self isForwarded: (self fetchPointer: FirstLinkIndex ofObject: aSemaphore)) ifTrue: - ["0 = aSemaphore, 1 = aProcess. Hence references to suspendedContext will /not/ be forwarded." - self followForwardedObjectFields: aSemaphore toDepth: 1]. - self deny: (self isForwarded: (self - fetchPointer: SuspendedContextIndex - ofObject: (self fetchPointer: FirstLinkIndex ofObject: aSemaphore)))! Item was added: + ----- Method: SpurMemoryManager>>ensureSemaphoreUnforwardedThroughContext: (in category 'interpreter access') ----- + ensureSemaphoreUnforwardedThroughContext: aSemaphore + "Make sure that the aSemaphore is followed through to the suspendedContext of the first link." + <inline: true> + | proc ctxt | + proc := self fetchPointer: FirstLinkIndex ofObject: aSemaphore. + (self isForwarded: proc) ifTrue: + [self followForwardedObjectFields: aSemaphore toDepth: 1. + proc := self fetchPointer: FirstLinkIndex ofObject: aSemaphore]. + self deny: (self isForwarded: proc). + ctxt := self fetchPointer: SuspendedContextIndex ofObject: proc. + (self isForwarded: ctxt) ifTrue: + [ctxt := self followForwarded: ctxt. + self storePointer: SuspendedContextIndex ofObject: proc withValue: ctxt]! Item was added: + ----- Method: SpurMemoryManager>>isFreeOop: (in category 'object testing') ----- + isFreeOop: oop + ^(self isNonImmediate: oop) and: [self isFreeObject: oop]! Item was changed: ----- Method: SpurMemoryManager>>isValidFreeObject: (in category 'free space') ----- isValidFreeObject: objOop | chunk | ^(self addressCouldBeOldObj: objOop) and: [(self isFreeObject: objOop) and: [(self oop: (self addressAfter: objOop) isLessThanOrEqualTo: endOfMemory) and: [((chunk := (self fetchPointer: self freeChunkNextIndex ofFreeChunk: objOop)) = 0 + or: [self isFreeOop: chunk]) + and: [(self isLargeFreeObject: objOop) not - or: [self isFreeObject: chunk]) - and: [(self bytesInObject: objOop) < (self numFreeLists * self allocationUnit) or: [((chunk := (self fetchPointer: self freeChunkParentIndex ofFreeChunk: objOop)) = 0 + or: [(self isFreeOop: chunk) and: [self isLargeFreeObject: chunk]]) - or: [self isFreeObject: chunk]) and: [((chunk := (self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: objOop)) = 0 + or: [(self isFreeOop: chunk) and: [self isLargeFreeObject: chunk]]) - or: [self isFreeObject: chunk]) and: [(chunk := (self fetchPointer: self freeChunkLargerIndex ofFreeChunk: objOop)) = 0 + or: [(self isFreeOop: chunk) and: [self isLargeFreeObject: chunk]]]]]]]]]! - or: [self isFreeObject: chunk]]]]]]]]! Item was changed: ----- Method: SpurMemoryManager>>shouldRemapObj: (in category 'gc - scavenging') ----- shouldRemapObj: objOop <api> "Answer if the obj should be scavenged (or simply followed). The method is called + shouldRemapObj: for compatibility with ObjectMemory. We test for being already + scavenged because mapStackPages via mapInterpeeterOops may be applied twice + in the context of a global GC where a scavenge, followed by a scan-mark-free, and + final compaction passes may result in scvenged fields being visited twice." - shouldRemapObj: for compatibility with ObjectMemory." ^(self isForwarded: objOop) + or: [(self isReallyYoungObject: objOop) + and: [(self isInFutureSpace: objOop) not]]! - or: [self deny: (self isInFutureSpace: objOop). - self isReallyYoungObject: objOop]! Item was changed: ----- Method: StackInterpreter>>assertValidExecutionPointe:r:s:imbar:line: (in category 'debug support') ----- assertValidExecutionPointe: lip r: lfp s: lsp imbar: inInterpreter line: ln <var: #lip type: #usqInt> <var: #lfp type: #'char *'> <var: #lsp type: #'char *'> self assert: inInterpreter l: ln. - self assert: stackPage = (stackPages stackPageFor: lfp) l: ln. self assert: stackPage = stackPages mostRecentlyUsedPage l: ln. self assertValidStackLimits: ln. + self assert: (stackPage addressIsInPage: lfp) l: ln. - self assert: lfp < stackPage baseAddress l: ln. self assert: lsp < lfp l: ln. self assert: lfp > lsp l: ln. self assert: lsp >= (stackPage realStackLimit - self stackLimitOffset) l: ln. self assert: (lfp - lsp) / objectMemory bytesPerOop < LargeContextSlots l: ln. self assert: (self validInstructionPointer: lip inFrame: lfp) l: ln. self assert: ((self frameIsBlockActivation: lfp) or: [(self pushedReceiverOrClosureOfFrame: lfp) = (self frameReceiver: lfp)]) l: ln. self assert: method = (self frameMethod: lfp) l: ln. self cppIf: MULTIPLEBYTECODESETS ifTrue: [self assert: (self methodUsesAlternateBytecodeSet: method) = (bytecodeSetSelector = 256) l: ln].! Item was changed: ----- Method: StackInterpreter>>synchronousSignal: (in category 'process primitive support') ----- synchronousSignal: aSemaphore "Signal the given semaphore from within the interpreter. Answer if the current process was preempted." | excessSignals | <inline: false> (self isEmptyList: aSemaphore) ifTrue: ["no process is waiting on this semaphore" excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore. self storeInteger: ExcessSignalsIndex ofObject: aSemaphore withValue: excessSignals + 1. ^false]. + objectMemory ensureSemaphoreUnforwardedThroughContext: aSemaphore. - objectMemory ensureSemaphoreForwardedThroughContext: aSemaphore. ^self resume: (self removeFirstLinkOfList: aSemaphore) preemptedYieldingIf: preemptionYields!

1 0

minor image version numbers?
by Eliot Miranda 17 Jan '15

17 Jan '15

Hi David, Hi All, here's an example of an occasional problem. I'm looking at the free tree in Spur and I have an unused field in each free chunk that is a remnant of an old attempt at a compaction algorithm I've long abandoned. I'd like to eliminate the field (2nd slot in a free chunk) but that means either breaking the loading of existing Spur images or some version marker in the image header to indicate whether the image contains old format free chunks or new format. This is the kind of internal micro-change that I don't think warrants taking a bit from the image version field. However, it /would/ be nice to have a field there-in for a minor version number that the VM implementor could simply increment when they want to make such a minor change. What do you think? Currently the unused bits in the image format are ImageFormat availableBits printStringBase: 2 '1111111,11111110,11100110,00000000' (the top bit is reserved for an extension bit). So we could use the top 7 bits for a 0-127 field that will probably last me for a long time, and it would be easy to mask it out of the version field. An alternative is for me to use some other field in the Spur image header. I'm happy to do that if the above scheme smells to anyone. There's a 16-bit field in Cog image headers I can use (see the2ndUnknownShort in VMMaker.oscog). -- best, Eliot

2 1

Re: OrderedDictionary (was: Re: [squeak-dev] Re: The Trunk: Collections-mt.593.mcz)
by Eliot Miranda 16 Jan '15

16 Jan '15

Hi Marcel, On Fri, Jan 16, 2015 at 5:54 AM, Marcel Taeumel < marcel.taeumel(a)student.hpi.uni-potsdam.de> wrote: > Ah, okay. I was curious about the performance of iterating over an array > vs. > the linked list: > > a := Array new: 1000. > l := LinkedList new. > > 1000 timesRepeat: [l add: (StackLink with: nil)]. > > [a do: [:ea | 1 + 2]] bench. "'94,600 per second.'" > > [l do: [:ea | 1 + 2]] bench. "'159,000 per second.'" > > I expected the opposite! :-O Why is that so? > > Best, > Marcel > OK, here's the profiling results, all on a .2GHz Core i7 MBP (and these numbers are noisy; there's a lot else going on on my machine). First, using Cog and a slightly modified benchmark that uses the elements of the collections so that the benchmark is "real", and so that each block does the same ammount of work | a l | a := Array new: 1000 withAll: 1 -> 1. l := LinkedList new. 1000 timesRepeat: [l add: (StackLink with: 1)]. { [| t | t := 0. a do: [:ea | t := t + ea key]. t] bench. [| t | t := 0. l do: [:ea | t := t + ea element]. t] bench} #('51,900 per second.' '70,400 per second.') Now the same code on Spur: #('57,100 per second.' '63,300 per second.') at: is faster, but (alas) LinkedList>>do: is slower because in Spur #== requires a read barrier to check for possible forwarders, so in "[aLink == nil] whileFalse:" Spur has to fetch a field from aLink to ensure it is not forwarded. At the VM level we can see that Object>>at: is expensive, but the block overhead dominates. First Cog /Users/eliot/Cog/oscogvm/build.macos32x86/squeak.cog.v3/Fast.app/Contents/MacOS/Squeak 1/16/2015 eden size: 2,097,152 stack pages: 160 code size: 1,048,576 | a | a := Array new: 1000 withAll: 1 -> 1. [| t | t := 0. a do: [:ea | t := t + ea key]. t] bench gc prior. clear prior. 5.004 seconds; sampling frequency 1471 hz 7340 samples in the VM (7363 samples in the entire program) 99.69% of total 7302 samples in generated vm code 99.48% of entire vm (99.17% of total) 38 samples in vanilla vm code 0.52% of entire vm ( 0.52% of total) % of generated vm code (% of total) (samples) (cumulative) 30.33% (30.08%) BlockClosure>>value: (2215) (30.33%) 18.47% (18.32%) Object>>at: (1349) (48.81%) 16.83% (16.69%) UndefinedObject>>DoIt (1229) (65.64%) 14.43% (14.31%) SequenceableCollection>>do: (1054) (80.07%) 9.57% ( 9.49%) LookupKey>>key (699) (89.65%) 6.35% ( 6.30%) SmallInteger>>+ (464) (96.00%) 3.75% ( 3.72%) PIC at: (274) (99.75%) 0.07% ( 0.07%) BlockClosure>>value (5) (99.82%) 0.05% ( 0.05%) BlockClosure>>bench (4) (99.88%) 0.04% ( 0.04%) PIC size (3) (99.92%) 0.04% ( 0.04%) ceClosureCopyTrampoline (3) (99.96%) 0.03% ( 0.03%) Time class>>mi...condClockValue (2) (99.99%) 0.01% ( 0.01%) ArrayedCollection>>size (1) (100.0%) | l | l := LinkedList new. 1000 timesRepeat: [l add: (StackLink with: 1)]. [| t | t := 0. l do: [:ea | t := t + ea element]. t] bench gc prior. clear prior. 5.001 seconds; sampling frequency 1452 hz 7240 samples in the VM (7260 samples in the entire program) 99.72% of total 7186 samples in generated vm code 99.25% of entire vm (98.98% of total) 54 samples in vanilla vm code 0.75% of entire vm ( 0.74% of total) % of generated vm code (% of total) (samples) (cumulative) 29.22% (28.93%) BlockClosure>>value: (2100) (29.22%) 26.32% (26.05%) UndefinedObject>>DoIt (1891) (55.54%) 22.92% (22.69%) LinkedList>>do: (1647) (78.46%) 8.14% ( 8.06%) SmallInteger>>+ (585) (86.60%) 6.76% ( 6.69%) StackLink>>element (486) (93.36%) 6.46% ( 6.39%) Link>>nextLink (464) (99.82%) 0.08% ( 0.08%) Time class>>...ndClockValue (6) (99.90%) 0.04% ( 0.04%) BlockClosure>>bench (3) (99.94%) 0.03% ( 0.03%) BlockClosure>>value (2) (99.97%) 0.01% ( 0.01%) ceClosureCopyTrampoline (1) (99.99%) 0.01% ( 0.01%) ceCreateNew...Trampoline (1) (100.0%) and then Spur: /Users/eliot/Cog/oscogvm/build.macos32x86/squeak.cog.spur/Fast.app/Contents/MacOS/Squeak 1/16/2015 eden size: 4,101,312 stack pages: 160 code size: 1,048,576 | a | a := Array new: 1000 withAll: 1 -> 1. [| t | t := 0. a do: [:ea | t := t + ea key]. t] bench gc prior. clear prior. 5.002 seconds; sampling frequency 1471 hz 7340 samples in the VM (7359 samples in the entire program) 99.74% of total 7330 samples in generated vm code 99.86% of entire vm (99.61% of total) 10 samples in vanilla vm code 0.14% of entire vm ( 0.14% of total) % of generated vm code (% of total) (samples) (cumulative) 33.06% (32.93%) BlockClosure>>value: (2423) (33.06%) 18.66% (18.59%) UndefinedObject>>DoIt (1368) (51.72%) 17.97% (17.90%) SequenceableCollection>>do: (1317) (69.69%) 13.33% (13.28%) Object>>at: (977) (83.02%) 8.84% ( 8.81%) SmallInteger>>+ (648) (91.86%) 4.90% ( 4.88%) PIC at: (359) (96.75%) 3.08% ( 3.07%) LookupKey>>key (226) (99.84%) 0.05% ( 0.05%) ceSmallBlockContext (4) (99.89%) 0.04% ( 0.04%) BlockClosure>>value (3) (99.93%) 0.03% ( 0.03%) Time class>>mi...condClockValue (2) (99.96%) 0.01% ( 0.01%) ArrayedCollection>>size (1) (99.97%) 0.01% ( 0.01%) BlockClosure>>bench (1) (99.99%) 0.01% ( 0.01%) EventSensor>>eventTickler (1) (100.0%) | l | l := LinkedList new. 1000 timesRepeat: [l add: (StackLink with: 1)]. [| t | t := 0. l do: [:ea | t := t + ea element]. t] bench gc prior. clear prior. 5.002 seconds; sampling frequency 1464 hz 7315 samples in the VM (7321 samples in the entire program) 99.92% of total 7307 samples in generated vm code 99.89% of entire vm (99.81% of total) 8 samples in vanilla vm code 0.11% of entire vm ( 0.11% of total) % of generated vm code (% of total) (samples) (cumulative) 27.33% (27.28%) UndefinedObject>>DoIt (1997) (27.33%) 27.11% (27.06%) LinkedList>>do: (1981) (54.44%) 24.39% (24.34%) BlockClosure>>value: (1782) (78.83%) 11.15% (11.13%) SmallInteger>>+ (815) (89.98%) 5.30% ( 5.29%) Link>>nextLink (387) (95.28%) 4.50% ( 4.49%) StackLink>>element (329) (99.78%) 0.12% ( 0.12%) BlockClosure>>bench (9) (99.90%) 0.07% ( 0.07%) Time class>>...ndClockValue (5) (99.97%) 0.01% ( 0.01%) ceSmallBlockContext (1) (99.99%) 0.01% ( 0.01%) BlockClosure>>value (1) (100.0%) So to try and make sense of this we can say that the cost of at: vs the cost of block evaluation is, in Cog 1349 + 274 / 2215 ~= 0.73 and in Spur 977 + 359 / 2423 ~= 0.55 at: being much faster in Spur because the object representation makes it much simpler to do the type analysis (since Object>>at: works on any indexable class) and bounds check. and approximately the difference between the Array and the LinkedList comes down to the relative costs of at: & SequenceableCollection>>#do: vs nextLink & LinkedList>>#do:, in Cog 1349 + 274 + 1054 / (1647 + 464) ~= 1.27 and in Spur 977 + 359 / (1981 + 387) ~= 0.56 Now Sista will make a big difference because it won't just eliminate the bounds checking overhead in at:, it'll also inline the block, so it'll be much more like | a | a := Array new: 1000 withAll: 1 -> 1. [| t | t := 0. 1 to: 1000 do: [:i| t := t + (a at: i) key]. t] bench Cog: 72,700 per second. Spur: 87,300 per second. but faster still because the bounds check in at: is completely eliminated. -- best, Eliot

1 0

A update to SystemTracer for getting back to 32 bits
by David T. Lewis 16 Jan '15

16 Jan '15

I have been using a 64-bit (format 68002) image as my working Squeak image for a few months now, so I became interested in the question of whether that image could be converted back to a 32-bit image that could be run again on Cog and on future Spur VMs. To my surprise, this turned out to be quite easy to do. >From the class comment from the original SystemTracer: The SystemTracer was invented by Ted Kaehler. It has gone through many variations. I have simplified it and adapted it to work with Squeak's limited Object hashing. It has written runnable Mac images on a Mac. Some changes may be needed for it to produce runnable images on a bigEndian machine. -- Dan I. 9/29/97 The current archive is at http://www.squeaksource.com/SystemTracing One variation of this is SystemTracer64, which is used for converting ("tracing") a standard 32-bit image into a 64-bit image format (identified as image format 68002). An up to date trace of the Squeak image is maintained at http://build.squeak.org/job/Squeak%2064-bit%20image/, and a Linux VM is at http://squeakvm.org/unix/release/Squeak-4.10.2.2614_64bit-linux_x86_64.tar.… This 64-bit image (format 68002) is a straightforward extension of the standard 32-bit image formats currently used for Squeak and Pharo (image format 6504 or 6505). Details are in the class comment for ObjectMemory, which now resides in package VMMaker on source.squeak.org. It provides essentially unlimited object memory space, with minimal change to the internal representation of the objects in that object memory. This is not to be confused with the 64-bit Spur object memory, which provides substantial performance improvements based on an improved (and different) object memory design. I made a minor update to the SystemTracer that allows it to convert a 64-bit image back to 32-bit format, and it worked perfectly with my working Squeak image that has been in 64-bit format for several months now. >From the update comment: Name: SystemTracing-dtl.26 Author: dtl Time: 2 January 2015, 1:21:45.031 pm Update SystemTracer2 to support tracing a 64-bit image format 68002 image back to 32-bit image format 6504. This makes conversion to 64-bit format a reversible process. To trace an existing 32-bit (format 6504 or 6505) image to 64-bit format: SystemTracer64 writeImage: 'clone64.image' To trace an 64-bit (format 68002) image to 32-bit format: SystemTracer2 writeImage: 'clone32.image' The resulting 32-bit image must be opened first using an interpreter VM, after which it can be run normally with a Cog VM. Tracing should be done using an interpreter VM. Dave

3 11

[commit][3230] CogVM source as per VMMaker.oscog-eem.1022
by commits＠squeakvm.org 15 Jan '15

15 Jan '15

Revision: 3230 Author: eliot Date: 2015-01-15 13:47:03 -0800 (Thu, 15 Jan 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1022 Fix monumental blunder in jitted store-check code. The saved registers mask needs to be the *or* of the value reg and the caller-saved registers, not the *and*!! Bow to the inevitable and add a manual override for primitive accessor depth. Use it in at: & at:put:. If manual override is not used then the automatically computed depth is too deep because of context access. Slang: Eliminate null expressions in and: and or: if generateDeadCode is false. Sista: Added super calls in conditionnal jumps generation in order not to generate counters for optimized methods. Added unconditionnal single bytecode 217. This bytecode can be used in two case: - when a method is discarded, all its bytecodes are replaced by the unconditional trap and its cogVMState is flushed - in optimized methods, in a branch that wants to trigger dynamic deoptimization Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h 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/vm/cogit.c branches/Cog/src/vm/cogit.h 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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nscogsrc/vm/cogit.c 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + CCodeGenerator VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac from - StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + StackToRegisterMappingCogit VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8691,8 +8691,7 @@ rcvrClass = fetchClassOf(receiver); cogMethod = mframeHomeMethodExport(); if (!((cogMethod->cmRefersToYoung))) { - if (((inlineCacheTagsMayBeObjects()) - && (isYoung(rcvrClass))) + if ((isYoung(rcvrClass)) || ((mixin != receiver) && (isYoung(mixin)))) { ensureInYoungReferrers(cogMethod); @@ -8892,11 +8891,7 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + tagCouldBeObj = 1; if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { if (!(asserta(checkValidOopReference(cacheTag1)))) { @@ -12623,11 +12618,7 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + tagCouldBeObj1 = 1; cacheTagMarked = tagCouldBeObj1 && (cacheTagIsMarked(cacheTag1)); if (entryPoint1 > methodZoneBase) { @@ -12782,11 +12773,7 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + tagCouldBeObj1 = 1; if (tagCouldBeObj1) { markAndTraceLiteralIfYoung(cacheTag1); } @@ -13584,8 +13571,7 @@ static sqInt processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) { - return (processorHasDivQuoRem(ignoredPrimIndex)) - && (mclassIsSmallInteger(ignoredPrimIndex)); + return mclassIsSmallInteger(ignoredPrimIndex); } static sqInt @@ -13603,8 +13589,7 @@ static sqInt processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) { - return (processorHasMultiply(ignoredPrimIndex)) - && (mclassIsSmallInteger(ignoredPrimIndex)); + return mclassIsSmallInteger(ignoredPrimIndex); } static sqInt @@ -13899,11 +13884,7 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) - || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) - || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + tagCouldBeObj1 = 1; if (tagCouldBeObj1 && (couldBeObject(cacheTag1))) { mappedCacheTag = remapObject(cacheTag1); @@ -13926,8 +13907,7 @@ /* First look at the classTag entry. This is an inline cache tag and so might not be an object. */ - if ((inlineCacheTagsMayBeObjects()) - && (couldBeObject(oop))) { + if (couldBeObject(oop)) { mappedOop = remapOop(oop); if (mappedOop != oop) { unalignedLongAtput(backEnd, cacheAddress, mappedOop); @@ -16510,7 +16490,7 @@ /* begin JumpNonZero: */ jmpAlreadyRoot = genoperand(JumpNonZero, ((sqInt)0)); assert(destReg == ReceiverResultReg); - CallRTregistersToBeSavedMask(ceStoreCheckTrampoline, (registerMaskFor(sourceReg)) & (callerSavedRegMask())); + CallRTregistersToBeSavedMask(ceStoreCheckTrampoline, (registerMaskFor(sourceReg)) | (callerSavedRegMask())); jmpTarget(jmpImmediate, jmpTarget(jmpDestYoung, jmpTarget(jmpSourceOld, jmpTarget(jmpAlreadyRoot, gLabel())))); return 0; } @@ -18914,8 +18894,7 @@ if (numCleanBlocks > 0) { addCleanBlockStarts(); } - if (!(1 - && (maybeAllocAndInitIRCs()))) { + if (!(maybeAllocAndInitIRCs())) { /* Inaccurate error code, but it'll do. This will likely never fail. */ Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nscogsrc/vm/cogit.h 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + CCodeGenerator VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac from - CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -221,7 +221,6 @@ #define HashBits 0x1FFE0000 #define HashBitsOffset 17 #define HashMaskUnshifted 0xFFF -#define HeaderFlagBitPosition 29 #define HeaderIndex 0 #define HeaderTypeClass 1 #define HeaderTypeFree 2 @@ -261,6 +260,7 @@ #define MethodCacheSize 4096 #define MethodDictionaryIndex 1 #define MethodHeaderArgCountShift 25 +#define MethodHeaderFlagBitPosition 29 #define MethodHeaderTempCountShift 19 #define MethodIndex 3 #define MFMethodFlagHasContextFlag 1 @@ -1384,6 +1384,7 @@ _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; _iss sqInt cogCompiledCodeCompactionCalledFor; +_iss sqInt flagInterpretedMethods; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -1400,7 +1401,6 @@ _iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt externalPrimitiveTableFirstFreeIndex; -_iss sqInt flagInterpretedMethods; _iss sqInt thisClassIndex; _iss sqInt edenBytes; _iss usqInt fwdTableLast; @@ -2101,7 +2101,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1022"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4835,6 +4835,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4852,7 +4853,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l300: /* end baseFrameReturn */; goto l299; } @@ -5325,10 +5326,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -7955,7 +7955,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8015,7 +8015,7 @@ null; goto l108; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10909,7 +10909,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10969,7 +10969,7 @@ null; goto l243; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -13849,9 +13849,7 @@ char *sp1; char *sp2; - assert(((numRegArgs()) > 0) - && (((numRegArgs()) <= 2) - && (((cogMethod->cmNumArgs)) <= (numRegArgs())))); + assert(((cogMethod->cmNumArgs)) <= (numRegArgs())); if (((cogMethod->cmNumArgs)) == 2) { longAtput(GIV(stackPointer) + (3 * BytesPerWord), longAt(GIV(stackPointer))); /* begin push: */ @@ -15328,11 +15326,10 @@ || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12))) { return 1; } - hasYoung = (!0) - && (isYoungObject((((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + hasYoung = isYoungObject((((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))); + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))); if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { i = ((literalCountOfMethodHeader(methodHeaderOf(oop))) + LiteralStart) - 1; } @@ -17050,10 +17047,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -17684,6 +17680,13 @@ return ((SelectorCannotInterpret < SelectorDoesNotUnderstand) ? SelectorDoesNotUnderstand : SelectorCannotInterpret); } + +/* In the Sista VM the flag bit in the method header is taken to identify + optimized methods. + In other VMs it can be used to flag methods that are interpreted, if it + has been requested + from the image header flags. */ + static void maybeFlagMethodAsInterpreted(sqInt aMethod) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -17695,7 +17698,7 @@ realHeader = (isCogMethodReference(rawHeader) ? ((((CogMethod *) rawHeader))->methodHeader) : rawHeader); - realHeader = realHeader | ((((1 << HeaderFlagBitPosition) << 1) | 1)); + realHeader = realHeader | ((((1 << MethodHeaderFlagBitPosition) << 1) | 1)); if (isCogMethodReference(rawHeader)) { ((((CogMethod *) rawHeader))->methodHeader = realHeader); } @@ -19182,6 +19185,7 @@ GIV(flagInterpretedMethods) = (headerFlags & 8) != 0; GIV(preemptionYields) = (headerFlags & 16) == 0; GIV(noThreadingOfGUIThread) = (headerFlags & 32) != 0; + /* begin getWord32FromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(int), 1, f); @@ -19291,30 +19295,25 @@ initializeObjectMemory(bytesToShift); /* begin checkAssumedCompactClasses */ /* begin checkCompactIndex:isClass:named: */ - if ((ClassArrayCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord())))) != (fetchPointerofObject(ClassArrayCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord())))) != (fetchPointerofObject(ClassArrayCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("Array"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassLargeNegativeIntegerCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargeNegativeIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargeNegativeIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("LargeNegativeInteger"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassLargePositiveIntegerCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargePositiveIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargePositiveIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("LargePositiveInteger"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassFloatCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord())))) != (fetchPointerofObject(ClassFloatCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord())))) != (fetchPointerofObject(ClassFloatCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("Float"); } /* begin checkCompactIndex:isClass:named: */ ; /* begin checkCompactIndex:isClass:named: */ - if ((ClassMethodContextCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMethodContext << (shiftForWord())))) != (fetchPointerofObject(ClassMethodContextCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMethodContext << (shiftForWord())))) != (fetchPointerofObject(ClassMethodContextCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("MethodContext"); } GIV(classByteArrayCompactIndex) = compactIndexOfClass(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteArray << (shiftForWord())))); @@ -20231,10 +20230,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -24419,7 +24417,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24466,7 +24464,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -37364,10 +37362,9 @@ endSeg = (segmentWordArray + (sizeBitsOf(segmentWordArray))) - BaseHeaderSize; data = longAt(segmentWordArray + BaseHeaderSize); if (!(((data & 0xFFFF) == (imageFormatVersion())) - || ((!0) - && ((data & 0xFFFF) == ((BytesPerWord == 4 + || ((data & 0xFFFF) == ((BytesPerWord == 4 ? 6504 - : 68002)))))) { + : 68002))))) { /* low 2 bytes */ /* Not readable -- try again with reversed bytes... */ @@ -37380,10 +37377,9 @@ } data = longAt(segmentWordArray + BaseHeaderSize); if (!(((data & 0xFFFF) == (imageFormatVersion())) - || ((!0) - && ((data & 0xFFFF) == ((BytesPerWord == 4 + || ((data & 0xFFFF) == ((BytesPerWord == 4 ? 6504 - : 68002)))))) { + : 68002))))) { /* low 2 bytes */ /* Still NG -- put things back and fail */ @@ -41993,8 +41989,7 @@ if (fmt1 <= 4) { if (fmt1 >= 3) { if (fmt1 == 4) { - if (1 - && (GIV(weakRootCount) >= 0)) { + if (GIV(weakRootCount) >= 0) { /* And remember as weak root */ @@ -43900,10 +43895,9 @@ sqImageFileSeek(f, imageOffset); version = (firstVersion = getWord32FromFileswap(f, 0)); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 0; } sqImageFileSeek(f, imageOffset); @@ -43912,10 +43906,9 @@ sqImageFileRead((&w2), sizeof(int), 1, f); version = byteSwapped(w2); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 1; } if (imageOffset == 0) { @@ -43928,10 +43921,9 @@ sqImageFileRead((&w), sizeof(int), 1, f); version = w; if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 0; } sqImageFileSeek(f, 512); @@ -43940,10 +43932,9 @@ sqImageFileRead((&w1), sizeof(int), 1, f); version = byteSwapped(w1); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 1; } } @@ -46061,10 +46052,9 @@ ctxtOrNilOrZero = 0; goto l1; } - if (!((198 == 0) - || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + if (!(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0))) { theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP))->methodObject) : longAt(theFP + FoxMethod)); @@ -48675,13 +48665,11 @@ && (((fieldOop = longAt((objOop + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())))), (((fieldOop & 1) == 0) && ((((((usqInt) (longAt(fieldOop))) >> (instFormatFieldLSB())) & 15) <= 4) - || (0 - && (isPointers(followForwarded(fieldOop)))))) + || (0))) && (((fieldOop = longAt((objOop + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())))), (((fieldOop & 1) == 0) && ((((((usqInt) (longAt(fieldOop))) >> (instFormatFieldLSB())) & 15) <= 4) - || (0 - && (isPointers(followForwarded(fieldOop)))))) + || (0))) && (((longAt((objOop + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) & 1))))))); } @@ -49119,13 +49107,12 @@ && (((((usqInt)anObject)) >= (startOfMemory())) && (((((usqInt)anObject)) < GIV(freeStart)) && (((longAt(anObject)) & TypeMask) != HeaderTypeGC))))) - && ((!0) && (addressCouldBeClassObj((classObj = ((anObject & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) : (((ccIndex = (((usqInt) (longAt(anObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(anObject - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))))))) { + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))))))) { if ((classObj == methClass) || ((methClass == null) || (methClass == GIV(nilObj)))) { @@ -51139,10 +51126,9 @@ readableFormat(sqInt imageVersion) { return (imageVersion == (imageFormatVersion())) - || ((!0) - && (imageVersion == ((BytesPerWord == 4 + || (imageVersion == ((BytesPerWord == 4 ? 6504 - : 68002)))); + : 68002))); } @@ -54560,10 +54546,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer1) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -55056,10 +55041,9 @@ handlerOrNilOrZero = 0; goto l1; } - if (!((198 == 0) - || (((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + if (!(((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0)))) { + : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0))) { theMethod = ((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP1))->methodObject) : longAt(theFP1 + FoxMethod)); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac from - CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -224,7 +224,6 @@ #define HashBits 0x1FFE0000 #define HashBitsOffset 17 #define HashMaskUnshifted 0xFFF -#define HeaderFlagBitPosition 29 #define HeaderIndex 0 #define HeaderTypeClass 1 #define HeaderTypeFree 2 @@ -264,6 +263,7 @@ #define MethodCacheSize 4096 #define MethodDictionaryIndex 1 #define MethodHeaderArgCountShift 25 +#define MethodHeaderFlagBitPosition 29 #define MethodHeaderTempCountShift 19 #define MethodIndex 3 #define MFMethodFlagHasContextFlag 1 @@ -1387,6 +1387,7 @@ _iss usqLong nextWakeupUsecs; _iss sqInt statMarkCount; _iss sqInt cogCompiledCodeCompactionCalledFor; +_iss sqInt flagInterpretedMethods; _iss sqInt gcMode; _iss sqInt highestRunnableProcessPriority; _iss sqInt lastCoggableInterpretedBlockMethod; @@ -1403,7 +1404,6 @@ _iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt externalPrimitiveTableFirstFreeIndex; -_iss sqInt flagInterpretedMethods; _iss sqInt thisClassIndex; _iss sqInt edenBytes; _iss usqInt fwdTableLast; @@ -2104,7 +2104,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1017"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1022"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4844,6 +4844,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l300; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4861,7 +4862,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l300: /* end baseFrameReturn */; goto l299; } @@ -5334,10 +5335,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -7964,7 +7964,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -8024,7 +8024,7 @@ null; goto l108; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -10918,7 +10918,7 @@ /* bytecodePrimBitShift */ { sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -10978,7 +10978,7 @@ null; goto l243; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -13858,9 +13858,7 @@ char *sp1; char *sp2; - assert(((numRegArgs()) > 0) - && (((numRegArgs()) <= 2) - && (((cogMethod->cmNumArgs)) <= (numRegArgs())))); + assert(((cogMethod->cmNumArgs)) <= (numRegArgs())); if (((cogMethod->cmNumArgs)) == 2) { longAtput(GIV(stackPointer) + (3 * BytesPerWord), longAt(GIV(stackPointer))); /* begin push: */ @@ -15337,11 +15335,10 @@ || (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12))) { return 1; } - hasYoung = (!0) - && (isYoungObject((((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 + hasYoung = isYoungObject((((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))); + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))); if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { i = ((literalCountOfMethodHeader(methodHeaderOf(oop))) + LiteralStart) - 1; } @@ -17059,10 +17056,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -17693,6 +17689,13 @@ return ((SelectorCannotInterpret < SelectorDoesNotUnderstand) ? SelectorDoesNotUnderstand : SelectorCannotInterpret); } + +/* In the Sista VM the flag bit in the method header is taken to identify + optimized methods. + In other VMs it can be used to flag methods that are interpreted, if it + has been requested + from the image header flags. */ + static void maybeFlagMethodAsInterpreted(sqInt aMethod) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -17704,7 +17707,7 @@ realHeader = (isCogMethodReference(rawHeader) ? ((((CogMethod *) rawHeader))->methodHeader) : rawHeader); - realHeader = realHeader | ((((1 << HeaderFlagBitPosition) << 1) | 1)); + realHeader = realHeader | ((((1 << MethodHeaderFlagBitPosition) << 1) | 1)); if (isCogMethodReference(rawHeader)) { ((((CogMethod *) rawHeader))->methodHeader = realHeader); } @@ -19191,6 +19194,7 @@ GIV(flagInterpretedMethods) = (headerFlags & 8) != 0; GIV(preemptionYields) = (headerFlags & 16) == 0; GIV(noThreadingOfGUIThread) = (headerFlags & 32) != 0; + /* begin getWord32FromFile:swap: */ w5 = 0; sqImageFileRead((&w5), sizeof(int), 1, f); @@ -19300,30 +19304,25 @@ initializeObjectMemory(bytesToShift); /* begin checkAssumedCompactClasses */ /* begin checkCompactIndex:isClass:named: */ - if ((ClassArrayCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord())))) != (fetchPointerofObject(ClassArrayCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassArray << (shiftForWord())))) != (fetchPointerofObject(ClassArrayCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("Array"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassLargeNegativeIntegerCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargeNegativeIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargeNegativeInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargeNegativeIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("LargeNegativeInteger"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassLargePositiveIntegerCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargePositiveIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassLargePositiveInteger << (shiftForWord())))) != (fetchPointerofObject(ClassLargePositiveIntegerCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("LargePositiveInteger"); } /* begin checkCompactIndex:isClass:named: */ - if ((ClassFloatCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord())))) != (fetchPointerofObject(ClassFloatCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord())))) != (fetchPointerofObject(ClassFloatCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("Float"); } /* begin checkCompactIndex:isClass:named: */ ; /* begin checkCompactIndex:isClass:named: */ - if ((ClassMethodContextCompactIndex != 0) - && ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMethodContext << (shiftForWord())))) != (fetchPointerofObject(ClassMethodContextCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord()))))))) { + if ((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassMethodContext << (shiftForWord())))) != (fetchPointerofObject(ClassMethodContextCompactIndex - 1, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))))) { invalidCompactClassError("MethodContext"); } GIV(classByteArrayCompactIndex) = compactIndexOfClass(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteArray << (shiftForWord())))); @@ -20240,10 +20239,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -24428,7 +24426,7 @@ primitiveBitShift(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt integerArgument; - sqLong integerReceiver; + usqInt integerReceiver; sqInt shifted; char *sp; @@ -24475,7 +24473,7 @@ } return; } - shifted = ((unsigned sqLong)integerReceiver) >> (0 - integerArgument); + shifted = ((usqInt) integerReceiver) >> (0 - integerArgument); } shifted = positive32BitIntegerFor(shifted); /* begin pop:thenPush: */ @@ -37373,10 +37371,9 @@ endSeg = (segmentWordArray + (sizeBitsOf(segmentWordArray))) - BaseHeaderSize; data = longAt(segmentWordArray + BaseHeaderSize); if (!(((data & 0xFFFF) == (imageFormatVersion())) - || ((!0) - && ((data & 0xFFFF) == ((BytesPerWord == 4 + || ((data & 0xFFFF) == ((BytesPerWord == 4 ? 6504 - : 68002)))))) { + : 68002))))) { /* low 2 bytes */ /* Not readable -- try again with reversed bytes... */ @@ -37389,10 +37386,9 @@ } data = longAt(segmentWordArray + BaseHeaderSize); if (!(((data & 0xFFFF) == (imageFormatVersion())) - || ((!0) - && ((data & 0xFFFF) == ((BytesPerWord == 4 + || ((data & 0xFFFF) == ((BytesPerWord == 4 ? 6504 - : 68002)))))) { + : 68002))))) { /* low 2 bytes */ /* Still NG -- put things back and fail */ @@ -42002,8 +41998,7 @@ if (fmt1 <= 4) { if (fmt1 >= 3) { if (fmt1 == 4) { - if (1 - && (GIV(weakRootCount) >= 0)) { + if (GIV(weakRootCount) >= 0) { /* And remember as weak root */ @@ -43909,10 +43904,9 @@ sqImageFileSeek(f, imageOffset); version = (firstVersion = getWord32FromFileswap(f, 0)); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 0; } sqImageFileSeek(f, imageOffset); @@ -43921,10 +43915,9 @@ sqImageFileRead((&w2), sizeof(int), 1, f); version = byteSwapped(w2); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 1; } if (imageOffset == 0) { @@ -43937,10 +43930,9 @@ sqImageFileRead((&w), sizeof(int), 1, f); version = w; if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 0; } sqImageFileSeek(f, 512); @@ -43949,10 +43941,9 @@ sqImageFileRead((&w1), sizeof(int), 1, f); version = byteSwapped(w1); if ((version == (imageFormatVersion())) - || ((!0) - && (version == ((BytesPerWord == 4 + || (version == ((BytesPerWord == 4 ? 6504 - : 68002))))) { + : 68002)))) { return 1; } } @@ -46070,10 +46061,9 @@ ctxtOrNilOrZero = 0; goto l1; } - if (!((198 == 0) - || (((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) + if (!(((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0)))) { + : (byteAt((theFP + FoxIFrameFlags) + 3)) != 0))) { theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP))->methodObject) : longAt(theFP + FoxMethod)); @@ -48684,13 +48674,11 @@ && (((fieldOop = longAt((objOop + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())))), (((fieldOop & 1) == 0) && ((((((usqInt) (longAt(fieldOop))) >> (instFormatFieldLSB())) & 15) <= 4) - || (0 - && (isPointers(followForwarded(fieldOop)))))) + || (0))) && (((fieldOop = longAt((objOop + BaseHeaderSize) + (MethodDictionaryIndex << (shiftForWord())))), (((fieldOop & 1) == 0) && ((((((usqInt) (longAt(fieldOop))) >> (instFormatFieldLSB())) & 15) <= 4) - || (0 - && (isPointers(followForwarded(fieldOop)))))) + || (0))) && (((longAt((objOop + BaseHeaderSize) + (InstanceSpecificationIndex << (shiftForWord())))) & 1))))))); } @@ -49128,13 +49116,12 @@ && (((((usqInt)anObject)) >= (startOfMemory())) && (((((usqInt)anObject)) < GIV(freeStart)) && (((longAt(anObject)) & TypeMask) != HeaderTypeGC))))) - && ((!0) && (addressCouldBeClassObj((classObj = ((anObject & 1) ? longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassSmallInteger << (shiftForWord()))) : (((ccIndex = (((usqInt) (longAt(anObject))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(anObject - BaseHeaderSize)) & AllButTypeMask : (/* begin fetchPointer:ofObject: */ - longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord()))))))))))) { + longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex - 1) << (shiftForWord())))))))))) { if ((classObj == methClass) || ((methClass == null) || (methClass == GIV(nilObj)))) { @@ -51148,10 +51135,9 @@ readableFormat(sqInt imageVersion) { return (imageVersion == (imageFormatVersion())) - || ((!0) - && (imageVersion == ((BytesPerWord == 4 + || (imageVersion == ((BytesPerWord == 4 ? 6504 - : 68002)))); + : 68002))); } @@ -54569,10 +54555,9 @@ GIV(primFailCode) = PrimErrWritePastObject; } } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) + if ((!GIV(primFailCode)) && ((GIV(framePointer) == savedFramePointer1) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory()))))) { /* Don't fail if primitive has done something radical, e.g. perform: */ @@ -55065,10 +55050,9 @@ handlerOrNilOrZero = 0; goto l1; } - if (!((198 == 0) - || (((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) + if (!(((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) ? ((longAt(theFP1 + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 - : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0)))) { + : (byteAt((theFP1 + FoxIFrameFlags) + 3)) != 0))) { theMethod = ((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory()) ? ((mframeHomeMethod(theFP1))->methodObject) : longAt(theFP1 + FoxMethod)); Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nsspursrc/vm/cogit.c 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + CCodeGenerator VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac from - StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + StackToRegisterMappingCogit VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -8674,9 +8674,8 @@ if ((((cPIC->cPICNumCases)) >= numPICCases) || (((errorSelectorOrNil != null) && (errorSelectorOrNil != SelectorDoesNotUnderstand)) - || ((inlineCacheTagIsYoung(cacheTag)) || ((newTargetMethodOrNil == null) - || (isYoung(newTargetMethodOrNil)))))) { + || (isYoung(newTargetMethodOrNil))))) { result = patchToOpenPICFornumArgsreceiver((cPIC->selector), (cPIC->cmNumArgs), receiver); assert(!result); return ceSendFromInLineCacheMiss(cPIC); @@ -8710,10 +8709,8 @@ rcvrClass = fetchClassOf(receiver); cogMethod = mframeHomeMethodExport(); if (!((cogMethod->cmRefersToYoung))) { - if (((inlineCacheTagsMayBeObjects()) - && (isYoung(rcvrClass))) - || ((mixin != receiver) - && (isYoung(mixin)))) { + if ((mixin != receiver) + && (isYoung(mixin))) { ensureInYoungReferrers(cogMethod); } } @@ -8826,10 +8823,9 @@ cacheTag = inlineCacheTagForInstance(receiver); if (((errorSelectorOrNil != null) && (errorSelectorOrNil != SelectorDoesNotUnderstand)) - || ((inlineCacheTagIsYoung(cacheTag)) || (((inlineCacheTagAt(backEnd, outerReturn)) == 0) || ((newTargetMethodOrNil == null) - || (isYoung(newTargetMethodOrNil)))))) { + || (isYoung(newTargetMethodOrNil))))) { result = patchToOpenPICFornumArgsreceiver((targetMethod->selector), (targetMethod->cmNumArgs), receiver); assert(!result); return ceSendFromInLineCacheMiss(targetMethod); @@ -8913,11 +8909,10 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) + tagCouldBeObj = (entryPoint1 < methodZoneBase) || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); if (tagCouldBeObj) { if (couldBeObject(cacheTag1)) { if (!(asserta(checkValidOopReference(cacheTag1)))) { @@ -12640,11 +12635,10 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) + tagCouldBeObj1 = (entryPoint1 < methodZoneBase) || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); if (tagCouldBeObj1) { if (markAndTraceCacheTagLiteralinatpc(cacheTag1, ((CogMethod *) cogMethod), ((usqInt)mcpc))) { codeModified = 1; @@ -12725,8 +12719,7 @@ # if NewspeakVM indexOfIRC = (theIRCs = 0); - if (1 - && (numIRCs > 0)) { + if (numIRCs > 0) { assert((noAssertMethodClassAssociationOf(methodObj)) != (nilObject())); /* begin allocateNPinnedSlots: */ objOop = allocatePinnedSlots(numIRCs * NumOopsPerIRC); @@ -13501,8 +13494,7 @@ static sqInt processorHasDivQuoRemAndMClassIsSmallInteger(sqInt ignoredPrimIndex) { - return (processorHasDivQuoRem(ignoredPrimIndex)) - && (mclassIsSmallInteger(ignoredPrimIndex)); + return mclassIsSmallInteger(ignoredPrimIndex); } static sqInt @@ -13520,8 +13512,7 @@ static sqInt processorHasMultiplyAndMClassIsSmallInteger(sqInt ignoredPrimIndex) { - return (processorHasMultiply(ignoredPrimIndex)) - && (mclassIsSmallInteger(ignoredPrimIndex)); + return mclassIsSmallInteger(ignoredPrimIndex); } static sqInt @@ -13816,11 +13807,10 @@ are markable/remappable objects. */ entryPoint1 = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); - tagCouldBeObj1 = (inlineCacheTagsMayBeObjects()) - || ((entryPoint1 < methodZoneBase) + tagCouldBeObj1 = (entryPoint1 < methodZoneBase) || (((entryPoint1 & entryPointMask) == uncheckedEntryAlignment) || (((entryPoint1 & entryPointMask) == checkedEntryAlignment) - && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); + && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC))); if (tagCouldBeObj1 && (couldBeObject(cacheTag1))) { mappedCacheTag = remapObject(cacheTag1); @@ -14907,8 +14897,7 @@ if ((((sqInt)(rawHeaderOf((cogMethod->methodObject))))) == (((sqInt)cogMethod))) { rawHeaderOfput((cogMethod->methodObject), (cogMethod->methodHeader)); - if (1 - && (((cogMethod->nextMethodOrIRCs)) != 0)) { + if (((cogMethod->nextMethodOrIRCs)) != 0) { /* begin freeIRCs: */ maybeIRCs = (cogMethod->nextMethodOrIRCs); if (oopisGreaterThan(maybeIRCs, nilObject())) { @@ -15418,8 +15407,7 @@ static void genConvertCharacterToSmallIntegerInReg(sqInt reg) { - assert(((characterTag()) == 2) - && (((numCharacterBits()) + 1) == (numSmallIntegerBits()))); + assert(((numCharacterBits()) + 1) == (numSmallIntegerBits())); /* begin LogicalShiftRightCq:R: */ genoperandoperand(LogicalShiftRightCqR, 1, reg); } @@ -15452,8 +15440,7 @@ static void genConvertSmallIntegerToCharacterInReg(sqInt reg) { - assert(((characterTag()) == 2) - && (((numCharacterBits()) + 1) == (numSmallIntegerBits()))); + assert(((numCharacterBits()) + 1) == (numSmallIntegerBits())); /* begin LogicalShiftLeftCq:R: */ genoperandoperand(LogicalShiftLeftCqR, 1, reg); } @@ -18148,7 +18135,7 @@ /* begin JumpNonZero: */ jmpAlreadyRemembered = genoperand(JumpNonZero, ((sqInt)0)); assert(destReg == ReceiverResultReg); - CallRTregistersToBeSavedMask(ceStoreCheckTrampoline, (registerMaskFor(valueReg)) & (callerSavedRegMask())); + CallRTregistersToBeSavedMask(ceStoreCheckTrampoline, (registerMaskFor(valueReg)) | (callerSavedRegMask())); jmpTarget(jmpImmediate, jmpTarget(jmpDestYoung, jmpTarget(jmpSourceOld, jmpTarget(jmpAlreadyRemembered, gLabel())))); return 0; } @@ -20635,8 +20622,7 @@ if (numCleanBlocks > 0) { addCleanBlockStarts(); } - if (!(1 - && (maybeAllocAndInitIRCs()))) { + if (!(maybeAllocAndInitIRCs())) { /* Inaccurate error code, but it'll do. This will likely never fail. */ @@ -23722,8 +23708,7 @@ if ((methodOrBlockNumArgs <= 2) && (methodOrBlockNumArgs > 0)) { regsSet = regsSet | (registerMaskFor(Arg0Reg)); - if ((2 > 1) - && (methodOrBlockNumArgs > 1)) { + if (methodOrBlockNumArgs > 1) { regsSet = regsSet | (registerMaskFor(Arg1Reg)); } } @@ -23778,8 +23763,7 @@ } else { if (numArgs > 0) { - if ((2 > 1) - && (numArgs > 1)) { + if (numArgs > 1) { ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); } @@ -23787,8 +23771,7 @@ ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); } } - if ((2 > 1) - && (numArgs > 1)) { + if (numArgs > 1) { popToReg(simStackAt(simStackPtr), Arg1Reg); } if (numArgs > 0) { @@ -23842,8 +23825,7 @@ Also check for any arg registers in use by other args. */ if (numArgs > 0) { - if ((2 > 1) - && (numArgs > 1)) { + if (numArgs > 1) { ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); } @@ -23851,8 +23833,7 @@ ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); } } - if ((2 > 1) - && (numArgs > 1)) { + if (numArgs > 1) { popToReg(simStackAt(simStackPtr), Arg1Reg); } if (numArgs > 0) { Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1016 uuid: 656d7591-7ea4-4c5f-9d13-c6a0bd8b8286 + CCodeGenerator VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac */ Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-01-15 00:03:32 UTC (rev 3229) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-01-15 21:47:03 UTC (rev 3230) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1017 uuid: 5684df46-8489-43e5-b2ac-6406ef739cf5 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1022 uuid: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac from @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1022.mcz
by commits＠source.squeak.org 15 Jan '15

15 Jan '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1022.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1022 Author: eem Time: 15 January 2015, 1:30:22.147 pm UUID: 69a59ffb-cfbd-4b9e-af74-7c2eb662beac Ancestors: VMMaker.oscog-eem.1021 Cope with the funky primitives generated from Smalltalk methods in computing accessor depths. =============== Diff against VMMaker.oscog-eem.1021 =============== Item was changed: ----- Method: CCodeGenerator>>accessorDepthForMethod: (in category 'spur primitive compilation') ----- accessorDepthForMethod: method "Compute the depth the method traverses object structure, assuming it is a primitive. This is in support of Spur's lazy become. A primitive may fail because it may encounter a forwarder. The primitive failure code needs to know to what depth it must follow arguments to follow forwarders and, if any are found and followed, retry the primitive. This method determines that depth. It starts by collecting references to the stack and then follows these through assignments to variables and use of accessor methods such as fetchPointer:ofObject:. For example | obj field | obj := self stackTop. field := objectMemory fetchPointer: 1 ofObject: obj. self storePointer: 1 ofObject: field withValue: (self stackValue: 1) has depth 2, since field is accessed, and field is an element of obj." + ^((method definingClass includesSelector: method selector) ifTrue: + [(method definingClass >> method selector) pragmaAt: #accessorDepth:]) - ^((method definingClass >> method selector) pragmaAt: #accessorDepth:) ifNil: [((self accessorChainsForMethod: method interpreterClass: (vmClass ifNil: [StackInterpreter])) inject: 0 into: [:length :chain| length max: (self accessorDepthForChain: chain)]) - 1] ifNotNil: [:pragma| pragma arguments first]!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2015