StackRduino
diff --git a/‎py/asmx64.c‎
Lines changed: 6 additions & 9 deletions b/‎py/asmx64.c‎
Lines changed: 6 additions & 9 deletions
@@ -325,31 +325,28 @@ void asm_x64_mov_r64_r64(asm_x64_t *as, int dest_r64, int src_r64) {
 }
 
 void asm_x64_mov_r8_to_mem8(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {
-    assert(dest_r64 < 8);
-    if (src_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_1(as, OPCODE_MOV_R8_TO_RM8);
     } else {
-        asm_x64_write_byte_2(as, REX_PREFIX | REX_R, OPCODE_MOV_R8_TO_RM8);
+        asm_x64_write_byte_2(as, REX_PREFIX | REX_R_FROM_R64(src_r64) | REX_B_FROM_R64(dest_r64), OPCODE_MOV_R8_TO_RM8);
     }
     asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);
 }
 
 void asm_x64_mov_r16_to_mem16(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {
-    assert(dest_r64 < 8);
-    if (src_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_2(as, OP_SIZE_PREFIX, OPCODE_MOV_R64_TO_RM64);
     } else {
-        asm_x64_write_byte_3(as, OP_SIZE_PREFIX, REX_PREFIX | REX_R, OPCODE_MOV_R64_TO_RM64);
+        asm_x64_write_byte_3(as, OP_SIZE_PREFIX, REX_PREFIX | REX_R_FROM_R64(src_r64) | REX_B_FROM_R64(dest_r64), OPCODE_MOV_R64_TO_RM64);
     }
     asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);
 }
 
 void asm_x64_mov_r32_to_mem32(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {
-    assert(dest_r64 < 8);
-    if (src_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_1(as, OPCODE_MOV_R64_TO_RM64);
     } else {
-        asm_x64_write_byte_2(as, REX_PREFIX | REX_R, OPCODE_MOV_R64_TO_RM64);
+        asm_x64_write_byte_2(as, REX_PREFIX | REX_R_FROM_R64(src_r64) | REX_B_FROM_R64(dest_r64), OPCODE_MOV_R64_TO_RM64);
     }
     asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);
 }
Original file line number	Diff line number	Diff line change
`@@ -325,31 +325,28 @@ void asm_x64_mov_r64_r64(asm_x64_t *as, int dest_r64, int src_r64) {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`void asm_x64_mov_r8_to_mem8(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {`
`328`		`- assert(dest_r64 < 8);`
`329`		`- if (src_r64 < 8) {`
	`328`	`+ if (src_r64 < 8 && dest_r64 < 8) {`
`330`	`329`	`asm_x64_write_byte_1(as, OPCODE_MOV_R8_TO_RM8);`
`331`	`330`	`} else {`
`332`		`- asm_x64_write_byte_2(as, REX_PREFIX \| REX_R, OPCODE_MOV_R8_TO_RM8);`
	`331`	`+ asm_x64_write_byte_2(as, REX_PREFIX \| REX_R_FROM_R64(src_r64) \| REX_B_FROM_R64(dest_r64), OPCODE_MOV_R8_TO_RM8);`
`333`	`332`	`}`
`334`	`333`	`asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);`
`335`	`334`	`}`
`336`	`335`
`337`	`336`	`void asm_x64_mov_r16_to_mem16(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {`
`338`		`- assert(dest_r64 < 8);`
`339`		`- if (src_r64 < 8) {`
	`337`	`+ if (src_r64 < 8 && dest_r64 < 8) {`
`340`	`338`	`asm_x64_write_byte_2(as, OP_SIZE_PREFIX, OPCODE_MOV_R64_TO_RM64);`
`341`	`339`	`} else {`
`342`		`- asm_x64_write_byte_3(as, OP_SIZE_PREFIX, REX_PREFIX \| REX_R, OPCODE_MOV_R64_TO_RM64);`
	`340`	`+ asm_x64_write_byte_3(as, OP_SIZE_PREFIX, REX_PREFIX \| REX_R_FROM_R64(src_r64) \| REX_B_FROM_R64(dest_r64), OPCODE_MOV_R64_TO_RM64);`
`343`	`341`	`}`
`344`	`342`	`asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);`
`345`	`343`	`}`
`346`	`344`
`347`	`345`	`void asm_x64_mov_r32_to_mem32(asm_x64_t *as, int src_r64, int dest_r64, int dest_disp) {`
`348`		`- assert(dest_r64 < 8);`
`349`		`- if (src_r64 < 8) {`
	`346`	`+ if (src_r64 < 8 && dest_r64 < 8) {`
`350`	`347`	`asm_x64_write_byte_1(as, OPCODE_MOV_R64_TO_RM64);`
`351`	`348`	`} else {`
`352`		`- asm_x64_write_byte_2(as, REX_PREFIX \| REX_R, OPCODE_MOV_R64_TO_RM64);`
	`349`	`+ asm_x64_write_byte_2(as, REX_PREFIX \| REX_R_FROM_R64(src_r64) \| REX_B_FROM_R64(dest_r64), OPCODE_MOV_R64_TO_RM64);`
`353`	`350`	`}`
`354`	`351`	`asm_x64_write_r64_disp(as, src_r64, dest_r64, dest_disp);`
`355`	`352`	`}`