Subzero, WASM: stop writing uninitialized data to .o file. Add timers.

runtime/wasm-runtime.cpp

 //===- subzero/runtime/wasm-runtime.cpp - Subzero WASM runtime source -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the system calls required by the libc that is included
 // in WebAssembly programs.
 //
 //===----------------------------------------------------------------------===//
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
+#include <iostream>
+#include <vector>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <iostream>
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <termios.h>
 #include <time.h>
 #include <unistd.h>
 
 #ifdef WASM_TRACE_RUNTIME
 #define TRACE_ENTRY()                                                          \
   { std::cerr << __func__ << "(...) = "; }
 template <typename T> T trace(T x) {
   std::cerr << x << std::endl;
   return x;
 }
 void trace() { std::cerr << "(void)" << std::endl; }
 #else
 #define TRACE_ENTRY()
 template <typename T> T trace(T x) { return x; }
 void trace() {}
 #endif // WASM_TRACE_RUNTIME
 
 extern "C" {
-extern char WASM_MEMORY[];
+char *WASM_MEMORY;
 extern uint32_t WASM_DATA_SIZE;
 extern uint32_t WASM_NUM_PAGES;
 } // end of extern "C"
 
 namespace {
 uint32_t HeapBreak;
 
 // TODO (eholk): make all of these constexpr.
 const uint32_t PageSizeLog2 = 16;
 const uint32_t PageSize = 1 << PageSizeLog2; // 64KB
@@ skipping 72 matching lines @@
 void __Sz_bounds_fail() {
   std::cerr << "Bounds check failure" << std::endl;
   abort();
 }
 
 void __Sz_indirect_fail() {
   std::cerr << "Invalid indirect call target" << std::endl;
   abort();
 }
 
+extern char WASM_DATA_INIT[];
+
 void env$$abort() {
   fprintf(stderr, "Aborting...\n");
   abort();
 }
 
 void env$$_abort() { env$$abort(); }
 
 double env$$floor_f(float X) {
   TRACE_ENTRY();
   return env::floor(X);
@@ skipping 60 matching lines @@
 UNIMPLEMENTED(pthread_cleanup_push)
 UNIMPLEMENTED(pthread_self)
 UNIMPLEMENTED(setjmp)
 
 extern int __szwasm_main(int, WasmPtr<WasmCharPtr>);
 
 #define WASM_REF(Type, Index) (WasmPtr<Type>(Index).asPtr())
 #define WASM_DEREF(Type, Index) (*WASM_REF(Type, Index))
 
 int main(int argc, const char **argv) {
+  // Create the heap.
+  std::vector<char> WasmHeap(WASM_NUM_PAGES << PageSizeLog2);
+  WASM_MEMORY = &WasmHeap[0];

[John, 2016/04/30 04:11:55]

WasmHeap->data()?

[Eric Holk, 2016/05/02 17:42:37]

Done.

+  std::copy(WASM_DATA_INIT, WASM_DATA_INIT + WASM_DATA_SIZE, WasmHeap.begin());
+
   // TODO (eholk): align these allocations correctly.
 
   // Allocate space for the global data.
   HeapBreak = WASM_DATA_SIZE;
   GlobalData = WASM_REF(WasmData, HeapBreak);
   HeapBreak += sizeof(WasmData);
 
   // copy the command line arguments.
   WasmPtr<WasmCharPtr> WasmArgV = HeapBreak;
   WasmPtr<char> *WasmArgVPtr = WasmArgV.asPtr();
@@ skipping 188 matching lines @@
 int env$$__syscall192(int Which, WasmArray<int> VarArgs) {
   TRACE_ENTRY();
   (void)Which;
   (void)VarArgs;
 
   // TODO (eholk): figure out how to implement this.
 
   return trace(-ENOMEM);
 }
 } // end of extern "C"