Commit bc1536f4bf01e45af80a930b31b9271551de1dc0 | zig

author	Matt Knight <mattnite@protonmail.com> 2020-08-18 22:18:36-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-08-21 11:40:35-07:00
log	bc1536f4bf01e45af80a930b31b9271551de1dc0
tree	5e4c86125923fee074416a2f50d16b9fe1d26abb
parent	7f1378909b54dec1636920389e60d8dfacb4e614

decided to split up loading of 64-bit immediates

1 files changed, 25 insertions(+), 21 deletions(-)

lib
- std
  - os
    bits
    linux
    bpf.zig

lib/std/os/bits/linux/bpf.zig+25-21

 @@ -460,27 +460,32 @@ pub const Insn = packed struct {
         };
     }
-    fn ld_imm_impl(dst: Reg, src: Reg, imm: u64) [2]Insn {
+    fn ld_imm_impl1(dst: Reg, src: Reg, imm: u64) Insn {
-        return [2]Insn{
+        return Insn{
-            Insn{
+            .code = LD | DW | IMM,
-                .code = LD | DW | IMM,
+            .dst = @enumToInt(dst),
-                .dst = @enumToInt(dst),
+            .src = @enumToInt(src),
-                .src = @enumToInt(src),
+            .off = 0,
-                .off = 0,
+            .imm = @intCast(i32, @truncate(u32, imm)),
-                .imm = @intCast(i32, @truncate(u32, imm)),
-            },
-            Insn{
-                .code = 0,
-                .dst = 0,
-                .src = 0,
-                .off = 0,
-                .imm = @intCast(i32, @truncate(u32, imm >> 32)),
-            },
         };
     }
-    pub fn ld_map_fd(dst: Reg, map_fd: fd_t) [2]Insn {
+    fn ld_imm_impl2(imm: u64) Insn {
-        return ld_imm_impl(dst, @intToEnum(Reg, PSEUDO_MAP_FD), @intCast(u64, map_fd));
+        return Insn{
+            .code = 0,
+            .dst = 0,
+            .src = 0,
+            .off = 0,
+            .imm = @intCast(i32, @truncate(u32, imm >> 32)),
+        };
+    }
+    pub fn ld_map_fd1(dst: Reg, map_fd: fd_t) Insn {
+        return ld_imm_impl1(dst, @intToEnum(Reg, PSEUDO_MAP_FD), @intCast(u64, map_fd));
+    }
+    pub fn ld_map_fd2(map_fd: fd_t) Insn {
+        return ld_imm_impl2(@intCast(u64, map_fd));
     }
     pub fn call(helper: Helper) Insn {
 @@ -533,9 +538,8 @@ test "ld_abs" {
 }
 test "ld_map_fd" {
-    const insns = Insn.ld_map_fd(.r1, 42);
+    expect_insn(Insn.ld_map_fd1(.r1, 42), 0x0000002a00001118);
-    expect_insn(insns[0], 0x0000002a00001118);
+    expect_insn(Insn.ld_map_fd2(42), 0x0000000000000000);
-    expect_insn(insns[1], 0x0000000000000000);
 }
 // st instructions