Implement more opcodes.

1 files changed, 24 insertions, 0 deletions

diff --git a/asm.peg b/asm.peg
index 76918fd..a49dfe7 100644
--- a/asm.peg
+++ b/asm.peg
@@ -36,6 +36,7 @@ instr =
   | i:add  { $$ = i; }
   | i:and  { $$ = i; }
   | i:lea  { $$ = i; }
+  | i:mov  { $$ = i; }
   | i:or   { $$ = i; }
   | i:sub  { $$ = i; }
   | i:xor  { $$ = i; }
@@ -47,6 +48,29 @@ lea =
     | 'q'? ws s:m ws? ',' ws? d:r64 { $$ = INSTR(2, s, d); }
   ) { $$.instr.kind = ASM_LEA; }
 
+mov = "mov" (
+    'b'? ws s:imm8  ws? ',' ws? d:r8  { $$ = INSTR(0, s, d); }
+  | 'w'? ws s:imm16 ws? ',' ws? d:r16 { $$ = INSTR(1, s, d); }
+  | 'l'? ws s:imm32 ws? ',' ws? d:r32 { $$ = INSTR(2, s, d); }
+  | 'q'? ws s:imm32 ws? ',' ws? d:r64 { $$ = INSTR(3, s, d); }
+  | 'b'  ws s:imm8  ws? ',' ws? d:m   { $$ = INSTR(4, s, d); }
+  | 'w'  ws s:imm16 ws? ',' ws? d:m   { $$ = INSTR(5, s, d); }
+  | 'l'  ws s:imm32 ws? ',' ws? d:m   { $$ = INSTR(6, s, d); }
+  | 'q'  ws s:imm32 ws? ',' ws? d:m   { $$ = INSTR(7, s, d); }
+  | 'b'? ws s:m     ws? ',' ws? d:r8  { $$ = INSTR(8, s, d); }
+  | 'w'? ws s:m     ws? ',' ws? d:r16 { $$ = INSTR(9, s, d); }
+  | 'l'? ws s:m     ws? ',' ws? d:r32 { $$ = INSTR(10, s, d); }
+  | 'q'? ws s:m     ws? ',' ws? d:r64 { $$ = INSTR(11, s, d); }
+  | 'b'? ws s:r8    ws? ',' ws? d:m   { $$ = INSTR(12, s, d); }
+  | 'w'? ws s:r16   ws? ',' ws? d:m   { $$ = INSTR(13, s, d); }
+  | 'l'? ws s:r32   ws? ',' ws? d:m   { $$ = INSTR(14, s, d); }
+  | 'q'? ws s:r64   ws? ',' ws? d:m   { $$ = INSTR(15, s, d); }
+  | 'b'? ws s:r8    ws? ',' ws? d:r8  { $$ = INSTR(16, s, d); }
+  | 'w'? ws s:r16   ws? ',' ws? d:r16 { $$ = INSTR(17, s, d); }
+  | 'l'? ws s:r32   ws? ',' ws? d:r32 { $$ = INSTR(18, s, d); }
+  | 'q'? ws s:r64   ws? ',' ws? d:r64 { $$ = INSTR(19, s, d); }
+)  { $$.instr.kind = ASM_MOV; }
+
 xchg = 
   'xchg' (
       'w'? ws s:ax    ws? ',' ws? d:r16   { $$ = INSTR(0, s, d); }