CogVM source as per VMMaker.oscog-eem.2945

If sqMemoryAccess.h is to define EXPORT et al then
sqPlatformSpecific.h, which provides platform-specific
overrides, must precede it.  This affects the cogit files.

Add explicit variables for the handler and unwind primitive
markers (PrimNumberHandlerMarker & PrimNumberUnwindMarker),
and add 123 as the no-context-switch marker (PrimNumberNoContextSwitchMarker).

Author: eliotmiranda

nsspur64src/vm/cogit.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGenerator VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
 
 

nsspur64src/vm/cogitARMv8.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGenerator VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -13,8 +13,8 @@ char *__cogitBuildInfo = __buildInfo;
 #include <stdlib.h>
 #include <string.h>
 #include "sqConfig.h"
-#include "sqMemoryAccess.h"
 #include "sqPlatformSpecific.h"
+#include "sqMemoryAccess.h"
 #include "sqCogStackAlignment.h"
 #include "dispdbg.h"
 #include "cogmethod.h"
@@ -6986,7 +6986,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    sqInt instrOpcode;
+    usqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -6996,7 +6996,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 

nsspur64src/vm/cogitX64SysV.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGenerator VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -13,8 +13,8 @@ char *__cogitBuildInfo = __buildInfo;
 #include <stdlib.h>
 #include <string.h>
 #include "sqConfig.h"
-#include "sqMemoryAccess.h"
 #include "sqPlatformSpecific.h"
+#include "sqMemoryAccess.h"
 #include "sqCogStackAlignment.h"
 #include "dispdbg.h"
 #include "cogmethod.h"

nsspur64src/vm/cogitX64WIN64.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGenerator VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2 " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -13,8 +13,8 @@ char *__cogitBuildInfo = __buildInfo;
 #include <stdlib.h>
 #include <string.h>
 #include "sqConfig.h"
-#include "sqMemoryAccess.h"
 #include "sqPlatformSpecific.h"
+#include "sqMemoryAccess.h"
 #include "sqCogStackAlignment.h"
 #include "dispdbg.h"
 #include "cogmethod.h"

nsspur64src/vm/cointerp.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
    from
-	CoInterpreter VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CoInterpreter VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -281,10 +281,13 @@ warningat(const char *s, int l) { /* ditto with line number. */
 #define PrimNumberDoPrimitive 118
 #define PrimNumberExternalCall 117
 #define PrimNumberFFICall 120
+#define PrimNumberHandlerMarker 199
 #define PrimNumberHashMultiply 159
 #define PrimNumberInstVarAt 73
+#define PrimNumberNoContextSwitchMarker 123
 #define PrimNumberShallowCopy 148
 #define PrimNumberSlotAt 173
+#define PrimNumberUnwindMarker 198
 #define PrimTraceLogSize 256
 #define PriorityIndex 2
 #define ProcessListsIndex 0
@@ -1265,7 +1268,7 @@ extern sqInt nonIndexablePointerFormat(void);
 static sqInt noUnscannedEphemerons(void);
 static sqInt NoDbgRegParms numBytesOfBytes(sqInt objOop);
 extern sqInt numBytesOf(sqInt objOop);
-extern usqInt numPointerSlotsOf(sqInt objOop);
+extern sqInt numPointerSlotsOf(sqInt objOop);
 static usqInt NoDbgRegParms numSlotsOfAny(sqInt objOop);
 extern usqInt numSlotsOf(sqInt objOop);
 static sqInt NoDbgRegParms numStrongSlotsOfInephemeral(sqInt objOop);
@@ -2628,7 +2631,7 @@ sqInt debugCallbackInvokes;
 sqInt debugCallbackReturns;
 sqInt ffiExceptionResponse;
 sqInt checkedPluginName;
-const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-eem.2936";
+const char *interpreterVersion = "Newspeak Virtual Machine [ Open Smalltalk, Spur] CoInterpreterPrimitives_VMMaker.oscog-eem.2945";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 int displayWidth;
 int displayDepth;
@@ -41060,7 +41063,7 @@ followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth)
     sqInt header1;
     sqInt i;
     sqInt numLiterals;
-    usqInt numSlots;
+    sqInt numSlots;
     usqInt numSlots1;
     sqInt oop;
     sqInt referent;
@@ -48682,7 +48685,7 @@ copyObjtoAddrstopAtsavedFirstFieldsindex(sqInt objOop, sqInt segAddr, sqInt endS
     sqInt iLimiT;
     sqInt methodHeader;
     sqInt numLiterals;
-    usqInt numMediatedSlots;
+    sqInt numMediatedSlots;
     usqInt numSlots;
     usqInt numSlots1;
     sqInt oop;
@@ -54938,7 +54941,7 @@ numBytesOf(sqInt objOop)
 	Works with CompiledMethods, as well as ordinary objects. */
 
 	/* SpurMemoryManager>>#numPointerSlotsOf: */
-usqInt
+sqInt
 numPointerSlotsOf(sqInt objOop)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt contextSize;
@@ -57933,7 +57936,7 @@ printReferencesTo(sqInt anOop)
 					assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(objOop1)));
 					contextSize = (sp >> 3);
 	l9:	/* end fetchStackPointerOf: */;
-					i = ((usqInt) (CtxtTempFrameStart + contextSize));
+					i = CtxtTempFrameStart + contextSize;
 					goto l10;
 				}
 				/* begin numSlotsOf: */
@@ -57966,7 +57969,7 @@ printReferencesTo(sqInt anOop)
 			/* begin literalCountOfMethodHeader: */
 			assert((((header) & 7) == 1));
 			numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask;
-			i = ((usqInt) (numLiterals + LiteralStart));
+			i = numLiterals + LiteralStart;
 	l10:	/* end numPointerSlotsOf: */;
 			while (((i -= 1)) >= 0) {
 				if (anOop == (longAt((objOop1 + BaseHeaderSize) + (((sqInt)((usqInt)(i) << (shiftForWord()))))))) {
@@ -61114,10 +61117,10 @@ updatePointers(void)
     sqInt numLiterals1;
     sqInt numLiterals2;
     sqInt numLiterals3;
-    usqInt numPointerSlots;
-    usqInt numPointerSlots1;
-    usqInt numPointerSlots2;
-    usqInt numPointerSlots3;
+    sqInt numPointerSlots;
+    sqInt numPointerSlots1;
+    sqInt numPointerSlots2;
+    sqInt numPointerSlots3;
     usqInt numSlots;
     usqInt numSlots1;
     usqInt numSlots11;
@@ -62273,7 +62276,7 @@ prepareForSnapshot(void)
     sqInt limit;
     sqInt newEndOfMemory;
     sqInt next;
-    usqInt node;
+    sqInt node;
     SpurSegmentInfo *seg;
     sqInt smallChild;
     sqInt treeNode;
@@ -63085,16 +63088,18 @@ callbackLeave(sqInt cbID)
 
 
 /*	Context switch should not be allowed on every method activation. In
-	particular the implementation of ensure: and ifCurtailed: depends on there
-	being no
-	suspension point on failing primitive 198 (primitiveMarkUnwindMethod).
-	slowPrimitiveResponse states
+	particular the
+	implementation of ensure: and ifCurtailed: depends on there being no
+	suspension point
+	on failing primitive 198 (primitiveMarkUnwindMethod,
+	primitiveMarkUnwindMethod). slowPrimitiveResponse used to state
 	``N.B. This means there is no suspension point on primitive failure
 	which methods such as ensure: and ifCurtailed: rely on.''
 	Rather than prevent context switch on all primitives but the ones we
 	really need
 	to be suspension points (primitiveSignal et al) we choose to allow context
-	switch for all but primitiveMarkUnwindMethod. */
+	switch for all but primitiveMarkUnwindMethod and
+	PrimNumberNoContextSwitch.  */
 
 	/* StackInterpreter>>#canContextSwitchIfActivating:header: */
 sqInt
@@ -63113,7 +63118,8 @@ canContextSwitchIfActivatingheader(sqInt theMethod, sqInt methodHeader)
 	}
 	return 
 #  if 1
-		primitiveIndex != 198
+		(primitiveIndex != PrimNumberUnwindMarker)
+			 && (primitiveIndex != PrimNumberNoContextSwitchMarker)
 #  else
 		(primitiveIndex == 0)
 			 || ((((primitiveIndex >= 85) && (primitiveIndex <= 88)))
@@ -65736,9 +65742,9 @@ findSPOfon(char *theFP, StackPage *thePage)
 
 
 /*	Search for either an unwind-protect (activation of method with primitive
-	198) or homeContext along the sender chain, which ever is found first.
-	Return values:
-	0			home context was found on sender chain with no intervening
+	198, PrimNumberUnwindMarker)
+	or homeContext along the sender chain, which ever is found first. Return
+	values: 0			home context was found on sender chain with no intervening
 	unwind-protects nilObj		home context could not be found => cannotReturn
 	context		the context of an intervening unwind-protect implies home context
 	was found */
@@ -65785,7 +65791,7 @@ findUnwindThroughContext(sqInt homeContext)
 			theMethod1 = ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())
 				? ((mframeHomeMethod(theFP))->methodObject)
 				: longAt(theFP + FoxMethod));
-			if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == 198) {
+			if ((primitiveIndexOfMethodheader(theMethod1, methodHeaderOf(theMethod1))) == PrimNumberUnwindMarker) {
 				if (theFP == theFPAbove) {
 					theSP = findSPOfon(theFP, stackPageFor(theFP));
 				}
@@ -65825,14 +65831,14 @@ findUnwindThroughContext(sqInt homeContext)
 		ctxtOrNilOrZero = GIV(nilObj);
 		goto l4;
 	}
-	ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, homeContext);
+	ctxtOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(PrimNumberUnwindMarker, senderContext, homeContext);
 	l4:	/* end findMethodWithPrimitive:FromFP:UpToContext: */;
 	assert(!((onSamePage
  && (ctxtOrNilOrZero == (nilObject())))));
 	if (ctxtOrNilOrZero == 0) {
 		/* begin fetchPointer:ofObject: */
 		theMethod = longAt((homeContext + BaseHeaderSize) + (((sqInt)((usqInt)(MethodIndex) << (shiftForWord())))));
-		if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) {
+		if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == PrimNumberUnwindMarker) {
 			return homeContext;
 		}
 		return 0;
@@ -66087,8 +66093,8 @@ static sqInt
 getErrorObjectFromPrimFailCode(void)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt classIndex;
-    sqInt clone;
-    sqInt errObj;
+    usqInt clone;
+    usqInt errObj;
     sqInt fieldIndex;
     sqInt i;
     usqInt newObj;
@@ -78252,7 +78258,7 @@ primitiveFindHandlerContext(void)
 	(GIV(stackPage)->headFP = GIV(framePointer));
 	(GIV(stackPage)->headSP = GIV(stackPointer));
 	assert(pageListIsWellFormed());
-	handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(199, longAt(GIV(stackPointer)), GIV(nilObj));
+	handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(PrimNumberHandlerMarker, longAt(GIV(stackPointer)), GIV(nilObj));
 	if (handlerOrNilOrZero == 0) {
 		/* begin nilObject */
 		handlerOrNilOrZero = GIV(nilObj);
@@ -78324,7 +78330,7 @@ primitiveFindNextUnwindContext(void)
 		assert((((senderOop) & 7) == 1));
 		theFP = pointerForOop(senderOop - 1);
 		if ((longAt(theFP + FoxSavedFP)) == 0) {
-			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, frameCallerContext(theFP), stopContext);
+			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(PrimNumberUnwindMarker, frameCallerContext(theFP), stopContext);
 		}
 		else {
 			/* begin findMethodWithPrimitive:FromFP:UpToContext: */
@@ -78345,7 +78351,7 @@ primitiveFindNextUnwindContext(void)
 					theMethod = ((((usqInt)(longAt(theFP1 + FoxMethod)))) < (startOfMemory())
 						? ((mframeHomeMethod(theFP1))->methodObject)
 						: longAt(theFP1 + FoxMethod));
-					if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) {
+					if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == PrimNumberUnwindMarker) {
 						if (theFP1 == theFPAbove) {
 							theSP = findSPOfon(theFP1, stackPageFor(theFP1));
 						}
@@ -78385,7 +78391,7 @@ primitiveFindNextUnwindContext(void)
 				handlerOrNilOrZero = GIV(nilObj);
 				goto l9;
 			}
-			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, senderContext, stopContext);
+			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(PrimNumberUnwindMarker, senderContext, stopContext);
 	l9:	/* end findMethodWithPrimitive:FromFP:UpToContext: */;
 		}
 	}
@@ -78394,7 +78400,7 @@ primitiveFindNextUnwindContext(void)
 		startContext = longAt((calleeContext + BaseHeaderSize) + (((sqInt)((usqInt)(SenderIndex) << (shiftForWord())))));
 		if (((startContext & (tagMask())) == 0)
 		 && (((longAt(startContext)) & (classIndexMask())) == ClassMethodContextCompactIndex)) {
-			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(198, startContext, stopContext);
+			handlerOrNilOrZero = findMethodWithPrimitiveFromContextUpToContext(PrimNumberUnwindMarker, startContext, stopContext);
 		}
 		else {
 			handlerOrNilOrZero = 0;

nsspur64src/vm/cointerp.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2936 uuid: 69233536-ece4-4ea1-b523-c28c4aa7d4c2
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2945 uuid: 5eae7a41-7349-4d77-87cc-fba72c5d8fd1
  */
 
 
@@ -256,7 +256,7 @@ extern sqInt minSlotsForShortening(void);
 extern sqInt nilObject(void);
 extern sqInt nonIndexablePointerFormat(void);
 extern sqInt numBytesOf(sqInt objOop);
-extern usqInt numPointerSlotsOf(sqInt objOop);
+extern sqInt numPointerSlotsOf(sqInt objOop);
 extern usqInt numSlotsOf(sqInt objOop);
 extern sqInt numStrongSlotsOfWeakling(sqInt objOop);
 extern sqInt objectAfter(sqInt objOop);