Merge branch 'master' into v2.1
This commit is contained in:
@@ -32,6 +32,7 @@ enum {
|
||||
RID_MAX,
|
||||
RID_ZERO = RID_R0,
|
||||
RID_TMP = RID_RA,
|
||||
RID_GP = RID_R28,
|
||||
|
||||
/* Calling conventions. */
|
||||
RID_RET = RID_R2,
|
||||
@@ -74,10 +75,10 @@ enum {
|
||||
|
||||
/* -- Register sets ------------------------------------------------------- */
|
||||
|
||||
/* Make use of all registers, except ZERO, TMP, SP, SYS1, SYS2 and JGL. */
|
||||
/* Make use of all registers, except ZERO, TMP, SP, SYS1, SYS2, JGL and GP. */
|
||||
#define RSET_FIXED \
|
||||
(RID2RSET(RID_ZERO)|RID2RSET(RID_TMP)|RID2RSET(RID_SP)|\
|
||||
RID2RSET(RID_SYS1)|RID2RSET(RID_SYS2)|RID2RSET(RID_JGL))
|
||||
RID2RSET(RID_SYS1)|RID2RSET(RID_SYS2)|RID2RSET(RID_JGL)|RID2RSET(RID_GP))
|
||||
#define RSET_GPR (RSET_RANGE(RID_MIN_GPR, RID_MAX_GPR) - RSET_FIXED)
|
||||
#if LJ_SOFTFP
|
||||
#define RSET_FPR 0
|
||||
@@ -97,7 +98,7 @@ enum {
|
||||
|
||||
#define RSET_SCRATCH_GPR \
|
||||
(RSET_RANGE(RID_R1, RID_R15+1)|\
|
||||
RID2RSET(RID_R24)|RID2RSET(RID_R25)|RID2RSET(RID_R28))
|
||||
RID2RSET(RID_R24)|RID2RSET(RID_R25))
|
||||
#if LJ_SOFTFP
|
||||
#define RSET_SCRATCH_FPR 0
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user