wingo pushed a commit to branch lightning
in repository guile.
commit 67d0c9a3f1122ab2353e45bdd5bfa2801ba24009
Author: Paolo Bonzini <[email protected]>
Date: Thu Nov 23 09:03:34 2006 +0000
merge from ludovic
Patches applied:
* [email protected]/lightning--stable--1.2--patch-38
Doc: Mention `JIT_R_NUM' and `JIT_V_NUM'.
* [email protected]/lightning--stable--1.2--patch-43
Removed C99/C++ comments from `asm-i386.h'.
git-archimport-id: [email protected]/lightning--stable--1.2--patch-50
---
doc/using.texi | 2 +-
lightning/i386/asm-i386.h | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/doc/using.texi b/doc/using.texi
index 2bc4cf1..173f1e7 100644
--- a/doc/using.texi
+++ b/doc/using.texi
@@ -101,7 +101,7 @@ preserved across function calls (@code{V0}, @code{V1} and
restriction was forced by the need to target CISC architectures
which, like the x86, are poor of registers; anyway, backends can
specify the actual number of available caller- and callee-save
-registers.
+registers with the macros @code{JIT_R_NUM} and @code{JIT_V_NUM}.
In addition, there is a special @code{RET} register which contains the
return value of the current function (@emph{not} the return value of
diff --git a/lightning/i386/asm-i386.h b/lightning/i386/asm-i386.h
index 94d944c..67f44a2 100644
--- a/lightning/i386/asm-i386.h
+++ b/lightning/i386/asm-i386.h
@@ -252,7 +252,7 @@ typedef _uc jit_insn;
#define __REX_reg(RR) (__REXwrxb(0,0,0,00,_BIT(_rXP(RR))))
#define __REX_mem(MB,MI) (__REXwrxb(0,0,0,_BIT(_rXP(MI)),_BIT(_rXP(MB))))
-// FIXME: can't mix new (SPL,BPL,SIL,DIL) with (AH,BH,CH,DH)
+/* FIXME: can't mix new (SPL,BPL,SIL,DIL) with (AH,BH,CH,DH) */
#define _REXBrr(RR,MR)
_m64(__REXw_x_(_r1e8lP(RR)||_r1e8lP(MR),0,RR,0,MR))
#define _REXBmr(MB,MI,RD)
_m64(__REXw_x_(_r1e8lP(RD)||_r1e8lP(MB),0,RD,_BIT(_rXP(MI)),MB))
#define _REXBrm(RS,MB,MI) _REXBmr(MB,MI,RS)
@@ -896,12 +896,14 @@ enum {
/* _format
Opcd ,Mod ,r ,m ,mem=dsp+sib ,imm... */
-// FIXME: no prefix is availble to encode a 32-bit operand size in 64-bit mode
+/* FIXME: no prefix is availble to encode a 32-bit operand size in 64-bit
+ mode */
#define CALLm(M) _O_D32
(0xe8 ,(int)(M) )
#define CALLLsr(R) (_REXLrr(0, R), _O_Mrm
(0xff ,_b11,_b010,_r4(R) ))
#define CALLsm(D,B,I,S) (_REXLrm(0, B, I),
_O_r_X (0xff ,_b010 ,(int)(D),B,I,S
))
-// FIXME: no prefix is availble to encode a 32-bit operand size in 64-bit mode
+/* FIXME: no prefix is availble to encode a 32-bit operand size in 64-bit
+ mode */
#define JMPSm(M) _O_D8
(0xeb ,(int)(M) )
#define JMPm(M)
_O_D32 (0xe9 ,(int)(M)
)
#define JMPLsr(R) (_REXLrr(0, R), _O_Mrm
(0xff ,_b11,_b100,_r4(R) ))