Merge pull request #792 from angr/fix/copy_via_memmove
Change pointer-deref-then-assignment to memmove to make PyPy happy.
diff --git a/arch/X86/X86Mapping.c b/arch/X86/X86Mapping.c
index c624581..6de2bcf 100644
--- a/arch/X86/X86Mapping.c
+++ b/arch/X86/X86Mapping.c
@@ -2686,10 +2686,20 @@
{ X86_INSW, X86_REG_DX },
{ X86_INSL, X86_REG_DX },
- { X86_MOV64o64a, X86_REG_RAX },
- { X86_MOV32o32a, X86_REG_EAX },
- { X86_MOV64o32a, X86_REG_EAX },
+ { X86_MOV8o16a, X86_REG_AL },
+ { X86_MOV8o32a, X86_REG_AL },
+ { X86_MOV8o64a, X86_REG_AL },
+
{ X86_MOV16o16a, X86_REG_AX },
+ { X86_MOV16o32a, X86_REG_AX },
+ { X86_MOV16o64a, X86_REG_AX },
+
+ { X86_MOV32o16a, X86_REG_EAX },
+ { X86_MOV32o32a, X86_REG_EAX },
+ { X86_MOV32o64a, X86_REG_EAX },
+
+ { X86_MOV64o32a, X86_REG_RAX },
+ { X86_MOV64o64a, X86_REG_RAX },
{ X86_PUSHCS32, X86_REG_CS },
{ X86_PUSHDS32, X86_REG_DS },