CogVM source as per VMMaker.oscog-eem.2504/FileAttributesPlugin.oscog-akg.49

Slang:
Fix a bug in type inferrence that resulted in the inferred return type of
findMapLocationForMcpc:inMethod: to flip between usqInt (correct) and sqInt
(incorrect).  addTypesFor:to:in: needed to answer if it was inferring a return
type from an untyped variable, as well as an untyped method.

Plugins: FileAttributesPlugin v2.0.8

Fix some of the doits in Slang Test Workspace.text

Author: eliotmiranda

image/Slang Test Workspace.text

@@ -1 +1 @@
-"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [| sel vmm s cg |	sel := #scavenge:.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: StackInterpreter;				options: #(ObjectMemory Spur64BitCoMemoryManager).	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	"to break at inlining decisions or type inferrende uncomment the following.	 If src & dest are different selectors, breaks on inlining.	 If src & dest are the same selector, breaks on type inference in sel."	"cg	breakSrcInlineSelector: sel;		breakDestInlineSelector: sel;		breakOnInline: false".	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel vmm s cg |	sel := #primitiveVoidVMStateForMethod.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: CoInterpreter"MT";				options: {#ObjectMemory. Cogit chooseCogitClass name}.	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel s vmm cg |	sel := #compileEntry.	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: CoInterpreter;				options: {#ObjectMemory. Cogit chooseCogitClass name};				buildCodeGeneratorForCogit]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #compactCogCompiledCode. sel }.	cg prepareMethods.	cg doInlining: cg vmClass doInlining.	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| tm s vmm cg |	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: StackInterpreter;				buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass.	cg addMethod: tm.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #foo }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg methodNamed: #foo)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin sel s vmm cg |	plugin := ThreadedARMFFIPlugin.	sel := #primitiveCallout.	vmm := VMMaker forPlatform: 'Cross'.	cg := [plugin buildCodeGenerator]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg	breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:;		breakDestInlineSelector: sel;		breakOnInline: "false"true.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg anyMethodNamed: sel)		removeUnusedTempsAndNilIfRequiredIn: cg;		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin s cg |	plugin := FileCopyPlugin"UnixOSProcessPlugin".	cg := plugin buildCodeGenerator.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	plugin pruneUnusedInterpreterPluginMethodsIn: cg.	s := ReadWriteStream on: String new.	cg emitCCodeOn: s doInlining: true doAssertions: false.	s contents] value].[| cg |cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].
+"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [| sel vmm s cg |	sel := #scavenge:.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: StackInterpreter;				options: #(ObjectMemory Spur64BitCoMemoryManager).	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	"to break at inlining decisions or type inferrence uncomment the following.	 If src & dest are different selectors, breaks on inlining.	 If src & dest are the same selector, breaks on type inference in sel."	"cg	breakSrcInlineSelector: sel;		breakDestInlineSelector: sel;		breakOnInline: false".	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel vmm s cg |	sel := #primitiveVoidVMStateForMethod.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: CoInterpreter"MT";				options: {#Cogit. Cogit chooseCogitClass name}.	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel s vmm cg |	sel := #compileEntry.	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: CoInterpreter;				options: {#Cogit. Cogit chooseCogitClass name};				buildCodeGeneratorForCogit]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #compactCogCompiledCode. sel }.	cg prepareMethods.	cg doInlining: cg vmClass doInlining.	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| tm s vmm cg |	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: StackInterpreter;				buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass.	cg addMethod: tm.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #foo }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg methodNamed: #foo)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin sel s vmm cg |	plugin := ThreadedARMFFIPlugin.	sel := #primitiveCallout.	vmm := VMMaker forPlatform: 'Cross'.	cg := [plugin buildCodeGenerator]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg	breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:;		breakDestInlineSelector: sel;		breakOnInline: "false"true.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg anyMethodNamed: sel)		removeUnusedTempsAndNilIfRequiredIn: cg;		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin s cg |	plugin := FileCopyPlugin"UnixOSProcessPlugin".	cg := plugin buildCodeGenerator.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	plugin pruneUnusedInterpreterPluginMethodsIn: cg.	s := ReadWriteStream on: String new.	cg emitCCodeOn: s doInlining: true doAssertions: false.	s contents] value].[| cg |cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].

nsspur64src/vm/cogit.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e
+	CCodeGenerator VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
  */
 
 

nsspur64src/vm/cogitX64SysV.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e
+	CCodeGenerator VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -583,7 +583,7 @@ static sqInt NoDbgRegParms fillInBlockHeadersAt(sqInt startAddress);
 static CogMethod * NoDbgRegParms fillInMethodHeadersizeselector(CogMethod *method, sqInt size, sqInt selector);
 static sqInt NoDbgRegParms findBackwardBranchIsBackwardBranchMcpcBcpcMatchingBcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranchAndAnnotation, char *mcpc, sqInt bcpc, void *targetBcpc);
 static usqInt NoDbgRegParms findBlockMethodWithEntrystartBcpc(sqInt blockEntryMcpc, sqInt startBcpc);
-static sqInt NoDbgRegParms findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod);
+static usqInt NoDbgRegParms findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod);
 extern CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
 static sqInt NoDbgRegParms findIsBackwardBranchMcpcBcpcMatchingMcpc(BytecodeDescriptor *descriptor, sqInt isBackwardBranchAndAnnotation, char *mcpc, sqInt bcpc, void *targetMcpc);
 static sqInt NoDbgRegParms firstMappedPCFor(CogMethod *cogMethod);
@@ -5812,7 +5812,7 @@ findBlockMethodWithEntrystartBcpc(sqInt blockEntryMcpc, sqInt startBcpc)
 }
 
 	/* Cogit>>#findMapLocationForMcpc:inMethod: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
 findMapLocationForMcpcinMethod(usqInt targetMcpc, CogMethod *cogMethod)
 {
     sqInt annotation;

nsspur64src/vm/cogitX64WIN64.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e
+	CCodeGenerator VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e
+	StackToRegisterMappingCogit VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2502 uuid: 698cab19-5a66-4b07-b38f-727d0c267c7e " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -656,7 +656,7 @@ static BytecodeDescriptor * loadBytesAndGetDescriptor(void);
 static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc);
 static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg);
 static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg);
-static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
+static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
 static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg);
 static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC);
 static void mapObjectReferencesInGeneratedRuntime(void);
@@ -2790,7 +2790,7 @@ static sqInt NoDbgRegParms
 blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
 {
     sqInt blockEntry;
-    sqInt end;
+    usqInt end;
     sqInt pc;
     sqInt result;
     usqInt targetpc;
@@ -7642,7 +7642,7 @@ gMoveCwR(sqInt wordConstant, sqInt reg)
 /*	Answer the address of the null byte at the end of the method map. */
 
 	/* Cogit>>#mapEndFor: */
-static sqInt NoDbgRegParms
+static usqInt NoDbgRegParms
 mapEndFor(CogMethod *cogMethod)
 {
     usqInt end;

nsspur64src/vm/cointerp.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.2500 uuid: c991a570-d1c2-4445-b94d-83b6da74f435
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
    from
-	CoInterpreter VMMaker.oscog-nice.2500 uuid: c991a570-d1c2-4445-b94d-83b6da74f435
+	CoInterpreter VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
  */
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-nice.2500 uuid: c991a570-d1c2-4445-b94d-83b6da74f435 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11 " __DATE__ ;
 char *__interpBuildInfo = __buildInfo;
 
 
@@ -1539,7 +1539,7 @@ static sqInt lookupOrdinarySend(void);
 static sqInt NoDbgRegParms lookupProtectedstartingAtrule(sqInt selector, sqInt mixinApplication, sqInt rule);
 extern sqInt lookupSelectorinClass(sqInt selector, sqInt class);
 static void NoDbgRegParms makeContextSnapshotSafe(sqInt ctxt);
-extern sqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
+extern usqInt makePointwithxValueyValue(sqInt xValue, sqInt yValue);
 static void mapInterpreterOops(void);
 static sqInt NoDbgRegParms markAndTraceStackPages(sqInt fullGCFlag);
 static void markAndTraceUntracedReachableStackPages(void);
@@ -2610,7 +2610,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */]
 	};
 sqInt checkedPluginName;
 char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-nice.2500";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.2504";
 sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
 volatile int sendTrace;
 
@@ -7096,7 +7096,7 @@ interpret(void)
 				sqInt context;
 				sqInt i;
 				sqInt initialIP;
-				sqInt newClosure;
+				usqInt newClosure;
 				usqInt newClosure1;
 				usqInt newObj;
 				sqInt numArgs;
@@ -14781,7 +14781,7 @@ interpret(void)
 				sqInt context;
 				sqInt i;
 				sqInt initialIP;
-				sqInt newClosure;
+				usqInt newClosure;
 				usqInt newClosure1;
 				usqInt newObj;
 				sqInt numArgs;
@@ -45496,7 +45496,7 @@ allInstancesOf(sqInt aClass)
     sqInt ptr1;
     sqInt ptr2;
     sqInt smallObj;
-    usqInt start;
+    sqInt start;
 
 	classIndex = (long32At(aClass + 4)) & (identityHashHalfWordMask());
 	if (classIndex == 0) {
@@ -45930,8 +45930,8 @@ allObjects(void)
     sqInt prevObj1;
     sqInt prevPrevObj;
     sqInt prevPrevObj1;
-    usqInt ptr;
-    usqInt start;
+    sqInt ptr;
+    sqInt start;
 
 
 	/* N.B. Does /not/ update totalFreeOldSpace */
@@ -62631,7 +62631,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 			assert((ReceiverIndex + ((sp >> 3))) < (lengthOf(obj)));
 			contextSize = (sp >> 3);
 	l7:	/* end fetchStackPointerOf: */;
-			numPointerSlots = ((usqInt) (CtxtTempFrameStart + contextSize));
+			numPointerSlots = CtxtTempFrameStart + contextSize;
 			goto l8;
 		}
 		/* begin numSlotsOf: */
@@ -62660,7 +62660,7 @@ updatePointersInsavedFirstFieldPointer(sqInt obj, sqInt firstFieldPtr)
 	l5:	/* end methodHeaderFromSavedFirstField: */;
 	assert((((header) & 7) == 1));
 	numLiterals = ((header >> 3)) & AlternateHeaderNumLiteralsMask;
-	numPointerSlots = ((usqInt) (numLiterals + LiteralStart));
+	numPointerSlots = numLiterals + LiteralStart;
 	l8:	/* end numPointerSlotsWhileCompactingOf:withFormat:savedFirstFieldPointer: */;
 	if ((fmt <= 5 /* lastPointerFormat */)
 	 && (numPointerSlots > 0)) {
@@ -69994,7 +69994,7 @@ makeContextSnapshotSafe(sqInt ctxt)
 	We know both will be integers so no value nor root checking is needed */
 
 	/* StackInterpreter>>#makePointwithxValue:yValue: */
-sqInt
+usqInt
 makePointwithxValueyValue(sqInt xValue, sqInt yValue)
 {   DECL_MAYBE_SQ_GLOBAL_STRUCT
     sqInt classObj;

nsspur64src/vm/cointerp.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGeneratorGlobalStructure VMMaker.oscog-nice.2500 uuid: c991a570-d1c2-4445-b94d-83b6da74f435
+	CCodeGeneratorGlobalStructure VMMaker.oscog-eem.2504 uuid: a00b0fad-c04c-47a6-8a11-5dbff110ac11
  */