Finish initial pass on wasm-binary, and add wasm-as tool #13

.gitignore

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

CMakeLists.txt

@@ -89,3 +89,13 @@ TARGET_LINK_LIBRARIES(s2wasm support)
 SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD 11)
 SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD_REQUIRED ON)
 INSTALL(TARGETS s2wasm DESTINATION bin)
+
+SET(wasm_as_SOURCES
+  src/wasm-as.cpp
+)
+ADD_EXECUTABLE(wasm-as
+               ${wasm_as_SOURCES})
+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)

src/wasm-as.cpp

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 WebAssembly Community Group participants
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// wasm2asm console tool
+//
+
+#include "support/colors.h"
+#include "support/command-line.h"
+#include "support/file.h"
+#include "wasm-binary.h"
+#include "wasm-s-parser.h"
+
+using namespace cashew;
+using namespace wasm;
+
+int main(int argc, const char *argv[]) {
+  Options options("wasm-as", "Assemble a .wast (WebAssembly text format) into a .wasm (WebAssembly binary format)");
+  options.add("--output", "-o", "Output file (stdout if not specified)",
+              Options::Arguments::One,
+              [](Options *o, const std::string &argument) {
+                o->extra["output"] = argument;
+                Colors::disable();
+              })
+      .add_positional("INFILE", Options::Arguments::One,
+                      [](Options *o, const std::string &argument) {
+                        o->extra["infile"] = argument;
+                      });
+  options.parse(argc, argv);
+
+  auto input(read_file<std::string>(options.extra["infile"], options.debug));
+
+  if (options.debug) std::cerr << "s-parsing..." << std::endl;
+  SExpressionParser parser(const_cast<char*>(input.c_str()));
+  Element& root = *parser.root;
+
+  if (options.debug) std::cerr << "w-parsing..." << std::endl;
+  AllocatingModule wasm;
+  SExpressionWasmBuilder builder(wasm, *root[0], [&]() { abort(); });
+
+  if (options.debug) std::cerr << "binarification..." << std::endl;
+  BufferWithRandomAccess buffer;
+  WasmBinaryWriter writer(&wasm, buffer);
+  writer.write();
+
+  if (options.debug) std::cerr << "writing to output..." << std::endl;
+  Output output(options.extra["output"], options.debug);
+  buffer.writeTo(output);
+
+  if (options.debug) std::cerr << "Done." << std::endl;
+}