Merge pull request #3 from xyjixyjixyji/master

popcnt and div
sisshiki1969 · Oct 23, 2024 · 17a1833 · 17a1833
2 parents 4176670 + 5925cd9
commit 17a1833
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/monoasm_macro/src/asm.rs b/monoasm_macro/src/asm.rs
@@ -180,6 +180,15 @@ pub fn compile(inst: Inst) -> TokenStream {
             }
         }
 
+        Inst::Div(op) => {
+            // DIV r/m64: RAX <- RAX / r/m64
+            match op {
+                // DIV r/m64
+                // REX.W F7 /6
+                op => quote! { jit.enc_rexw_digit(&[0xf7], #op, 6, Imm::None); },
+            }
+        }
+
         Inst::Movsd(op1, op2) => match (op1, op2) {
             (XmOperand::Xmm(op1), op2) => quote! {
                 jit.emitb(0xf2);
@@ -327,6 +336,12 @@ pub fn compile(inst: Inst) -> TokenStream {
                 jit.enc_rexw_mr(&[0x0f, 0xbd], #op1, #op2);
             )
         }
+        Inst::Popcntq(op1, op2) => {
+            quote!(
+                jit.emitb(0xf3);
+                jit.enc_rexw_mr(&[0x0f, 0xb8], #op1, #op2);
+            )
+        }
     }
 }
 

diff --git a/monoasm_macro/src/inst.rs b/monoasm_macro/src/inst.rs
@@ -82,6 +82,7 @@ pub enum Inst {
 
     Imul(RmiOperand, RmiOperand),
     Idiv(RmOperand),
+    Div(RmOperand),
 
     Lea(RmOperand, RmOperand),
 
@@ -117,6 +118,7 @@ pub enum Inst {
 
     Lzcntq(Register, RmOperand),
     Tzcntq(Register, RmOperand),
+    Popcntq(Register, RmOperand),
 
     Int3,
 }
@@ -291,6 +293,7 @@ impl Parse for Inst {
                 "negq" => parse_1op!(Negq),
                 "imul" => parse_2op!(Imul),
                 "idiv" => parse_1op!(Idiv),
+                "div" => parse_1op!(Div),
 
                 "testq" => parse_2op!(Testq),
                 "testb" => parse_2op!(Testb),
@@ -386,6 +389,7 @@ impl Parse for Inst {
 
                 "lzcntq" => parse_2op!(Lzcntq),
                 "tzcntq" => parse_2op!(Tzcntq),
+                "popcntq" => parse_2op!(Popcntq),
 
                 "dq" => {
                     if input.peek(LitFloat) {