[Vm-dev] [commit][2933] CogVM source as per VMMaker.oscog-eem.735

commits at squeakvm.org commits at squeakvm.org
Thu May 29 01:02:02 UTC 2014


Revision: 2933
Author:   eliot
Date:     2014-05-28 18:02:01 -0700 (Wed, 28 May 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.735

Spur:
Fix management of lastFreeChunk during compaction
(in sweepToCoallesceFreeSpaceForPigCompactFrom: and
freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact).
lastFreeChunk's link was not being correctly terminated.

Add asserts to chunk freers to check for free chunks
overlapping, which caught the compaction bug.

Make sure that endOfMemory is immediately below the last bridge.  This is where
it was set when adding a new segment, but on loading a snapshot it was
mispositioned at the end of the last bridge.  Add a check to checkSegments,
and use it in a few more places.

Eliminate bogus assert in sortedFreeListPairwiseReverseDo:.
If free gets used then lastFreeChunk won't point to it any
more.

Nuke obsolete method (from old non-repeating compact).

Cogit:
Correct link register usage in various places.  e.g.  enilopmarts,
checkForInterrupts trampoline.  But especially, correct link register usage in
the return sequence generators.  Since Tim and I agree that RetN: returns to the
LinkReg, and no longer pops the return address from the stack,  genUpArrowReturn
and genReturnTopFromBlock must explicitly pop the saved return address into
LinkReg before RetN:.  That means that all the RetN:'s in machine code primitives
will do the right thing, allowing these to avoid pushing LinkReg on entry.

Frame print:
fix a typo.

Modified Paths:
--------------
    branches/Cog/nscogsrc/vm/cogit.c
    branches/Cog/nscogsrc/vm/cogit.h
    branches/Cog/nscogsrc/vm/cogmethod.h
    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/cogit.c
    branches/Cog/nsspursrc/vm/cogit.h
    branches/Cog/nsspursrc/vm/cogmethod.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/sistasrc/vm/cogit.c
    branches/Cog/sistasrc/vm/cogit.h
    branches/Cog/sistasrc/vm/cogmethod.h
    branches/Cog/sistasrc/vm/cointerp.c
    branches/Cog/sistasrc/vm/cointerp.h
    branches/Cog/sistasrc/vm/gcc3x-cointerp.c
    branches/Cog/sistasrc/vm/interp.h
    branches/Cog/sistasrc/vm/vmCallback.h
    branches/Cog/spursistasrc/vm/cogit.c
    branches/Cog/spursistasrc/vm/cogit.h
    branches/Cog/spursistasrc/vm/cogmethod.h
    branches/Cog/spursistasrc/vm/cointerp.c
    branches/Cog/spursistasrc/vm/cointerp.h
    branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
    branches/Cog/spursistasrc/vm/interp.h
    branches/Cog/spursistasrc/vm/vmCallback.h
    branches/Cog/spursrc/vm/cogit.c
    branches/Cog/spursrc/vm/cogit.h
    branches/Cog/spursrc/vm/cogmethod.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/cogit.c
    branches/Cog/src/vm/cogit.h
    branches/Cog/src/vm/cogmethod.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/cogit.c
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.c	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/cogit.c	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7780,6 +7780,7 @@
     AbstractInstruction *jumpTarget1114;
     AbstractInstruction *jumpTarget1115;
     AbstractInstruction *jumpTarget1116;
+    AbstractInstruction *jumpTarget1117;
     AbstractInstruction *jumpTarget112;
     AbstractInstruction *jumpTarget113;
     AbstractInstruction *jumpTarget114;
@@ -7796,7 +7797,6 @@
     AbstractInstruction *jumpTarget124;
     AbstractInstruction *jumpTarget125;
     AbstractInstruction *jumpTarget126;
-    AbstractInstruction *jumpTarget127;
     AbstractInstruction *jumpTarget13;
     AbstractInstruction *jumpTarget14;
     AbstractInstruction *jumpTarget15;
@@ -8333,12 +8333,12 @@
 		}
 		assert(jumpTarget13 != 0);
 		jumpTarget4 = jumpTarget13;
-		offset17 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
+		offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
-			? isQuick(self_in_dispatchConcretize, offset17)
+			? isQuick(self_in_dispatchConcretize, offset16)
 			: ((self_in_dispatchConcretize->machineCodeSize)) == 2)) {
 			((self_in_dispatchConcretize->machineCode))[0] = (112 + 4);
-			((self_in_dispatchConcretize->machineCode))[1] = (offset17 & 0xFF);
+			((self_in_dispatchConcretize->machineCode))[1] = (offset16 & 0xFF);
 			((self_in_dispatchConcretize->machineCodeSize) = 2);
 			return;
 		}
@@ -8352,13 +8352,13 @@
 		}
 		assert(jumpTarget111 != 0);
 		jumpTarget21 = jumpTarget111;
-		offset16 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
+		offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 4);
-		((self_in_dispatchConcretize->machineCode))[2] = (offset16 & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset16) >> 8) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset16) >> 16) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset16) >> 24) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF);
 		((self_in_dispatchConcretize->machineCodeSize) = 6);
 		return;
 
@@ -8374,12 +8374,12 @@
 		}
 		assert(jumpTarget14 != 0);
 		jumpTarget5 = jumpTarget14;
-		offset19 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
+		offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
-			? isQuick(self_in_dispatchConcretize, offset19)
+			? isQuick(self_in_dispatchConcretize, offset18)
 			: ((self_in_dispatchConcretize->machineCodeSize)) == 2)) {
 			((self_in_dispatchConcretize->machineCode))[0] = (112 + 5);
-			((self_in_dispatchConcretize->machineCode))[1] = (offset19 & 0xFF);
+			((self_in_dispatchConcretize->machineCode))[1] = (offset18 & 0xFF);
 			((self_in_dispatchConcretize->machineCodeSize) = 2);
 			return;
 		}
@@ -8393,13 +8393,13 @@
 		}
 		assert(jumpTarget112 != 0);
 		jumpTarget22 = jumpTarget112;
-		offset18 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
+		offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 5);
-		((self_in_dispatchConcretize->machineCode))[2] = (offset18 & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset18) >> 8) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 16) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 24) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF);
 		((self_in_dispatchConcretize->machineCodeSize) = 6);
 		return;
 
@@ -8651,13 +8651,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget120);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) {
-			jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address)));
+		jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget119);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) {
+			jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address)));
 		}
-		assert(jumpTarget120 != 0);
-		jumpTarget29 = jumpTarget120;
+		assert(jumpTarget119 != 0);
+		jumpTarget29 = jumpTarget119;
 		offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset26)
@@ -8670,13 +8670,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget119);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) {
-			jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address)));
+		jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1110);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) {
+			jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address)));
 		}
-		assert(jumpTarget119 != 0);
-		jumpTarget210 = jumpTarget119;
+		assert(jumpTarget1110 != 0);
+		jumpTarget210 = jumpTarget1110;
 		offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 12);
@@ -8691,13 +8691,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget121);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) {
-			jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address)));
+		jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget120);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) {
+			jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address)));
 		}
-		assert(jumpTarget121 != 0);
-		jumpTarget30 = jumpTarget121;
+		assert(jumpTarget120 != 0);
+		jumpTarget30 = jumpTarget120;
 		offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset27)
@@ -8710,13 +8710,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1110);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) {
-			jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address)));
+		jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1111);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) {
+			jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address)));
 		}
-		assert(jumpTarget1110 != 0);
-		jumpTarget211 = jumpTarget1110;
+		assert(jumpTarget1111 != 0);
+		jumpTarget211 = jumpTarget1111;
 		offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 13);
@@ -8731,13 +8731,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget122);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) {
-			jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address)));
+		jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget121);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) {
+			jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address)));
 		}
-		assert(jumpTarget122 != 0);
-		jumpTarget31 = jumpTarget122;
+		assert(jumpTarget121 != 0);
+		jumpTarget31 = jumpTarget121;
 		offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset28)
@@ -8750,13 +8750,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1111);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) {
-			jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address)));
+		jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1112);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) {
+			jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address)));
 		}
-		assert(jumpTarget1111 != 0);
-		jumpTarget212 = jumpTarget1111;
+		assert(jumpTarget1112 != 0);
+		jumpTarget212 = jumpTarget1112;
 		offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 15);
@@ -8771,13 +8771,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget123);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) {
-			jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address)));
+		jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget122);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) {
+			jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address)));
 		}
-		assert(jumpTarget123 != 0);
-		jumpTarget32 = jumpTarget123;
+		assert(jumpTarget122 != 0);
+		jumpTarget32 = jumpTarget122;
 		offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset29)
@@ -8790,13 +8790,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1112);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) {
-			jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address)));
+		jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1113);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) {
+			jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address)));
 		}
-		assert(jumpTarget1112 != 0);
-		jumpTarget213 = jumpTarget1112;
+		assert(jumpTarget1113 != 0);
+		jumpTarget213 = jumpTarget1113;
 		offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 14);
@@ -8812,13 +8812,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget124);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) {
-			jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address)));
+		jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget123);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) {
+			jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address)));
 		}
-		assert(jumpTarget124 != 0);
-		jumpTarget33 = jumpTarget124;
+		assert(jumpTarget123 != 0);
+		jumpTarget33 = jumpTarget123;
 		offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset30)
@@ -8831,13 +8831,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1113);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) {
-			jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address)));
+		jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1114);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) {
+			jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address)));
 		}
-		assert(jumpTarget1113 != 0);
-		jumpTarget214 = jumpTarget1113;
+		assert(jumpTarget1114 != 0);
+		jumpTarget214 = jumpTarget1114;
 		offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 7);
@@ -8853,13 +8853,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget125);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) {
-			jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address)));
+		jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget124);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) {
+			jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address)));
 		}
-		assert(jumpTarget125 != 0);
-		jumpTarget34 = jumpTarget125;
+		assert(jumpTarget124 != 0);
+		jumpTarget34 = jumpTarget124;
 		offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset31)
@@ -8872,13 +8872,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1114);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) {
-			jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address)));
+		jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1115);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) {
+			jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address)));
 		}
-		assert(jumpTarget1114 != 0);
-		jumpTarget215 = jumpTarget1114;
+		assert(jumpTarget1115 != 0);
+		jumpTarget215 = jumpTarget1115;
 		offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 6);
@@ -8893,13 +8893,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget126);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) {
-			jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address)));
+		jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget125);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) {
+			jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address)));
 		}
-		assert(jumpTarget126 != 0);
-		jumpTarget35 = jumpTarget126;
+		assert(jumpTarget125 != 0);
+		jumpTarget35 = jumpTarget125;
 		offset32 = (((sqInt) jumpTarget35)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset32)
@@ -8912,13 +8912,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1115);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) {
-			jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address)));
+		jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1116);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) {
+			jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address)));
 		}
-		assert(jumpTarget1115 != 0);
-		jumpTarget216 = jumpTarget1115;
+		assert(jumpTarget1116 != 0);
+		jumpTarget216 = jumpTarget1116;
 		offset122 = (((sqInt) jumpTarget216)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 11);
@@ -8933,13 +8933,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget127 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget127);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget127)) {
-			jumpTarget127 = ((AbstractInstruction *) ((jumpTarget127->address)));
+		jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget126);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) {
+			jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address)));
 		}
-		assert(jumpTarget127 != 0);
-		jumpTarget36 = jumpTarget127;
+		assert(jumpTarget126 != 0);
+		jumpTarget36 = jumpTarget126;
 		offset33 = (((sqInt) jumpTarget36)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset33)
@@ -8952,13 +8952,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1116 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1116);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1116)) {
-			jumpTarget1116 = ((AbstractInstruction *) ((jumpTarget1116->address)));
+		jumpTarget1117 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1117);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1117)) {
+			jumpTarget1117 = ((AbstractInstruction *) ((jumpTarget1117->address)));
 		}
-		assert(jumpTarget1116 != 0);
-		jumpTarget217 = jumpTarget1116;
+		assert(jumpTarget1117 != 0);
+		jumpTarget217 = jumpTarget1117;
 		offset123 = (((sqInt) jumpTarget217)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 10);
@@ -10935,13 +10935,15 @@
 genCheckForInterruptsTrampoline(void)
 {
     sqInt address;
+    sqInt address1;
 
 	opcodeIndex = 0;
 	/* begin PopR: */
 	genoperand(PopR, TempReg);
 	/* begin MoveR:Aw: */
-	address = instructionPointerAddress();
-	genoperandoperand(MoveRAw, TempReg, address);
+	address1 = instructionPointerAddress();
+	genoperandoperand(MoveRAw, TempReg, address1);
+
 	return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 1, 0, null, null, null, null, 0, null, 1);
 }
 
@@ -11263,6 +11265,7 @@
 	genoperand(PopR, regArg2);
 	/* begin PopR: */
 	genoperand(PopR, regArg1);
+	
 	/* begin RetN: */
 	genoperand(RetN, 0);
 	computeMaximumSizes();
@@ -11297,6 +11300,7 @@
 	genoperand(PopR, regArg2);
 	/* begin PopR: */
 	genoperand(PopR, regArg1);
+	
 	/* begin RetN: */
 	genoperand(RetN, 0);
 	computeMaximumSizes();
@@ -11329,6 +11333,7 @@
 	genLoadStackPointers(backEnd);
 	/* begin PopR: */
 	genoperand(PopR, regArg);
+	
 	/* begin RetN: */
 	genoperand(RetN, 0);
 	computeMaximumSizes();
@@ -11424,21 +11429,24 @@
     sqInt address;
     sqInt address1;
     sqInt address2;
+    sqInt address3;
 
 	genPushRegisterArgs();
 	/* begin MoveMw:r:R: */
 	genoperandoperandoperand(MoveMwrR, 0, SPReg, ClassReg);
+
 	/* begin MoveR:Aw: */
-	address = framePointerAddress();
-	genoperandoperand(MoveRAw, FPReg, address);
+	address2 = framePointerAddress();
+	genoperandoperand(MoveRAw, FPReg, address2);
 	/* begin LoadEffectiveAddressMw:r:R: */
 	genoperandoperandoperand(LoadEffectiveAddressMwrR, BytesPerWord, SPReg, TempReg);
 	/* begin MoveR:Aw: */
 	address1 = instructionPointerAddress();
 	genoperandoperand(MoveRAw, ClassReg, address1);
+
 	/* begin MoveR:Aw: */
-	address2 = stackPointerAddress();
-	genoperandoperand(MoveRAw, TempReg, address2);
+	address3 = stackPointerAddress();
+	genoperandoperand(MoveRAw, TempReg, address3);
 	return 0;
 }
 
@@ -13782,13 +13790,15 @@
 genNonLocalReturnTrampoline(void)
 {
     sqInt address;
+    sqInt address1;
 
 	opcodeIndex = 0;
 	/* begin PopR: */
 	genoperand(PopR, TempReg);
 	/* begin MoveR:Aw: */
-	address = instructionPointerAddress();
-	genoperandoperand(MoveRAw, TempReg, address);
+	address1 = instructionPointerAddress();
+	genoperandoperand(MoveRAw, TempReg, address1);
+
 	return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1);
 }
 
@@ -15345,6 +15355,7 @@
 		/* begin PopR: */
 		genoperand(PopR, FPReg);
 	}
+	
 	/* begin RetN: */
 	genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord);
 	return 0;
@@ -16522,10 +16533,12 @@
 		genoperandoperand(MoveRR, FPReg, SPReg);
 		/* begin PopR: */
 		genoperand(PopR, FPReg);
+		
 		/* begin RetN: */
 		genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord);
 	}
 	else {
+		;
 		/* begin RetN: */
 		offset = ((methodOrBlockNumArgs > 1)
 		 || (regArgsHaveBeenPushed)

Modified: branches/Cog/nscogsrc/vm/cogit.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogit.h	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/cogit.h	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
 
 

Modified: branches/Cog/nscogsrc/vm/cogmethod.h
===================================================================
--- branches/Cog/nscogsrc/vm/cogmethod.h	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/cogmethod.h	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
 
 typedef struct {

Modified: branches/Cog/nscogsrc/vm/cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.c	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/cointerp.c	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
    from
-	CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2058,7 +2058,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.735";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -4851,6 +4851,7 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
+							null;
 							goto l309;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4868,7 +4869,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					/* return self */
+					null;
 				l309:	/* end baseFrameReturn */;
 					goto l306;
 				}
@@ -47489,7 +47490,7 @@
 		printFrameOopindexat("arg", numArgs - i, (theFP + FoxCallerSavedIP) + (i * BytesPerWord));
 	}
 	printFrameThingatextraString("caller ip", theFP + FoxCallerSavedIP, ((longAt(theFP + FoxCallerSavedIP)) == (ceReturnToInterpreterPC())
-		? "ceReturnToInterptreter"
+		? "ceReturnToInterpreter"
 		: 0));
 	printFrameThingat("saved fp", theFP + FoxSavedFP);
 	printFrameMethodFor(theFP);

Modified: branches/Cog/nscogsrc/vm/cointerp.h
===================================================================
--- branches/Cog/nscogsrc/vm/cointerp.h	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/cointerp.h	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
 
 

Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c	2014-05-29 01:02:01 UTC (rev 2933)
@@ -2,11 +2,11 @@
 
 
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
    from
-	CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -2061,7 +2061,7 @@
 	/* 574 */ (void (*)(void))0,
 	/* 575 */ (void (*)(void))0,
  0 };
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.733";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.735";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */;
 volatile int sendTrace;
 
@@ -4860,6 +4860,7 @@
 							GIV(framePointer) = localFP;
 							
 							ceEnterCogCodePopReceiverReg();
+							null;
 							goto l309;
 						}
 						localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -4877,7 +4878,7 @@
 					/* begin fetchNextBytecode */
 					currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
 
-					/* return self */
+					null;
 				l309:	/* end baseFrameReturn */;
 					goto l306;
 				}
@@ -47498,7 +47499,7 @@
 		printFrameOopindexat("arg", numArgs - i, (theFP + FoxCallerSavedIP) + (i * BytesPerWord));
 	}
 	printFrameThingatextraString("caller ip", theFP + FoxCallerSavedIP, ((longAt(theFP + FoxCallerSavedIP)) == (ceReturnToInterpreterPC())
-		? "ceReturnToInterptreter"
+		? "ceReturnToInterpreter"
 		: 0));
 	printFrameThingat("saved fp", theFP + FoxSavedFP);
 	printFrameMethodFor(theFP);

Modified: branches/Cog/nscogsrc/vm/interp.h
===================================================================
--- branches/Cog/nscogsrc/vm/interp.h	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/interp.h	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
 
 #define VM_PROXY_MAJOR 1

Modified: branches/Cog/nscogsrc/vm/vmCallback.h
===================================================================
--- branches/Cog/nscogsrc/vm/vmCallback.h	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nscogsrc/vm/vmCallback.h	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.733 uuid: 6d38bb55-fe48-480d-a606-d577925a2785
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
 
 #define VM_CALLBACK_INC 1

Modified: branches/Cog/nsspursrc/vm/cogit.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.c	2014-05-28 15:19:56 UTC (rev 2932)
+++ branches/Cog/nsspursrc/vm/cogit.c	2014-05-29 01:02:01 UTC (rev 2933)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	CCodeGenerator VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa
+	StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.734 uuid: d6a50836-2b47-4425-a81b-07dcc902faaa " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.735 uuid: ee13367a-8346-4ce8-a124-276cba680fc1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -7712,6 +7712,7 @@
     AbstractInstruction *jumpTarget1114;
     AbstractInstruction *jumpTarget1115;
     AbstractInstruction *jumpTarget1116;
+    AbstractInstruction *jumpTarget1117;
     AbstractInstruction *jumpTarget112;
     AbstractInstruction *jumpTarget113;
     AbstractInstruction *jumpTarget114;
@@ -7728,7 +7729,6 @@
     AbstractInstruction *jumpTarget124;
     AbstractInstruction *jumpTarget125;
     AbstractInstruction *jumpTarget126;
-    AbstractInstruction *jumpTarget127;
     AbstractInstruction *jumpTarget13;
     AbstractInstruction *jumpTarget14;
     AbstractInstruction *jumpTarget15;
@@ -8265,12 +8265,12 @@
 		}
 		assert(jumpTarget13 != 0);
 		jumpTarget4 = jumpTarget13;
-		offset17 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
+		offset16 = (((sqInt) jumpTarget4)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
-			? isQuick(self_in_dispatchConcretize, offset17)
+			? isQuick(self_in_dispatchConcretize, offset16)
 			: ((self_in_dispatchConcretize->machineCodeSize)) == 2)) {
 			((self_in_dispatchConcretize->machineCode))[0] = (112 + 4);
-			((self_in_dispatchConcretize->machineCode))[1] = (offset17 & 0xFF);
+			((self_in_dispatchConcretize->machineCode))[1] = (offset16 & 0xFF);
 			((self_in_dispatchConcretize->machineCodeSize) = 2);
 			return;
 		}
@@ -8284,13 +8284,13 @@
 		}
 		assert(jumpTarget111 != 0);
 		jumpTarget21 = jumpTarget111;
-		offset16 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
+		offset17 = (((sqInt) jumpTarget21)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 4);
-		((self_in_dispatchConcretize->machineCode))[2] = (offset16 & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset16) >> 8) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset16) >> 16) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset16) >> 24) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[2] = (offset17 & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF);
 		((self_in_dispatchConcretize->machineCodeSize) = 6);
 		return;
 
@@ -8306,12 +8306,12 @@
 		}
 		assert(jumpTarget14 != 0);
 		jumpTarget5 = jumpTarget14;
-		offset19 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
+		offset18 = (((sqInt) jumpTarget5)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
-			? isQuick(self_in_dispatchConcretize, offset19)
+			? isQuick(self_in_dispatchConcretize, offset18)
 			: ((self_in_dispatchConcretize->machineCodeSize)) == 2)) {
 			((self_in_dispatchConcretize->machineCode))[0] = (112 + 5);
-			((self_in_dispatchConcretize->machineCode))[1] = (offset19 & 0xFF);
+			((self_in_dispatchConcretize->machineCode))[1] = (offset18 & 0xFF);
 			((self_in_dispatchConcretize->machineCodeSize) = 2);
 			return;
 		}
@@ -8325,13 +8325,13 @@
 		}
 		assert(jumpTarget112 != 0);
 		jumpTarget22 = jumpTarget112;
-		offset18 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
+		offset19 = (((sqInt) jumpTarget22)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 5);
-		((self_in_dispatchConcretize->machineCode))[2] = (offset18 & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset18) >> 8) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 16) & 0xFF);
-		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 24) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[2] = (offset19 & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF);
+		((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF);
 		((self_in_dispatchConcretize->machineCodeSize) = 6);
 		return;
 
@@ -8583,13 +8583,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget120);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) {
-			jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address)));
+		jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget119);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) {
+			jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address)));
 		}
-		assert(jumpTarget120 != 0);
-		jumpTarget29 = jumpTarget120;
+		assert(jumpTarget119 != 0);
+		jumpTarget29 = jumpTarget119;
 		offset26 = (((sqInt) jumpTarget29)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset26)
@@ -8602,13 +8602,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget119 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget119);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget119)) {
-			jumpTarget119 = ((AbstractInstruction *) ((jumpTarget119->address)));
+		jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1110);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) {
+			jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address)));
 		}
-		assert(jumpTarget119 != 0);
-		jumpTarget210 = jumpTarget119;
+		assert(jumpTarget1110 != 0);
+		jumpTarget210 = jumpTarget1110;
 		offset116 = (((sqInt) jumpTarget210)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 12);
@@ -8623,13 +8623,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget121);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) {
-			jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address)));
+		jumpTarget120 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget120);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget120)) {
+			jumpTarget120 = ((AbstractInstruction *) ((jumpTarget120->address)));
 		}
-		assert(jumpTarget121 != 0);
-		jumpTarget30 = jumpTarget121;
+		assert(jumpTarget120 != 0);
+		jumpTarget30 = jumpTarget120;
 		offset27 = (((sqInt) jumpTarget30)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset27)
@@ -8642,13 +8642,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1110 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1110);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1110)) {
-			jumpTarget1110 = ((AbstractInstruction *) ((jumpTarget1110->address)));
+		jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1111);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) {
+			jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address)));
 		}
-		assert(jumpTarget1110 != 0);
-		jumpTarget211 = jumpTarget1110;
+		assert(jumpTarget1111 != 0);
+		jumpTarget211 = jumpTarget1111;
 		offset117 = (((sqInt) jumpTarget211)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 13);
@@ -8663,13 +8663,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget122);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) {
-			jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address)));
+		jumpTarget121 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget121);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget121)) {
+			jumpTarget121 = ((AbstractInstruction *) ((jumpTarget121->address)));
 		}
-		assert(jumpTarget122 != 0);
-		jumpTarget31 = jumpTarget122;
+		assert(jumpTarget121 != 0);
+		jumpTarget31 = jumpTarget121;
 		offset28 = (((sqInt) jumpTarget31)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset28)
@@ -8682,13 +8682,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1111 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1111);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1111)) {
-			jumpTarget1111 = ((AbstractInstruction *) ((jumpTarget1111->address)));
+		jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1112);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) {
+			jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address)));
 		}
-		assert(jumpTarget1111 != 0);
-		jumpTarget212 = jumpTarget1111;
+		assert(jumpTarget1112 != 0);
+		jumpTarget212 = jumpTarget1112;
 		offset118 = (((sqInt) jumpTarget212)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 15);
@@ -8703,13 +8703,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget123);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) {
-			jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address)));
+		jumpTarget122 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget122);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget122)) {
+			jumpTarget122 = ((AbstractInstruction *) ((jumpTarget122->address)));
 		}
-		assert(jumpTarget123 != 0);
-		jumpTarget32 = jumpTarget123;
+		assert(jumpTarget122 != 0);
+		jumpTarget32 = jumpTarget122;
 		offset29 = (((sqInt) jumpTarget32)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset29)
@@ -8722,13 +8722,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1112 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1112);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1112)) {
-			jumpTarget1112 = ((AbstractInstruction *) ((jumpTarget1112->address)));
+		jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1113);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) {
+			jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address)));
 		}
-		assert(jumpTarget1112 != 0);
-		jumpTarget213 = jumpTarget1112;
+		assert(jumpTarget1113 != 0);
+		jumpTarget213 = jumpTarget1113;
 		offset119 = (((sqInt) jumpTarget213)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 14);
@@ -8744,13 +8744,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget124);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) {
-			jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address)));
+		jumpTarget123 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget123);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget123)) {
+			jumpTarget123 = ((AbstractInstruction *) ((jumpTarget123->address)));
 		}
-		assert(jumpTarget124 != 0);
-		jumpTarget33 = jumpTarget124;
+		assert(jumpTarget123 != 0);
+		jumpTarget33 = jumpTarget123;
 		offset30 = (((sqInt) jumpTarget33)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset30)
@@ -8763,13 +8763,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1113 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1113);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1113)) {
-			jumpTarget1113 = ((AbstractInstruction *) ((jumpTarget1113->address)));
+		jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1114);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) {
+			jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address)));
 		}
-		assert(jumpTarget1113 != 0);
-		jumpTarget214 = jumpTarget1113;
+		assert(jumpTarget1114 != 0);
+		jumpTarget214 = jumpTarget1114;
 		offset120 = (((sqInt) jumpTarget214)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 7);
@@ -8785,13 +8785,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget125 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget125);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget125)) {
-			jumpTarget125 = ((AbstractInstruction *) ((jumpTarget125->address)));
+		jumpTarget124 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget124);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget124)) {
+			jumpTarget124 = ((AbstractInstruction *) ((jumpTarget124->address)));
 		}
-		assert(jumpTarget125 != 0);
-		jumpTarget34 = jumpTarget125;
+		assert(jumpTarget124 != 0);
+		jumpTarget34 = jumpTarget124;
 		offset31 = (((sqInt) jumpTarget34)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 2)));
 		if ((((self_in_dispatchConcretize->machineCodeSize)) == 0
 			? isQuick(self_in_dispatchConcretize, offset31)
@@ -8804,13 +8804,13 @@
 		/* begin concretizeConditionalJumpLong: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget1114 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget1114);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1114)) {
-			jumpTarget1114 = ((AbstractInstruction *) ((jumpTarget1114->address)));
+		jumpTarget1115 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
+		assertSaneJumpTarget(jumpTarget1115);
+		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget1115)) {
+			jumpTarget1115 = ((AbstractInstruction *) ((jumpTarget1115->address)));
 		}
-		assert(jumpTarget1114 != 0);
-		jumpTarget215 = jumpTarget1114;
+		assert(jumpTarget1115 != 0);
+		jumpTarget215 = jumpTarget1115;
 		offset121 = (((sqInt) jumpTarget215)) - (((sqInt) (((self_in_dispatchConcretize->address)) + 6)));
 		((self_in_dispatchConcretize->machineCode))[0] = 15;
 		((self_in_dispatchConcretize->machineCode))[1] = (128 + 6);
@@ -8825,13 +8825,13 @@
 		/* begin concretizeConditionalJump: */
 		/* begin computeJumpTargetOffsetPlus: */
 		/* begin jumpTargetAddress */
-		jumpTarget126 = ((AbstractInstruction *) (((self_in_dispatchConcretize->operands))[0]));
-		assertSaneJumpTarget(jumpTarget126);
-		if (isAnInstruction(self_in_dispatchConcretize, jumpTarget126)) {
-			jumpTarget126 = ((AbstractInstruction *) ((jumpTarget126->address)));

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list