Merge branch 'master' of https://codeberg.org/eaxcc/eaxcc

documentation/test.asm

@@ -449,6 +449,36 @@ nnn:	nop
 	nop
 	cmovg r9, r9; 4D 0F 4F C9
 
+	nop
+	nop
+	nop
+
+	nop
+	mov rcx, rdx
+	nop
+	mov rdx, [x8]
+	nop
+	mov qword[x8], rdx
+	nop
+	mov rdx, 1122334455667788h
+	nop
+	mov qword[x8], 11223344h
+
+	nop
+	nop
+	nop
+
+xxx:	nop
+	jmp xxx
+	nop
+	jmp fff
+	nop
+	jmp rcx
+	nop
+	jmp r9
+	nop
+	jmp qword[x4]
+
 	nop
 
 	nop

source/assembler.c

@@ -240,6 +240,53 @@ static void build_move_if (operation_index operation,
 	//~displacement (4, 0X12345678); // Not implemented at this point!
 }
 
+// SPECIAL!
+static void build_jump (size_index size,
+                        type_index to,
+                        next       destination) {
+	/* */
+	place ((to == REG) && upper (destination), (byte) 0X41);
+
+	place (to == REL, (byte) (0XE9 + 0X02 * (size == D8)));
+	place (to == REG, (byte) 0XFF);
+	place (to == REG, (byte) (0XE0 + 0X01 * (destination & 0X07)));
+	place (to == MEM, (byte) 0XFF);
+	place (to == MEM, (byte) 0X25);
+
+	//~displacement (to == MEM, 4, 0X12345678); // Keep when in mind!
+}
+
+// VERY FUCKING SPECIAL!
+static void build_move (size_index size,
+                        type_index to,
+                        next       destination,
+                        type_index from,
+                        next       source) {
+	/* */
+	build_short_prefix (size == D16);
+
+	build_long_prefix (size == D64,
+	                  (to   == REG) && (upper ((form) destination)),
+	                  (from == REG) && (upper ((form) source)));
+
+	place ((to == REG) && (from == REG), (byte) (0X88 + (size != D8)));
+	place ((to == REG) && (from == MEM), (byte) (0X8A + (size != D8)));
+	place ((to == MEM) && (from == REG), (byte) (0X88 + (size != D8)));
+
+	build_register_redirection ((to == REG) && (from == MEM), destination);
+	build_register_redirection ((to == MEM) && (from == REG), source);
+
+	place ((to == REG) && (from == IMM), (byte) (0XB0
+	                                           + 0X08 * (size != D8)
+	                                           + 0X01 * (destination & 0X07)));
+
+	place ((to == MEM) && (from == IMM), (byte) (0XC6 + (size != D8)));
+	place ((to == MEM) && (from == IMM), (byte) (0X05));
+
+	//~displacement (4, 0X12345678); // Not implemented at this point!
+	//~immediate?   (4, 0X12345678); // Not implemented at this point!
+}
+
 next   token_count;
 byte * token_array;
 
@@ -279,6 +326,17 @@ void assemble (next   count,
 			               array [index + 2], array [index + 3],
 			               array [index + 4], array [index + 5]);
 			index += 5;
+		} else if (array [index] == JMP) {
+			build_jump_if (array [index + 1], array [index + 2],
+			               array [index + 3]);
+			index += 3;
+		} else if (array [index] == MOV) {
+			build_move_if (array [index + 1], array [index + 2],
+			               array [index + 3], array [index + 4],
+			               array [index + 5]);
+			index += 5;
+		} else {
+			exit (EXIT_FAILURE); // For debugging only!
 		}
 	}
 }

source/assembler.h

@@ -9,7 +9,7 @@ typedef enum {
 } size_index;
 
 typedef enum {
-	NIL,              REG,              MEM,              IMM,
+	REL,              REG,              MEM,              IMM,
 } type_index;
 
 typedef enum {