1 files changed, 3 insertions, 3 deletions
diff --git a/disasm.cpp b/disasm.cpp
index a878c92..09a5149 100644
--- a/disasm.cpp
+++ b/disasm.cpp
@@ -738,7 +738,7 @@ static size_t disasm_move_to(
     case AddrMode::kImmediate:
         break;
     }
-    node.op = Op::Typical(OpCode::kMOVE, opsize, src, Arg{reg, 0});
+    node.op = Op::Typical(OpCode::kMOVE, opsize, src, Arg{{reg}, {0}});
     return node.size = kInstructionSizeStepBytes + src.Size(opsize);
 }
 
@@ -1806,8 +1806,8 @@ static size_t snprint_reg_mask(
             const size_t remaining = bufsz - written;
             const int ret = snprintf(buf + written, remaining, "%s%%%c%d", delimiter, regtype, id);
             assert(ret > 0);
-            assert(static_cast<unsigned>(ret) >= strlen("%d0"));
-            assert(static_cast<unsigned>(ret) <= strlen("-%d0"));
+            assert(static_cast<unsigned>(ret) >= sizeof("%d0")-1);
+            assert(static_cast<unsigned>(ret) <= sizeof("-%d0")-1);
             written += Min(remaining, ret);
             first_printed = true;
         }