Basic ContextPromotionPass and some opcode info rearranging.

src/alloy/hir/function_builder.h

@@ -55,7 +55,6 @@ public:
 
   void Comment(const char* format, ...);
 
-  const OpcodeInfo* GetNopOpcode() const;
   void Nop();
 
   // trace info/etc

src/alloy/hir/instr.cc

@@ -19,7 +19,7 @@ void Instr::set_src1(Value* value) {
   if (src1.value == value) {
     return;
   }
-  if (src1.value) {
+  if (src1_use) {
     src1.value->RemoveUse(src1_use);
   }
   src1.value = value;
@@ -30,7 +30,7 @@ void Instr::set_src2(Value* value) {
   if (src2.value == value) {
     return;
   }
-  if (src2.value) {
+  if (src2_use) {
     src2.value->RemoveUse(src2_use);
   }
   src2.value = value;
@@ -41,7 +41,7 @@ void Instr::set_src3(Value* value) {
   if (src3.value == value) {
     return;
   }
-  if (src3.value) {
+  if (src3_use) {
     src3.value->RemoveUse(src3_use);
   }
   src3.value = value;

src/alloy/hir/opcodes.cc

@@ -0,0 +1,25 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <alloy/hir/opcodes.h>
+
+using namespace alloy;
+using namespace alloy::hir;
+
+
+namespace alloy {
+namespace hir {
+
+#define DEFINE_OPCODE(num, name, sig, flags) \
+    static const OpcodeInfo num##_info = { flags, sig, name, num, };
+#include <alloy/hir/opcodes.inl>
+#undef DEFINE_OPCODE
+
+}  // namespace hir
+}  // namespace alloy

src/alloy/hir/opcodes.h

@@ -212,6 +212,12 @@ typedef struct {
 } OpcodeInfo;
 
 
+#define DEFINE_OPCODE(num, name, sig, flags) \
+    extern const OpcodeInfo num##_info;
+#include <alloy/hir/opcodes.inl>
+#undef DEFINE_OPCODE
+
+
 }  // namespace hir
 }  // namespace alloy
 

src/alloy/hir/opcodes.inl

@@ -0,0 +1,512 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2013 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+
+DEFINE_OPCODE(
+    OPCODE_COMMENT,
+    "comment",
+    OPCODE_SIG_X,
+    OPCODE_FLAG_IGNORE);
+
+DEFINE_OPCODE(
+    OPCODE_NOP,
+    "nop",
+    OPCODE_SIG_X,
+    OPCODE_FLAG_IGNORE);
+
+DEFINE_OPCODE(
+    OPCODE_DEBUG_BREAK,
+    "debug_break",
+    OPCODE_SIG_X,
+    OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_DEBUG_BREAK_TRUE,
+    "debug_break_true",
+    OPCODE_SIG_X_V,
+    OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_TRAP,
+    "trap",
+    OPCODE_SIG_X,
+    OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_TRAP_TRUE,
+    "trap_true",
+    OPCODE_SIG_X_V,
+    OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_CALL,
+    "call",
+    OPCODE_SIG_X_S,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_CALL_TRUE,
+    "call_true",
+    OPCODE_SIG_X_V_S,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_CALL_INDIRECT,
+    "call_indirect",
+    OPCODE_SIG_X_V,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_CALL_INDIRECT_TRUE,
+    "call_indirect_true",
+    OPCODE_SIG_X_V_V,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_RETURN,
+    "return",
+    OPCODE_SIG_X,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_BRANCH,
+    "branch",
+    OPCODE_SIG_X_L,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_BRANCH_IF,
+    "branch_if",
+    OPCODE_SIG_X_V_L_L,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_BRANCH_TRUE,
+    "branch_true",
+    OPCODE_SIG_X_V_L,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_BRANCH_FALSE,
+    "branch_false",
+    OPCODE_SIG_X_V_L,
+    OPCODE_FLAG_BRANCH);
+
+DEFINE_OPCODE(
+    OPCODE_ASSIGN,
+    "assign",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_CAST,
+    "cast",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ZERO_EXTEND,
+    "zero_extend",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SIGN_EXTEND,
+    "sign_extend",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_TRUNCATE,
+    "truncate",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_CONVERT,
+    "convert",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ROUND,
+    "round",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_VECTOR_CONVERT_I2F,
+    "vector_convert_i2f",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_VECTOR_CONVERT_F2I,
+    "vector_convert_f2i",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_LOAD_CONTEXT,
+    "load_context",
+    OPCODE_SIG_V_O,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_STORE_CONTEXT,
+    "store_context",
+    OPCODE_SIG_X_O_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_LOAD,
+    "load",
+    OPCODE_SIG_V_V,
+    OPCODE_FLAG_MEMORY);
+
+DEFINE_OPCODE(
+    OPCODE_LOAD_ACQUIRE,
+    "load_acquire",
+    OPCODE_SIG_V_V,
+    OPCODE_FLAG_MEMORY | OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_STORE,
+    "store",
+    OPCODE_SIG_X_V_V,
+    OPCODE_FLAG_MEMORY);
+
+DEFINE_OPCODE(
+    OPCODE_STORE_RELEASE,
+    "store_release",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_MEMORY | OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_PREFETCH,
+    "prefetch",
+    OPCODE_SIG_X_V_O,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_MAX,
+    "max",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_MIN,
+    "min",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SELECT,
+    "select",
+    OPCODE_SIG_V_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_IS_TRUE,
+    "is_true",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_IS_FALSE,
+    "is_false",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_COMPARE_EQ,
+    "compare_eq",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_NE,
+    "compare_ne",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_SLT,
+    "compare_slt",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_SLE,
+    "compare_sle",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_SGT,
+    "compare_sgt",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_SGE,
+    "compare_sge",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_ULT,
+    "compare_ult",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_ULE,
+    "compare_ule",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_UGT,
+    "compare_ugt",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_COMPARE_UGE,
+    "compare_uge",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_DID_CARRY,
+    "did_carry",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_DID_OVERFLOW,
+    "did_overflow",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_VECTOR_COMPARE_EQ,
+    "vector_compare_eq",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+DEFINE_OPCODE(
+    OPCODE_VECTOR_COMPARE_SGT,
+    "vector_compare_sgt",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_VECTOR_COMPARE_SGE,
+    "vector_compare_sge",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_VECTOR_COMPARE_UGT,
+    "vector_compare_ugt",
+    OPCODE_SIG_V_V_V,
+    0);
+DEFINE_OPCODE(
+    OPCODE_VECTOR_COMPARE_UGE,
+    "vector_compare_uge",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ADD,
+    "add",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_ADD_CARRY,
+    "add_carry",
+    OPCODE_SIG_V_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_SUB,
+    "sub",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_MUL,
+    "mul",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_DIV,
+    "div",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_REM,
+    "rem",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_MULADD,
+    "mul_add",
+    OPCODE_SIG_V_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_MULSUB,
+    "mul_sub",
+    OPCODE_SIG_V_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_NEG,
+    "neg",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ABS,
+    "abs",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SQRT,
+    "sqrt",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_RSQRT,
+    "rsqrt",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_DOT_PRODUCT_3,
+    "dot_product_3",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_DOT_PRODUCT_4,
+    "dot_product_4",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_AND,
+    "and",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_OR,
+    "or",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_XOR,
+    "xor",
+    OPCODE_SIG_V_V_V,
+    OPCODE_FLAG_COMMUNATIVE);
+
+DEFINE_OPCODE(
+    OPCODE_NOT,
+    "not",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SHL,
+    "shl",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_VECTOR_SHL,
+    "vector_shl",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SHR,
+    "shr",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SHA,
+    "sha",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ROTATE_LEFT,
+    "rotate_left",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_BYTE_SWAP,
+    "byte_swap",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_CNTLZ,
+    "cntlz",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_INSERT,
+    "insert",
+    OPCODE_SIG_V_V_O_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_EXTRACT,
+    "extract",
+    OPCODE_SIG_V_V_O,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SPLAT,
+    "splat",
+    OPCODE_SIG_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_PERMUTE,
+    "permute",
+    OPCODE_SIG_V_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_SWIZZLE,
+    "swizzle",
+    OPCODE_SIG_V_V_O,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_COMPARE_EXCHANGE,
+    "compare_exchange",
+    OPCODE_SIG_V_V_V_V,
+    OPCODE_FLAG_VOLATILE);
+
+DEFINE_OPCODE(
+    OPCODE_ATOMIC_ADD,
+    "atomic_add",
+    OPCODE_SIG_V_V_V,
+    0);
+
+DEFINE_OPCODE(
+    OPCODE_ATOMIC_SUB,
+    "atomic_sub",
+    OPCODE_SIG_V_V_V,
+    0);

src/alloy/hir/sources.gypi

@@ -9,7 +9,9 @@
     'instr.h',
     'label.cc',
     'label.h',
+    'opcodes.cc',
     'opcodes.h',
+    'opcodes.inl',
     'tracing.h',
     'value.cc',
     'value.h',