CogVM source as per VMMaker.oscog-eem.3690

Simplify getting/setting the flags in imageHeaderFlags. No longer extract these into
separate variables (eliminating 10 variables), but instead test the bits directly.
Declare imageHeaderFlags in sq.h as extern const; provide sendWheelEvents as a macro.

Split and rename primitiveDoMixedArithmetic into numericPrimsMixArithmetic &
numericPrimsMixComparison. This involves adding loadFloatOrIntForComparisonFrom:
alongside loadFloatOrIntFrom:. See Cuis-Smalltalk/Cuis-Smalltalk-Dev#308

Have the MTVM exit with an error if the flag for processHasThreadAffinity is not set,
instead of testing it everywhere. Hence get rid of willNotThreadWarnCount, and avoid
testing processHasThreadAffinity except once at startup.

Commit the plumbing for processHasOSErr which will be tested by the FFI to collect
errno/GetLastError immediately after any FFI call, eliminating the possibility of
preemtion between call and error fetch if implemented at the image level.

Move InterpreterPrimitives>>{primitiveFailForFFIException:at:,primitiveInvokeObjectAsMethod,primitiveMethod}
from InterpreterPrimitives to StackInterpreterPrimitives/StackInterpreter, which allows
moving messageSelector and newMethod down to StackInterpreter which is a better place for them.

Make the logging into ownerLog in CogThreadManager conditional, controlled by the global enableOwnerLog.

Cogit:
Rename compileAbstractInstructionsFrom:through: to what it does, compileBytecodesFrom:through:

Author: eliotmiranda

platforms/Cross/vm/sq.h

@@ -218,7 +218,10 @@ sqInt success(sqInt);
 
 extern VM_EXPORT void *displayBits;
 extern VM_EXPORT int displayWidth, displayHeight, displayDepth;
-extern VM_EXPORT sqInt sendWheelEvents;
+#if !defined(SQ_USE_GLOBAL_STRUCT) // In the interpreter this is not const
+extern VM_EXPORT const sqInt imageHeaderFlags;
+#define sendWheelEvents() (imageHeaderFlags & 0x80)
+#endif
 
 sqInt ioBeep(void);
 sqInt ioExit(void);

platforms/Cross/vm/sqVirtualMachine.c

@@ -379,6 +379,7 @@ struct VirtualMachine* sqGetInterpreterProxy(void)
 	VM->isWordsOrShorts = isWordsOrShorts;
 	VM->bytesPerElement = bytesPerElement;
 	VM->fileTimesInUTC = fileTimesInUTC;
+	VM->processHasOSErr = processHasOSErr;
 #endif
 	return VM;
 }

platforms/Cross/vm/sqVirtualMachine.h

@@ -7,24 +7,20 @@
 #include "interp.h"
 
 #if SPURVM
-# define VM_VERSION "7.0rc2"
+# define VM_VERSION "7.0"
 #else
-# define VM_VERSION "4.7rc2"
+# define VM_VERSION "4.7"
 #endif
 
+// Functions extending the original struct VirtualMachine are guarded by VM_PROXY_MINOR below
+// We want to clean-up and simplify with VM_PROXY_MAJOR -> 2 asap.
+// VM_PROXY_MAJOR & VM_PROXY_MINOR are properly defined in interp.h
+
 #ifndef VM_PROXY_MAJOR
-/* Increment the following number if you change the order of
-   functions listed or if you remove functions */
 # define VM_PROXY_MAJOR 1
 #endif
-
 #ifndef VM_PROXY_MINOR
-/* Increment the following number if you add functions at the end */
-# if SPURVM
-#	define VM_PROXY_MINOR 13
-# else
-#	define VM_PROXY_MINOR 12
-# endif
+# define VM_PROXY_MINOR 12
 #endif
 
 #include "sqMemoryAccess.h"
@@ -384,6 +380,7 @@ typedef struct VirtualMachine {
   sqInt (*isWordsOrShorts)(sqInt oop);	/* for SoundPlugin et al */
   sqInt (*bytesPerElement)(sqInt oop);	/* for SocketPugin et al */
   sqInt (*fileTimesInUTC)(void);		/* for FilePlugin et al */
+  sqInt (*processHasOSErr)(void);		/* for ThreadedFFIPlugin/SqueakFFIPrims */
 #endif
 } VirtualMachine;
 
@@ -610,6 +607,7 @@ sqInt identityHashOf(sqInt);
 sqInt isWordsOrShorts(sqInt);
 sqInt bytesPerElement(sqInt);
 sqInt fileTimesInUTC(void);
+sqInt processHasOSErr(void);
 sqInt primitiveFailForwithSecondary(sqInt reasonCode,sqLong extraErrorCode);
 #endif
 

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

@@ -377,7 +377,7 @@ - (void) recordWheelEvent:(NSEvent *) theEvent fromView: (NSView <sqSqueakOSXVie
 		prevYDelta = ( now - prevYTime < 500) ? prevYDelta + yDelta : yDelta;
 		prevYTime = now;
 	}
-	if (sendWheelEvents) {
+	if (sendWheelEvents()) {
 		float limit = 20;
 		if (-limit < prevXDelta && prevXDelta < limit && -limit < prevYDelta && prevYDelta < limit ) return;
 		sqMouseEvent evt;

platforms/unix/vm-display-X11/sqUnixX11.c

@@ -3495,7 +3495,6 @@ static const char *
 nameForKeyboardEvent(XEvent *evt) { return nameForKeycode(evt->xkey.keycode); }
 #endif /* DEBUG_EVENTS */
 
-extern sqInt sendWheelEvents; /* If true deliver EventTypeMouseWheel else kybd */
 /* if sendWheelEvents is false this maps wheel events to arrow keys */
 static int mouseWheel2Squeak[4] = {30, 31, 28, 29};
 /* if sendWheelEvents is true this determines how much x & y are incremented */
@@ -3634,7 +3633,7 @@ handleEvent(XEvent *evt)
 		recordMouseEvent();
 	  }
 	  else if (evt->xbutton.button <= 7) { /* mouse wheel */
-		if (sendWheelEvents)
+		if (sendWheelEvents())
 			recordMouseWheelEvent(mouseWheelXDelta[evt->xbutton.button - 4],
 								  mouseWheelYDelta[evt->xbutton.button - 4]);
 		else if (evt->xbutton.button <= 5) { /* only emulate up/down, as left/right

platforms/unix/vm-display-fbdev/sqUnixEvdevKeyMouse.c

@@ -51,8 +51,6 @@
 /* #include <X11/keysym.h>  * /usr/include/X11/keysym.h */
 #include <libevdev-1.0/libevdev/libevdev.h> /*  /usr/include/libevdev-1.0/libevdev/libevdev.h */
 
-extern sqInt sendWheelEvents; /* If true deliver EventTypeMouseWheel else kybd */
-
 #ifndef input_event_sec
 #define input_event_sec  time.tv_sec
 #define input_event_usec time.tv_usec
@@ -642,7 +640,7 @@ static void processLibEvdevMouseEvents() {
 #ifdef DEBUG_EVENTS
 	  DPRINTF("EVDEV  Wheel value: %d\n", value);
 #endif
-	  if (sendWheelEvents) {
+	  if (sendWheelEvents()) {
 	    recordMouseWheelEvent( 0, value ); /* delta-y only */
 	  } else { /* Send wheel events as arrow up/down */
 	    if (value > -1) {

platforms/win32/vm/sqWin32Window.c

@@ -71,9 +71,6 @@ void setFullScreenFlag(sqInt);
 sqInt getSavedWindowSize(void);
 extern sqInt deferDisplayUpdates;
 
-extern sqInt sendWheelEvents; /* If true deliver EventTypeMouseWheel else kybd */
-/* if sendWheelEvents is false this maps wheel events to arrow keys */
-
 /*** Variables -- image and path names ***/
 #define IMAGE_NAME_SIZE MAX_PATH_UTF8 
 
@@ -383,7 +380,7 @@ MainWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     mousePosition.y = GET_Y_LPARAM(lParam);
     break;
   case WM_MOUSEHWHEEL: {
-    if (inputSemaphoreIndex && sendWheelEvents) {
+    if (inputSemaphoreIndex && sendWheelEvents()) {
       int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);
       /* accumulate enough delta before sending the event to the image */
       int limit = WHEEL_DELTA / 6; /* threshold for delivering events */
@@ -413,7 +410,7 @@ MainWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     zDelta = vWheelDelta;
     vWheelDelta = 0;
     if (inputSemaphoreIndex) {
-      if (sendWheelEvents) {
+      if (sendWheelEvents()) {
         recordMouseWheelEvent(messageTouse,0,zDelta);
         break;   
       } else {

src/plugins/VectorEnginePlugin/VectorEnginePlugin.c

@@ -1,10 +1,10 @@
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.3668 uuid: d0a2c840-707b-457e-9ff3-c455828ac41c
-	(Compiler-eem.523)
+	SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.3690 uuid: b8fa6d9a-c8b4-4de4-9ecb-3bbc0d42fc4c
+	(Compiler-eem.526)
    from
-	VectorEnginePlugin VectorEnginePlugin-eem.22 uuid: b78f39f5-368d-4cba-99a5-399c4ffe554c
+	VectorEnginePlugin VectorEnginePlugin-jmv.23 uuid: 616c8d53-d834-4d11-a3b1-84e977cae8ca
  */
-static char __buildInfo[] = "VectorEnginePlugin VectorEnginePlugin-eem.22 uuid: b78f39f5-368d-4cba-99a5-399c4ffe554c " __DATE__ ;
+static char __buildInfo[] = "VectorEnginePlugin VectorEnginePlugin-jmv.23 uuid: 616c8d53-d834-4d11-a3b1-84e977cae8ca " __DATE__ ;
 
 
 #include "config.h"
@@ -171,7 +171,7 @@ extern sqInt stackValue(sqInt offset);
 extern
 #endif
 struct VirtualMachine* interpreterProxy;
-static const char *moduleName = "VectorEnginePlugin VectorEnginePlugin-eem.22 " INT_EXT;
+static const char *moduleName = "VectorEnginePlugin VectorEnginePlugin-jmv.23 " INT_EXT;
 static uint32_t * morphIds;
 static sqInt needsFullAlphaCircle;
 static sqInt prevYRounded;

src/spur32.cog.lowcode/cogit.h

@@ -1,6 +1,6 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.3680 uuid: a9ad06c5-1c8d-4efc-b2a6-1516f7d64803
-	(Cog-eem.504, * Compiler-nice.525)
+	CCodeGenerator VMMaker.oscog-eem.3690 uuid: b8fa6d9a-c8b4-4de4-9ecb-3bbc0d42fc4c
+	(Cog-eem.504, Compiler-eem.526)
  */