wingo pushed a commit to branch lightning
in repository guile.
commit 9a188c1b294dbd3306fff0bb43f27321efd81940
Author: Paolo Bonzini <[email protected]>
Date: Wed Mar 19 09:37:23 2008 +0100
misc. x86-64 bugfixes
2008-03-19 Paolo Bonzini <[email protected]>
* lightning/i386/core-64.h: Misc bugfixes.
---
ChangeLog | 4 ++++
lightning/i386/core-64.h | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 165bc69..cdf0248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-03-19 Paolo Bonzini <[email protected]>
+ * lightning/i386/core-64.h: Misc bugfixes.
+
+2008-03-19 Paolo Bonzini <[email protected]>
+
* lightning/i386/core-i386.c: Remove jit_ldr_i, jit_ldxr_i.
* lightning/i386/core-32.h: Add jit_ldr_i, jit_ldxr_i.
* lightning/i386/core-64.h: Add jit_ld{r,xr,i,xi}_{ui,l,ul};
diff --git a/lightning/i386/core-64.h b/lightning/i386/core-64.h
index 08d686f..8aa5d4a 100644
--- a/lightning/i386/core-64.h
+++ b/lightning/i386/core-64.h
@@ -104,14 +104,14 @@ struct jit_local_state {
/* These can sometimes use byte or word versions! */
#define jit_ori_l(d, rs, is) jit_qop_ ((d), (rs), jit_reduceQ(OR,
(is), (d)), ORQrr(JIT_REXTMP, (d)) )
-#define jit_xori_l(d, rs, is) jit_qop_ ((d), (rs), jit_reduceQ(XOR,
(is), (d)), ORQrr(JIT_REXTMP, (d)) )
+#define jit_xori_l(d, rs, is) jit_qop_ ((d), (rs), jit_reduceQ(XOR,
(is), (d)), XORQrr(JIT_REXTMP, (d)) )
#define jit_lshi_l(d, rs, is) ((is) <= 3 ? LEAQmr(0, 0, (rs), 1 << (is),
(d)) : jit_qop_small ((d), (rs), SHLQir((is), (d)) ))
#define jit_rshi_l(d, rs, is)
jit_qop_small ((d), (rs), SARQir((is), (d)) )
#define jit_rshi_ul(d, rs, is)
jit_qop_small ((d), (rs), SHRQir((is), (d)) )
-#define jit_lshr_l(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_ ((d), (r1), SHLQrr(_CL, (d)) ))
-#define jit_rshr_l(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_ ((d), (r1), SARQrr(_CL, (d)) ))
-#define jit_rshr_ul(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_ ((d), (r1), SHRQrr(_CL, (d)) ))
+#define jit_lshr_l(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_small ((d), (r1), SHLQrr(_CL, (d)) ))
+#define jit_rshr_l(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_small ((d), (r1), SARQrr(_CL, (d)) ))
+#define jit_rshr_ul(d, r1, r2) jit_replace((r1), (r2), _ECX,
jit_qop_small ((d), (r1), SHRQrr(_CL, (d)) ))
/* Stack */
#define jit_pushr_i(rs) PUSHQr(rs)
