m

pc/instrs/INSTRS

@@ -107,7 +107,6 @@ cloopnz ri
 # Movement instructions
 #
 
-<<<<<<< Updated upstream
 lea rm m
 mov rm rim
 xchg rm rim
@@ -122,128 +121,21 @@ cleanz rm m
 cmovnz rm rim
 cxchgnz rm rim
 ccmpxchgnz rm rim
-=======
-mov r r
-mov r i
-mov r m
-mov m r
-mov m i
-mov m m
-cmovz r r
-cmovz r i
-cmovz r m
-cmovz m r
-cmovz m i
-cmovz m m
-cmovnz r r
-cmovnz r i
-cmovnz r m
-cmovnz m r
-cmovnz m i
-cmovnz m m
 
-movb r r
-movb r i
-movb r m
-movb m r
-movb m i
-movb m m
-cmovbz r r
-cmovbz r i
-cmovbz r m
-cmovbz m r
-cmovbz m i
-cmovbz m m
-cmovbnz r r
-cmovbnz r i
-cmovbnz r m
-cmovbnz m r
-cmovbnz m i
-cmovbnz m m
+movb rm rim
+movw rm rim
+movl rm rim
+movt rm rim
 
-movw r r
-movw r i
-movw r m
-movw m r
-movw m i
-movw m m
-cmovwz r r
-cmovwz r i
-cmovwz r m
-cmovwz m r
-cmovwz m i
-cmovwz m m
-cmovwnz r r
-cmovwnz r i
-cmovwnz r m
-cmovwnz m r
-cmovwnz m i
-cmovwnz m m
+cmovbz rm rim
+cmovwz rm rim
+cmovlz rm rim
+cmovtz rm rim
 
-movl r r
-movl r i
-movl r m
-movl m r
-movl m i
-movl m m
-cmovlz r r
-cmovlz r i
-cmovlz r m
-cmovlz m r
-cmovlz m i
-cmovlz m m
-cmovlnz r r
-cmovlnz r i
-cmovlnz r m
-cmovlnz m r
-cmovlnz m i
-cmovlnz m m
-
-movt r r
-movt r i
-movt r m
-movt m r
-movt m i
-movt m m
-cmovtz r r
-cmovtz r i
-cmovtz r m
-cmovtz m r
-cmovtz m i
-cmovtz m m
-cmovtnz r r
-cmovtnz r i
-cmovtnz r m
-cmovtnz m r
-cmovtnz m i
-cmovtnz m m
-
-xchg r r
-xchg r i
-xchg r m
-xchg m r
-xchg m i
-xchg m m
-cxchgz r r
-cxchgz r i
-cxchgz r m
-cxchgz m r
-cxchgz m i
-cxchgz m m
-cxchgnz r r
-cxchgnz r i
-cxchgnz r m
-cxchgnz m r
-cxchgnz m i
-cxchgnz m m
-
-lea r m
-lea m m
-cleaz r m
-cleaz m m
-cleanz r m
-cleanz m m
->>>>>>> Stashed changes
+cmovbnz rm rim
+cmovwnz rm rim
+cmovlnz rm rim
+cmovtnz rm rim
 
 #
 # Stack manipulation instructions

pc/regs.h

@@ -35,10 +35,8 @@ enum
 #define cr2 R(CR2)
 #define cr3 R(CR3)
 
-    SA0, SA1,
-    SA2, SA3,
-    SA4, SA5,
-    SA6, SA7,
+    SA0, SA1, SA2, SA3,
+    SA4, SA5, SA6, SA7,
 
     NREGS
 };