Replacing DidCarry with manual calculation and fixing compares.

src/xenia/cpu/hir/hir_builder.cc

@@ -1287,20 +1287,6 @@ Value* HIRBuilder::CompareUGE(Value* value1, Value* value2) {
   return CompareXX(OPCODE_COMPARE_UGE_info, value1, value2);
 }
 
-Value* HIRBuilder::DidCarry(Value* value) {
-  Instr* i = AppendInstr(OPCODE_DID_CARRY_info, 0, AllocValue(INT8_TYPE));
-  i->set_src1(value);
-  i->src2.value = i->src3.value = NULL;
-  return i->dest;
-}
-
-Value* HIRBuilder::DidOverflow(Value* value) {
-  Instr* i = AppendInstr(OPCODE_DID_OVERFLOW_info, 0, AllocValue(INT8_TYPE));
-  i->set_src1(value);
-  i->src2.value = i->src3.value = NULL;
-  return i->dest;
-}
-
 Value* HIRBuilder::DidSaturate(Value* value) {
   Instr* i = AppendInstr(OPCODE_DID_SATURATE_info, 0, AllocValue(INT8_TYPE));
   i->set_src1(value);

src/xenia/cpu/hir/hir_builder.h

@@ -158,8 +158,6 @@ class HIRBuilder {
   Value* CompareULE(Value* value1, Value* value2);
   Value* CompareUGT(Value* value1, Value* value2);
   Value* CompareUGE(Value* value1, Value* value2);
-  Value* DidCarry(Value* value);
-  Value* DidOverflow(Value* value);
   Value* DidSaturate(Value* value);
   Value* VectorCompareEQ(Value* value1, Value* value2, TypeName part_type);
   Value* VectorCompareSGT(Value* value1, Value* value2, TypeName part_type);

src/xenia/cpu/hir/opcodes.h

@@ -48,7 +48,6 @@ enum PrefetchFlags {
   PREFETCH_STORE = (1 << 2),
 };
 enum ArithmeticFlags {
-  ARITHMETIC_SET_CARRY = (1 << 1),
   ARITHMETIC_UNSIGNED = (1 << 2),
   ARITHMETIC_SATURATE = (1 << 3),
 };
@@ -163,8 +162,6 @@ enum Opcode {
   OPCODE_COMPARE_ULE,
   OPCODE_COMPARE_UGT,
   OPCODE_COMPARE_UGE,
-  OPCODE_DID_CARRY,
-  OPCODE_DID_OVERFLOW,
   OPCODE_DID_SATURATE,
   OPCODE_VECTOR_COMPARE_EQ,
   OPCODE_VECTOR_COMPARE_SGT,

src/xenia/cpu/hir/opcodes.inl

@@ -341,16 +341,6 @@ DEFINE_OPCODE(
     OPCODE_SIG_V_V_V,
     0)
 
-DEFINE_OPCODE(
-    OPCODE_DID_CARRY,
-    "did_carry",
-    OPCODE_SIG_V_V,
-    OPCODE_FLAG_PAIRED_PREV)
-DEFINE_OPCODE(
-    OPCODE_DID_OVERFLOW,
-    "did_overflow",
-    OPCODE_SIG_V_V,
-    OPCODE_FLAG_PAIRED_PREV)
 DEFINE_OPCODE(
     OPCODE_DID_SATURATE,
     "did_saturate",