wingo pushed a commit to branch lightning
in repository guile.
commit 065bc52d7faef1dd4a9455316d669f6015f9c3ef
Author: Paolo Bonzini <[email protected]>
Date: Mon Oct 30 07:34:05 2006 +0000
Fix assertion failures in i386 movs and movz opcodes
2006-10-30 Paolo Bonzini <[email protected]>
* lightning/i386/asm.h (MOVS*, MOVZ*): Use correct _r[124] macros.
git-archimport-id: [email protected]/lightning--stable--1.2--patch-29
---
ChangeLog | 6 +++++-
lightning/i386/asm.h | 20 ++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 283ab3d..32255d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2006-10-30 Paolo Bonzini <[email protected]>
+
+ * lightning/i386/asm.h (MOVS*, MOVZ*): Use correct _r[124] macros.
+
2006-10-16 Paolo Bonzini <[email protected]>
- * lightning/i386/i386.h (jit_flush_code): Fix syntax error. :-(
+ * lightning/i386/funcs.h (jit_flush_code): Fix syntax error. :-(
2006-07-06 Paolo Bonzini <[email protected]>
Ludovic Courtes <[email protected]>
diff --git a/lightning/i386/asm.h b/lightning/i386/asm.h
index b167705..8a9c581 100644
--- a/lightning/i386/asm.h
+++ b/lightning/i386/asm.h
@@ -570,19 +570,19 @@ typedef _uc jit_insn;
#define MOVLir(IM, R) _Or_L (0xb8,_r4(R)
,IM )
#define MOVLim(IM, MD, MB, MI, MS) _O_X_L (0xc7
,MD,MB,MI,MS ,IM )
-#define MOVZBLrr(RS, RD) _OO_Mrm (0x0fb6
,_b11,_r1(RD),_r1(RS) )
-#define MOVZBLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fb6
,_r1(RD) ,MD,MB,MI,MS )
-#define MOVZBWrr(RS, RD) _wOO_Mrm (0x0fb6
,_b11,_r2(RD),_r2(RS) )
+#define MOVZBLrr(RS, RD) _OO_Mrm (0x0fb6
,_b11,_r4(RD),_r1(RS) )
+#define MOVZBLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fb6
,_r4(RD) ,MD,MB,MI,MS )
+#define MOVZBWrr(RS, RD) _wOO_Mrm (0x0fb6
,_b11,_r2(RD),_r1(RS) )
#define MOVZBWmr(MD, MB, MI, MS, RD) _wOO_r_X (0x0fb6
,_r2(RD) ,MD,MB,MI,MS )
-#define MOVZWLrr(RS, RD) _OO_Mrm (0x0fb7
,_b11,_r1(RD),_r1(RS) )
-#define MOVZWLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fb7
,_r1(RD) ,MD,MB,MI,MS )
+#define MOVZWLrr(RS, RD) _OO_Mrm (0x0fb7
,_b11,_r4(RD),_r2(RS) )
+#define MOVZWLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fb7
,_r4(RD) ,MD,MB,MI,MS )
-#define MOVSBLrr(RS, RD) _OO_Mrm (0x0fbe
,_b11,_r1(RD),_r1(RS) )
-#define MOVSBLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fbe
,_r1(RD) ,MD,MB,MI,MS )
-#define MOVSBWrr(RS, RD) _wOO_Mrm (0x0fbe
,_b11,_r2(RD),_r2(RS) )
+#define MOVSBLrr(RS, RD) _OO_Mrm (0x0fbe
,_b11,_r4(RD),_r1(RS) )
+#define MOVSBLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fbe
,_r4(RD) ,MD,MB,MI,MS )
+#define MOVSBWrr(RS, RD) _wOO_Mrm (0x0fbe
,_b11,_r2(RD),_r1(RS) )
#define MOVSBWmr(MD, MB, MI, MS, RD) _wOO_r_X (0x0fbe
,_r2(RD) ,MD,MB,MI,MS )
-#define MOVSWLrr(RS, RD) _OO_Mrm (0x0fbf
,_b11,_r1(RD),_r1(RS) )
-#define MOVSWLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fbf
,_r1(RD) ,MD,MB,MI,MS )
+#define MOVSWLrr(RS, RD) _OO_Mrm (0x0fbf
,_b11,_r4(RD),_r2(RS) )
+#define MOVSWLmr(MD, MB, MI, MS, RD) _OO_r_X (0x0fbf
,_r4(RD) ,MD,MB,MI,MS )
#define MULBr(RS) _O_Mrm (0xf6
,_b11,_b100 ,_r1(RS) )
