From 676e4f3824054cf39c87d008909b0e57bb9bdcc8 Mon Sep 17 00:00:00 2001
From: kcbanner <kcbanner@gmail.com>
Date: Wed, 28 Dec 2022 02:05:15 -0500
Subject: cbe: changes to get zig2.c compiling under msvc

- Add cpuid / getXCR0 functions for the cbe to use instead of asm blocks
- Don't cast between 128 bit types during truncation
- Fixup truncation to use functions for shifts / adds
- Fixup float casts for undefined values
- Add test for 128 bit integer truncation
---
 src/codegen/c.zig | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'src/codegen')

diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index 216366e576..b97626990d 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -746,9 +746,9 @@ pub const DeclGen = struct {
                     var int_pl = Type.Payload.Bits{ .base = .{ .tag = .int_signed }, .data = bits };
                     const int_ty = Type.initPayload(&int_pl.base);
 
-                    try writer.writeByte('(');
-                    try dg.renderTypecast(writer, ty);
-                    try writer.writeAll(")zig_as_");
+                    try writer.writeAll("zig_cast_");
+                    try dg.renderTypeForBuiltinFnName(writer, ty);
+                    try writer.writeAll(" zig_as_");
                     try dg.renderTypeForBuiltinFnName(writer, ty);
                     try writer.writeByte('(');
                     switch (bits) {
@@ -3616,16 +3616,14 @@ fn airTrunc(f: *Function, inst: Air.Inst.Index) !CValue {
     try writer.writeAll(" = ");
 
     const needs_lo = operand_int_info.bits > 64 and dest_bits <= 64;
-    if (!needs_lo or dest_c_bits != 64 or dest_int_info.signedness != operand_int_info.signedness) {
-        try writer.writeByte('(');
-        try f.renderTypecast(writer, inst_ty);
-        try writer.writeByte(')');
-    }
-
     if (needs_lo) {
         try writer.writeAll("zig_lo_");
         try f.object.dg.renderTypeForBuiltinFnName(writer, operand_ty);
         try writer.writeByte('(');
+    } else if (dest_c_bits <= 64) {
+        try writer.writeByte('(');
+        try f.renderTypecast(writer, inst_ty);
+        try writer.writeByte(')');
     }
 
     if (dest_bits >= 8 and std.math.isPowerOfTwo(dest_bits)) {
@@ -3640,11 +3638,11 @@ fn airTrunc(f: *Function, inst: Air.Inst.Index) !CValue {
                 std.heap.stackFallback(@sizeOf(ExpectedContents), arena.allocator());
 
             const mask_val = try inst_ty.maxInt(stack.get(), target);
-
-            // TODO: This needs to use _and_ to do this to support > 64 bits and !zig_has_int128
+            try writer.writeAll("zig_and_");
+            try f.object.dg.renderTypeForBuiltinFnName(writer, operand_ty);
             try writer.writeByte('(');
-            try f.writeCValue(writer, operand, .Other);
-            try writer.print(" & {x})", .{try f.fmtIntLiteral(inst_ty, mask_val)});
+            try f.writeCValue(writer, operand, .FunctionArgument);
+            try writer.print(", {x})", .{try f.fmtIntLiteral(operand_ty, mask_val)});
         },
         .signed => {
             const c_bits = toCIntBits(operand_int_info.bits) orelse
@@ -3655,10 +3653,24 @@ fn airTrunc(f: *Function, inst: Air.Inst.Index) !CValue {
             };
             const shift_val = Value.initPayload(&shift_pl.base);
 
-            // TODO: This needs to use shl and shr to do this to support > 64 bits and !zig_has_int128
-            try writer.print("((int{d}_t)((uint{0d}_t)", .{c_bits});
-            try f.writeCValue(writer, operand, .Other);
-            try writer.print(" << {}) >> {0})", .{try f.fmtIntLiteral(Type.u8, shift_val)});
+            try writer.writeAll("zig_shr_");
+            try f.object.dg.renderTypeForBuiltinFnName(writer, operand_ty);
+            if (c_bits == 128) {
+                try writer.print("(zig_bitcast_i{d}(", .{c_bits});
+            } else {
+                try writer.print("((int{d}_t)", .{c_bits});
+            }
+            try writer.print("zig_shl_u{d}(", .{c_bits});
+            if (c_bits == 128) {
+                try writer.print("zig_bitcast_u{d}(", .{c_bits});
+            } else {
+                try writer.print("(uint{d}_t)", .{c_bits});
+            }
+            try f.writeCValue(writer, operand, .FunctionArgument);
+            if (c_bits == 128) try writer.writeByte(')');
+            try writer.print(", {})", .{ try f.fmtIntLiteral(Type.u8, shift_val) });
+            if (c_bits == 128) try writer.writeByte(')');
+            try writer.print(", {})", .{ try f.fmtIntLiteral(Type.u8, shift_val) });
         },
     }
 
-- 
cgit v1.2.3