Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into …

…merge-with-pharo
OpenSmalltalk · Nov 2, 2016 · ba96153 · ba96153
2 parents ed46fc2 + 33bef2b
commit ba96153
Show file tree

Hide file tree

Showing 62 changed files with 3,945 additions and 12,762 deletions.
diff --git a/nsspur64src/vm/cogit.h b/nsspur64src/vm/cogit.h
@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1968 uuid: 57140cb2-3dcf-4e1d-86e1-7d7a520d0f88
+	CCodeGenerator VMMaker.oscog-eem.1972 uuid: 0e6a54ad-d62f-4b69-9f0d-7b66f8350984
  */
 
 

diff --git a/nsspur64src/vm/cogitX64.c b/nsspur64src/vm/cogitX64.c
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1965 uuid: e173d891-126a-4db1-a8ba-fdfa64bfc28c
+	CCodeGenerator VMMaker.oscog-eem.1972 uuid: 0e6a54ad-d62f-4b69-9f0d-7b66f8350984
    from
-	StackToRegisterMappingCogit VMMaker.oscog-eem.1965 uuid: e173d891-126a-4db1-a8ba-fdfa64bfc28c
+	StackToRegisterMappingCogit VMMaker.oscog-eem.1972 uuid: 0e6a54ad-d62f-4b69-9f0d-7b66f8350984
  */
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1965 uuid: e173d891-126a-4db1-a8ba-fdfa64bfc28c " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1972 uuid: 0e6a54ad-d62f-4b69-9f0d-7b66f8350984 " __DATE__ ;
 char *__cogitBuildInfo = __buildInfo;
 
 
@@ -3795,7 +3795,7 @@ static sqInt NoDbgRegParms
 closedPICRefersToUnmarkedObject(CogMethod *cPIC)
 {
     sqInt i;
-    sqInt object;
+    usqInt object;
     sqInt pc;
 
 	if (!((isImmediate((cPIC->selector)))
@@ -6116,12 +6116,12 @@ static sqInt NoDbgRegParms
 generateMapAtstart(sqInt addressOrNull, sqInt startAddress)
 {
     unsigned char annotation;
-    sqInt delta;
+    usqInt delta;
     sqInt i;
     AbstractInstruction *instruction;
     sqInt length;
-    sqInt location;
-    sqInt mapEntry;
+    usqInt location;
+    usqInt mapEntry;
     sqInt maxDelta;
     usqInt mcpc;
 
@@ -22689,7 +22689,9 @@ genExtPushIntegerBytecode(void)
 {
     sqInt value;
 
-	value = byte1 + (((sqInt)((usqInt)(extB) << 8)));
+	value = byte1 + (((usqInt) ((extB > 0x7F
+	? extB - 256
+	: extB)) << 8));
 	extB = 0;
 	return genPushLiteral(((value << 3) | 1));
 }
@@ -23016,7 +23018,9 @@ genExtUnconditionalJump(void)
     sqInt distance;
     sqInt target;
 
-	distance = byte1 + (((sqInt)((usqInt)(extB) << 8)));
+	distance = byte1 + (((usqInt) ((extB > 0x7F
+	? extB - 256
+	: extB)) << 8));
 	assert(distance == (v4LongBranchDistance(generatorAt(byte0), bytecodePC, ((extA != 0
 	? 1
 	: 0)) + ((extB != 0
@@ -24893,7 +24897,7 @@ v4LongBranchDistance(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqIn
 	}
 	extBValue = extBValue1;
 
-	return (fetchByteofObject(pc + 1, aMethodObj)) + (((sqInt)((usqInt)(extBValue) << 8)));
+	return (fetchByteofObject(pc + 1, aMethodObj)) + (((usqInt) extBValue << 8));
 }
 
 	/* SimpleStackBasedCogit>>#voidCogCompiledCode */