wasm-dis

.gitignore

@@ -4,6 +4,7 @@ bin/wasm2asm
 bin/s2wasm
 bin/wasm.js
 bin/wasm-as
+bin/wasm-dis
 *.a
 *~
 *.diff

CMakeLists.txt

@@ -99,3 +99,13 @@ TARGET_LINK_LIBRARIES(wasm-as support)
 SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD 11)
 SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD_REQUIRED ON)
 INSTALL(TARGETS wasm-as DESTINATION bin)
+
+SET(wasm_dis_SOURCES
+  src/wasm-dis.cpp
+)
+ADD_EXECUTABLE(wasm-dis
+               ${wasm_dis_SOURCES})
+TARGET_LINK_LIBRARIES(wasm-dis support)
+SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD 11)
+SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD_REQUIRED ON)
+INSTALL(TARGETS wasm-dis DESTINATION bin)

auto_update_tests.py

@@ -68,5 +68,23 @@
     actual, err = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
     open(os.path.join('test', 'passes', passname + '.txt'), 'w').write(actual)
 
+print '\n[ checking binary format testcases... ]\n'
+
+for wast in sorted(os.listdir('test')):
+  if wast.endswith('.wast') and not wast in ['unit.wast']: # blacklist some known failures
+    cmd = [os.path.join('bin', 'wasm-as'), os.path.join('test', wast), '-o', 'a.wasm']
+    print ' '.join(cmd)
+    if os.path.exists('a.wasm'): os.unlink('a.wasm')
+    subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    assert os.path.exists('a.wasm')
+
+    cmd = [os.path.join('bin', 'wasm-dis'), 'a.wasm', '-o', 'a.wast']
+    print ' '.join(cmd)
+    if os.path.exists('a.wast'): os.unlink('a.wast')
+    subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    assert os.path.exists('a.wast')
+    actual = open('a.wast').read()
+    open(os.path.join('test', wast + '.fromBinary'), 'w').write(actual)
+
 print '\n[ success! ]'
 

check.py

@@ -280,16 +280,26 @@ def fix(x):
   if unexpected_result_count:
     fail(unexpected_result_count, 0)
 
-print '\n[ checking wasm-as testcases... ]\n'
+print '\n[ checking binary format testcases... ]\n'
 
 for wast in tests:
   if wast.endswith('.wast') and not wast in ['unit.wast']: # blacklist some known failures
     cmd = [os.path.join('bin', 'wasm-as'), os.path.join('test', wast), '-o', 'a.wasm']
-    print cmd
+    print ' '.join(cmd)
     if os.path.exists('a.wasm'): os.unlink('a.wasm')
     subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     assert os.path.exists('a.wasm')
 
+    cmd = [os.path.join('bin', 'wasm-dis'), 'a.wasm', '-o', 'a.wast']
+    print ' '.join(cmd)
+    if os.path.exists('a.wast'): os.unlink('a.wast')
+    subprocess.check_call(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    assert os.path.exists('a.wast')
+    expected = open(os.path.join('test', wast + '.fromBinary')).read()
+    actual = open('a.wast').read()
+    if actual != expected:
+      fail(actual, expected)
+
 print '\n[ checking example testcases... ]\n'
 
 cmd = [os.environ.get('CXX') or 'g++', '-std=c++11', os.path.join('test', 'example', 'find_div0s.cpp'), '-Isrc', '-g', '-lsupport', '-Llib/.']

src/wasm-as.cpp

@@ -52,8 +52,8 @@ int main(int argc, const char *argv[]) {
   SExpressionWasmBuilder builder(wasm, *root[0], [&]() { abort(); });
 
   if (options.debug) std::cerr << "binarification..." << std::endl;
-  BufferWithRandomAccess buffer;
-  WasmBinaryWriter writer(&wasm, buffer);
+  BufferWithRandomAccess buffer(options.debug);
+  WasmBinaryWriter writer(&wasm, buffer, options.debug);
   writer.write();
 
   if (options.debug) std::cerr << "writing to output..." << std::endl;