Automatically generate __sig properties for JS library symbols

Author: sbc100

src/compiler.js

@@ -21,6 +21,7 @@ global.printErr = (x) => {
 };
 
 function find(filename) {
+  assert(filename);
   const prefixes = [__dirname, process.cwd()];
   for (let i = 0; i < prefixes.length; ++i) {
     const combined = nodePath.join(prefixes[i], filename);
@@ -32,6 +33,7 @@ function find(filename) {
 }
 
 global.read = (filename) => {
+  assert(filename);
   const absolute = find(filename);
   return fs.readFileSync(absolute).toString();
 };
@@ -43,22 +45,25 @@ function load(f) {
 // Basic utilities
 load('utility.js');
 
+// Load default settings
+load('./settings.js');
+load('./settings_internal.js');
 
 const argv = process.argv.slice(2);
 const symbolsOnlyArg = argv.indexOf('--symbols-only');
 if (symbolsOnlyArg != -1) {
   argv.splice(symbolsOnlyArg, 1);
 }
 
-const symbolsOnly = symbolsOnlyArg != -1;
-
 // Load settings from JSON passed on the command line
 const settingsFile = argv[0];
 assert(settingsFile);
 
 const settings = JSON.parse(read(settingsFile));
 Object.assign(global, settings);
 
+global.symbolsOnly = symbolsOnlyArg != -1;
+
 EXPORTED_FUNCTIONS = new Set(EXPORTED_FUNCTIONS);
 WASM_EXPORTS = new Set(WASM_EXPORTS);
 SIDE_MODULE_EXPORTS = new Set(SIDE_MODULE_EXPORTS);
@@ -94,7 +99,7 @@ if (!STRICT) {
 B = new Benchmarker();
 
 try {
-  runJSify(symbolsOnly);
+  runJSify();
 
   B.print('glue');
 } catch (err) {

src/jsifier.js

@@ -66,7 +66,7 @@ function isDefined(symName) {
   return false;
 }
 
-function runJSify(symbolsOnly = false) {
+function runJSify() {
   const libraryItems = [];
   const symbolDeps = {};
   let postSets = [];

src/library.js

@@ -1225,9 +1225,9 @@ mergeInto(LibraryManager.library, {
 
     return 0;
   },
-  strptime_l__sig: 'pppp',
+  strptime_l__sig: 'ppppp',
   strptime_l__deps: ['strptime'],
-  strptime_l: function(buf, format, tm) {
+  strptime_l: function(buf, format, tm, locale) {
     return _strptime(buf, format, tm); // no locale support yet
   },
 
@@ -3029,16 +3029,11 @@ mergeInto(LibraryManager.library, {
     return runEmAsmFunction(code, sigPtr, argbuf);
   },
 
-#if MEMORY64
-  // We can't use the alias in wasm64 mode becuase the function signature differs
   emscripten_asm_const_ptr__sig: 'pppp',
   emscripten_asm_const_ptr__deps: ['$runEmAsmFunction'],
   emscripten_asm_const_ptr: function(code, sigPtr, argbuf) {
     return runEmAsmFunction(code, sigPtr, argbuf);
   },
-#else
-  emscripten_asm_const_ptr: 'emscripten_asm_const_int',
-#endif
 
   $runMainThreadEmAsm__deps: ['$readEmAsmArgs'],
   $runMainThreadEmAsm__sig: 'iippi',

src/library_sdl.js

@@ -1398,8 +1398,8 @@ var LibrarySDL = {
 
   SDL_WasInit__deps: ['SDL_Init'],
   SDL_WasInit__proxy: 'sync',
-  SDL_WasInit__sig: 'i',
-  SDL_WasInit: function() {
+  SDL_WasInit__sig: 'ii',
+  SDL_WasInit: function(flags) {
     if (SDL.startTime === null) {
       _SDL_Init();
     }
@@ -1937,7 +1937,7 @@ var LibrarySDL = {
   },
 
   SDL_SetClipRect__proxy: 'sync',
-  SDL_SetClipRect__sig: 'vii',
+  SDL_SetClipRect__sig: 'iii',
   SDL_SetClipRect: function(surf, rect) {
     var surfData = SDL.surfaces[surf];
 
@@ -1946,6 +1946,7 @@ var LibrarySDL = {
     } else {
       delete surfData.clipRect;
     }
+    return 1;
   },
 
   SDL_FillRect__proxy: 'sync',
@@ -2228,7 +2229,7 @@ var LibrarySDL = {
 
   IMG_Load_RW__deps: ['SDL_LockSurface', 'SDL_FreeRW', '$PATH_FS', 'malloc'],
   IMG_Load_RW__proxy: 'sync',
-  IMG_Load_RW__sig: 'iii',
+  IMG_Load_RW__sig: 'ipi',
   IMG_Load_RW: function(rwopsID, freeSrc) {
     try {
       // stb_image integration support
@@ -2380,7 +2381,7 @@ var LibrarySDL = {
 
   IMG_Load__deps: ['IMG_Load_RW', 'SDL_RWFromFile'],
   IMG_Load__proxy: 'sync',
-  IMG_Load__sig: 'ii',
+  IMG_Load__sig: 'ip',
   IMG_Load: function(filename){
     var rwops = _SDL_RWFromFile(filename);
     var result = _IMG_Load_RW(rwops, 1);
@@ -2905,9 +2906,10 @@ var LibrarySDL = {
     SDL.channelMinimumNumber = num;
   },
   Mix_PlayChannelTimed__proxy: 'sync',
-  Mix_PlayChannelTimed__sig: 'iiii',
-  Mix_PlayChannelTimed: function(channel, id, loops) {
+  Mix_PlayChannelTimed__sig: 'iiiii',
+  Mix_PlayChannelTimed: function(channel, id, loops, ticks) {
     // TODO: handle fixed amount of N loops. Currently loops either 0 or infinite times.
+    assert(ticks == -1);
 
     // Get the audio element associated with the ID
     var info = SDL.audios[id];
@@ -3459,8 +3461,8 @@ var LibrarySDL = {
   SDL_DestroyRenderer: function(renderer) {},
 
   SDL_GetWindowFlags__proxy: 'sync',
-  SDL_GetWindowFlags__sig: 'iii',
-  SDL_GetWindowFlags: function(x, y) {
+  SDL_GetWindowFlags__sig: 'ii',
+  SDL_GetWindowFlags: function(window) {
     if (Browser.isFullscreen) {
        return 1;
     }
@@ -3475,8 +3477,8 @@ var LibrarySDL = {
   SDL_GL_DeleteContext: function(context) {},
 
   SDL_GL_GetSwapInterval__proxy: 'sync',
-  SDL_GL_GetSwapInterval__sig: 'ii',
-  SDL_GL_GetSwapInterval: function(state) {
+  SDL_GL_GetSwapInterval__sig: 'i',
+  SDL_GL_GetSwapInterval: function() {
     if (Browser.mainLoop.timingMode == 1/*EM_TIMING_RAF*/) return Browser.mainLoop.timingValue;
     else return 0;
   },

src/library_syscall.js

@@ -175,13 +175,6 @@ var SyscallsLibrary = {
     FS.chmod(path, mode);
     return 0;
   },
-  __syscall_rename__sig: 'ipp',
-  __syscall_rename: function(old_path, new_path) {
-    old_path = SYSCALLS.getStr(old_path);
-    new_path = SYSCALLS.getStr(new_path);
-    FS.rename(old_path, new_path);
-    return 0;
-  },
   __syscall_rmdir__sig: 'ip',
   __syscall_rmdir: function(path) {
     path = SYSCALLS.getStr(path);

src/library_uuid.js

@@ -1,4 +1,4 @@
-/**
+/**Z
  * @license
  * Copyright 2013 The Emscripten Authors
  * SPDX-License-Identifier: MIT

src/modules.js

@@ -247,6 +247,7 @@ global.LibraryManager = {
 
 if (!BOOTSTRAPPING_STRUCT_INFO) {
   // Load struct and define information.
+  assert(STRUCT_INFO);
   const temp = JSON.parse(read(STRUCT_INFO));
   C_STRUCTS = temp.structs;
   C_DEFINES = temp.defines;

src/utility.js

@@ -119,6 +119,18 @@ function mergeInto(obj, other, options = null) {
     }
   }
 
+  for (const key of Object.keys(other)) {
+    if (key.endsWith('__sig')) {
+      if (obj.hasOwnProperty(key)) {
+        const oldsig = obj[key];
+        const newsig = other[key];
+        if (oldsig != newsig) {
+          console.warn(`Signature redefinition mismatch for : ${key}. (old=${oldsig} vs new=${newsig})`);
+        }
+      }
+    }
+  }
+
   return Object.assign(obj, other);
 }
 

system/include/SDL/SDL_cpuinfo.h

@@ -105,21 +105,25 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
  *  This function returns true if the CPU has MMX features.
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMXExt(void);
 
 /**
  *  This function returns true if the CPU has 3DNow! features.
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNowExt(void);
 
 /**
  *  This function returns true if the CPU has SSE features.
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSEExt(void);
 
 /**
  *  This function returns true if the CPU has SSE2 features.
  */
 extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2Ext(void);
 
 /**
  *  This function returns true if the CPU has SSE3 features.

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_emscripten.cpp

@@ -26,14 +26,9 @@
 #include <emscripten/stack.h>
 #include <sys/types.h>
 
-namespace __sanitizer {
+#include "emscripten_internal.h"
 
-extern "C" {
-char* emscripten_get_module_name(char *buf, size_t length);
-void* emscripten_builtin_mmap(void *addr, size_t length, int prot, int flags,
-                             int fd, off_t offset);
-int emscripten_builtin_munmap(void *addr, size_t length);
-}
+namespace __sanitizer {
 
 void ListOfModules::init() {
   modules_.Initialize(2);