wingo pushed a commit to branch lightning
in repository guile.
commit 3b4343ec476a62cbeb9cb5b67618da8fced75301
Author: Paolo Bonzini <[email protected]>
Date: Thu Feb 14 09:55:57 2008 +0100
avoid redefinition of _r1
2008-02-13 Paolo Bonzini <[email protected]>
* lightning/i386/asm-32.h: Avoid redefinition of _r1, reported by
Sam Steingold.
* lightning/i386/asm-64.h: Likewise.
---
ChangeLog | 6 ++++++
lightning/i386/asm-32.h | 3 +++
lightning/i386/asm-64.h | 2 ++
3 files changed, 11 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 9e2dca4..9b6879c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-13 Paolo Bonzini <[email protected]>
+
+ * lightning/i386/asm-32.h: Avoid redefinition of _r1, reported by
+ Sam Steingold.
+ * lightning/i386/asm-64.h: Likewise.
+
2008-02-08 Paolo Bonzini <[email protected]>
* lightning/i386/asm-i386.h: Don't define _VOID, reported
diff --git a/lightning/i386/asm-32.h b/lightning/i386/asm-32.h
index f629839..ac1e55b 100644
--- a/lightning/i386/asm-32.h
+++ b/lightning/i386/asm-32.h
@@ -45,7 +45,10 @@
#include "asm-i386.h"
+#if defined(_ASM_SAFETY)
#define _r1(R) ( ((R) & ~3) == _AL || ((R) & ~3) == _AH ? _rN(R) :
JITFAIL( "8-bit register required"))
+#endif
+
#define _rA(R) _r4(R)
/* Use RIP-addressing in 64-bit mode, if possible */
diff --git a/lightning/i386/asm-64.h b/lightning/i386/asm-64.h
index 0efcfc3..0ee2e50 100644
--- a/lightning/i386/asm-64.h
+++ b/lightning/i386/asm-64.h
@@ -127,6 +127,7 @@
#define _R15 0x4F
#define _RIP -2
+#if defined(_ASM_SAFETY)
#define _r1(R) ( ((unsigned) _rC((R) - 16)) < (0x30 - 16) ?
_rN(R) : JITFAIL( "8-bit register required"))
#if 0
@@ -134,6 +135,7 @@
#else
#define _r8(R) ( (_rC(R) == 0x50) ? _rN(R) :
_r4(R))
#endif
+#endif
#define _r1e8lP(R) ((int)(R) >= _SPL && (int)(R) <= _DIL)
