Merge branch 'main' into always-bulkmem

Author: dschuff

.circleci/config.yml

@@ -544,6 +544,7 @@ jobs:
           test_targets: "
             lto2.test_dylink_syslibs_all
             lto2.test_float_builtins
+            lto2.test_avx_nontrapping
             lto0.test_exceptions_allowed_uncaught
             lto0.test_longjmp_standalone_standalone
             lto0.test_embind_i64_val

ChangeLog.md

@@ -20,6 +20,9 @@ See docs/process.md for more on how version tagging works.
 
 3.1.72 (in development)
 -----------------------
+- The `MEMORY64` setting is no longer experimental. At time of writing all
+  browsers still require a flag to run the resulting binaries but that should
+  change in the coming months since the proposal is now at stage 4. (#22864)
 
 3.1.71 - 11/04/24
 -----------------

site/source/docs/api_reference/html5.h.rst

@@ -244,7 +244,7 @@ Struct
 
     Maximum size 32 ``char`` (i.e. ``EM_UTF8 code[32]``).
 
-  .. c:member:: unsigned long location
+  .. c:member:: unsigned int location
 
     Indicates the location of the key on the keyboard. One of the :c:data:`DOM_KEY_LOCATION <DOM_KEY_LOCATION_STANDARD>` values.
 
@@ -273,20 +273,20 @@ Struct
 
     .. warning:: This attribute has been dropped from DOM Level 3 events.
 
-  .. c:member:: unsigned long charCode
+  .. c:member:: unsigned int charCode
 
     The Unicode reference number of the key; this attribute is used only by the keypress event. For keys whose ``char`` attribute contains multiple characters, this is the Unicode value of the first character in that attribute.
 
     .. warning:: This attribute is deprecated, you should use the field ``key`` instead, if available.
 
-  .. c:member:: unsigned long keyCode
+  .. c:member:: unsigned int keyCode
 
     A system and implementation dependent numerical code identifying the unmodified value of the pressed key.
 
     .. warning:: This attribute is deprecated, you should use the field ``key`` instead, if available.
 
 
-  .. c:member:: unsigned long which
+  .. c:member:: unsigned int which
 
     A system and implementation dependent numeric code identifying the unmodified value of the pressed key; this is usually the same as ``keyCode``.
 
@@ -364,13 +364,13 @@ Struct
 
     Absolute wallclock time when the data was recorded (milliseconds).
 
-  .. c:member:: long screenX
-    long screenY
+  .. c:member:: int screenX
+    int screenY
 
     The coordinates relative to the browser screen coordinate system.
 
-  .. c:member:: long clientX
-    long clientY
+  .. c:member:: int clientX
+    int clientY
 
     The coordinates relative to the viewport associated with the event.
 
@@ -396,24 +396,24 @@ Struct
 
     A bitmask that indicates which combinations of mouse buttons were being held down at the time of the event.
 
-  .. c:member:: long movementX
-    long movementY;
+  .. c:member:: int movementX
+    int movementY;
 
     If pointer lock is active, these two extra fields give relative mouse movement since the last event.
 
-  .. c:member:: long targetX
-     long targetY
+  .. c:member:: int targetX
+     int targetY
 
     These fields give the mouse coordinates mapped relative to the coordinate space of the target DOM element receiving the input events (Emscripten-specific extension; coordinates are rounded down to the nearest integer).
 
 
-  .. c:member:: long canvasX
-     long canvasY
+  .. c:member:: int canvasX
+     int canvasY
 
     These fields give the mouse coordinates mapped to the Emscripten canvas client area (Emscripten-specific extension; coordinates are rounded down the nearest integer).
 
 
-  .. c:member:: long padding
+  .. c:member:: int padding
 
     Internal, and can be ignored.
 
@@ -517,7 +517,7 @@ Struct
     in scroll values of 0. The positive Y scroll direction is when scrolling the page downwards (page CSS pixel +Y direction), which corresponds to scrolling
     the mouse wheel downwards (away from the screen) on Windows, Linux, and also on macOS when the 'natural scroll' option is disabled.
 
-  .. c:member:: unsigned long deltaMode
+  .. c:member:: unsigned int deltaMode
 
     One of the :c:data:`DOM_DELTA_<DOM_DELTA_PIXEL>` values that indicates the units of measurement for the delta values.
 
@@ -579,7 +579,7 @@ Struct
   The event structure passed in DOM element `UIEvent <https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#interface-UIEvent>`_ events: `resize <https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-resize>`_ and `scroll <https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-scroll>`_.
 
 
-  .. c:member:: long detail
+  .. c:member:: int detail
 
     For resize and scroll events this is always zero.
 
@@ -1487,22 +1487,22 @@ Struct
 
   Specifies the status of a single `touch point <http://www.w3.org/TR/touch-events/#touch-interface>`_ on the page.
 
-  .. c:member:: long identifier
+  .. c:member:: int identifier
 
     An identification number for each touch point.
 
-  .. c:member:: long screenX
-    long screenY
+  .. c:member:: int screenX
+    int screenY
 
     The touch coordinate relative to the whole screen origin, in pixels.
 
-  .. c:member:: long clientX
-    long clientY
+  .. c:member:: int clientX
+    int clientY
 
     The touch coordinate relative to the viewport, in pixels.
 
-  .. c:member:: long pageX
-    long pageY
+  .. c:member:: int pageX
+    int pageY
 
     The touch coordinate relative to the viewport, in pixels, and including any scroll offset.
 
@@ -1514,13 +1514,13 @@ Struct
 
     Specifies whether this touch point is still above the original target on which it was initially pressed.
 
-  .. c:member:: long targetX
-     long targetY
+  .. c:member:: int targetX
+     int targetY
 
     These fields give the touch coordinates mapped relative to the coordinate space of the target DOM element receiving the input events (Emscripten-specific extension).
 
-  .. c:member:: long canvasX
-    long canvasY
+  .. c:member:: int canvasX
+    int canvasY
 
     The touch coordinates mapped to the Emscripten canvas client area, in pixels (Emscripten-specific extension).
 
@@ -1643,7 +1643,7 @@ Struct
 
     Specifies whether this gamepad is connected to the browser page.
 
-  .. c:member:: long index
+  .. c:member:: int index
 
     An ordinal associated with this gamepad, zero-based.
 

site/source/docs/tools_reference/settings_reference.rst

@@ -3297,7 +3297,9 @@ Default value: true
 RUNTIME_DEBUG
 =============
 
-If true, add tracing to core runtime functions.
+If non-zero, add tracing to core runtime functions.  Can be set to 2 for
+extra tracing (for example, tracing that occurs on each turn of the event
+loop or each user callback, which can flood the console).
 This setting is enabled by default if any of the following debugging settings
 are enabled:
 - PTHREADS_DEBUG
@@ -3311,7 +3313,7 @@ are enabled:
 - SOCKET_DEBUG
 - FETCH_DEBUG
 
-Default value: false
+Default value: 0
 
 .. _legacy_runtime:
 

src/library.js

@@ -2046,16 +2046,12 @@ addToLibrary({
   // at runtime.
   $keepRuntimeAlive__deps: ['$runtimeKeepaliveCounter'],
   $keepRuntimeAlive: () => noExitRuntime || runtimeKeepaliveCounter > 0,
-#elif !EXIT_RUNTIME
-  // When `noExitRuntime` is not include and EXIT_RUNTIME=0 then we know the
+#elif !EXIT_RUNTIME && !PTHREADS
+  // When `noExitRuntime` is not included and EXIT_RUNTIME=0 then we know the
   // runtime can never exit (i.e. should always be kept alive).
-  // However for pthreads we always default to allowing the runtime to exit
-  // otherwise threads never exit and are not joinable.
-#if PTHREADS
-  $keepRuntimeAlive: () => !ENVIRONMENT_IS_PTHREAD,
-#else
+  // However, since pthreads themselves always need to be able to exit we
+  // have to track `runtimeKeepaliveCounter` in that case.
   $keepRuntimeAlive: () => true,
-#endif
 #else
   $keepRuntimeAlive__deps: ['$runtimeKeepaliveCounter'],
   $keepRuntimeAlive: () => runtimeKeepaliveCounter > 0,
@@ -2128,7 +2124,7 @@ addToLibrary({
       return;
     }
 #endif
-#if RUNTIME_DEBUG
+#if RUNTIME_DEBUG >= 2
     dbg(`maybeExit: user callback done: runtimeKeepaliveCounter=${runtimeKeepaliveCounter}`);
 #endif
     if (!keepRuntimeAlive()) {

src/library_browser.js

@@ -192,7 +192,7 @@ var LibraryBrowser = {
     },
 
     createContext(/** @type {HTMLCanvasElement} */ canvas, useWebGL, setInModule, webGLContextAttributes) {
-      if (useWebGL && Module.ctx && canvas == Module.canvas) return Module.ctx; // no need to recreate GL context if it's already been created for this canvas.
+      if (useWebGL && Module.ctx && canvas == Module['canvas']) return Module.ctx; // no need to recreate GL context if it's already been created for this canvas.
 
       var ctx;
       var contextHandle;

src/library_egl.js

@@ -634,6 +634,7 @@ var LibraryEGL = {
   eglGetCurrentDisplay: () => EGL.currentContext ? {{{ eglDefaultDisplay }}} : 0,
 
   // EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
+  eglSwapBuffers__deps: ['$GLctx'],
   eglSwapBuffers__proxy: 'sync',
   eglSwapBuffers: (dpy, surface) => {
 #if PROXY_TO_WORKER
@@ -642,9 +643,9 @@ var LibraryEGL = {
 
     if (!EGL.defaultDisplayInitialized) {
       EGL.setErrorCode(0x3001 /* EGL_NOT_INITIALIZED */);
-    } else if (!Module.ctx) {
+    } else if (!GLctx) {
       EGL.setErrorCode(0x3002 /* EGL_BAD_ACCESS */);
-    } else if (Module.ctx.isContextLost()) {
+    } else if (GLctx.isContextLost()) {
       EGL.setErrorCode(0x300E /* EGL_CONTEXT_LOST */);
     } else {
       // According to documentation this does an implicit flush.

src/library_fs.js

@@ -63,7 +63,6 @@ FS.staticInit();
     trackingDelegate: {},
 #endif
     ErrnoError: null, // set during init
-    genericErrors: {},
     filesystems: null,
     syncFSRequests: 0, // we warn if there are multiple in flight at once
 #if expectToReceiveOnModule('logReadFiles')
@@ -1435,12 +1434,6 @@ FS.staticInit();
 #endif
     },
     staticInit() {
-      // Some errors may happen quite a bit, to avoid overhead we reuse them (and suffer a lack of stack info)
-      [{{{ cDefs.ENOENT }}}].forEach((code) => {
-        FS.genericErrors[code] = new FS.ErrnoError(code);
-        FS.genericErrors[code].stack = '<generic error, no stack>';
-      });
-
       FS.nameTable = new Array(4096);
 
       FS.mount(MEMFS, {}, '/');

src/library_glfw.js

@@ -419,7 +419,7 @@ var LibraryGLFW = {
       // This logic comes directly from the sdl implementation. We cannot
       // call preventDefault on all keydown events otherwise onKeyPress will
       // not get called
-      if (event.keyCode === 8 /* backspace */ || event.keyCode === 9 /* tab */) {
+      if (event.key == 'Backspace' || event.key == 'Tab') {
         event.preventDefault();
       }
     },

src/library_glut.js

@@ -399,13 +399,13 @@ var LibraryGLUT = {
         var now = Date.now();
         return now - GLUT.initTime;
       case 0x0069: /* GLUT_WINDOW_STENCIL_SIZE */
-        return Module.ctx.getContextAttributes().stencil ? 8 : 0;
+        return GLctx.getContextAttributes().stencil ? 8 : 0;
       case 0x006A: /* GLUT_WINDOW_DEPTH_SIZE */
-        return Module.ctx.getContextAttributes().depth ? 8 : 0;
+        return GLctx.getContextAttributes().depth ? 8 : 0;
       case 0x006E: /* GLUT_WINDOW_ALPHA_SIZE */
-        return Module.ctx.getContextAttributes().alpha ? 8 : 0;
+        return GLctx.getContextAttributes().alpha ? 8 : 0;
       case 0x0078: /* GLUT_WINDOW_NUM_SAMPLES */
-        return Module.ctx.getContextAttributes().antialias ? 1 : 0;
+        return GLctx.getContextAttributes().antialias ? 1 : 0;
 
       default:
         throw "glutGet(" + type + ") not implemented yet";