1 files changed, 29 insertions, 117 deletions
diff --git a/src/emscripten-optimizer/optimizer.h b/src/emscripten-optimizer/optimizer.h
index e30347025..132ff6fb8 100644
--- a/src/emscripten-optimizer/optimizer.h
+++ b/src/emscripten-optimizer/optimizer.h
@@ -19,127 +19,39 @@
 
 #include "simple_ast.h"
 
-extern bool preciseF32, receiveJSON, emitJSON, minifyWhitespace, last;
-
-extern cashew::Ref extraInfo;
-
-//
-
-enum AsmType {
-  ASM_INT = 0,
-  ASM_DOUBLE,
-  ASM_FLOAT,
-  ASM_FLOAT32X4,
-  ASM_FLOAT64X2,
-  ASM_INT8X16,
-  ASM_INT16X8,
-  ASM_INT32X4,
-  ASM_INT64, // non-asm.js
-  ASM_NONE   // number of types
+using namespace cashew;
+
+extern IString JS_FLOAT_ZERO;
+
+extern IString SIMD_INT8X16_CHECK;
+extern IString SIMD_INT16X8_CHECK;
+extern IString SIMD_INT32X4_CHECK;
+extern IString SIMD_FLOAT32X4_CHECK;
+extern IString SIMD_FLOAT64X2_CHECK;
+
+enum JsType {
+  JS_INT = 0,
+  JS_DOUBLE,
+  JS_FLOAT,
+  JS_FLOAT32X4,
+  JS_FLOAT64X2,
+  JS_INT8X16,
+  JS_INT16X8,
+  JS_INT32X4,
+  JS_INT64,
+  JS_NONE // number of types
 };
 
-struct AsmData;
-
-AsmType detectType(cashew::Ref node,
-                   AsmData* asmData = nullptr,
-                   bool inVarDef = false,
-                   cashew::IString minifiedFround = cashew::IString(),
-                   bool allowI64 = false);
-
-struct AsmData {
-  struct Local {
-    Local() = default;
-    Local(AsmType type, bool param) : type(type), param(param) {}
-    AsmType type;
-    bool param; // false if a var
-  };
-  typedef std::unordered_map<cashew::IString, Local> Locals;
-
-  Locals locals;
-  std::vector<cashew::IString> params; // in order
-  std::vector<cashew::IString> vars;   // in order
-  AsmType ret;
-
-  cashew::Ref func;
-
-  AsmType getType(const cashew::IString& name) {
-    auto ret = locals.find(name);
-    if (ret != locals.end()) {
-      return ret->second.type;
-    }
-    return ASM_NONE;
-  }
-  void setType(const cashew::IString& name, AsmType type) {
-    locals[name].type = type;
-  }
-
-  bool isLocal(const cashew::IString& name) { return locals.count(name) > 0; }
-  bool isParam(const cashew::IString& name) {
-    return isLocal(name) && locals[name].param;
-  }
-  bool isVar(const cashew::IString& name) {
-    return isLocal(name) && !locals[name].param;
-  }
-
-  // if you want to fill in the data yourself
-  AsmData() = default;
-  // if you want to read data from f, and modify it as you go (parallel to
-  // denormalize)
-  AsmData(cashew::Ref f);
-
-  void denormalize();
-
-  void addParam(cashew::IString name, AsmType type) {
-    locals[name] = Local(type, true);
-    params.push_back(name);
-  }
-  void addVar(cashew::IString name, AsmType type) {
-    locals[name] = Local(type, false);
-    vars.push_back(name);
-  }
-
-  void deleteVar(cashew::IString name) {
-    locals.erase(name);
-    for (size_t i = 0; i < vars.size(); i++) {
-      if (vars[i] == name) {
-        vars.erase(vars.begin() + i);
-        break;
-      }
-    }
-  }
-};
-
-extern cashew::IString ASM_FLOAT_ZERO;
-
-extern cashew::IString SIMD_INT8X16_CHECK;
-extern cashew::IString SIMD_INT16X8_CHECK;
-extern cashew::IString SIMD_INT32X4_CHECK;
-extern cashew::IString SIMD_FLOAT32X4_CHECK;
-extern cashew::IString SIMD_FLOAT64X2_CHECK;
-
-int parseInt(const char* str);
-
-struct HeapInfo {
-  bool valid, unsign, floaty;
-  int bits;
-  AsmType type;
-};
-
-HeapInfo parseHeap(const char* name);
-
-enum AsmSign {
+enum JsSign {
   // small constants can be signed or unsigned, variables are also flexible
-  ASM_FLEXIBLE = 0,
-  ASM_SIGNED = 1,
-  ASM_UNSIGNED = 2,
-  ASM_NONSIGNED = 3,
+  JS_FLEXIBLE = 0,
+  JS_SIGNED,
+  JS_UNSIGNED,
+  JS_NONSIGNED,
 };
 
-extern AsmSign detectSign(cashew::Ref node, cashew::IString minifiedFround);
-
-cashew::Ref makeAsmCoercedZero(AsmType type);
-cashew::Ref makeAsmCoercion(cashew::Ref node, AsmType type);
-
-cashew::Ref makeSigning(cashew::Ref node, AsmSign sign);
+Ref makeJsCoercedZero(JsType type);
+Ref makeJsCoercion(Ref node, JsType type);
+Ref makeSigning(Ref node, JsSign sign);
 
 #endif // wasm_optimizer_h