CogVM source as per VMMaker.oscog-eem.2830

IA32ABIPlugin:
Add primAlienCopyInto, a slightly more convenient way of getting data out of
aliens.

Author: eliotmiranda

src/plugins/IA32ABI/IA32ABI.c

@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.2826 uuid: 0dd1c326-6391-497c-896b-b605178640de
+	VMPluginCodeGenerator VMMaker.oscog-eem.2830 uuid: b30cd73c-7118-461b-9d8a-1c523c6aa011
    from
-	IA32ABIPlugin VMMaker.oscog-eem.2826 uuid: 0dd1c326-6391-497c-896b-b605178640de
+	IA32ABIPlugin VMMaker.oscog-eem.2830 uuid: b30cd73c-7118-461b-9d8a-1c523c6aa011
  */
-static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.2826 uuid: 0dd1c326-6391-497c-896b-b605178640de " __DATE__ ;
+static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.2830 uuid: b30cd73c-7118-461b-9d8a-1c523c6aa011 " __DATE__ ;
 
 
 
@@ -74,6 +74,7 @@ static sqInt indexlengthinRange(sqInt byteIndex, sqInt length, sqInt rcvr);
 EXPORT(sqInt) isAlien(sqInt anOop);
 EXPORT(sqInt) primAddressField(void);
 EXPORT(sqInt) primAddressFieldPut(void);
+EXPORT(sqInt) primAlienCopyInto(void);
 EXPORT(sqInt) primAlienReplace(void);
 EXPORT(sqInt) primAllocateExecutablePage(void);
 EXPORT(sqInt) primBoxedFree(void);
@@ -193,6 +194,9 @@ static sqInt (*isOopImmutable)(sqInt oop);
 #endif /* IMMUTABILITY */
 static sqInt (*isWordsOrBytes)(sqInt oop);
 static sqInt (*methodArgumentCount)(void);
+static sqInt (*methodReturnFloat)(double aFloat);
+static sqInt (*methodReturnInteger)(sqInt integer);
+static sqInt (*methodReturnReceiver)(void);
 static sqInt (*methodReturnValue)(sqInt oop);
 static sqInt (*pop)(sqInt nItems);
 static sqInt (*popthenPush)(sqInt nItems, sqInt oop);
@@ -202,7 +206,6 @@ static sqInt (*positive64BitIntegerFor)(usqLong integerValue);
 static usqLong (*positive64BitValueOf)(sqInt oop);
 static usqIntptr_t (*positiveMachineIntegerValueOf)(sqInt oop);
 static sqInt (*primitiveFailFor)(sqInt reasonCode);
-static sqInt (*pushFloat)(double f);
 static sqInt (*returnAsThroughCallbackContext)(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext);
 static sqInt (*signalNoResume)(sqInt aSemaphore);
 static sqInt (*signed32BitIntegerFor)(sqInt integerValue);
@@ -254,6 +257,9 @@ extern sqInt isOopImmutable(sqInt oop);
 #endif
 extern sqInt isWordsOrBytes(sqInt oop);
 extern sqInt methodArgumentCount(void);
+extern sqInt methodReturnFloat(double aFloat);
+extern sqInt methodReturnInteger(sqInt integer);
+extern sqInt methodReturnReceiver(void);
 extern sqInt methodReturnValue(sqInt oop);
 extern sqInt pop(sqInt nItems);
 extern sqInt popthenPush(sqInt nItems, sqInt oop);
@@ -263,7 +269,6 @@ extern sqInt positive64BitIntegerFor(usqLong integerValue);
 extern usqLong positive64BitValueOf(sqInt oop);
 extern usqIntptr_t positiveMachineIntegerValueOf(sqInt oop);
 extern sqInt primitiveFailFor(sqInt reasonCode);
-extern sqInt pushFloat(double f);
 extern sqInt returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext);
 extern sqInt signalNoResume(sqInt aSemaphore);
 extern sqInt signed32BitIntegerFor(sqInt integerValue);
@@ -280,7 +285,7 @@ extern sqInt trueObject(void);
 extern
 #endif
 struct VirtualMachine* interpreterProxy;
-static const char *moduleName = "IA32ABI VMMaker.oscog-eem.2826 " INT_EXT;
+static const char *moduleName = "IA32ABI VMMaker.oscog-eem.2830 " INT_EXT;
 
 
 
@@ -343,15 +348,12 @@ primAddressField(void)
 {
     sqInt rcvr;
     sqInt value;
-    sqInt valueOop;
 
 	rcvr = stackValue(0);
 	value = longAt((rcvr + BaseHeaderSize) + BytesPerOop);
-	/* begin positiveMachineIntegerFor: */
-	valueOop = (BytesPerWord == 8
+	return methodReturnValue((BytesPerWord == 8
 		? positive64BitIntegerFor(value)
-		: positive32BitIntegerFor(value));
-	return methodReturnValue(valueOop);
+		: positive32BitIntegerFor(value)));
 }
 
 
@@ -383,6 +385,81 @@ primAddressFieldPut(void)
 }
 
 
+/*	Copy some number of bytes from the receiver starting at the first index
+	into some destination
+	object starting at the second index. The destination may be an Aliens or a
+	bit-indexable object.
+	The primitive will have the following signature:
+	<Alien>
+	primCopyFrom: start <Integer>
+	to: stop <Integer>
+	into: destination <Alien | indexableByteSubclass et al>
+	startingAt: destStart <Integer> ^<self>
+	<primitive: 'primitiveAlienReplace' error: errorCode module: 'IA32ABI'>
+	 */
+
+	/* IA32ABIPlugin>>#primAlienCopyInto */
+EXPORT(sqInt)
+primAlienCopyInto(void)
+{
+    sqInt alien;
+    sqInt dest;
+    sqInt destAddr;
+    sqInt destStart;
+    sqInt myLength;
+    sqInt src;
+    sqInt start;
+    sqInt stop;
+    sqInt totalLength;
+
+
+	/* Unchecked! */
+	alien = stackValue(4);
+	start = stackIntegerValue(3);
+	stop = stackIntegerValue(2);
+	dest = stackValue(1);
+	destStart = stackIntegerValue(0);
+	if ((failed())
+	 || (!(isWordsOrBytes(dest)))) {
+		return primitiveFailFor(PrimErrBadArgument);
+	}
+	myLength = longAt(alien + BaseHeaderSize);
+	src = (((myLength > 0
+	? (alien + BaseHeaderSize) + BytesPerOop
+	: longAt((alien + BaseHeaderSize) + BytesPerOop))) + start) - 1;
+	if (includesBehaviorThatOf(fetchClassOf(dest), classAlien())) {
+		totalLength = longAt(dest + BaseHeaderSize);
+		destAddr = (((totalLength > 0
+	? (dest + BaseHeaderSize) + BytesPerOop
+	: longAt((dest + BaseHeaderSize) + BytesPerOop))) + start) - 1;
+		if (totalLength == 0) {
+
+			/* no bounds checks for zero-sized (pointer) Aliens */
+			totalLength = stop;
+		}
+		else {
+			totalLength = SQABS(totalLength);
+		}
+	}
+	else {
+		totalLength = byteSizeOf(dest);
+		destAddr = ((dest + BaseHeaderSize) + start) - 1;
+	}
+	if (!(((start >= 1)
+		 && (((start - 1) <= stop)
+		 && (stop <= (SQABS(myLength)))))
+		 && (((stop - start) + 1) <= totalLength))) {
+		return primitiveFailFor(PrimErrBadIndex);
+	}
+	if (isOopImmutable(dest)) {
+		return primitiveFailFor(PrimErrNoModification);
+	}
+	memmove(((void *)destAddr), ((void *)src), (stop - start) + 1);
+	methodReturnReceiver();
+	return 0;
+}
+
+
 /*	Copy some number of bytes from some source object starting at the index
 	into the receiver destination object from startIndex to stopIndex. The
 	source and destination may be Aliens or byte-indexable objects. The
@@ -408,7 +485,6 @@ EXPORT(sqInt)
 primAlienReplace(void)
 {
     sqInt array;
-    sqInt count;
     sqInt dest;
     sqInt repl;
     sqInt replStart;
@@ -485,9 +561,8 @@ primAlienReplace(void)
 	if (isOopImmutable(array)) {
 		return primitiveFailFor(PrimErrNoModification);
 	}
-	count = (stop - start) + 1;
-	memmove(((void *)dest), ((void *)src), count);
-	pop(methodArgumentCount());
+	memmove(((void *)dest), ((void *)src), (stop - start) + 1);
+	methodReturnReceiver();
 	return 0;
 }
 
@@ -551,7 +626,7 @@ primBoxedFree(void)
 	 || (isInMemory(addr)))) {
 		return primitiveFailFor(PrimErrInappropriate);
 	}
-	free((void *)addr);
+	free(((void *)addr));
 	ptr[0] = 0;
 	ptr[1] = 0;
 	return 0;
@@ -754,8 +829,8 @@ primDoubleAt(void)
 	}
 	addr = startAddr + byteOffset;
 	memcpy((&floatValue), addr, sizeof(floatValue));
-	pop(2);
-	return pushFloat(floatValue);
+	methodReturnFloat(floatValue);
+	return 0;
 }
 
 
@@ -846,8 +921,8 @@ primFloatAt(void)
 	}
 	addr = startAddr + byteOffset;
 	memcpy((&floatValue), addr, sizeof(floatValue));
-	pop(2);
-	return pushFloat(floatValue);
+	methodReturnFloat(floatValue);
+	return 0;
 }
 
 
@@ -916,7 +991,7 @@ primFree(void)
 	 || (isInMemory(addr))) {
 		return primitiveFailFor(PrimErrInappropriate);
 	}
-	free((void *)addr);
+	free(((void *)addr));
 	pop(1);
 	return 0;
 }
@@ -1615,7 +1690,8 @@ primStrlenFromStartIndex(void)
 			index += 1;
 		}
 	}
-	return methodReturnValue(positive32BitIntegerFor(index));
+	methodReturnInteger(index);
+	return 0;
 }
 
 
@@ -1632,7 +1708,6 @@ primStrlenThroughPointerAtIndex(void)
 {
     usqIntptr_t addr;
     usqIntptr_t byteOffset;
-    char *ptr;
     sqInt rcvr;
 
 	byteOffset = (stackPositiveMachineIntegerValue(0)) - 1;
@@ -1646,8 +1721,7 @@ primStrlenThroughPointerAtIndex(void)
 	addr = (((longAt(rcvr + BaseHeaderSize)) > 0
 	? (rcvr + BaseHeaderSize) + BytesPerOop
 	: longAt((rcvr + BaseHeaderSize) + BytesPerOop))) + byteOffset;
-	ptr = ((char *) (longAt(addr)));
-	return methodReturnValue(positive32BitIntegerFor(strlen(ptr)));
+	return methodReturnInteger(strlen(((char *) (longAt(addr)))));
 }
 
 
@@ -2245,6 +2319,9 @@ setInterpreter(struct VirtualMachine *anInterpreter)
 #endif
 		isWordsOrBytes = interpreterProxy->isWordsOrBytes;
 		methodArgumentCount = interpreterProxy->methodArgumentCount;
+		methodReturnFloat = interpreterProxy->methodReturnFloat;
+		methodReturnInteger = interpreterProxy->methodReturnInteger;
+		methodReturnReceiver = interpreterProxy->methodReturnReceiver;
 		methodReturnValue = interpreterProxy->methodReturnValue;
 		pop = interpreterProxy->pop;
 		popthenPush = interpreterProxy->popthenPush;
@@ -2254,7 +2331,6 @@ setInterpreter(struct VirtualMachine *anInterpreter)
 		positive64BitValueOf = interpreterProxy->positive64BitValueOf;
 		positiveMachineIntegerValueOf = interpreterProxy->positiveMachineIntegerValueOf;
 		primitiveFailFor = interpreterProxy->primitiveFailFor;
-		pushFloat = interpreterProxy->pushFloat;
 		returnAsThroughCallbackContext = interpreterProxy->returnAsThroughCallbackContext;
 		signalNoResume = interpreterProxy->signalNoResume;
 		signed32BitIntegerFor = interpreterProxy->signed32BitIntegerFor;
@@ -2335,6 +2411,7 @@ void* IA32ABI_exports[][3] = {
 	{(void*)_m, "isAlien", (void*)isAlien},
 	{(void*)_m, "primAddressField\000\000", (void*)primAddressField},
 	{(void*)_m, "primAddressFieldPut\000\000", (void*)primAddressFieldPut},
+	{(void*)_m, "primAlienCopyInto\000\000", (void*)primAlienCopyInto},
 	{(void*)_m, "primAlienReplace\000\000", (void*)primAlienReplace},
 	{(void*)_m, "primAllocateExecutablePage\000\377", (void*)primAllocateExecutablePage},
 	{(void*)_m, "primBoxedFree\000\001", (void*)primBoxedFree},
@@ -2390,6 +2467,7 @@ void* IA32ABI_exports[][3] = {
 
 signed char primAddressFieldAccessorDepth = 0;
 signed char primAddressFieldPutAccessorDepth = 0;
+signed char primAlienCopyIntoAccessorDepth = 0;
 signed char primAlienReplaceAccessorDepth = 0;
 signed char primBoxedFreeAccessorDepth = 1;
 signed char primCallOutDoubleReturnAccessorDepth = 0;