Minor polish:

* Removed auto-added `.js` from dynamically loaded libs.
* Removed redundant bit fiddling in _formatString. Uses unSign/reSign instead.

2 files changed, 6 insertions, 17 deletions

diff --git a/src/library.js b/src/library.js
index 284f093d..db76d39d 100644
--- a/src/library.js
+++ b/src/library.js
@@ -210,19 +210,9 @@ var Library = {
           var currArg = getNextArg(false, argSize);
           // Truncate to requested size.
           argSize = argSize || 4;
-          var limit = undefined;
-          if (argSize == 4) {
-            limit = 0xFFFFFFFF;
-          } else if (argSize == 2) {
-            limit = 0xFFFF;
-          } else if (argSize == 1) {
-            limit = 0xFF;
-          }
-          if (limit !== undefined) {
-            currArg = currArg & limit;
-            if (!signed && currArg < 0 || signed && currArg > (limit - 1) / 2) {
-              currArg = ~(limit - currArg);
-            }
+          if (argSize <= 4) {
+            var limit = Math.pow(256, argSize) - 1;
+            currArg = (signed ? reSign : unSign)(currArg & limit, argSize * 8);
           }
           // Format the number.
           var currAbsArg = Math.abs(currArg);
@@ -1491,7 +1481,6 @@ var Library = {
   dlopen: function(filename, flag) {
     // TODO: Add support for LD_LIBRARY_PATH.
     filename = Pointer_stringify(filename);
-    filename += '.js';
 
     if (DLFCN_DATA.loadedLibNames[filename]) {
       // Already loaded; increment ref count and return.
diff --git a/tests/runner.py b/tests/runner.py
index d7848769..46380a85 100644
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -1821,7 +1821,7 @@ if 'benchmark' not in sys.argv:
       filename = os.path.join(dirname, 'liblib.cpp')
       BUILD_AS_SHARED_LIB = 1
       self.build(lib_src, dirname, filename)
-      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so.js'))
+      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so'))
 
       src = '''
         #include <cstdio>
@@ -1866,7 +1866,7 @@ if 'benchmark' not in sys.argv:
       BUILD_AS_SHARED_LIB = 1
       EXPORTED_FUNCTIONS = ['__Z7get_cmpv']
       self.build(lib_src, dirname, filename)
-      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so.js'))
+      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so'))
 
       src = '''
         #include <stdio.h>
@@ -1946,7 +1946,7 @@ if 'benchmark' not in sys.argv:
       EXPORTED_FUNCTIONS = ['__Z4funciPFvvE']
       EXPORTED_GLOBALS = ['_global']
       self.build(lib_src, dirname, filename)
-      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so.js'))
+      shutil.move(filename + '.o.js', os.path.join(dirname, 'liblib.so'))
 
       src = '''
         #include <stdio.h>