Commit 1803167db2d5045e71015498b8e5b184c53edf07 | zig

author	Joachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-25 09:30:53+01:00
committer	Joachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-26 17:21:39+01:00
log	1803167db2d5045e71015498b8e5b184c53edf07
tree	f41994dd5eecaf7d62e10f68fe2dc48b934b9cd5
parent	af844931b2600e50e586436dee0d607d67ed9ff2
signature	Commit is signed but in an unrecognized format.

AIR: change signature of overflow arithmetic instructions

add_with_overflow and similar functions now have the ty_pl data
attached. The Payload will now be a binary operation and the inst is
expected to return a tuple consisting of the destination integer type
and an overflow bit (u1).

Co-authored-by: Jan Philipp Hafer <jan.hafer@rwth-aachen.de>

2 files changed, 20 insertions(+), 28 deletions(-)

src
- Air.zig
- print_air.zig

src/Air.zig+16-22

 @@ -134,28 +134,24 @@ pub const Inst = struct {
         /// Uses the `bin_op` field.
         min,
         /// Integer addition with overflow. Both operands are guaranteed to be the same type,
-        /// and the result is bool. The wrapped value is written to the pointer given by the in
+        /// and the result is a tuple with .{res, ov}. The wrapped value is written to res
-        /// operand of the `pl_op` field. Payload is `Bin` with `lhs` and `rhs` the relevant types
+        /// and if an overflow happens, ov is 1. Otherwise ov is 0.
-        /// of the operation.
+        /// Uses the `ty_pl` field. Payload is `Bin`.
-        /// Uses the `pl_op` field with payload `Bin`.
         add_with_overflow,
         /// Integer subtraction with overflow. Both operands are guaranteed to be the same type,
-        /// and the result is bool. The wrapped value is written to the pointer given by the in
+        /// and the result is a tuple with .{res, ov}. The wrapped value is written to res
-        /// operand of the `pl_op` field. Payload is `Bin` with `lhs` and `rhs` the relevant types
+        /// and if an overflow happens, ov is 1. Otherwise ov is 0.
-        /// of the operation.
+        /// Uses the `ty_pl` field. Payload is `Bin`.
-        /// Uses the `pl_op` field with payload `Bin`.
         sub_with_overflow,
         /// Integer multiplication with overflow. Both operands are guaranteed to be the same type,
-        /// and the result is bool. The wrapped value is written to the pointer given by the in
+        /// and the result is a tuple with .{res, ov}. The wrapped value is written to res
-        /// operand of the `pl_op` field. Payload is `Bin` with `lhs` and `rhs` the relevant types
+        /// and if an overflow happens, ov is 1. Otherwise ov is 0.
-        /// of the operation.
+        /// Uses the `ty_pl` field. Payload is `Bin`.
-        /// Uses the `pl_op` field with payload `Bin`.
         mul_with_overflow,
         /// Integer left-shift with overflow. Both operands are guaranteed to be the same type,
-        /// and the result is bool. The wrapped value is written to the pointer given by the in
+        /// and the result is a tuple with .{res, ov}. The wrapped value is written to res
-        /// operand of the `pl_op` field. Payload is `Bin` with `lhs` and `rhs` the relevant types
+        /// and if an overflow happens, ov is 1. Otherwise ov is 0.
-        /// of the operation.
+        /// Uses the `ty_pl` field. Payload is `Bin`.
-        /// Uses the `pl_op` field with payload `Bin`.
         shl_with_overflow,
         /// Allocates stack local memory.
         /// Uses the `ty` field.
 @@ -964,6 +960,10 @@ pub fn typeOfIndex(air: Air, inst: Air.Inst.Index) Type {
         .union_init,
         .field_parent_ptr,
         .cmp_vector,
+        .add_with_overflow,
+        .sub_with_overflow,
+        .mul_with_overflow,
+        .shl_with_overflow,
         => return air.getRefType(datas[inst].ty_pl.ty),
         .not,
 @@ -1074,12 +1074,6 @@ pub fn typeOfIndex(air: Air, inst: Air.Inst.Index) Type {
             const extra = air.extraData(Air.Bin, datas[inst].pl_op.payload).data;
             return air.typeOf(extra.lhs);
         },
-        .add_with_overflow,
-        .sub_with_overflow,
-        .mul_with_overflow,
-        .shl_with_overflow,
-        => return Type.bool,
     }
 }

src/print_air.zig+4-6

 @@ -473,14 +473,12 @@ const Writer = struct {
     }
     fn writeOverflow(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {
-        const pl_op = w.air.instructions.items(.data)[inst].pl_op;
+        const ty_pl = w.air.instructions.items(.data)[inst].ty_pl;
-        const extra = w.air.extraData(Air.Bin, pl_op.payload).data;
+        const extra = w.air.extraData(Air.Bin, ty_pl.payload).data;
-        try w.writeOperand(s, inst, 0, pl_op.operand);
+        try w.writeOperand(s, inst, 0, extra.lhs);
-        try s.writeAll(", ");
-        try w.writeOperand(s, inst, 1, extra.lhs);
         try s.writeAll(", ");
-        try w.writeOperand(s, inst, 2, extra.rhs);
+        try w.writeOperand(s, inst, 1, extra.rhs);
     }
     fn writeMemset(w: *Writer, s: anytype, inst: Air.Inst.Index) @TypeOf(s).Error!void {