| ... | @@ -734,9 +734,9 @@ pub const Instruction = union(enum) { | ... | @@ -734,9 +734,9 @@ pub const Instruction = union(enum) { |
| 734 | }, | 734 | }, |
| 735 | }; | 735 | }; |
| 736 | } | 736 | } |
| 737 | fn format3o(op3: u6, opf: u9, cc: CCR, rs1: Register, rs2: Register) Instruction { | 737 | fn format3o(op3: u6, opf: u9, ccr: CCR, rs1: Register, rs2: Register) Instruction { |
| 738 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 738 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 739 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 739 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 740 | return Instruction{ | 740 | return Instruction{ |
| 741 | .format_3o = .{ | 741 | .format_3o = .{ |
| 742 | .cc1 = ccr_cc1, | 742 | .cc1 = ccr_cc1, |
| ... | @@ -785,9 +785,9 @@ pub const Instruction = union(enum) { | ... | @@ -785,9 +785,9 @@ pub const Instruction = union(enum) { |
| 785 | }; | 785 | }; |
| 786 | } | 786 | } |
| 787 | | 787 | |
| 788 | fn format4a(rd: Register, op3: u6, rs1: Register, cc: CCR, rs2: Register) Instruction { | 788 | fn format4a(rd: Register, op3: u6, rs1: Register, ccr: CCR, rs2: Register) Instruction { |
| 789 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 789 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 790 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 790 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 791 | return Instruction{ | 791 | return Instruction{ |
| 792 | .format4a = .{ | 792 | .format4a = .{ |
| 793 | .rd = rd.enc(), | 793 | .rd = rd.enc(), |
| ... | @@ -800,9 +800,9 @@ pub const Instruction = union(enum) { | ... | @@ -800,9 +800,9 @@ pub const Instruction = union(enum) { |
| 800 | }; | 800 | }; |
| 801 | } | 801 | } |
| 802 | | 802 | |
| 803 | fn format4b(rd: Register, op3: u6, rs1: Register, cc: CCR, imm: i11) Instruction { | 803 | fn format4b(rd: Register, op3: u6, rs1: Register, ccr: CCR, imm: i11) Instruction { |
| 804 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 804 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 805 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 805 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 806 | return Instruction{ | 806 | return Instruction{ |
| 807 | .format4b = .{ | 807 | .format4b = .{ |
| 808 | .rd = rd.enc(), | 808 | .rd = rd.enc(), |
| ... | @@ -815,10 +815,10 @@ pub const Instruction = union(enum) { | ... | @@ -815,10 +815,10 @@ pub const Instruction = union(enum) { |
| 815 | }; | 815 | }; |
| 816 | } | 816 | } |
| 817 | | 817 | |
| 818 | fn format4c(rd: Register, op3: u6, cc: CCR, cond: Condition, rs2: Register) Instruction { | 818 | fn format4c(rd: Register, op3: u6, ccr: CCR, cond: Condition, rs2: Register) Instruction { |
| 819 | const ccr_cc2 = @truncate(u1, @enumToInt(cc) >> 2); | 819 | const ccr_cc2 = @truncate(u1, @enumToInt(ccr) >> 2); |
| 820 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 820 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 821 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 821 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 822 | return Instruction{ | 822 | return Instruction{ |
| 823 | .format4c = .{ | 823 | .format4c = .{ |
| 824 | .rd = rd.enc(), | 824 | .rd = rd.enc(), |
| ... | @@ -832,10 +832,10 @@ pub const Instruction = union(enum) { | ... | @@ -832,10 +832,10 @@ pub const Instruction = union(enum) { |
| 832 | }; | 832 | }; |
| 833 | } | 833 | } |
| 834 | | 834 | |
| 835 | fn format4d(rd: Register, op3: u6, cc: CCR, cond: Condition, imm: i11) Instruction { | 835 | fn format4d(rd: Register, op3: u6, ccr: CCR, cond: Condition, imm: i11) Instruction { |
| 836 | const ccr_cc2 = @truncate(u1, @enumToInt(cc) >> 2); | 836 | const ccr_cc2 = @truncate(u1, @enumToInt(ccr) >> 2); |
| 837 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 837 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 838 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 838 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 839 | return Instruction{ | 839 | return Instruction{ |
| 840 | .format4d = .{ | 840 | .format4d = .{ |
| 841 | .rd = rd.enc(), | 841 | .rd = rd.enc(), |
| ... | @@ -849,9 +849,9 @@ pub const Instruction = union(enum) { | ... | @@ -849,9 +849,9 @@ pub const Instruction = union(enum) { |
| 849 | }; | 849 | }; |
| 850 | } | 850 | } |
| 851 | | 851 | |
| 852 | fn format4e(rd: Register, op3: u6, rs1: Register, cc: CCR, sw_trap: u7) Instruction { | 852 | fn format4e(rd: Register, op3: u6, rs1: Register, ccr: CCR, sw_trap: u7) Instruction { |
| 853 | const ccr_cc1 = @truncate(u1, @enumToInt(cc) >> 1); | 853 | const ccr_cc1 = @truncate(u1, @enumToInt(ccr) >> 1); |
| 854 | const ccr_cc0 = @truncate(u1, @enumToInt(cc)); | 854 | const ccr_cc0 = @truncate(u1, @enumToInt(ccr)); |
| 855 | return Instruction{ | 855 | return Instruction{ |
| 856 | .format4e = .{ | 856 | .format4e = .{ |
| 857 | .rd = rd.enc(), | 857 | .rd = rd.enc(), |