Vm-dev March 2014

vm-dev@lists.squeakfoundation.org

23 participants
104 discussions

Re: [Pharo-dev] strange time / delay problems on pharo-contribution-linux64-4.ci.inria.fr
by Eliot Miranda 11 Mar '14

11 Mar '14

On Tue, Mar 4, 2014 at 2:37 PM, Sven Van Caekenberghe <sven(a)stfx.eu> wrote: > > On 04 Mar 2014, at 22:34, Max Leske <maxleske(a)gmail.com> wrote: > > > Phew! I already thought I was crazy :) > > > > In that case here are two more tidbits: > > - I tried to log 'DateAndTime now' in a different test simultaneously. > The timestamp produced there was different, suggesting that the clock does > move from time to time. > > - FileSystemTests>>testEntryAt exhibits that problem. But the tests run > on the main Pharo machines are fine (that's why I thought it might be the > system clock). > > - the same test only fails in the Pharo3 image, not in Pharo2, but both > use the stable PharoVM for building. > > There is a big difference in how DateAndTime class>>#now works in 2.0 vs > 3.0. The former uses #millisecondClockValue while the latter uses > #microsecondClockValue. Furthermore 2.0 does all kind of crazy stuff with a > loop and Delays to try to improve the accuracy, we threw all that out. > > Yeah, I guess the clock is just being updated slowly, maybe under heavy > load. The question is where that happens. I think in the virtualised OS. > That makes sense. In the VM the microsecond clock is updated on every heartbeat and the heartbeat should be running at about 500Hz. Can anyone with hardware confirm that in 3.0 the time on linux does indeed increase at about 500Hz? Note that even in 2.0 the time is being derived from the same basis. In Cog, the effective time basis is the 64-bit microsecond clock maintained by the heartbeat and even the secondClock and millisecondClock are derived from this. So its still confusing why there should be such a difference between 2.0 and 3.0. > > > Hope that helps. > > > > On 04.03.2014, at 22:10, Sven Van Caekenberghe <sven(a)stfx.eu> wrote: > > > >> Hey Max, > >> > >> Great catch, I saw some weird stuff too, and we had this conversation : > >> > >>> may be just = > >>> and time does not pass fast enough/ > >>> > >>>> On 03 Mar 2014, at 22:22, no-reply(a)ci.inria.fr wrote: > >>>> > >>>>> > https://ci.inria.fr/pharo/job/Pharo-3.0-Update-Step-2.1-Validation-A-L/labe… > >>>>> > >>>>> 1 regressions found. > >>>>> KernelTests.Chronology.DateAndTimeTest.testMonotonicity > >>>> > >>>> How the hell can this fail ? > >>>> The clock moving backwards ?? > >>>> > >>>> testMonotonicity > >>>> > >>>> | t1 t2 t3 t4 | > >>>> t1 := DateAndTime now. > >>>> t2 := DateAndTime now. > >>>> (Delay forMilliseconds: 1000) wait. > >>>> t3 := DateAndTime now. > >>>> t4 := DateAndTime now. > >>>> > >>>> self > >>>> assert: (t1 <= t2); > >>>> assert: (t2 < t3); > >>>> assert: (t3 <= t4). > >> > >> > >> So you proofed Stef's assumption of time standing still ;-) > >> > >> But there were earlier problems as well. > >> > >> Thx ! > >> > >> On 04 Mar 2014, at 21:43, Max Leske <maxleske(a)gmail.com> wrote: > >> > >>> There seems to be a problem on > pharo-contribution-linux64-4.ci.inria.fr AFAICT. I can reproduce the > following to phenomena: > >>> > >>> 1. '(Delay forSeconds: 10) wait' does not wait. > >>> 2. 'DateAndTime now' does not change for long intervals. > >>> > >>> For instance, the following code: > >>> > >>> (FileSystem disk workingDirectory / 'foo.log') writeStreamDo: [ > :stream | > >>> stream nextPutAll: DateAndTime now asString;crlf. > >>> stream nextPutAll: ([(Delay forSeconds: 10) wait] timeToRun / > 1000) asString; crlf. > >>> stream nextPutAll: DateAndTime now asString ]. > >>> > >>> produces this output: > >>> > >>> 2014-03-04T21:32:21.396669+01:00 > >>> 0:00:00:00 > >>> 2014-03-04T21:32:21.396669+01:00 > >>> > >>> Too me (and my untrained eye) this looks like a system clock problem. > Could somebode take a look at the server in question? > >>> > >>> Cheers, > >>> Max > >> > >> > > > > > > > -- best, Eliot

3 4

Re: [Pharo-dev] Touch Events VM changes
by Clément Bera 11 Mar '14

11 Mar '14

Hello, the right place is vm-dev. I put it in CC. Regards, 2014-03-11 11:37 GMT+01:00 J.F. Rick <self(a)je77.com>: > As we move from mouse-keyboard devices to touch-based ones, it would be > nice if we could unify touch development across the different Pharo > platforms (iOS, Android, Windows 8, Linux, etc.), so that we can start to > build touch-aware widgets and frameworks. Currently, there's a lot of > interest but no unified movement. For instance, I've got a very nice > multi-touch 27" computer that I run in Linux. I develop the applications in > Pharo but I currently use a hack to get the touch events: I use OSProcess > to start the mtdev2tuio application that takes touch input and sends it via > TUIO. I then use a UDP socket to read the events on Pharo. If I am to share > my work, I need to get beyond the hack. I (or rather Igor as I watched) > investigated the possibility of using NativeBoost calls to do the same, but > it would not work since mtdev2tuio has to run as superuser, meaning Pharo > would have to run as superuser. We came to the conclusion that this must be > a VM-level change. > > I'm not a VM hacker but would like to reach the people who maintain the > linux and windows VM to see if this might not be a reasonable addition to > the standard VM. There does seem to be standard support for touch events in > XFree86, so it shouldn't be too large a change on Linux. I assume that > Windows 8 similarly makes touch events available. Is this the right place > to ask or is there another mailing list (e.g., the cog-vm)? > > Cheers, > > Jeff > > -- > Jochen "Jeff" Rick, Ph.D. > http://www.je77.com/ > Skype ID: jochenrick >

1 0

VM Maker: VMMaker.oscog-eem.637.mcz
by commits＠source.squeak.org 11 Mar '14

11 Mar '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.637.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.637 Author: eem Time: 10 March 2014, 4:51:23.09 pm UUID: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 Ancestors: VMMaker.oscog-eem.636 Fix genSmallIntegerComparison:orDoubleComparison: (which lies behind SmallInteger>>#= primitive 6) for Spur which has immediate Characters. =============== Diff against VMMaker.oscog-eem.636 =============== Item was changed: ----- Method: SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like receiver (also in ResultReceiverReg) arg return address" + | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | - | jumpDouble jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> + <var: #jumpNonInt type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> - <var: #jumpFail type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - ClassReg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. + objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: + [self MoveR: ClassReg R: TempReg. + jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg]. objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. + - "It was a Float, so convert the receiver to double and perform the operation" self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genConvertSmallIntegerToIntegerInReg: TempReg. self ConvertR: TempReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: BytesPerWord * 2. + objectRepresentation smallIntegerIsOnlyImmediateType + ifTrue: [jumpFail jmpTarget: self Label] + ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)]. - jumpFail jmpTarget: self Label. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator "Stack looks like return address" + | jumpDouble jumpNonInt jumpFail jumpTrue jumpCond | - | jumpDouble jumpFail jumpTrue jumpCond | <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> <var: #jumpDouble type: #'AbstractInstruction *'> + <var: #jumpNonInt type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> - <var: #jumpFail type: #'AbstractInstruction *'> <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> - <var: #jumpCond type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" jumpTrue := self gen: jumpOpcode. self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. "Argument may be a Float : let us check or fail" jumpDouble jmpTarget: self Label. + objectRepresentation smallIntegerIsOnlyImmediateType ifFalse: + [self MoveR: ClassReg R: TempReg. + jumpNonInt := objectRepresentation genJumpImmediateInScratchReg: TempReg]. objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. jumpFail := self JumpNonZero: 0. + - "It was a Float, so convert the receiver to double and perform the operation" objectRepresentation genConvertSmallIntegerToIntegerInReg: ReceiverResultReg. self ConvertR: ReceiverResultReg Rd: DPFPReg0. objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. self CmpRd: DPFPReg1 Rd: DPFPReg0. jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) objRef: objectMemory falseObject. self RetN: 0. jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) objRef: objectMemory trueObject). self RetN: 0. + + objectRepresentation smallIntegerIsOnlyImmediateType + ifTrue: [jumpFail jmpTarget: self Label] + ifFalse: [jumpNonInt jmpTarget: (jumpFail jmpTarget: self Label)]. - jumpFail jmpTarget: self Label. ^0!

1 0

[commit][2876] CogVm source as per VMMaker.oscog-eem.637
by commits＠squeakvm.org 11 Mar '14

11 Mar '14

Revision: 2876 Author: eliot Date: 2014-03-10 16:54:08 -0700 (Mon, 10 Mar 2014) Log Message: ----------- CogVm source as per VMMaker.oscog-eem.637 Fix genSmallIntegerComparison:orDoubleComparison: (which lies behind SmallInteger>>#= primitive 6) for Spur which has immediate Characters. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 from - StackToRegisterMappingCogit VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + StackToRegisterMappingCogit VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -15981,6 +15981,7 @@ AbstractInstruction *jumpCond; AbstractInstruction *jumpDouble; AbstractInstruction *jumpFail; + AbstractInstruction *jumpNonInt; AbstractInstruction *jumpTrue; sqInt quickConstant; @@ -15997,6 +15998,10 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpDouble, gLabel()); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ClassReg, TempReg); + jumpNonInt = genJumpImmediateInScratchReg(TempReg); + genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); /* begin CmpCq:R: */ quickConstant = classFloatCompactIndex(); @@ -16019,7 +16024,8 @@ jmpTarget(jumpCond, annotateobjRef(gMoveCwR(trueObject(), ReceiverResultReg), trueObject())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpFail, gLabel()); + jmpTarget(jumpNonInt, jmpTarget(jumpFail, gLabel())); + return 0; } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Mar 10 13:25:38 PDT 2014 + Mon Mar 10 16:53:44 PDT 2014 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/spursrc/vm/cogit.c 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 from - StackToRegisterMappingCogit VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + StackToRegisterMappingCogit VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -14790,6 +14790,7 @@ AbstractInstruction *jumpCond; AbstractInstruction *jumpDouble; AbstractInstruction *jumpFail; + AbstractInstruction *jumpNonInt; AbstractInstruction *jumpTrue; sqInt quickConstant; @@ -14806,6 +14807,10 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpDouble, gLabel()); + /* begin MoveR:R: */ + genoperandoperand(MoveRR, ClassReg, TempReg); + jumpNonInt = genJumpImmediateInScratchReg(TempReg); + genGetCompactClassIndexNonImmOfinto(Arg0Reg, SendNumArgsReg); /* begin CmpCq:R: */ quickConstant = classFloatCompactIndex(); @@ -14828,7 +14833,8 @@ jmpTarget(jumpCond, annotateobjRef(gMoveCwR(trueObject(), ReceiverResultReg), trueObject())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpFail, gLabel()); + jmpTarget(jumpNonInt, jmpTarget(jumpFail, gLabel())); + return 0; } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/spursrc/vm/cogit.h 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ Modified: branches/Cog/spursrc/vm/cogmethod.h =================================================================== --- branches/Cog/spursrc/vm/cogmethod.h 2014-03-10 20:26:23 UTC (rev 2875) +++ branches/Cog/spursrc/vm/cogmethod.h 2014-03-10 23:54:08 UTC (rev 2876) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.622 uuid: 7a33af68-b347-4a24-b960-e8755f7c49f3 + CCodeGenerator VMMaker.oscog-eem.637 uuid: 313e51e8-63ef-40f1-a824-c26eaa2b39b7 */ typedef struct {

1 0

[commit][2875] CogVM source as per VMMaker.oscog-eem.636
by commits＠squeakvm.org 10 Mar '14

10 Mar '14

Revision: 2875 Author: eliot Date: 2014-03-10 13:26:23 -0700 (Mon, 10 Mar 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.636 Fix byteFormatForNumBytes: and hence fix the new version of positive64BitIntegerFor:. Spur: Make sure expungeDuplicateAndUnmarkedClasses: resets classTableIndex for nil entries. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1146,7 +1146,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2033,7 +2033,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.636"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4827,7 +4827,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l307; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4845,7 +4844,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l307: /* end baseFrameReturn */; goto l304; } @@ -23735,17 +23734,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -23756,21 +23753,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23785,7 +23768,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23839,18 +23822,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -29803,7 +29786,7 @@ && ((integerValue ^ (integerValue << 1)) >= 0)) { return ((integerValue << 1) | 1); } - newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + (4 & 3), 1); + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - 4) & 3), 1); byteAtput((newLargeInteger + BaseHeaderSize) + 3, (((usqInt) integerValue) >> 24) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 2, (((usqInt) integerValue) >> 16) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 1, (((usqInt) integerValue) >> 8) & 0xFF); @@ -29889,7 +29872,7 @@ if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; } - newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + (sz & 3), ((sqInt) 8 >> 2)); + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - sz) & 3), ((sqInt) 8 >> 2)); byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)integerValue) >> 56) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 6, (((unsigned sqLong)integerValue) >> 48) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 5, (((unsigned sqLong)integerValue) >> 40) & 0xFF); @@ -50265,7 +50248,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1149,7 +1149,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2036,7 +2036,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.636"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4836,7 +4836,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l307; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4854,7 +4853,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l307: /* end baseFrameReturn */; goto l304; } @@ -23744,17 +23743,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -23765,21 +23762,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23794,7 +23777,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23848,18 +23831,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -29812,7 +29795,7 @@ && ((integerValue ^ (integerValue << 1)) >= 0)) { return ((integerValue << 1) | 1); } - newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + (4 & 3), 1); + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - 4) & 3), 1); byteAtput((newLargeInteger + BaseHeaderSize) + 3, (((usqInt) integerValue) >> 24) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 2, (((usqInt) integerValue) >> 16) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 1, (((usqInt) integerValue) >> 8) & 0xFF); @@ -29898,7 +29881,7 @@ if (!(((highWord = ((usqInt) highWord) >> 8)) == 0)) { sz += 1; } - newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + (sz & 3), ((sqInt) 8 >> 2)); + newLargeInteger = eeInstantiateSmallClassIndexformatnumSlots(ClassLargePositiveIntegerCompactIndex, 8 + ((4 - sz) & 3), ((sqInt) 8 >> 2)); byteAtput((newLargeInteger + BaseHeaderSize) + 7, (((unsigned sqLong)integerValue) >> 56) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 6, (((unsigned sqLong)integerValue) >> 48) & 0xFF); byteAtput((newLargeInteger + BaseHeaderSize) + 5, (((unsigned sqLong)integerValue) >> 40) & 0xFF); @@ -50274,7 +50257,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nscogsrc/vm/interp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1476,6 +1476,7 @@ _iss usqInt freeOldSpaceStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; @@ -1483,7 +1484,6 @@ _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; -_iss sqInt classTableIndex; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt growHeadroom; _iss sqInt highestRunnableProcessPriority; @@ -2191,7 +2191,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.636"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -25712,20 +25712,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -37865,7 +37871,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -37985,7 +37991,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1479,6 +1479,7 @@ _iss usqInt freeOldSpaceStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; @@ -1486,7 +1487,6 @@ _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; -_iss sqInt classTableIndex; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt growHeadroom; _iss sqInt highestRunnableProcessPriority; @@ -2194,7 +2194,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.636"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -25721,20 +25721,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -37874,7 +37880,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -37994,7 +38000,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspursrc/vm/interp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1286,6 +1286,7 @@ _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; @@ -1293,7 +1294,6 @@ _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; @@ -1981,7 +1981,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.636"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -21944,20 +21944,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -32360,7 +32366,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -32480,7 +32486,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1283,6 +1283,7 @@ _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; @@ -1290,7 +1291,6 @@ _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; @@ -1978,7 +1978,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.635"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.636"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -21935,20 +21935,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -32351,7 +32357,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -32471,7 +32477,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sun Mar 9 12:14:16 PDT 2014 + Mon Mar 10 13:25:38 PDT 2014 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spursrc/vm/cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1466,13 +1466,13 @@ _iss usqInt freeOldSpaceStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; -_iss sqInt classTableIndex; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt growHeadroom; _iss sqInt highestRunnableProcessPriority; @@ -2181,7 +2181,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.635]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.636]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6397,7 +6397,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6407,7 +6406,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6435,7 +6433,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -20790,20 +20787,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -32506,7 +32509,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -32626,7 +32629,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spursrc/vm/cointerp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1469,13 +1469,13 @@ _iss usqInt freeOldSpaceStart; _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; -_iss sqInt classTableIndex; _iss sqInt cogCompiledCodeCompactionCalledFor; _iss sqInt growHeadroom; _iss sqInt highestRunnableProcessPriority; @@ -2184,7 +2184,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.635]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.636]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6406,7 +6406,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6416,7 +6415,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6444,7 +6442,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -20799,20 +20796,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -32515,7 +32518,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -32635,7 +32638,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/spursrc/vm/interp.h =================================================================== --- branches/Cog/spursrc/vm/interp.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spursrc/vm/interp.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursrc/vm/vmCallback.h 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spursrc/vm/vmCallback.h 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1279,6 +1279,7 @@ _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; @@ -1286,7 +1287,6 @@ _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; @@ -1974,7 +1974,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.635]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.636]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -17367,20 +17367,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { if (classIndex < GIV(classTableIndex)) { GIV(classTableIndex) = classIndex; } } + else { + if ((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((rawHashBitsOf(classOrNil)) != classIndex)) { + /* begin storePointerUnchecked:ofObject:withValue: */ + assert(!(isForwarded(classTablePage))); + longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); + assert((expungeUnmarked + && (!(isMarked(classOrNil)))) + || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classIndex < GIV(classTableIndex)) { + GIV(classTableIndex) = classIndex; + } + } + } } } } @@ -27372,7 +27378,7 @@ return ((integerValue << 1) | 1); } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (4 & ((wordSize()) - 1)); + objFormat = 16 + ((8 - 4) & ((wordSize()) - 1)); assert((1 >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) @@ -27492,7 +27498,7 @@ sz += 1; } /* begin eeInstantiateSmallClassIndex:format:numSlots: */ - objFormat = 16 + (sz & ((wordSize()) - 1)); + objFormat = 16 + ((8 - sz) & ((wordSize()) - 1)); assert(((((sqInt) 8 >> 2)) >= 0) && (ClassLargePositiveIntegerCompactIndex != 0)); assert(((objFormat < (firstByteFormat()) Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-03-09 19:17:15 UTC (rev 2874) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-03-10 20:26:23 UTC (rev 2875) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 from - StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 + StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.636 uuid: 97945106-afaf-4c50-be03-a1806625c3b9 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1276,6 +1276,7 @@ _iss sqInt longRunningPrimitiveCheckMethod; _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt profileMethod; +_iss sqInt classTableIndex; _iss sqInt ephemeronQueue; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt growHeadroom; @@ -1283,7 +1284,6 @@ _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; _iss sqInt profileSemaphore; -_iss sqInt classTableIndex; _iss sqInt highestRunnableProcessPriority; _iss usqLong longRunningPrimitiveStartUsecs; _iss usqLong longRunningPrimitiveStopUsecs; @@ -1971,7 +1971,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.635]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.636]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -17358,20 +17358,26 @@ assert((classAtIndex(classIndex)) == classOrNil); assert((classOrNil == GIV(nilObj)) || (addressCouldBeClassObj(classOrNil))); - if ((classOrNil != GIV(nilObj)) - && ((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((rawHashBitsOf(classOrNil)) != classIndex))) { - /* begin storePointerUnchecked:ofObject:withValue: */ - assert(!(isForwarded(classTablePage))); - longAtput((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2), GIV(nilObj)); - assert((expungeUnmarked - && (!(isMarked(classOrNil)))) - || ((classAtIndex(rawHashBitsOf(classOrNil))) == classOrNil)); + if (classOrNil == GIV(nilObj)) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.636.mcz
by commits＠source.squeak.org 10 Mar '14

10 Mar '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.636.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.636 Author: eem Time: 10 March 2014, 12:19:45.557 pm UUID: 97945106-afaf-4c50-be03-a1806625c3b9 Ancestors: VMMaker.oscog-eem.635 Fix byteFormatForNumBytes: and hence fix the new version of positive64BitIntegerFor:. Make sure expungeDuplicateAndUnmarkedClasses: resets classTableIndex for nil entries. Eliminate duplication in generateEntire. Typo. =============== Diff against VMMaker.oscog-eem.635 =============== Item was changed: ----- Method: ObjectMemory>>byteFormatForNumBytes: (in category 'header access') ----- byteFormatForNumBytes: numBytes + ^self firstByteFormat + (4 - numBytes bitAnd: 3)! - ^self firstByteFormat + (numBytes bitAnd: 3)! Item was changed: ----- Method: SpurMemoryManager>>byteFormatForNumBytes: (in category 'header format') ----- byteFormatForNumBytes: numBytes + ^self firstByteFormat + (8 - numBytes bitAnd: self wordSize - 1)! - ^self firstByteFormat + (numBytes bitAnd: self wordSize - 1)! Item was changed: ----- Method: SpurMemoryManager>>expungeDuplicateAndUnmarkedClasses: (in category 'class table') ----- expungeDuplicateAndUnmarkedClasses: expungeUnmarked "Bits have been set in the classTableBitmap corresponding to used classes. Any class in the class table that does not have a bit set has no instances with that class index. However, becomeForward: can create duplicate entries, and these duplicate entries a) won't have a bit set on load (because there are no forwarders on load), b) wont match their identityHash. So expunge duplicates by eliminating unmarked entries that don't occur at their identityHash. Further, any class in the table that is unmarked will also not have a bit set so eliminate unmarked classes using the bitmap too." 1 to: numClassTablePages - 1 do: "Avoid expunging the puns by not scanning the 0th page." [:i| | classTablePage | "optimize scan by only scanning bitmap in regions that have pages." classTablePage := self fetchPointer: i ofObject: hiddenRootsObj. classTablePage ~= nilObj ifTrue: [i << self classTableMajorIndexShift to: i << self classTableMajorIndexShift + self classTableMinorIndexMask by: 8 do: [:majorBitIndex| | byteIndex byte classIndex classOrNil | "optimize scan by scanning a byte of indices (8 indices) at a time" byteIndex := majorBitIndex / BitsPerByte. byte := classTableBitmap at: byteIndex. byte ~= 255 ifTrue: [0 to: 7 do: [:minorBitIndex| (byte noMask: 1 << minorBitIndex) ifTrue: [classIndex := majorBitIndex + minorBitIndex. classOrNil := self fetchPointer: (classIndex bitAnd: self classTableMinorIndexMask) ofObject: classTablePage. self assert: (self classAtIndex: classIndex) = classOrNil. self assert: (classOrNil = nilObj or: [coInterpreter addressCouldBeClassObj: classOrNil]). "only remove a class if it is at a duplicate entry or it is unmarked and we're expunging unmarked classes." + classOrNil = nilObj + ifTrue: + [classIndex < classTableIndex ifTrue: + [classTableIndex := classIndex]] + ifFalse: + [((expungeUnmarked and: [(self isMarked: classOrNil) not]) + or: [(self rawHashBitsOf: classOrNil) ~= classIndex]) ifTrue: + [self storePointerUnchecked: (classIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage + withValue: nilObj. + "but if it is marked, it should still be in the table at its correct index." + self assert: ((expungeUnmarked and: [(self isMarked: classOrNil) not]) + or: [(self classAtIndex: (self rawHashBitsOf: classOrNil)) = classOrNil]). + "If the removed class is before the classTableIndex, set the + classTableIndex to point to the empty slot so as to reuse it asap." + classIndex < classTableIndex ifTrue: + [classTableIndex := classIndex]]]]]]]]]! - (classOrNil ~= nilObj - and: [(expungeUnmarked and: [(self isMarked: classOrNil) not]) - or: [(self rawHashBitsOf: classOrNil) ~= classIndex]]) ifTrue: - [self storePointerUnchecked: (classIndex bitAnd: self classTableMinorIndexMask) - ofObject: classTablePage - withValue: nilObj. - "but if it is marked, it should still be in the table at its correct index." - self assert: ((expungeUnmarked and: [(self isMarked: classOrNil) not]) - or: [(self classAtIndex: (self rawHashBitsOf: classOrNil)) = classOrNil]). - "If the removed class is before the classTableIndex, set the - classTableIndex to point to the empty slot so as to reuse it asap." - classIndex < classTableIndex ifTrue: - [classTableIndex := classIndex]]]]]]]]! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceHiddenRoots (in category 'gc - global') ----- markAndTraceHiddenRoots "The hidden roots hold both the class table pages and the obj stacks, and hence need special treatment. The obj stacks must be marked specially; their pages must be marked, but only the contents of the ephemeronQueue should be marked. If a class table page is weak we can mark and trace the hiddenRoots, + which will not trace through class table pages because they are weak. - which will not trace through class table opages because they are weak. But if class table pages are strong, we must mark the pages and *not* trace them so that only classes reachable from the true roots will be marked, and unreachable classes will be left unmarked." self markAndTraceObjStack: markStack andContents: false. self markAndTraceObjStack: weaklingStack andContents: false. self markAndTraceObjStack: ephemeronQueue andContents: true. self setIsMarkedOf: self freeListsObj to: true. (self isWeakNonImm: classTableFirstPage) ifTrue: [^self markAndTrace: hiddenRootsObj]. self setIsMarkedOf: hiddenRootsObj to: true. self markAndTrace: classTableFirstPage. 1 to: numClassTablePages - 1 do: [:i| self setIsMarkedOf: (self fetchPointer: i ofObject: hiddenRootsObj) to: true]! Item was changed: ----- Method: VMMaker>>generateEntire (in category 'generate sources') ----- generateEntire "Generate the interp, internal plugins and exports as well as the external plugins. If this comes from a generator, log it for convenience." self configurationGeneratorNameOrNil ifNotNil: [:generator| logger cr; nextPutAll: (generator selector copyReplaceAll: 'generate' with: ''). interpreterClassName ifNotNil: + [logger space; nextPutAll: (CCodeGenerator shortMonticelloDescriptionForClass: (Smalltalk classNamed: interpreterClassName))]. - [logger - space; nextPutAll: interpreterClassName; - space; nextPutAll: (CCodeGenerator shortMonticelloDescriptionForClass: (Smalltalk classNamed: interpreterClassName))]. logger cr; flush]. self generateMainVM. self generateExternalPlugins!

1 0

VM Maker: Cog-eem.142.mcz
by commits＠source.squeak.org 10 Mar '14

10 Mar '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.142.mcz ==================== Summary ==================== Name: Cog-eem.142 Author: eem Time: 9 March 2014, 7:02:01.428 pm UUID: 599c09fa-c337-4558-940d-d4f2a6564634 Ancestors: Cog-eem.141 Use class side shortMonticelloDescriptionForClass: per VMMaker.oscog-eem.632 =============== Diff against Cog-eem.141 =============== Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>version:withPatches:for: (in category 'patching') ----- version: version withPatches: patches for: package | snapshot ancestry | snapshot := MCPatcher apply: (self patchForPackage: package withPatches: patches snapshot: version snapshot) to: version snapshot. ancestry := MCWorkingAncestry new addAncestor: version info. ^MCVersion package: version package info: (ancestry infoWithName: version info name message: version info name, ' patched for Spur by ', + (CCodeGenerator shortMonticelloDescriptionForClass: self class), - (CCodeGenerator new shortMonticelloDescriptionForClass: self class), '\\' withCRs, version info message) snapshot: snapshot dependencies: {} "punt on computing dependencies; there are't any so far" !

1 0

[commit][2874] CogVM source as per VMMaker.oscog-eem.635
by commits＠squeakvm.org 09 Mar '14

09 Mar '14

Revision: 2874 Author: eliot Date: 2014-03-09 12:17:15 -0700 (Sun, 09 Mar 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.635 Spur: Fix decoding the per-segment bridge span/seg size info on load and successfully load a multi-segment Newspeak bootstrap image. Finally! Rename writeImageToFile: to writeImageSegmentsToFile:. Don't write out empty segments on snapshot. Make various of the segment snapshot i/o rouitnes not inline for debugging Newspeak bootstrap load crash. Make segmentContainingObj: available for debugging. Fix assert in inClassTableBitmapSet:. Make sure adjustAllOopsBy: only sets bits in the classTableBitmap for classes, not class index puns. Provide a free tree printer. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 from - CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1146,7 +1146,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1273,8 +1273,8 @@ _iss usqInt method; _iss StackPage * stackPage; _iss sqInt bytecodeSetSelector; +_iss usqInt instructionPointer; _iss usqInt freeStart; -_iss usqInt instructionPointer; _iss sqInt argumentCount; _iss sqInt nilObj; _iss usqInt newMethod; @@ -2033,7 +2033,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.630"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4827,6 +4827,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l307; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4844,7 +4845,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l307: /* end baseFrameReturn */; goto l304; } @@ -23734,15 +23735,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23753,7 +23756,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23768,7 +23785,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23822,18 +23839,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50248,7 +50265,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -55013,23 +55030,23 @@ return ((((usqInt) w << 0)) & Bytes3to0Mask) + ((((usqInt) w << 0)) & Bytes7to4Mask); } + +/* Write the image header and heap contents to imageFile for snapshot. */ + static sqInt writeImageFileIO(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesWritten; sqImageFile f; sqInt headerSize; - squeakFileOffsetType headerStart; + squeakFileOffsetType headerStart; sqInt i; - usqInt memStart; + usqInt imageBytes; + extern char imageName[]; sqInt okToWrite; void *sCWIfn; - sqInt successBoolean; - - /* If the security plugin can be loaded, use it to check for write permission. - If not, assume it's ok */ - + null; sCWIfn = ioLoadFunctionFrom("secCanWriteImage", "SecurityPlugin"); if (sCWIfn != 0) { okToWrite = ((sqInt (*)(void))sCWIfn)(); @@ -55057,12 +55074,13 @@ } return null; } - headerStart = sqImageFileStartLocation(f,imageName,headerSize+imageBytes); + imageBytes = GIV(freeStart) - (startOfMemory()); + headerStart = sqImageFileStartLocation(f, imageName, headerSize + imageBytes); /* Note: on Unix systems one could put an exec command here, padded to 512 bytes */; sqImageFileSeek(f, headerStart); putLongtoFile(imageFormatVersion(), f); putLongtoFile(headerSize, f); - putLongtoFile(GIV(freeStart) - (startOfMemory()), f); + putLongtoFile(imageBytes, f); putLongtoFile(startOfMemory(), f); putLongtoFile(GIV(specialObjectsOop), f); putLongtoFile(((usqInt) GIV(freeStart)) >> ShiftForWord, f); @@ -55088,6 +55106,7 @@ putLongtoFile(0, f); } + sqImageFileSeek(f, headerStart + headerSize); if (!(!GIV(primFailCode))) { /* file write or seek failure */ @@ -55095,14 +55114,10 @@ sqImageFileClose(f); return null; } - sqImageFileSeek(f, headerStart + headerSize); - memStart = startOfMemory(); - bytesWritten = sqImageFileWrite(pointerForOop(memStart), sizeof(char), GIV(freeStart) - (startOfMemory()), f); - + bytesWritten = sqImageFileWrite(pointerForOop(startOfMemory()), sizeof(char), imageBytes, f); /* begin success: */ - successBoolean = bytesWritten == (GIV(freeStart) - (startOfMemory())); - if (!successBoolean) { + if (!(bytesWritten == imageBytes)) { /* Don't overwrite an error code that has already been set. */ Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 from - CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1149,7 +1149,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1276,8 +1276,8 @@ _iss usqInt method; _iss StackPage * stackPage; _iss sqInt bytecodeSetSelector; +_iss usqInt instructionPointer; _iss usqInt freeStart; -_iss usqInt instructionPointer; _iss sqInt argumentCount; _iss sqInt nilObj; _iss usqInt newMethod; @@ -2036,7 +2036,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.630"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -4836,6 +4836,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); + null; goto l307; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4853,7 +4854,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - /* return self */ + null; l307: /* end baseFrameReturn */; goto l304; } @@ -23743,15 +23744,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -23762,7 +23765,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -23777,7 +23794,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -23831,18 +23848,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -50257,7 +50274,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -55022,23 +55039,23 @@ return ((((usqInt) w << 0)) & Bytes3to0Mask) + ((((usqInt) w << 0)) & Bytes7to4Mask); } + +/* Write the image header and heap contents to imageFile for snapshot. */ + static sqInt writeImageFileIO(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesWritten; sqImageFile f; sqInt headerSize; - squeakFileOffsetType headerStart; + squeakFileOffsetType headerStart; sqInt i; - usqInt memStart; + usqInt imageBytes; + extern char imageName[]; sqInt okToWrite; void *sCWIfn; - sqInt successBoolean; - - /* If the security plugin can be loaded, use it to check for write permission. - If not, assume it's ok */ - + null; sCWIfn = ioLoadFunctionFrom("secCanWriteImage", "SecurityPlugin"); if (sCWIfn != 0) { okToWrite = ((sqInt (*)(void))sCWIfn)(); @@ -55066,12 +55083,13 @@ } return null; } - headerStart = sqImageFileStartLocation(f,imageName,headerSize+imageBytes); + imageBytes = GIV(freeStart) - (startOfMemory()); + headerStart = sqImageFileStartLocation(f, imageName, headerSize + imageBytes); /* Note: on Unix systems one could put an exec command here, padded to 512 bytes */; sqImageFileSeek(f, headerStart); putLongtoFile(imageFormatVersion(), f); putLongtoFile(headerSize, f); - putLongtoFile(GIV(freeStart) - (startOfMemory()), f); + putLongtoFile(imageBytes, f); putLongtoFile(startOfMemory(), f); putLongtoFile(GIV(specialObjectsOop), f); putLongtoFile(((usqInt) GIV(freeStart)) >> ShiftForWord, f); @@ -55097,6 +55115,7 @@ putLongtoFile(0, f); } + sqImageFileSeek(f, headerStart + headerSize); if (!(!GIV(primFailCode))) { /* file write or seek failure */ @@ -55104,14 +55123,10 @@ sqImageFileClose(f); return null; } - sqImageFileSeek(f, headerStart + headerSize); - memStart = startOfMemory(); - bytesWritten = sqImageFileWrite(pointerForOop(memStart), sizeof(char), GIV(freeStart) - (startOfMemory()), f); - + bytesWritten = sqImageFileWrite(pointerForOop(startOfMemory()), sizeof(char), imageBytes, f); /* begin success: */ - successBoolean = bytesWritten == (GIV(freeStart) - (startOfMemory())); - if (!successBoolean) { + if (!(bytesWritten == imageBytes)) { /* Don't overwrite an error code that has already been set. */ Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nscogsrc/vm/interp.h 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 from - CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -604,6 +604,7 @@ void findString(char *aCString); static sqInt firstAccessibleObject(void); sqInt firstByteFormat(void); +static sqInt firstClassIndexPun(void); sqInt firstCompiledMethodFormat(void); static sqInt firstCorpse(sqInt headOfCorpseList); static void firstFitCompact(void); @@ -699,7 +700,6 @@ static sqInt iframeSavedIP(char *theFP); void ifValidWriteBackStackPointersSaveTo(void *theCFP, void *theCSP, char **savedFPP, char **savedSPP); static sqInt imageFormatVersion(void); -static sqInt imageSizeToWrite(void); sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector); static sqInt inactiveOrFailedToDeferScan(sqInt anEphemeron); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -711,6 +711,7 @@ static void initializeStacknumSlotspageSize(char *theStackPages, sqInt stackSlots, sqInt slotsPerPage); sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod); static void initSegmentBridgeWithBytesat(usqLong numBytes, sqInt address); +void inOrderPrintFreeTreeprintList(sqInt freeChunk, sqInt printNextList); sqInt instanceSizeOf(sqInt classObj); sqInt instantiateClassindexableSize(sqInt classObj, sqInt nElements); usqInt instructionPointerAddress(void); @@ -881,6 +882,7 @@ static sqInt newObjectHash(void); static sqInt newSpaceIsEmpty(void); static StackPage * newStackPage(void); +static SpurSegmentInfo * nextNonEmptySegmentAfter(sqInt i); usqInt nextProfileTickAddress(void); sqInt nilObject(void); static void nilUnmarkedWeaklingSlots(void); @@ -932,6 +934,7 @@ unsigned long positiveMachineIntegerValueOf(sqInt oop); static void postBecomeOrCompactScanClassTable(sqInt effectsFlags); static void postGCAction(sqInt gcModeArg); +static void prepareForSnapshot(void); sqInt primErrTable(void); usqInt primFailCodeAddress(void); static void primitiveAdd(void); @@ -1196,6 +1199,7 @@ sqInt printFrame(char *theFP); void printFrameWithSP(char *theFP, char *theSP); void printFreeChunk(sqInt freeChunk); +static void printFreeChunkisNextChunk(sqInt freeChunk, sqInt isNextChunk); void printFreeList(sqInt chunkOrIndex); void printHex(sqInt n); void printInstancesOf(sqInt aClassOop); @@ -1278,6 +1282,7 @@ static sqInt scavengeUnfiredEphemeronsOnEphemeronList(void); static void scavengingGCTenuringIf(sqInt tenuringCriterion); static usqInt segLimit(SpurSegmentInfo * self_in_segLimit); +EXPORT(SpurSegmentInfo *) segmentContainingObj(sqInt objOop); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); EXPORT(sqInt) sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtr, sqInt stackPtr, sqInt regsPtr, sqInt jmpBufPtr); void setBreakSelector(char *aString); @@ -1393,7 +1398,8 @@ static sqInt withSmallIntegerTags(char *value); static sqInt wordIndexableFormat(void); static sqInt writeImageFileIO(void); -static sqInt writeSegmentnextSegmentSizetoFile(SpurSegmentInfo *segment, sqInt nextSegSize, FILE *aBinaryStream); +static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream); +static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream); /*** Variables ***/ #if SQ_USE_GLOBAL_STRUCT @@ -1423,9 +1429,9 @@ _iss usqInt endOfMemory; _iss sqInt totalFreeOldSpace; _iss sqInt trueObj; +_iss SpurSegmentInfo * segments; _iss sqInt falseObj; _iss sqInt remapBufferCount; -_iss SpurSegmentInfo * segments; _iss sqInt needGCFlag; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; @@ -2185,7 +2191,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.630"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.635"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -27382,6 +27388,19 @@ return 16; } + +/* Class puns are class indices not used by any class. There is an entry + for the pun that refers to the notional class of objects with this class + index. But because the index doesn't match the class it won't show up + in allInstances, hence hiding the object with a pun as its class index. + The puns occupy indices 16 through 31. */ + +static sqInt +firstClassIndexPun(void) +{ + return 16; +} + sqInt firstCompiledMethodFormat(void) { @@ -30387,24 +30406,6 @@ } -/* when asked, newSpace should be empty. */ - -static sqInt -imageSizeToWrite(void) -{ DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt i; - sqInt total; - - assert(newSpaceIsEmpty()); - /* begin totalBytesInSegments */ - total = 0; - for (i = 0; i < GIV(numSegments); i += 1) { - total += ((GIV(segments)[i]).segSize); - } - return total; -} - - /* This is used to implement the innards of the pushImplicitReceiverBytecode, used for implicit receiver sends in NS2/NS3. Find the nearest lexically-enclosing implementation of selector by searching up the static @@ -30990,6 +30991,7 @@ SpurNewSpaceSpace *aNewSpace; sqInt bit; sqInt bit1; + sqInt classIndex; sqInt classTableRoot; sqInt field; sqInt fieldAddr; @@ -31065,32 +31067,16 @@ ? GIV(oldSpaceStart) + (BaseHeaderSize) : GIV(oldSpaceStart)); while ((((usqInt) obj)) < (((usqInt) GIV(freeOldSpaceStart)))) { - if (((longAt(obj)) & 0x3FFFFF) == 0) { - /* begin swizzleFieldsOfFreeChunk: */ - field = longAt((obj + (BaseHeaderSize)) + (0 << 2)); - if (field != 0) { - /* begin storePointerNoAssert:ofFreeChunk:withValue: */ - valuePointer = swizzleObj(field); - longAtput((obj + (BaseHeaderSize)) + (0 << 2), valuePointer); + classIndex = (longAt(obj)) & 0x3FFFFF; + if (classIndex >= 8) { + if (classIndex > 0x1F) { + /* begin inClassTableBitmapSet: */ + assert((classIndex >= (firstClassIndexPun())) + && (classIndex <= (classIndexMask()))); + majorIndex = ((sqInt) classIndex >> 3); + bit = 1 << (classIndex & (BitsPerByte - 1)); + GIV(classTableBitmap)[majorIndex] = ((GIV(classTableBitmap)[majorIndex]) | bit); } - if ((bytesInObject(obj)) >= (32 * 8)) { - for (index = 2, indexLimiT = 4; index <= indexLimiT; index += 1) { - field = longAt((obj + (BaseHeaderSize)) + (index << 2)); - if (field != 0) { - /* begin storePointerNoAssert:ofFreeChunk:withValue: */ - valuePointer1 = swizzleObj(field); - longAtput((obj + (BaseHeaderSize)) + (index << 2), valuePointer1); - } - } - } - } - else { - /* begin inClassTableBitmapSet: */ - assert((((longAt(obj)) & 0x3FFFFF) >= 0) - && (((longAt(obj)) & 0x3FFFFF) <= (classIndexMask()))); - majorIndex = ((sqInt) ((longAt(obj)) & 0x3FFFFF) >> 3); - bit = 1 << (((longAt(obj)) & 0x3FFFFF) & (BitsPerByte - 1)); - GIV(classTableBitmap)[majorIndex] = ((GIV(classTableBitmap)[majorIndex]) | bit); /* begin swizzleFieldsOfObject: */ fieldAddr = obj + (lastPointerOfWhileSwizzling(obj)); while ((((usqInt) fieldAddr)) >= (((usqInt) (obj + (BaseHeaderSize))))) { @@ -31101,6 +31087,27 @@ fieldAddr -= BytesPerOop; } } + else { + if (classIndex == 0) { + /* begin swizzleFieldsOfFreeChunk: */ + field = longAt((obj + (BaseHeaderSize)) + (0 << 2)); + if (field != 0) { + /* begin storePointerNoAssert:ofFreeChunk:withValue: */ + valuePointer = swizzleObj(field); + longAtput((obj + (BaseHeaderSize)) + (0 << 2), valuePointer); + } + if ((bytesInObject(obj)) >= (32 * 8)) { + for (index = 2, indexLimiT = 4; index <= indexLimiT; index += 1) { + field = longAt((obj + (BaseHeaderSize)) + (index << 2)); + if (field != 0) { + /* begin storePointerNoAssert:ofFreeChunk:withValue: */ + valuePointer1 = swizzleObj(field); + longAtput((obj + (BaseHeaderSize)) + (index << 2), valuePointer1); + } + } + } + } + } obj = objectAfter(obj); } } @@ -31114,12 +31121,13 @@ ? GIV(oldSpaceStart) + (BaseHeaderSize) : GIV(oldSpaceStart)); while ((((usqInt) obj)) < (((usqInt) GIV(endOfMemory)))) { - if (!(((longAt(obj)) & 0x3FFFFF) == 0)) { + classIndex = (longAt(obj)) & 0x3FFFFF; + if (classIndex > 0x1F) { /* begin inClassTableBitmapSet: */ - assert((((longAt(obj)) & 0x3FFFFF) >= 0) - && (((longAt(obj)) & 0x3FFFFF) <= (classIndexMask()))); - majorIndex1 = ((sqInt) ((longAt(obj)) & 0x3FFFFF) >> 3); - bit1 = 1 << (((longAt(obj)) & 0x3FFFFF) & (BitsPerByte - 1)); + assert((classIndex >= (firstClassIndexPun())) + && (classIndex <= (classIndexMask()))); + majorIndex1 = ((sqInt) classIndex >> 3); + bit1 = 1 << (classIndex & (BitsPerByte - 1)); GIV(classTableBitmap)[majorIndex1] = ((GIV(classTableBitmap)[majorIndex1]) | bit1); } obj = objectAfter(obj); @@ -31348,6 +31356,32 @@ } +/* print free chunks in freeTree in order. */ + +void +inOrderPrintFreeTreeprintList(sqInt freeChunk, sqInt printNextList) +{ + sqInt next; + + if (((next = longAt((freeChunk + (BaseHeaderSize)) + (3 << 2)))) != 0) { + inOrderPrintFreeTreeprintList(next, printNextList); + } + printFreeChunkisNextChunk(freeChunk, 0); + if (printNextList) { + next = freeChunk; + while (((next = longAt((next + (BaseHeaderSize)) + (0 << 2)))) != 0) { + /* begin tab */ + /* begin printChar: */ + putchar(' '); + printFreeChunkisNextChunk(next, 1); + } + } + if (((next = longAt((freeChunk + (BaseHeaderSize)) + (4 << 2)))) != 0) { + inOrderPrintFreeTreeprintList(next, printNextList); + } +} + + /* Answer the number of slots in a class. For example the instanceSizeOf: ClassPoint is 2, for the x & y slots. The instance size of non-pointer classes is 0. */ @@ -34774,7 +34808,7 @@ classIndex = (longAt(objOop)) & 0x3FFFFF; /* begin inClassTableBitmapSet: */ - assert((classIndex >= 0) + assert((classIndex >= (firstClassIndexPun())) && (classIndex <= (classIndexMask()))); majorIndex = ((sqInt) classIndex >> 3); bit = 1 << (classIndex & (BitsPerByte - 1)); @@ -36700,6 +36734,30 @@ } +/* Answer the the next non-empty segment or nil. The size of a segment + includes that of its bridge. A segment containing just a free object and a + bridge will still + have a size of manager bridgeSize after shortening it in + prepareForSnapshot. + */ + +static SpurSegmentInfo * +nextNonEmptySegmentAfter(sqInt i) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt nextx; + + nextx = i; + while(1) { + if (((nextx += 1)) >= GIV(numSegments)) { + return null; + } + if ((((GIV(segments)[nextx]).segSize)) > (2 * (BaseHeaderSize))) { + return (&(GIV(segments)[nextx])); + } + } +} + + /* N.B. nextProfileTick is 64-bits */ usqInt @@ -38172,6 +38230,110 @@ GIV(gcMode) = 0; } + +/* shorten all segments by any trailing free space. */ + +static void +prepareForSnapshot(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt cameFrom; + SpurSegmentInfo * cascade0; + usqInt freeChunk; + sqInt i; + sqInt i1; + sqInt largeChild; + sqInt newEndOfMemory; + sqInt next; + sqInt node; + SpurSegmentInfo *seg; + sqInt smallChild; + sqInt treeNode; + + for (i = 0; i < GIV(numSegments); i += 1) { + cascade0 = (&(GIV(segments)[i])); + (cascade0->savedSegSize = ((GIV(segments)[i]).segSize)); + (cascade0->lastFreeObject = null); + } + /* begin freeTreeNodesDo: */ + treeNode = GIV(freeLists)[0]; + if (treeNode == 0) { + goto l2; + } + cameFrom = -1; + do { + assert((bytesInObject(treeNode)) >= ((numFreeLists()) * (allocationUnit()))); + smallChild = longAt((treeNode + (BaseHeaderSize)) + (3 << 2)); + largeChild = longAt((treeNode + (BaseHeaderSize)) + (4 << 2)); + assert((smallChild == 0) + || (treeNode == (fetchPointerofFreeChunk(freeChunkParentIndex(), smallChild)))); + assert((largeChild == 0) + || (treeNode == (fetchPointerofFreeChunk(freeChunkParentIndex(), largeChild)))); + if (((smallChild == 0) + && (largeChild == 0)) + || ((largeChild == 0 + ? cameFrom == smallChild + : cameFrom == largeChild))) { + + /* and since we've applied we must move on up */ + + node = treeNode; + while (node != 0) { + next = objectAfterlimit(node, endOfMemory()); + if (((longAt(next)) & 0x3FFFFF) == 3) { + /* begin segmentContainingObj: */ + for (i1 = (GIV(numSegments) - 1); i1 >= 0; i1 += -1) { + if (node >= (((GIV(segments)[i1]).segStart))) { + seg = (&(GIV(segments)[i1])); + goto l3; + } + } + seg = null; + l3: /* end segmentContainingObj: */; + (seg->lastFreeObject = node); + node = 0; + } + else { + node = longAt((node + (BaseHeaderSize)) + (0 << 2)); + } + } + treeNode = treeNode; + + cameFrom = treeNode; + treeNode = longAt((treeNode + (BaseHeaderSize)) + (2 << 2)); + } + else { + if ((smallChild != 0) + && (cameFrom != smallChild)) { + treeNode = smallChild; + } + else { + assert(largeChild != 0); + treeNode = largeChild; + } + cameFrom = -1; + } + } while(treeNode != 0); +l2: /* end freeTreeNodesDo: */; + for (i = 0; i < GIV(numSegments); i += 1) { + freeChunk = ((GIV(segments)[i]).lastFreeObject); + if (!(freeChunk == null)) { + detachFreeObject(freeChunk); + ((GIV(segments)[i]).segSize = ((((rawNumSlotsOf(freeChunk)) == 0xFF + ? freeChunk - (BaseHeaderSize) + : freeChunk)) + (2 * (BaseHeaderSize))) - (((GIV(segments)[i]).segStart))); + bridgeFromto((&(GIV(segments)[i])), (i < (GIV(numSegments) - 1) + ? (&(GIV(segments)[i + 1])) + : 0)); + } + } + /* begin setEndOfMemory: */ + newEndOfMemory = ((((GIV(segments)[GIV(numSegments) - 1]).segSize)) + (((GIV(segments)[GIV(numSegments) - 1]).segStart))) - (2 * (BaseHeaderSize)); + GIV(endOfMemory) = newEndOfMemory; + if (GIV(freeOldSpaceStart) > newEndOfMemory) { + GIV(freeOldSpaceStart) = newEndOfMemory; + } +} + sqInt primErrTable(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT @@ -56383,6 +56545,12 @@ void printFreeChunk(sqInt freeChunk) { + printFreeChunkisNextChunk(freeChunk, 0); +} + +static void +printFreeChunkisNextChunk(sqInt freeChunk, sqInt isNextChunk) +{ usqLong numBytes; numBytes = bytesInObject(freeChunk); @@ -56396,7 +56564,8 @@ /* begin printHexPtrnp: */ /* begin printHexnp: */ printf("0x%x", oopForPointer(longAt((freeChunk + (BaseHeaderSize)) + (0 << 2)))); - if (numBytes >= (32 * 8)) { + if ((numBytes >= (32 * 8)) + && (!isNextChunk)) { print(" ^ "); /* begin printHexPtrnp: */ /* begin printHexnp: */ @@ -56418,7 +56587,6 @@ printFreeList(sqInt chunkOrIndex) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt freeChunk; - usqLong numBytes; if ((chunkOrIndex >= 0) && (chunkOrIndex < 32)) { @@ -56428,33 +56596,7 @@ freeChunk = chunkOrIndex; while (freeChunk != 0) { /* begin printFreeChunk: */ - numBytes = bytesInObject(freeChunk); - print("freeChunk "); - /* begin printHexPtrnp: */ - /* begin printHexnp: */ - printf("0x%x", oopForPointer(freeChunk)); - print(" bytes "); - printNum(numBytes); - print(" next "); - /* begin printHexPtrnp: */ - /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + (BaseHeaderSize)) + (0 << 2)))); - if (numBytes >= (32 * 8)) { - print(" ^ "); - /* begin printHexPtrnp: */ - /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + (BaseHeaderSize)) + (2 << 2)))); - print(" < "); - /* begin printHexPtrnp: */ - /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + (BaseHeaderSize)) + (3 << 2)))); - print(" > "); - /* begin printHexPtrnp: */ - /* begin printHexnp: */ - printf("0x%x", oopForPointer(longAt((freeChunk + (BaseHeaderSize)) + (4 << 2)))); - } - /* begin cr */ - printf("\n"); + printFreeChunkisNextChunk(freeChunk, 0); freeChunk = longAt((freeChunk + (BaseHeaderSize)) + (0 << 2)); } } @@ -59368,13 +59510,16 @@ /* Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the - segment info, while eliminating the bridge objects that end each segment - and give the size of the subsequent segment. */ + segment info for swizzling, while eliminating the bridge objects at the + end of each + segment that specify the distance to and the size of the subsequent + segment. */ static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bridge; + sqInt bridgehead; sqInt bridgeSpan; sqInt bytesRead; usqInt newBase; @@ -59391,7 +59536,7 @@ oldBase = 0; newBase = oldSpaceStart(); nextSegmentSize = GIV(firstSegmentSize); - bridge = (GIV(firstSegmentSize) + (oldSpaceStart())) - (BaseHeaderSize); + bridgehead = (GIV(firstSegmentSize) + (oldSpaceStart())) - (2 * (BaseHeaderSize)); while (1) { segInfo = (&(GIV(segments)[GIV(numSegments)])); (segInfo->segStart = oldBase); @@ -59405,12 +59550,15 @@ return totalBytesRead; } GIV(numSegments) += 1; - bridgeSpan = 4 * (rawOverflowSlotsOf(bridge)); + bridge = bridgehead + (BaseHeaderSize); + bridgeSpan = ((rawNumSlotsOf(bridgehead)) == 0 + ? 0 + : 4 * (rawOverflowSlotsOf(bridge))); oldBase = (oldBase + nextSegmentSize) + bridgeSpan; newBase = (newBase + nextSegmentSize) - (2 * (BaseHeaderSize)); nextSegmentSize = longLongAt(bridge); if (!(nextSegmentSize != 0)) break; - bridge = (bridge - (2 * (BaseHeaderSize))) + nextSegmentSize; + bridgehead = (bridgehead - (2 * (BaseHeaderSize))) + nextSegmentSize; } assert((newBase - (oldSpaceStart())) == (totalBytesRead - (GIV(numSegments) * (bridgeSize())))); /* begin setFreeOldSpaceStart: */ @@ -61218,7 +61366,20 @@ return ((self_in_segLimit->segSize)) + ((self_in_segLimit->segStart)); } +EXPORT(SpurSegmentInfo *) +segmentContainingObj(sqInt objOop) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + for (i = (GIV(numSegments) - 1); i >= 0; i += -1) { + if (objOop >= (((GIV(segments)[i]).segStart))) { + return (&(GIV(segments)[i])); + } + } + return null; +} + + /* Send the calllback message to Alien class with the supplied arg(s). Use either the 1 arg invokeCallbackContext: or the 4 arg @@ -62790,22 +62951,14 @@ sqInt activeProc; sqInt address; sqInt bytes; - sqInt cameFrom; - SpurSegmentInfo * cascade0; CogMethod *cogMethod; sqInt errorCode; usqInt freeChunk; - usqInt freeChunk1; sqInt i; sqInt i1; - sqInt i2; - sqInt i3; usqInt initialIP; - sqInt largeChild; sqInt methodHeader; sqInt newEndOfMemory; - sqInt newEndOfMemory1; - sqInt next; sqInt numArgs; sqInt numTemps; sqInt object; @@ -62813,9 +62966,7 @@ sqInt rcvr; sqInt rcvr1; sqInt savedTenuringThreshold; - SpurSegmentInfo *seg; void *setMacType; - sqInt smallChild; char *sp; char *sp1; char *sp10; @@ -62831,7 +62982,6 @@ char *sp9; sqInt stackIndex; sqInt table; - sqInt treeNode; /* For now the stack munging below doesn't deal with more than one argument. @@ -62879,83 +63029,7 @@ assert(GIV(pastSpaceStart) == (((pastSpace()).start))); assert(GIV(freeStart) == (((eden()).start))); fullGC(); - /* begin prepareForSnapshot */ - for (i2 = 0; i2 < GIV(numSegments); i2 += 1) { - cascade0 = (&(GIV(segments)[i2])); - (cascade0->savedSegSize = ((GIV(segments)[i2]).segSize)); - (cascade0->lastFreeObject = null); - } - /* begin freeTreeNodesDo: */ - treeNode = GIV(freeLists)[0]; - if (treeNode == 0) { - goto l2; - } - cameFrom = -1; - do { - assert((bytesInObject(treeNode)) >= ((numFreeLists()) * (allocationUnit()))); - smallChild = longAt((treeNode + (BaseHeaderSize)) + (3 << 2)); - largeChild = longAt((treeNode + (BaseHeaderSize)) + (4 << 2)); - assert((smallChild == 0) - || (treeNode == (fetchPointerofFreeChunk(freeChunkParentIndex(), smallChild)))); - assert((largeChild == 0) - || (treeNode == (fetchPointerofFreeChunk(freeChunkParentIndex(), largeChild)))); - if (((smallChild == 0) - && (largeChild == 0)) - || ((largeChild == 0 - ? cameFrom == smallChild - : cameFrom == largeChild))) { - - /* and since we've applied we must move on up */ - - next = objectAfterlimit(treeNode, endOfMemory()); - if (((longAt(next)) & 0x3FFFFF) == 3) { - /* begin segmentContainingObj: */ - for (i1 = (GIV(numSegments) - 1); i1 >= 0; i1 += -1) { - if (treeNode >= (((GIV(segments)[i1]).segStart))) { - seg = (&(GIV(segments)[i1])); - goto l4; - } - } - seg = null; - l4: /* end segmentContainingObj: */; - (seg->lastFreeObject = treeNode); - } - treeNode = treeNode; - - cameFrom = treeNode; - treeNode = longAt((treeNode + (BaseHeaderSize)) + (2 << 2)); - } - else { - if ((smallChild != 0) - && (cameFrom != smallChild)) { - treeNode = smallChild; - } - else { - assert(largeChild != 0); - treeNode = largeChild; - } - cameFrom = -1; - } - } while(treeNode != 0); -l2: /* end freeTreeNodesDo: */; - for (i2 = 0; i2 < GIV(numSegments); i2 += 1) { - freeChunk = ((GIV(segments)[i2]).lastFreeObject); - if (!(freeChunk == null)) { - detachFreeObject(freeChunk); - ((GIV(segments)[i2]).segSize = ((((rawNumSlotsOf(freeChunk)) == 0xFF - ? freeChunk - (BaseHeaderSize) - : freeChunk)) + (2 * (BaseHeaderSize))) - (((GIV(segments)[i2]).segStart))); - bridgeFromto((&(GIV(segments)[i2])), (i2 < (GIV(numSegments) - 1) - ? (&(GIV(segments)[i2 + 1])) - : 0)); - } - } - /* begin setEndOfMemory: */ - newEndOfMemory = ((((GIV(segments)[GIV(numSegments) - 1]).segSize)) + (((GIV(segments)[GIV(numSegments) - 1]).segStart))) - (2 * (BaseHeaderSize)); - GIV(endOfMemory) = newEndOfMemory; - if (GIV(freeOldSpaceStart) > newEndOfMemory) { - GIV(freeOldSpaceStart) = newEndOfMemory; - } + prepareForSnapshot(); activeContext = GIV(tempOop); GIV(tempOop) = 0; if (!GIV(primFailCode)) { @@ -62989,25 +63063,25 @@ longAtput((activeContext + (BaseHeaderSize)) + (StackPointerIndex << 2), (((stackIndex - 1) << 1) | 1)); } /* begin postSnapshot */ - for (i3 = (GIV(numSegments) - 1); i3 >= 0; i3 += -1) { - freeChunk1 = ((GIV(segments)[i3]).lastFreeObject); - if (!(freeChunk1 == null)) { - address = ((((GIV(segments)[i3]).segSize)) + (((GIV(segments)[i3]).segStart))) - (2 * (BaseHeaderSize)); - ((GIV(segments)[i3]).segSize = ((GIV(segments)[i3]).savedSegSize)); - bridgeFromto((&(GIV(segments)[i3])), (i3 < (GIV(numSegments) - 1) - ? (&(GIV(segments)[i3 + 1])) + for (i1 = (GIV(numSegments) - 1); i1 >= 0; i1 += -1) { + freeChunk = ((GIV(segments)[i1]).lastFreeObject); + if (!(freeChunk == null)) { + address = ((((GIV(segments)[i1]).segSize)) + (((GIV(segments)[i1]).segStart))) - (2 * (BaseHeaderSize)); + ((GIV(segments)[i1]).segSize = ((GIV(segments)[i1]).savedSegSize)); + bridgeFromto((&(GIV(segments)[i1])), (i1 < (GIV(numSegments) - 1) + ? (&(GIV(segments)[i1 + 1])) : 0)); /* begin addFreeChunkWithBytes:at: */ - bytes = (((((GIV(segments)[i3]).segSize)) + (((GIV(segments)[i3]).segStart))) - address) - (2 * (BaseHeaderSize)); + bytes = (((((GIV(segments)[i1]).segSize)) + (((GIV(segments)[i1]).segStart))) - address) - (2 * (BaseHeaderSize)); freeChunkWithBytesat(bytes, address); GIV(totalFreeOldSpace) += bytes; } } /* begin setEndOfMemory: */ - newEndOfMemory1 = ((((GIV(segments)[GIV(numSegments) - 1]).segSize)) + (((GIV(segments)[GIV(numSegments) - 1]).segStart))) - (2 * (BaseHeaderSize)); - GIV(endOfMemory) = newEndOfMemory1; - if (GIV(freeOldSpaceStart) > newEndOfMemory1) { - GIV(freeOldSpaceStart) = newEndOfMemory1; + newEndOfMemory = ((((GIV(segments)[GIV(numSegments) - 1]).segSize)) + (((GIV(segments)[GIV(numSegments) - 1]).segStart))) - (2 * (BaseHeaderSize)); + GIV(endOfMemory) = newEndOfMemory; + if (GIV(freeOldSpaceStart) > newEndOfMemory) { + GIV(freeOldSpaceStart) = newEndOfMemory; } marryContextInNewStackPageAndInitializeInterpreterRegisters(activeContext); if (!GIV(primFailCode)) { @@ -65609,26 +65683,25 @@ return 10; } + +/* Write the image header and heap contents to imageFile for snapshot. */ + static sqInt writeImageFileIO(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt bytesWritten; sqImageFile f; sqInt headerSize; - squeakFileOffsetType headerStart; + squeakFileOffsetType headerStart; sqInt i; sqInt i1; - usqInt memStart; - sqInt nextSegSize; + sqInt imageBytes; + extern char imageName[]; sqInt okToWrite; void *sCWIfn; - sqInt successBoolean; sqInt total; - - /* If the security plugin can be loaded, use it to check for write permission. - If not, assume it's ok */ - + null; sCWIfn = ioLoadFunctionFrom("secCanWriteImage", "SecurityPlugin"); if (sCWIfn != 0) { okToWrite = ((sqInt (*)(void))sCWIfn)(); @@ -65656,12 +65729,22 @@ } return null; } - headerStart = sqImageFileStartLocation(f,imageName,headerSize+imageBytes); + /* begin imageSizeToWrite */ + assert(newSpaceIsEmpty()); + /* begin totalBytesInNonEmptySegments */ + total = 0; + for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { + if ((((GIV(segments)[i1]).segSize)) > (2 * (BaseHeaderSize))) { + total += ((GIV(segments)[i1]).segSize); + } + } + imageBytes = total; + headerStart = sqImageFileStartLocation(f, imageName, headerSize + imageBytes); /* Note: on Unix systems one could put an exec command here, padded to 512 bytes */; sqImageFileSeek(f, headerStart); putLongtoFile(imageFormatVersion(), f); putLongtoFile(headerSize, f); - putLongtoFile(imageSizeToWrite(), f); + putLongtoFile(imageBytes, f); putLongtoFile(GIV(oldSpaceStart), f); putLongtoFile(GIV(specialObjectsOop), f); putLongtoFile(newObjectHash(), f); @@ -65688,6 +65771,7 @@ putLongtoFile(0, f); } + sqImageFileSeek(f, headerStart + headerSize); if (!(!GIV(primFailCode))) { /* file write or seek failure */ @@ -65695,25 +65779,10 @@ sqImageFileClose(f); return null; } - sqImageFileSeek(f, headerStart + headerSize); - /* begin writeImageToFile: */ - total = 0; - assert(((endOfMemory()) == (segLimit(&GIV(segments)[GIV(numSegments) - 1]))) - || (((endOfMemory()) + (bridgeSize())) == (segLimit(&GIV(segments)[GIV(numSegments) - 1])))); - if (!(GIV(firstSegmentSize) == null)) { - assert(GIV(firstSegmentSize) == (((GIV(segments)[0]).segSize))); - } - for (i1 = 0; i1 < GIV(numSegments); i1 += 1) { - nextSegSize = (i1 == (GIV(numSegments) - 1) - ? 0 - : ((GIV(segments)[i1 + 1]).segSize)); - total += writeSegmentnextSegmentSizetoFile((&(GIV(segments)[i1])), nextSegSize, f); - } - bytesWritten = total; + bytesWritten = writeImageSegmentsToFile(f); /* begin success: */ - successBoolean = bytesWritten == (imageSizeToWrite()); - if (!successBoolean) { + if (!(bytesWritten == imageBytes)) { /* Don't overwrite an error code that has already been set. */ @@ -65725,19 +65794,53 @@ } static sqInt -writeSegmentnextSegmentSizetoFile(SpurSegmentInfo *segment, sqInt nextSegSize, FILE *aBinaryStream) +writeImageSegmentsToFile(sqImageFile aBinaryStream) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt i; + sqInt total; + + assert(((endOfMemory()) == (segLimit(&GIV(segments)[GIV(numSegments) - 1]))) + || (((endOfMemory()) + (bridgeSize())) == (segLimit(&GIV(segments)[GIV(numSegments) - 1])))); + if (!(GIV(firstSegmentSize) == null)) { + assert(GIV(firstSegmentSize) == (((GIV(segments)[0]).segSize))); + } + assert((((GIV(segments)[0]).segSize)) > 0); + total = 0; + for (i = 0; i < GIV(numSegments); i += 1) { + if ((((GIV(segments)[i]).segSize)) > (2 * (BaseHeaderSize))) { + total += writeSegmentnextSegmenttoFile((&(GIV(segments)[i])), nextNonEmptySegmentAfter(i), aBinaryStream); + } + } + return total; +} + + +/* Write the segment contents, the size of and the distance to the next + segment to aBinaryStream. + */ + +static sqInt +writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) { - sqInt lastDoubleWord; + usqLong firstSavedBridgeWord; sqInt nWritten; - usqLong savedDoubleWord; + sqInt pier1; + sqInt pier2; + usqLong secondSavedBridgeWord; - lastDoubleWord = (((segment->segSize)) + ((segment->segStart))) - (BaseHeaderSize); + pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * (BaseHeaderSize)); + pier2 = pier1 + (BaseHeaderSize); assert(isValidSegmentBridge(bridgeFor(segment))); - assert((startOfObject(bridgeFor(segment))) == (lastDoubleWord - (BaseHeaderSize))); - savedDoubleWord = longLongAt(lastDoubleWord); - longLongAtput(lastDoubleWord, nextSegSize); + assert((startOfObject(bridgeFor(segment))) == pier1); + firstSavedBridgeWord = longLongAt(pier1); + secondSavedBridgeWord = longLongAt(pier2); + bridgeFromto(segment, nextSegment); + longLongAtput(pier2, (nextSegment == null + ? 0 + : (nextSegment->segSize))); nWritten = sqImageFileWrite(((void *)((segment->segStart))), 1, (segment->segSize), aBinaryStream); - longLongAtput(lastDoubleWord, savedDoubleWord); + longLongAtput(pier1, firstSavedBridgeWord); + longLongAtput(pier2, secondSavedBridgeWord); return nWritten; } @@ -65800,6 +65903,7 @@ {"", "printFramesOnStackPageListInUse\000\377", (void*)printFramesOnStackPageListInUse}, {"", "reestablishContextPriorToCallback", (void*)reestablishContextPriorToCallback}, {"", "returnAsThroughCallbackContext", (void*)returnAsThroughCallbackContext}, + {"", "segmentContainingObj", (void*)segmentContainingObj}, {"", "sendInvokeCallbackContext", (void*)sendInvokeCallbackContext}, {"", "sendInvokeCallbackStackRegistersJmpbuf", (void*)sendInvokeCallbackStackRegistersJmpbuf}, {"", "setInterruptCheckChain", (void*)setInterruptCheckChain}, Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-03-09 19:17:15 UTC (rev 2874) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ @@ -108,6 +108,7 @@ sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector); sqInt indexablePointersFormat(void); sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod); +void inOrderPrintFreeTreeprintList(sqInt freeChunk, sqInt printNextList); sqInt instanceSizeOf(sqInt classObj); usqInt instructionPointerAddress(void); usqInt interpretAddress(void); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-03-06 23:26:55 UTC (rev 2873) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-03-09 19:17:15 UTC (rev 2874) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 from - CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 + CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.630 uuid: 8ca18389-543a-4847-958c-8e818a7e0900 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.635 uuid: d3e35b87-a79e-44a1-975b-549d6ae06743 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -607,6 +607,7 @@ void findString(char *aCString); static sqInt firstAccessibleObject(void); sqInt firstByteFormat(void); +static sqInt firstClassIndexPun(void); sqInt firstCompiledMethodFormat(void); static sqInt firstCorpse(sqInt headOfCorpseList); static void firstFitCompact(void); @@ -702,7 +703,6 @@ static sqInt iframeSavedIP(char *theFP); void ifValidWriteBackStackPointersSaveTo(void *theCFP, void *theCSP, char **savedFPP, char **savedSPP); static sqInt imageFormatVersion(void); -static sqInt imageSizeToWrite(void); sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector); static sqInt inactiveOrFailedToDeferScan(sqInt anEphemeron); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); @@ -714,6 +714,7 @@ static void initializeStacknumSlotspageSize(char *theStackPages, sqInt stackSlots, sqInt slotsPerPage); sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod); static void initSegmentBridgeWithBytesat(usqLong numBytes, sqInt address); +void inOrderPrintFreeTreeprintList(sqInt freeChunk, sqInt printNextList); sqInt instanceSizeOf(sqInt classObj); sqInt instantiateClassindexableSize(sqInt classObj, sqInt nElements); usqInt instructionPointerAddress(void); @@ -884,6 +885,7 @@ static sqInt newObjectHash(void); static sqInt newSpaceIsEmpty(void); static StackPage * newStackPage(void); +static SpurSegmentInfo * nextNonEmptySegmentAfter(sqInt i); usqInt nextProfileTickAddress(void); sqInt nilObject(void); static void nilUnmarkedWeaklingSlots(void); @@ -935,6 +937,7 @@ unsigned long positiveMachineIntegerValueOf(sqInt oop); static void postBecomeOrCompactScanClassTable(sqInt effectsFlags); static void postGCAction(sqInt gcModeArg); +static void prepareForSnapshot(void); sqInt primErrTable(void); usqInt primFailCodeAddress(void); static void primitiveAdd(void); @@ -1199,6 +1202,7 @@ sqInt printFrame(char *theFP); void printFrameWithSP(char *theFP, char *theSP); void printFreeChunk(sqInt freeChunk); +static void printFreeChunkisNextChunk(sqInt freeChunk, sqInt isNextChunk); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.635.mcz
by commits＠source.squeak.org 09 Mar '14

09 Mar '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.635.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.635 Author: eem Time: 9 March 2014, 11:06:51.319 am UUID: d3e35b87-a79e-44a1-975b-549d6ae06743 Ancestors: VMMaker.oscog-eem.634 Fix decoding the per-segment bridge span/seg size info on load and successfully load a multi-segment Newspeak bootstrap image. Finally! =============== Diff against VMMaker.oscog-eem.634 =============== Item was changed: ----- Method: SpurSegmentManager>>readHeapFromImageFile:dataBytes: (in category 'snapshot') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the segment info for swizzling, while eliminating the bridge objects at the end of each segment that specify the distance to and the size of the subsequent segment." <var: #f type: #sqImageFile> <inline: false> + | bytesRead totalBytesRead bridgehead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | - | bytesRead totalBytesRead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | <var: 'segInfo' type: #'SpurSegmentInfo *'> self allocateOrExtendSegmentInfos. "segment sizes include the two-header-word bridge at the end of each segment." numSegments := totalBytesRead := 0. oldBase := 0. "N.B. still must be adjusted by oldBaseAddr." newBase := manager oldSpaceStart. nextSegmentSize := firstSegmentSize. + bridgehead := firstSegmentSize + manager oldSpaceStart - manager bridgeSize. - bridge := firstSegmentSize + manager oldSpaceStart - manager baseHeaderSize. [segInfo := self addressOf: (segments at: numSegments). segInfo segStart: oldBase; "N.B. still must be adjusted by oldBaseAddr." segSize: nextSegmentSize; swizzle: newBase - oldBase. "N.B. still must be adjusted by oldBaseAddr." bytesRead := self readHeapFrom: f at: newBase dataBytes: nextSegmentSize. bytesRead > 0 ifTrue: [totalBytesRead := totalBytesRead + bytesRead]. bytesRead ~= nextSegmentSize ifTrue: [^totalBytesRead]. numSegments := numSegments + 1. + bridge := bridgehead + manager baseHeaderSize. + bridgeSpan := (manager rawNumSlotsOf: bridgehead) = 0 - bridgeSpan := (manager rawNumSlotsOf: bridge) = 0 ifTrue: [0] ifFalse: [manager bytesPerSlot * (manager rawOverflowSlotsOf: bridge)]. oldBase := oldBase + nextSegmentSize + bridgeSpan. newBase := newBase + nextSegmentSize - manager bridgeSize. nextSegmentSize := manager longLongAt: bridge. nextSegmentSize ~= 0] whileTrue: + [bridgehead := bridgehead - manager bridgeSize + nextSegmentSize]. - [bridge := bridge - manager bridgeSize + nextSegmentSize]. "newBase should point just past the last bridge. all others should have been eliminated." self assert: newBase - manager oldSpaceStart = (totalBytesRead - (numSegments * manager bridgeSize)). "set freeOldSpaceStart now for adjustAllOopsBy:" manager setFreeOldSpaceStart: newBase. "we're done. nil firstSegmentSize for a subsequent snapshot." firstSegmentSize := nil. ^totalBytesRead!

1 0

VM Maker: VMMaker.oscog-eem.634.mcz
by commits＠source.squeak.org 09 Mar '14

09 Mar '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.634.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.634 Author: eem Time: 9 March 2014, 10:35:34.439 am UUID: 6eba1357-7d48-41e2-b193-8bf6aa8d71c8 Ancestors: VMMaker.oscog-eem.633 Spur: Fix the reading of 0-sized bridges for adjacent segments on image load. Rename writeImageToFile: to writeImageSegmentsToFile:. Snapshot: don't use cCode: in writeImageFileIO and move the simulatpr's version up to writeImageFileIOSimulation to cut down on duplication. =============== Diff against VMMaker.oscog-eem.633 =============== Item was added: + ----- Method: CogVMSimulator>>imageName (in category 'image save/restore') ----- + imageName + ^imageName! Item was removed: - ----- Method: CogVMSimulator>>writeImageFileIO (in category 'image save/restore') ----- - writeImageFileIO - "Write the image to a file as an image snapshot." - - | headerSize file | - BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. - headerSize := 64. - - (file := FileStream fileNamed: imageName) ifNil: - [self primitiveFail. - ^nil]. - [ - file binary. - - { - self imageFormatVersion. - headerSize. - objectMemory imageSizeToWrite. - objectMemory baseAddressOfImage. - objectMemory specialObjectsOop. - objectMemory lastHash. - self ioScreenSize. - self getImageHeaderFlags. - extraVMMemory - } - do: [:long | self putLong: long toFile: file]. - - { desiredNumStackPages. self unknownShortOrCodeSizeInKs } do: - [:short| self putShort: short toFile: file]. - - self putLong: desiredEdenBytes toFile: file. - - { maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do: - [:short| self putShort: short toFile: file]. - - objectMemory hasSpurMemoryManagerAPI - ifTrue: - [| bytesWritten | - self putLong: objectMemory firstSegmentBytes toFile: file."Pad the rest of the header." - 3 timesRepeat: [self putLong: 0 toFile: file]. - - "Position the file after the header." - file position: headerSize. - bytesWritten := objectMemory segmentManager writeImageToFile: file. - self assert: bytesWritten = objectMemory imageSizeToWrite] - ifFalse: - ["Pad the rest of the header." - 4 timesRepeat: [self putLong: 0 toFile: file]. - - "Position the file after the header." - file position: headerSize. - - "Write the object memory." - objectMemory baseAddressOfImage // 4 + 1 - to: objectMemory baseAddressOfImage + objectMemory imageSizeToWrite // 4 - do: [:index | - self - putLong: (objectMemory memory at: index) - toFile: file]]. - - self success: true - ] - ensure: [file ifNotNil: [file close]]! Item was added: + ----- Method: SpurMemoryManager>>writeImageSegmentsToFile: (in category 'snapshot') ----- + writeImageSegmentsToFile: aBinaryStream + <doNotGenerate> + ^segmentManager writeImageSegmentsToFile: aBinaryStream! Item was added: + ----- Method: SpurSegmentManager>>nextNonEmptySegmentAfter: (in category 'snapshot') ----- + nextNonEmptySegmentAfter: i + "Answer the the next non-empty segment or nil. The size of a segment includes + that of its bridge. A segment containing just a free object and a bridge will still + have a size of manager bridgeSize after shortening it in prepareForSnapshot." + <returnTypeC: #'SpurSegmentInfo *'> + | nextx | + nextx := i. + [(nextx := nextx + 1) >= numSegments ifTrue: + [^nil]. + (segments at: nextx) segSize > manager bridgeSize ifTrue: + [^self addressOf: (segments at: nextx)]] repeat! Item was removed: - ----- Method: SpurSegmentManager>>nextNonEmptySegmentSizeAfter: (in category 'snapshot') ----- - nextNonEmptySegmentSizeAfter: i - "Answer the size of the next non-empty segment. - The size of a segment includes that of its bridge. - A segment containing just a free object and a bridge will still have a - size of manager bridgeSize after shortening it in prepareForSnapshot." - | nextx | - nextx := i. - [(nextx := nextx + 1) >= numSegments ifTrue: - [^0]. - (segments at: nextx) segSize > manager bridgeSize ifTrue: - [^(segments at: nextx) segSize]] repeat! Item was changed: ----- Method: SpurSegmentManager>>readHeapFromImageFile:dataBytes: (in category 'snapshot') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the + segment info for swizzling, while eliminating the bridge objects at the end of each + segment that specify the distance to and the size of the subsequent segment." - segment info, while eliminating the bridge objects that end each segment and - give the size of the subsequent segment." <var: #f type: #sqImageFile> <inline: false> | bytesRead totalBytesRead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | <var: 'segInfo' type: #'SpurSegmentInfo *'> self allocateOrExtendSegmentInfos. "segment sizes include the two-header-word bridge at the end of each segment." numSegments := totalBytesRead := 0. oldBase := 0. "N.B. still must be adjusted by oldBaseAddr." newBase := manager oldSpaceStart. nextSegmentSize := firstSegmentSize. bridge := firstSegmentSize + manager oldSpaceStart - manager baseHeaderSize. [segInfo := self addressOf: (segments at: numSegments). segInfo segStart: oldBase; "N.B. still must be adjusted by oldBaseAddr." segSize: nextSegmentSize; swizzle: newBase - oldBase. "N.B. still must be adjusted by oldBaseAddr." bytesRead := self readHeapFrom: f at: newBase dataBytes: nextSegmentSize. bytesRead > 0 ifTrue: [totalBytesRead := totalBytesRead + bytesRead]. bytesRead ~= nextSegmentSize ifTrue: [^totalBytesRead]. numSegments := numSegments + 1. + bridgeSpan := (manager rawNumSlotsOf: bridge) = 0 + ifTrue: [0] + ifFalse: [manager bytesPerSlot * (manager rawOverflowSlotsOf: bridge)]. - bridgeSpan := manager bytesPerSlot * (manager rawOverflowSlotsOf: bridge). oldBase := oldBase + nextSegmentSize + bridgeSpan. newBase := newBase + nextSegmentSize - manager bridgeSize. nextSegmentSize := manager longLongAt: bridge. nextSegmentSize ~= 0] whileTrue: [bridge := bridge - manager bridgeSize + nextSegmentSize]. "newBase should point just past the last bridge. all others should have been eliminated." self assert: newBase - manager oldSpaceStart = (totalBytesRead - (numSegments * manager bridgeSize)). "set freeOldSpaceStart now for adjustAllOopsBy:" manager setFreeOldSpaceStart: newBase. "we're done. nil firstSegmentSize for a subsequent snapshot." firstSegmentSize := nil. ^totalBytesRead! Item was added: + ----- Method: SpurSegmentManager>>writeImageSegmentsToFile: (in category 'snapshot') ----- + writeImageSegmentsToFile: aBinaryStream + <var: 'aBinaryStream' type: #sqImageFile> + <inline: false> + | total | + self assert: (manager endOfMemory = (segments at: numSegments - 1) segLimit + or: [manager endOfMemory + manager bridgeSize = (segments at: numSegments - 1) segLimit]). + firstSegmentSize ifNotNil: + [self assert: firstSegmentSize = (segments at: 0) segSize]. + self assert: (segments at: 0) segSize > 0. + total := 0. + 0 to: numSegments - 1 do: + [:i| + (segments at: i) segSize > manager bridgeSize ifTrue: + [total := total + (self writeSegment: (self addressOf: (segments at: i)) + nextSegment: (self nextNonEmptySegmentAfter: i) + toFile: aBinaryStream)]]. + ^total! Item was removed: - ----- Method: SpurSegmentManager>>writeImageToFile: (in category 'snapshot') ----- - writeImageToFile: aBinaryStream - <var: 'aBinaryStream' type: #'FILE *'> - <inline: false> - | total | - self assert: (manager endOfMemory = (segments at: numSegments - 1) segLimit - or: [manager endOfMemory + manager bridgeSize = (segments at: numSegments - 1) segLimit]). - firstSegmentSize ifNotNil: - [self assert: firstSegmentSize = (segments at: 0) segSize]. - self assert: (segments at: 0) segSize > 0. - total := 0. - 0 to: numSegments - 1 do: - [:i| - (segments at: i) segSize > manager bridgeSize ifTrue: - [total := total + (self writeSegment: (self addressOf: (segments at: i)) - nextSegmentSize: (self nextNonEmptySegmentSizeAfter: i) - toFile: aBinaryStream)]]. - ^total! Item was added: + ----- Method: SpurSegmentManager>>writeSegment:nextSegment:toFile: (in category 'snapshot') ----- + writeSegment: segment nextSegment: nextSegment toFile: aBinaryStream + "Write the segment contents, the size of and the distance to the next segment to aBinaryStream." + <var: 'segment' type: #'SpurSegmentInfo *'> + <var: 'nextSegment' type: #'SpurSegmentInfo *'> + <var: 'aBinaryStream' type: #sqImageFile> + | pier1 pier2 firstSavedBridgeWord secondSavedBridgeWord nWritten | + <var: 'firstSavedBridgeWord' type: #usqLong> + <var: 'secondSavedBridgeWord' type: #usqLong> + pier1 := segment segLimit - manager bridgeSize. + pier2 := pier1 + manager baseHeaderSize. + self assert: (self isValidSegmentBridge: (self bridgeFor: segment)). + self assert: (manager startOfObject: (self bridgeFor: segment)) = pier1. + "Temporarily change the bridge to bridge to the next non-empty segment. + The first double word of the bridge includes the bridge size in slots, and + hence specifies the distance to the next segment. The following double + word is replaced by the size of the next segment, or 0 if there isn't one." + firstSavedBridgeWord := manager longLongAt: pier1. + secondSavedBridgeWord := manager longLongAt: pier2. + self bridgeFrom: segment to: nextSegment. + manager + longLongAt: pier2 + put: (nextSegment ifNil: [0] ifNotNil: [nextSegment segSize]). + nWritten := self cCode: + [self + sq: segment segStart asVoidPointer + Image: 1 + File: segment segSize + Write: aBinaryStream] + inSmalltalk: + [aBinaryStream + next: segment segSize / 4 + putAll: manager memory + startingAt: segment segStart / 4 + 1. + segment segSize]. + manager + longLongAt: pier1 put: firstSavedBridgeWord; + longLongAt: pier2 put: secondSavedBridgeWord. + ^nWritten! Item was removed: - ----- Method: SpurSegmentManager>>writeSegment:nextSegmentSize:toFile: (in category 'snapshot') ----- - writeSegment: segment nextSegmentSize: nextSegSize toFile: aBinaryStream - <var: 'segment' type: #'SpurSegmentInfo *'> - <var: 'aBinaryStream' type: #'FILE *'> - | lastDoubleWord savedDoubleWord nWritten | - <var: 'savedDoubleWord' type: #usqLong> - lastDoubleWord := segment segLimit - manager baseHeaderSize. - self assert: (self isValidSegmentBridge: (self bridgeFor: segment)). - self assert: (manager startOfObject: (self bridgeFor: segment)) = (lastDoubleWord - manager baseHeaderSize). - savedDoubleWord := manager longLongAt: lastDoubleWord. - manager longLongAt: lastDoubleWord put: nextSegSize. - nWritten := self cCode: - [self - sq: segment segStart asVoidPointer - Image: 1 - File: segment segSize - Write: aBinaryStream] - inSmalltalk: - [aBinaryStream - next: segment segSize / 4 - putAll: manager memory - startingAt: segment segStart / 4 + 1. - segment segSize]. - manager longLongAt: lastDoubleWord put: savedDoubleWord. - ^nWritten! Item was changed: ----- Method: StackInterpreter>>writeImageFileIO (in category 'image save/restore') ----- writeImageFileIO + "Write the image header and heap contents to imageFile for snapshot." + | imageName headerStart headerSize f imageBytes bytesWritten sCWIfn okToWrite | + <var: #f type: #sqImageFile> + <var: #headerStart type: #squeakFileOffsetType> + <var: #sCWIfn type: #'void *'> + <var: #imageName declareC: 'extern char imageName[]'> + self cCode: [] inSmalltalk: [^self writeImageFileIOSimulation]. - | headerStart headerSize f bytesWritten sCWIfn okToWrite | - <var: #f type: 'sqImageFile'> - <var: #headerStart type: 'squeakFileOffsetType '> - <var: #sCWIfn type: 'void *'> "If the security plugin can be loaded, use it to check for write permission. If not, assume it's ok" sCWIfn := self ioLoadFunction: 'secCanWriteImage' From: 'SecurityPlugin'. sCWIfn ~= 0 ifTrue: [okToWrite := self cCode: '((sqInt (*)(void))sCWIfn)()'. okToWrite ifFalse:[^self primitiveFail]]. "local constants" headerStart := 0. headerSize := 64. "header size in bytes; do not change!!" + f := self sqImageFile: imageName Open: 'wb'. - f := self cCode: 'sqImageFileOpen(imageName, "wb")'. f = nil ifTrue: "could not open the image file for writing" [^self primitiveFail]. + imageBytes := objectMemory imageSizeToWrite. + headerStart := self sqImage: f File: imageName StartLocation: headerSize + imageBytes. - headerStart := self cCode: 'sqImageFileStartLocation(f,imageName,headerSize+imageBytes)'. self cCode: '/* Note: on Unix systems one could put an exec command here, padded to 512 bytes */'. "position file to start of header" self sqImageFile: f Seek: headerStart. self putLong: self imageFormatVersion toFile: f. self putLong: headerSize toFile: f. + self putLong: imageBytes toFile: f. - self putLong: objectMemory imageSizeToWrite toFile: f. self putLong: objectMemory baseAddressOfImage toFile: f. self putLong: objectMemory specialObjectsOop toFile: f. self putLong: objectMemory newObjectHash toFile: f. self putLong: self ioScreenSize toFile: f. self putLong: self getImageHeaderFlags toFile: f. self putLong: extraVMMemory toFile: f. self putShort: desiredNumStackPages toFile: f. self putShort: self unknownShortOrCodeSizeInKs toFile: f. self putLong: desiredEdenBytes toFile: f. self putShort: (maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]) toFile: f. self putShort: the2ndUnknownShort toFile: f. objectMemory hasSpurMemoryManagerAPI ifTrue: [self putLong: objectMemory firstSegmentBytes toFile: f."Pad the rest of the header." 1 to: 3 do: [:i| self putLong: 0 toFile: f]] ifFalse: [1 to: 4 do: [:i| self putLong: 0 toFile: f]]. "fill remaining header words with zeros" - self successful ifFalse: [ - "file write or seek failure" - self cCode: 'sqImageFileClose(f)'. - ^ nil]. - "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. + self successful ifFalse: "file write or seek failure" + [self sqImageFileClose: f. + ^nil]. + "write the image data" objectMemory hasSpurMemoryManagerAPI ifTrue: + [bytesWritten := objectMemory writeImageSegmentsToFile: f] - [bytesWritten := objectMemory segmentManager writeImageToFile: f] ifFalse: + [bytesWritten := self sq: (self pointerForOop: objectMemory baseAddressOfImage) - [| memStart | - memStart := objectMemory baseAddressOfImage. - bytesWritten := self sq: (self pointerForOop: memStart) Image: (self sizeof: #char) + File: imageBytes + Write: f]. + self success: bytesWritten = imageBytes. + self sqImageFileClose: f! - File: objectMemory imageSizeToWrite - Write: f. - self touch: memStart]. - self success: bytesWritten = objectMemory imageSizeToWrite. - self cCode: 'sqImageFileClose(f)' - ! Item was added: + ----- Method: StackInterpreter>>writeImageFileIOSimulation (in category 'image save/restore') ----- + writeImageFileIOSimulation + "Write the image header and heap contents to imageFile for snapshot. + c.f. writeImageFileIO" + <doNotGenerate> + | headerSize file | + BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. + headerSize := 64. + + (file := FileStream fileNamed: self imageName) ifNil: + [self primitiveFail. + ^nil]. + [ + file binary. + + { + self imageFormatVersion. + headerSize. + objectMemory imageSizeToWrite. + objectMemory baseAddressOfImage. + objectMemory specialObjectsOop. + objectMemory lastHash. + self ioScreenSize. + self getImageHeaderFlags. + extraVMMemory ifNil: [0] + } + do: [:long | self putLong: long toFile: file]. + + { desiredNumStackPages. self unknownShortOrCodeSizeInKs } do: + [:short| self putShort: short toFile: file]. + + self putLong: desiredEdenBytes toFile: file. + + { maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do: + [:short| self putShort: short toFile: file]. + + objectMemory hasSpurMemoryManagerAPI + ifTrue: + [| bytesWritten | + self putLong: objectMemory firstSegmentBytes toFile: file."Pad the rest of the header." + 3 timesRepeat: [self putLong: 0 toFile: file]. + + "Position the file after the header." + file position: headerSize. + bytesWritten := objectMemory writeImageSegmentsToFile: file. + self assert: bytesWritten = objectMemory imageSizeToWrite] + ifFalse: + ["Pad the rest of the header." + 4 timesRepeat: [self putLong: 0 toFile: file]. + + "Position the file after the header." + file position: headerSize. + + "Write the object memory." + objectMemory baseAddressOfImage // 4 + 1 + to: objectMemory baseAddressOfImage + objectMemory imageSizeToWrite // 4 + do: [:index | + self + putLong: (objectMemory memory at: index) + toFile: file]]. + + self success: true + ] + ensure: [file ifNotNil: [file close]]! Item was changed: + ----- Method: StackInterpreterSimulator>>imageName (in category 'image save/restore') ----- - ----- Method: StackInterpreterSimulator>>imageName (in category 'spur bootstrap') ----- imageName ^imageName! Item was removed: - ----- Method: StackInterpreterSimulator>>writeImageFileIO (in category 'image save/restore') ----- - writeImageFileIO - "Write the image to a file as an image snapshot." - - | headerSize file | - BytesPerWord = 4 ifFalse: [self error: 'Not rewritten for 64 bits yet']. - headerSize := 64. - - (file := FileStream fileNamed: imageName) ifNil: - [self primitiveFail. - ^nil]. - [ - file binary. - - { - self imageFormatVersion. - headerSize. - objectMemory imageSizeToWrite. - objectMemory baseAddressOfImage. - objectMemory specialObjectsOop. - objectMemory lastHash. - self ioScreenSize. - self getImageHeaderFlags. - extraVMMemory ifNil: [0] - } - do: [:long | self putLong: long toFile: file]. - - { desiredNumStackPages. self unknownShortOrCodeSizeInKs } do: - [:short| self putShort: short toFile: file]. - - self putLong: desiredEdenBytes toFile: file. - - { maxExtSemTabSizeSet ifTrue: [self ioGetMaxExtSemTableSize] ifFalse: [0]. 0 } do: - [:short| self putShort: short toFile: file]. - - objectMemory hasSpurMemoryManagerAPI - ifTrue: - [| bytesWritten | - self putLong: objectMemory firstSegmentBytes toFile: file."Pad the rest of the header." - 3 timesRepeat: [self putLong: 0 toFile: file]. - - "Position the file after the header." - file position: headerSize. - bytesWritten := objectMemory segmentManager writeImageToFile: file. - self assert: bytesWritten = objectMemory imageSizeToWrite] - ifFalse: - ["Pad the rest of the header." - 4 timesRepeat: [self putLong: 0 toFile: file]. - - "Position the file after the header." - file position: headerSize. - - "Write the object memory." - objectMemory baseAddressOfImage // 4 + 1 - to: objectMemory baseAddressOfImage + objectMemory imageSizeToWrite // 4 - do: [:index | - self - putLong: (objectMemory memory at: index) - toFile: file]]. - - self success: true - ] - ensure: [file ifNotNil: [file close]]!

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2014