Add memory operand overload for base+index*scale

zyantific · May 22, 2024 · a8f024e · a8f024e
1 parent e0001ae
commit a8f024e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/examples/assembler_basic/main.cpp b/examples/assembler_basic/main.cpp
@@ -17,6 +17,7 @@ int main()
     a.lea(x86::rax, x86::qword_ptr(labelA));
     a.lea(x86::rbx, x86::qword_ptr(labelB));
     a.lea(x86::rdx, x86::qword_ptr(labelC));
+    a.movsx(x86::rax, x86::word_ptr(x86::rax, x86::rdx, 2));
 
     a.bind(labelA);
     a.dq(0x123456789);

diff --git a/zasm/include/zasm/x86/memory.hpp b/zasm/include/zasm/x86/memory.hpp
@@ -29,6 +29,13 @@ namespace zasm::x86
         return Mem(bitSize, Seg{}, base, index, 1, 0);
     }
 
+    // ptr [base + index * scale]
+    // ex.: mov eax, ptr [ecx+edx]
+    static constexpr Mem ptr(BitSize bitSize, const Gp& base, const Gp& index, int32_t scale) noexcept
+    {
+        return Mem(bitSize, Seg{}, base, index, scale, 0);
+    }
+
     // ptr [base + index * scale + disp]
     // ex.: mov eax, ptr [ecx+edx*2+0xC]
     static constexpr Mem ptr(BitSize bitSize, const Gp& base, const Gp& index, int32_t scale, int64_t disp) noexcept
@@ -99,6 +106,13 @@ namespace zasm::x86
         return Mem(bitSize, seg, base, index, 1, 0);
     }
 
+    // ptr : seg [base + index * scale]
+    // ex.: mov eax, ptr:ds [edx+ecx*2+0xC]
+    static constexpr Mem ptr(BitSize bitSize, const Seg& seg, const Gp& base, const Gp& index, int32_t scale) noexcept
+    {
+        return Mem(bitSize, seg, base, index, scale, 0);
+    }
+
     // ptr : seg [base + index * scale + disp]
     // ex.: mov eax, ptr:ds [edx+ecx*2+0xC]
     static constexpr Mem ptr(