CogVM source as per VMMaker.oscog-eem.3664

Interpreter:
Eliminate PrimNumberClosureValueNoContextSwitch & PrimNumberFullClosureValueNoContextSwitch
in favour of direct comparison against the two primitives, since there are two
indices devoted to primitiveClosureValueNoContextSwitch.

Delete obsolete window manipulation primitives that have long since migrated
to the HostWindowPlugin.

There is no need to use runBlockOnMainThread: in macOS's ioScreenScaleFactor
since it uses getMainWindowDelegate which uses runBlockOnMainThread:.

Make clear the order of the primitive log in crash dumps.

Fix a slip in assertValidExternalFrameWithIP: that shows up in simulation.

FilePlugin:
Change the width of lastChar in SQFile from char to short to avoid a clang
insistence on comparison between a char and -1 being always false (??).
-1 being EOF, and lastChar needing to hold EOF, make lastChar a short.
Avoid changing the size of SQFile by changing two char flags to 1 bit fields.

BitBltPlugin: some simplifications now that Slang is improved.
Part of sneaking up on a clipping bug. Forgive the noise.

Author: eliotmiranda

platforms/Cross/plugins/FilePlugin/FilePlugin.h

@@ -32,20 +32,18 @@ typedef int mode_t;
 
 /* squeak file record; see sqFilePrims.c for details */
 typedef struct {
-  int			 sessionID;	/* ikp: must be first */
-  void			*file;
+  int		 sessionID;	/* ikp: must be first */
+  void		*file;
+  short		 lastChar;	// Must be comparable against EOF, which is -1, but
+						// e.g. clang refuses to do this with a char variable
 #if defined(ACORN)
 // ACORN has to have 'lastOp' as at least a 32 bit field in order to work
-  int lastOp; // actually used to save file position
-  char writable;
-  char lastChar;
-  char isStdioStream;
+  int		 lastOp; // actually used to save file position
 #else
-  char			 writable;
-  char			 lastOp; /* 0 = uncommitted, 1 = read, 2 = write */
-  char			 lastChar;
-  char			 isStdioStream;
+  char		 lastOp; /* 0 = uncommitted, 1 = read, 2 = write */
 #endif
+  unsigned	 writable : 1;
+  unsigned	 isStdioStream : 1;
 } SQFile;
 
 /* file i/o */

platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c

@@ -76,12 +76,12 @@
 	positioning operation to be done automatically if needed.
 
 	typedef struct {
-		int		sessionID;
-		File	*file;
-		char	writable;
-		char	lastOp;  		// 0 = uncommitted, 1 = read, 2 = write //
-		char	lastChar;		// one character peek for stdin //
-		char	isStdioStream;
+		int			 sessionID;
+		File		*file;
+		short		 lastChar;		// one character peek for stdin; short to bow down to clang
+		char		 lastOp;  		// 0 = uncommitted, 1 = read, 2 = write
+		unsigned	 writable : 1;
+		unsigned	 isStdioStream : 1;
 	} SQFile;
 
 ***/
@@ -92,9 +92,9 @@
 #define WRITE_OP	2
 
 #ifndef SEEK_SET
-#define SEEK_SET	0
-#define SEEK_CUR	1
-#define SEEK_END	2
+# define SEEK_SET	0
+# define SEEK_CUR	1
+# define SEEK_END	2
 #endif
 
 /*** Variables ***/
@@ -109,17 +109,13 @@ static FILE *
 getFile(SQFile *f)
 {
   FILE *file;
-  void *in= (void *)&f->file;
-  void *out= (void *)&file;
-  memcpy(out, in, sizeof(FILE *));
+  memcpy(&file, &f->file, sizeof(FILE *));
   return file;
 }
 static void
 setFile(SQFile *f, FILE *file)
 {
-  void *in= (void *)&file;
-  void *out= (void *)&f->file;
-  memcpy(out, in, sizeof(FILE *));
+  memcpy(&f->file, &file, sizeof(FILE *));
 }
 #else /* OBJECTS_32BIT_ALIGNED */
 # define getFile(f) ((FILE *)((f)->file))

platforms/Cross/vm/sq.h

@@ -244,11 +244,6 @@ sqInt ioHasDisplayDepth(sqInt depth);
 sqInt ioSetDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFlag);
 char* ioGetLogDirectory(void);
 sqInt ioSetLogDirectoryOfSize(void* lblIndex, sqInt sz);
-char* ioGetWindowLabel(void);
-sqInt ioSetWindowLabelOfSize(void *lblIndex, sqInt sz);
-sqInt ioGetWindowWidth(void);
-sqInt ioGetWindowHeight(void);
-sqInt ioSetWindowWidthHeight(sqInt w, sqInt h);
 sqInt ioIsWindowObscured(void);
 
 sqInt ioRelinquishProcessorForMicroseconds(sqInt microSeconds);

platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m

@@ -230,7 +230,7 @@ Some of this code was funded via a grant from the European Smalltalk User Group
 	else
 		fprintf(file,"\nCan't dump Smalltalk stack(s). Not in VM or GUI thread\n");
 # if STACKVM
-	fprintf(file,"\nMost recent primitives\n");
+	fprintf(file,"\nMost recent primitives (oldest first)\n");
 	dumpPrimTraceLogOn(file);
 #	if COGVM
 	fprintf(file,"\n");

platforms/iOS/vm/Common/Classes/sqSqueakScreenAPI.m

@@ -67,13 +67,9 @@ Some of this code was funded via a grant from the European Smalltalk User Group
 }
 
 double ioScreenScaleFactor(void) {
-	//API Documented
-	__block double answer;
+	//API
 
-	[gDelegateApp runBlockOnMainThread:^{
-		answer = [getMainWindowDelegate() ioScreenScaleFactor];
-	}];
-	return answer;
+	return [getMainWindowDelegate() ioScreenScaleFactor];
 }
 
 sqInt ioScreenSize(void) {
@@ -137,23 +133,6 @@ sqInt ioShowDisplay(
 }
 
 
-char *ioGetWindowLabel(void)
-{
-	return [getMainWindowDelegate() ioGetTitle];
-}
-
-sqInt ioSetWindowLabelOfSize(void *lblIndex, sqInt sz)
-{
-	[getMainWindowDelegate() ioSetTitle: lblIndex length: sz];
-	return 1;
-}
-
-sqInt ioGetWindowWidth(void) { return 0; }
-
-sqInt ioGetWindowHeight(void) { return 0; }
-
-sqInt ioSetWindowWidthHeight(sqInt w, sqInt h) { return 0; }
-
 sqInt ioIsWindowObscured(void) { return 0; }
 
 /* This is invoked when the GC moves the display bitmap.  For now do nothing. */

platforms/iOS/vm/OSX/sqSqueakOSXApplication+cursor.m

@@ -73,15 +73,13 @@ - (void) setCursor: (sqInt)  cursorBitsIndex withMask: (sqInt) cursorMaskIndex
 			 bytesPerRow: 2
 			 bitsPerPixel: 0]);
 
-    unsigned char*      planes[5];
+	unsigned char *planes[5];
 	[bitmap getBitmapDataPlanes:planes];
 
-	unsigned char*      data;
-    unsigned char*      mask;
-	data=planes[0];
-	mask=planes[1];
+	unsigned char *data = planes[0];
+	unsigned char *mask = planes[1];
 
-	for (int i= 0; i < 16; ++i) {
+	for (int i = 0; i < 16; ++i) {
 		unsigned int word= ((unsigned int *)pointerForOop(cursorBitsIndex))[i];
 		data[i*2 + 0]= 0xFF ^ ((word >> 24) & 0xFF);
 		data[i*2 + 1]= 0xFF ^ ((word >> 16) & 0xFF);
@@ -90,24 +88,17 @@ - (void) setCursor: (sqInt)  cursorBitsIndex withMask: (sqInt) cursorMaskIndex
 			word= ((unsigned int *)pointerForOop(cursorMaskIndex))[i];
 		else 
 			word = 0xFFFFFFFF;
-		
+
 		mask[i*2 + 0]= (word >> 24) & 0xFF;
 		mask[i*2 + 1]= (word >> 16) & 0xFF;
 	}
 
 	NSImage *image = AUTORELEASEOBJ([[NSImage alloc] init]);
 	[image addRepresentation: bitmap];
-	
-	
+
 	NSPoint hotSpot= { -offsetX, -offsetY };
 	self.squeakCursor = AUTORELEASEOBJ([[NSCursor alloc] initWithImage: image hotSpot: hotSpot]);
 
-/*	if (browserActiveAndDrawingContextOkAndNOTInFullScreenMode())
-		browserSetCursor(&macCursor);
-*/
-#warning what about browser
-	
-	
 	if (!gSqueakHeadless || browserActiveAndDrawingContextOkAndInFullScreenMode())
 		[gDelegateApp runBlockAsyncOnMainThread:^{
 				@try {
@@ -127,32 +118,31 @@ - (sqInt) ioSetCursorARGB: (sqInt) cursorBitsIndex extentX: (sqInt) extentX exte
 		return 0;
 
 	@autoreleasepool {
-	
-	NSBitmapImageRep *bitmap= AUTORELEASEOBJ([[NSBitmapImageRep alloc]
-								initWithBitmapDataPlanes: NULL pixelsWide: extentX pixelsHigh: extentY
-								bitsPerSample: 8 samplesPerPixel: 4
-								hasAlpha: YES isPlanar: NO
-								colorSpaceName: NSCalibratedRGBColorSpace
-								bytesPerRow: extentX * 4
-								bitsPerPixel: 0]);
-	unsigned int *planes[5];
-	[bitmap getBitmapDataPlanes: (unsigned char **) planes];
-	unsigned int *src= (unsigned int*) pointerForOop(cursorBitsIndex);
-	unsigned int *dst= planes[0];
-	sqInt i;
-	for (i= 0; i < extentX * extentY; ++i, ++dst, ++src) {
+
+		NSBitmapImageRep *bitmap= AUTORELEASEOBJ([[NSBitmapImageRep alloc]
+									initWithBitmapDataPlanes: NULL pixelsWide: extentX pixelsHigh: extentY
+									bitsPerSample: 8 samplesPerPixel: 4
+									hasAlpha: YES isPlanar: NO
+									colorSpaceName: NSCalibratedRGBColorSpace
+									bytesPerRow: extentX * 4
+									bitsPerPixel: 0]);
+		unsigned int *planes[5];
+		[bitmap getBitmapDataPlanes: (unsigned char **) planes];
+		unsigned int *src= (unsigned int*) pointerForOop(cursorBitsIndex);
+		unsigned int *dst= planes[0];
+		for (sqInt i = 0; i < extentX * extentY; ++i, ++dst, ++src) {
 #if VMENDIANNESS
-		*dst=  ((*src & 0xFF000000) >> 24) | ((*src & 0x00FFFFFF) << 8) ; // ARGB to RGBA
+			*dst=  ((*src & 0xFF000000) >> 24) | ((*src & 0x00FFFFFF) << 8) ; // ARGB to RGBA
 #else
-		*dst= (*src & 0xFF00FF00) | ((*src & 0x000000FF) << 16) | ((*src & 0x00FF0000) >> 16); // BGRA to RGBA
+			*dst= (*src & 0xFF00FF00) | ((*src & 0x000000FF) << 16) | ((*src & 0x00FF0000) >> 16); // BGRA to RGBA
 #endif
+		}
+		NSImage  *image= AUTORELEASEOBJ([[NSImage alloc] init]);
+		[image addRepresentation: bitmap];
+		NSPoint hotSpot= { -offsetX, -offsetY };
+		self.squeakCursor = AUTORELEASEOBJ([[NSCursor alloc] initWithImage: image hotSpot: hotSpot]);
+		[gDelegateApp runBlockAsyncOnMainThread:^{ [self.squeakCursor set]; }];
 	}
-	NSImage  *image= AUTORELEASEOBJ([[NSImage alloc] init]);
-	[image addRepresentation: bitmap];
-	NSPoint hotSpot= { -offsetX, -offsetY };
-	self.squeakCursor = AUTORELEASEOBJ([[NSCursor alloc] initWithImage: image hotSpot: hotSpot]);
-	[gDelegateApp runBlockAsyncOnMainThread:^{ [self.squeakCursor set]; }];
-    }
 	return 1;
 }
 @end

platforms/minheadless/common/sqWindow-Dispatch.c

@@ -138,30 +138,6 @@ ioSetDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFlag)
     return currentWindowSystem->setDisplayMode(width, height, depth, fullscreenFlag);
 }
 
-char*
-ioGetWindowLabel(void)
-{
-    return currentWindowSystem->getWindowLabel();
-}
-
-sqInt
-ioSetWindowLabelOfSize(void *lblIndex, sqInt sz)
-{
-    return currentWindowSystem->setWindowLabelOfSize(lblIndex, sz);
-}
-
-sqInt
-ioGetWindowWidth(void)
-{
-    return currentWindowSystem->getWindowWidth();
-}
-
-sqInt
-ioGetWindowHeight(void)
-{
-    return currentWindowSystem->getWindowHeight();
-}
-
 sqInt
 ioSetWindowWidthHeight(sqInt w, sqInt h)
 {

platforms/minheadless/common/sqWindow-Null.c

@@ -91,30 +91,6 @@ sqNull_setDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFl
     return 0;
 }
 
-static char*
-sqNull_getWindowLabel(void)
-{
-    return "";
-}
-
-static sqInt
-sqNull_setWindowLabelOfSize(void *lblIndex, sqInt sz)
-{
-    return 0;
-}
-
-static sqInt
-sqNull_getWindowWidth(void)
-{
-    return currentDisplayWidth;
-}
-
-static sqInt
-sqNull_getWindowHeight(void)
-{
-    return currentDisplayHeight;
-}
-
 static sqInt
 sqNull_setWindowWidthHeight(sqInt w, sqInt h)
 {
@@ -226,10 +202,6 @@ sqWindowSystem sqNullWindowSystem = {
     .showDisplay = sqNull_showDisplay,
     .hasDisplayDepth = sqNull_hasDisplayDepth,
     .setDisplayMode = sqNull_setDisplayMode,
-    .getWindowLabel = sqNull_getWindowLabel,
-    .setWindowLabelOfSize = sqNull_setWindowLabelOfSize,
-    .getWindowWidth = sqNull_getWindowWidth,
-    .getWindowHeight = sqNull_getWindowHeight,
     .setWindowWidthHeight = sqNull_setWindowWidthHeight,
     .isWindowObscured = sqNull_isWindowObscured,
     .getNextEvent = sqNull_getNextEvent,

platforms/minheadless/common/sqWindow.h

@@ -35,14 +35,6 @@ typedef struct
 
     sqInt (*setDisplayMode)(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFlag);
 
-    char* (*getWindowLabel)(void);
-
-    sqInt (*setWindowLabelOfSize)(void *lblIndex, sqInt sz);
-
-    sqInt (*getWindowWidth)(void);
-
-    sqInt (*getWindowHeight)(void);
-
     sqInt (*setWindowWidthHeight)(sqInt w, sqInt h);
 
     sqInt (*isWindowObscured)(void);

platforms/minheadless/sdl2-window/sqWindow-SDL2.c

@@ -846,47 +846,6 @@ sqSDL2_setDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFl
     return 0;
 }
 
-static char*
-sqSDL2_getWindowLabel(void)
-{
-    return (char*)SDL_GetWindowTitle(window);
-}
-
-static sqInt
-sqSDL2_setWindowLabelOfSize(void *lblIndex, sqInt size)
-{
-    char *buffer;
-
-    buffer = (char*)malloc(size + 1);
-    memcpy(buffer, lblIndex, size);
-    buffer[size] = 0;
-
-    SDL_SetWindowTitle(window, buffer);
-
-    free(buffer);
-    return 0;
-}
-
-static sqInt
-sqSDL2_getWindowWidth(void)
-{
-    int width = 0;
-    int height = 0;
-    if(windowRenderer)
-        SDL_GetRendererOutputSize(windowRenderer, &width, &height);
-    return width;
-}
-
-static sqInt
-sqSDL2_getWindowHeight(void)
-{
-    int width = 0;
-    int height = 0;
-    if(windowRenderer)
-        SDL_GetRendererOutputSize(windowRenderer, &width, &height);
-    return height;
-}
-
 static sqInt
 sqSDL2_setWindowWidthHeight(sqInt w, sqInt h)
 {
@@ -1135,10 +1094,6 @@ sqWindowSystem sqSDL2WindowSystem = {
     .showDisplay = sqSDL2_showDisplay,
     .hasDisplayDepth = sqSDL2_hasDisplayDepth,
     .setDisplayMode = sqSDL2_setDisplayMode,
-    .getWindowLabel = sqSDL2_getWindowLabel,
-    .setWindowLabelOfSize = sqSDL2_setWindowLabelOfSize,
-    .getWindowWidth = sqSDL2_getWindowWidth,
-    .getWindowHeight = sqSDL2_getWindowHeight,
     .setWindowWidthHeight = sqSDL2_setWindowWidthHeight,
     .isWindowObscured = sqSDL2_isWindowObscured,
     .getNextEvent = sqSDL2_getNextEvent,