CogVM source as per VMMaker.oscog-eem.2775

Fix a warning from compiling the cogit.

ThreadedFFIPlugin: Add primitiveCDataModel which with 0 args answers the C data
model name (LLP64, ILP32 et al), and with a ByteArray arg of 9 elements, answers
the sizes of char, short, etc, & wchar_t.

Slang:
Allow TMethod>>typeFor:in: to infer tpes for non-integral constants (integral
constants need very special handling, done in the client).
Eliminate unnecessary parentheses in ifNil:.

Author: eliotmiranda

nsspur64src/vm/cogit.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2773 uuid: 3c51054d-e839-4959-b3e1-562845a4fa54
+	CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
  */
 
 

nsspur64src/vm/cogitARMv8.c

@@ -1,10 +1,10 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2773 uuid: 3c51054d-e839-4959-b3e1-562845a4fa54
+	CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2773 uuid: 3c51054d-e839-4959-b3e1-562845a4fa54
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
 	CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2773 uuid: 3c51054d-e839-4959-b3e1-562845a4fa54\n\
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2\n\
 CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
@@ -757,7 +757,7 @@ static void generateTrampolines(void);
 static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
 static void genGetLeafCallStackPointers(void);
 static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
-static usqInt genInvokeInterpretTrampoline(void);
+static void (*)(void) genInvokeInterpretTrampoline(void);
 static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
 static usqInt genNonLocalReturnTrampoline(void);
 static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -6796,7 +6796,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
 static sqInt NoDbgRegParms
 rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
 {
-    usqInt instrOpcode;
+    sqInt instrOpcode;
     sqInt mcpc;
     sqInt offset;
 
@@ -6806,7 +6806,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
 	instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
 	assert((instrOpcode == 5)
 	 || (instrOpcode == 37));
-	codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
+	codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
 	return 4;
 }
 
@@ -8805,7 +8805,7 @@ cogCodeConstituents(sqInt withDetails)
 		cogMethod = ((CogMethod *) (roundUpToMethodAlignment(backEnd(), (((sqInt)cogMethod)) + ((cogMethod->blockSize)))));
 	}
 	constituents = instantiateClassindexableSize(classArray(), count * 2);
-	if (!(constituents)) {
+	if (!constituents) {
 		return constituents;
 	}
 	pushRemappableOop(constituents);
@@ -8835,7 +8835,7 @@ cogCodeConstituents(sqInt withDetails)
 					 && (((cogMethod->cmType)) == CMClosedPIC)
 						? createCPICData(cogMethod)
 						: (cogMethod->selector)));
-			if (!(profileData)) {
+			if (!profileData) {
 				return cleanUpFailingCogCodeConstituents(cogMethod);
 			}
 			storePointerUncheckedofObjectwithValue(count, constituents, profileData);
@@ -8845,7 +8845,7 @@ cogCodeConstituents(sqInt withDetails)
 			else {
 				value = positive64BitIntegerFor(((usqInt)cogMethod));
 			}
-			if (!(value)) {
+			if (!value) {
 				return cleanUpFailingCogCodeConstituents(cogMethod);
 			}
 			storePointerUncheckedofObjectwithValue(count + 1, constituents, value);
@@ -9342,14 +9342,14 @@ collectCogConstituentForAnnotationMcpcBcpcMethod(BytecodeDescriptor *descriptor,
     sqInt *sendTable1;
     CogMethod *targetMethod1;
 
-	if (!(descriptor)) {
+	if (!descriptor) {
 		return 0;
 	}
 	if (!((descriptor->isMapped))) {
 		return 0;
 	}
 	address = positive64BitIntegerFor(((usqInt)mcpc));
-	if (!(address)) {
+	if (!address) {
 		return PrimErrNoMemory;
 	}
 	storePointerUncheckedofObjectwithValue(cogConstituentIndex, topRemappableOop(), address);
@@ -9463,12 +9463,12 @@ collectCogMethodConstituent(CogMethod *cogMethod)
 	/* +1 for first address */
 	nSlots = ((((byteSizeOf(cm)) - (startPCOfMethod(cm))) * 2) + (minSlotsForShortening())) + 1;
 	data = instantiateClassindexableSize(splObj(ClassArray), nSlots);
-	if (!(data)) {
+	if (!data) {
 		return null;
 	}
 	pushRemappableOop(data);
 	address = positive64BitIntegerFor(((usqInt)cogMethod));
-	if (!(address)) {
+	if (!address) {
 		popRemappableOop();
 		return null;
 	}
@@ -10443,7 +10443,7 @@ createCPICData(CogMethod *cPIC)
 	assert((((cPIC->methodObject)) == 0)
 	 || (addressCouldBeOop((cPIC->methodObject))));
 	picData = instantiateClassindexableSize(classArray(), (((cPIC->cPICNumCases)) * 2) + 1);
-	if (!(picData)) {
+	if (!picData) {
 		return picData;
 	}
 	storePointerUncheckedofObjectwithValue(0, picData, (cPIC->selector));
@@ -11889,7 +11889,7 @@ genInnerPICAbortTrampoline(char *name)
 	this is the caller's responsibility), and invoke interpret PDQ. */
 
 	/* Cogit>>#genInvokeInterpretTrampoline */
-static usqInt
+static void (*)(void)
 genInvokeInterpretTrampoline(void)
 {
     sqInt address;
@@ -11924,7 +11924,7 @@ genInvokeInterpretTrampoline(void)
 	checkLiteralforInstruction(((sqInt)jumpTarget), genoperand(JumpFull, ((sqInt)jumpTarget)));
 	outputInstructionsForGeneratedRuntimeAt(startAddress);
 	recordGeneratedRunTimeaddress("ceInvokeInterpret", startAddress);
-	return startAddress;
+	return ((void (*)(void)) startAddress);
 }
 
 
@@ -14533,7 +14533,7 @@ patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver)
 	/* See if an Open PIC is already available. */
 	outerReturn = stackTop();
 	oPIC = openPICWithSelector(selector);
-	if (!(oPIC)) {
+	if (!oPIC) {
 
 		/* otherwise attempt to create an Open PIC. */
 		oPIC = cogOpenPICSelectornumArgs(selector, numArgs);
@@ -15315,7 +15315,7 @@ unlinkAllSends(void)
     sqInt mcpc;
     sqInt result;
 
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	cogMethod = ((CogMethod *) methodZoneBase);
@@ -15888,7 +15888,7 @@ unlinkSendsLinkedForInvalidClasses(void)
     sqInt mcpc;
     sqInt result;
 
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	cogMethod = ((CogMethod *) methodZoneBase);
@@ -15963,7 +15963,7 @@ unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector)
     sqInt mustScanAndUnlink;
     sqInt result;
 
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	cogMethod = ((CogMethod *) methodZoneBase);
@@ -16058,7 +16058,7 @@ unlinkSendsToFree(void)
     sqInt mcpc;
     sqInt result;
 
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	codeModified = 0;
@@ -16124,7 +16124,7 @@ unlinkSendsToMachineCodePrimitiveMethodsAndFreeIf(sqInt freeIfTrue)
     sqInt mcpc;
     sqInt result;
 
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	codeModified = (freedSomething = 0);
@@ -16209,7 +16209,7 @@ unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue)
 		return;
 	}
 	targetMethod = cogMethodOf(targetMethodObject);
-	if (!(methodZoneBase)) {
+	if (!methodZoneBase) {
 		return;
 	}
 	codeModified = (freedPIC = 0);
@@ -17129,7 +17129,7 @@ removeFromOpenPICList(CogMethod *anOpenPIC)
     CogMethod *prevPIC;
 
 	assert(((anOpenPIC->cmType)) == CMOpenPIC);
-	if (!(openPICList)) {
+	if (!openPICList) {
 		return null;
 	}
 	assert((((openPICList->cmType)) == CMOpenPIC)
@@ -27808,7 +27808,7 @@ pcDataForAnnotationMcpcBcpcMethod(BytecodeDescriptor *descriptor, sqInt isBackwa
     sqInt actualBcpc;
     sqInt actualMcpc;
 
-	if (!(descriptor)) {
+	if (!descriptor) {
 
 		/* this is the stackCheck offset */
 		assert(introspectionDataIndex == 0);
@@ -31241,7 +31241,7 @@ genSpecialSelectorArithmetic(void)
 		error("Case not found and no otherwise clause");
 	}
 	if (jumpNotSmallInts == null) {
-		if (!(jumpContinue)) {
+		if (!jumpContinue) {
 
 			/* overflow cannot happen */
 			/* begin annotateInstructionForBytecode */
@@ -31439,7 +31439,7 @@ genSpecialSelectorComparison(void)
 	/* begin Jump: */
 	jumpTarget = ensureNonMergeFixupAt(postBranchPC);
 	genoperand(Jump, ((sqInt)jumpTarget));
-	if (!(jumpNotSmallInts)) {
+	if (!jumpNotSmallInts) {
 		/* begin annotateInstructionForBytecode */
 		if (prevInstIsPCAnnotated()) {
 			/* begin Nop */
@@ -33338,15 +33338,15 @@ tempsValidAndVolatileEntriesSpilled(void)
 	for (i = 1; i <= methodOrBlockNumTemps; i += 1) {
 		if (!(((((simStackAt(i))->type)) == SSBaseOffset)
 			 || (maybeCompilingFirstPassOfBlockWithInitialPushNil()))) {
-			if (!(culprit)) {
+			if (!culprit) {
 				culprit = i;
 			}
 			return 0;
 		}
 	}
 	for (i = (methodOrBlockNumTemps + 1); i < simSpillBase; i += 1) {
 		if (!(((simStackAt(i))->spilled))) {
-			if (!(culprit)) {
+			if (!culprit) {
 				culprit = i;
 			}
 			return 0;