@@ -2523,8 +2523,8 @@ IR_FOLD(ADD(SUB, C_ADDR))
2523
2523
/* (c1 - x) + c2 => (c1 + c2) - x */
2524
2524
val .u64 = ctx -> ir_base [op1_insn -> op1 ].val .u64 + op2_insn -> val .u64 ;
2525
2525
opt ++ ; /* ADD -> SUB */
2526
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2527
2526
op2 = op1_insn -> op2 ;
2527
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2528
2528
IR_FOLD_RESTART ;
2529
2529
}
2530
2530
IR_FOLD_NEXT ;
@@ -2549,8 +2549,8 @@ IR_FOLD(ADD(SUB, C_I64))
2549
2549
/* (c1 - x) + c2 => (c1 + c2) - x */
2550
2550
val .i64 = ctx -> ir_base [op1_insn -> op1 ].val .i64 + op2_insn -> val .i64 ;
2551
2551
opt ++ ; /* ADD -> SUB */
2552
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2553
2552
op2 = op1_insn -> op2 ;
2553
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2554
2554
IR_FOLD_RESTART ;
2555
2555
}
2556
2556
IR_FOLD_NEXT ;
@@ -2602,8 +2602,8 @@ IR_FOLD(SUB(C_ADDR, ADD))
2602
2602
if (IR_IS_CONST_REF (op2_insn -> op2 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op2 ].op )) {
2603
2603
/* c1 - (x + c2) => (c1 - c2) - x */
2604
2604
val .u64 = op1_insn -> val .u64 - ctx -> ir_base [op2_insn -> op2 ].val .u64 ;
2605
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2606
2605
op2 = op2_insn -> op1 ;
2606
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2607
2607
IR_FOLD_RESTART ;
2608
2608
}
2609
2609
IR_FOLD_NEXT ;
@@ -2617,8 +2617,8 @@ IR_FOLD(SUB(C_I64, ADD))
2617
2617
if (IR_IS_CONST_REF (op2_insn -> op2 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op2 ].op )) {
2618
2618
/* c1 - (x + c2) => (c1 - c2) - x */
2619
2619
val .i64 = op1_insn -> val .i64 - ctx -> ir_base [op2_insn -> op2 ].val .i64 ;
2620
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2621
2620
op2 = op2_insn -> op1 ;
2621
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2622
2622
IR_FOLD_RESTART ;
2623
2623
}
2624
2624
IR_FOLD_NEXT ;
@@ -2643,8 +2643,8 @@ IR_FOLD(SUB(SUB, C_ADDR))
2643
2643
} else if (IR_IS_CONST_REF (op1_insn -> op1 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op1_insn -> op1 ].op )) {
2644
2644
/* (c1 - x) - c2 => (c1 - c2) - x */
2645
2645
val .u64 = ctx -> ir_base [op1_insn -> op1 ].val .u64 - op2_insn -> val .u64 ;
2646
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2647
2646
op2 = op1_insn -> op2 ;
2647
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2648
2648
IR_FOLD_RESTART ;
2649
2649
}
2650
2650
IR_FOLD_NEXT ;
@@ -2668,8 +2668,8 @@ IR_FOLD(SUB(SUB, C_I64))
2668
2668
} else if (IR_IS_CONST_REF (op1_insn -> op1 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op1_insn -> op1 ].op )) {
2669
2669
/* (c1 - x) - c2 => (c1 - c2) - x */
2670
2670
val .i64 = ctx -> ir_base [op1_insn -> op1 ].val .i64 - op2_insn -> val .i64 ;
2671
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2672
2671
op2 = op1_insn -> op2 ;
2672
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2673
2673
IR_FOLD_RESTART ;
2674
2674
}
2675
2675
IR_FOLD_NEXT ;
@@ -2684,8 +2684,8 @@ IR_FOLD(SUB(C_ADDR, SUB))
2684
2684
if (IR_IS_CONST_REF (op2_insn -> op2 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op2 ].op )) {
2685
2685
/* c1 - (x - c2) => (c1 + c2) - x */
2686
2686
val .u64 = op1_insn -> val .u64 + ctx -> ir_base [op2_insn -> op2 ].val .u64 ;
2687
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2688
2687
op2 = op2_insn -> op1 ;
2688
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2689
2689
IR_FOLD_RESTART ;
2690
2690
} else if (IR_IS_CONST_REF (op2_insn -> op1 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op1 ].op )) {
2691
2691
/* c1 - (c2 - x) => x + (c1 - c2) */
@@ -2709,8 +2709,8 @@ IR_FOLD(SUB(C_I64, SUB))
2709
2709
if (IR_IS_CONST_REF (op2_insn -> op2 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op2 ].op )) {
2710
2710
/* c1 - (x - c2) => (c1 + c2) - x */
2711
2711
val .i64 = op1_insn -> val .i64 + ctx -> ir_base [op2_insn -> op2 ].val .i64 ;
2712
- op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2713
2712
op2 = op2_insn -> op1 ;
2713
+ op1 = ir_const (ctx , val , IR_OPT_TYPE (opt ));
2714
2714
IR_FOLD_RESTART ;
2715
2715
} else if (IR_IS_CONST_REF (op2_insn -> op1 ) && !IR_IS_SYM_CONST (ctx -> ir_base [op2_insn -> op1 ].op )) {
2716
2716
/* c1 - (c2 - x) => x + (c1 - c2) */
0 commit comments