X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-lispregs.h;h=1ba8fab1cf9dfba8263880036cce5e4ee9d55fdb;hb=ed1910efb36f71b5ebe33b5ffffd7195e15644de;hp=817a9aeda438695e14c79f67636f82d246296d30;hpb=ded744f74ab2f1a97679ad4f91e0eb8d995daef2;p=sbcl.git

diff --git a/src/runtime/ppc-lispregs.h b/src/runtime/ppc-lispregs.h
index 817a9ae..1ba8fab 100644
--- a/src/runtime/ppc-lispregs.h
+++ b/src/runtime/ppc-lispregs.h
@@ -1,65 +1,78 @@
 #if defined LISP_FEATURE_DARWIN
 #if defined LANGUAGE_ASSEMBLY
 #define REG(num) r##num
+#define FREG(num) f##num
 #else
 #define REG(num) num
+#define FREG(num) num
 #endif
 #else
 #define REG(num) num
+#define FREG(num) num
 #endif
 
 #define NREGS 32
 
-#define reg_ZERO      REG(0)	/* Should always contain 0 in lisp */
-#define reg_NSP       REG(1)	/* The number/C stack pointer */
-#define reg_POLL      REG(2)	/* Lisp preemption/Mystery SVR4 ABI reg */
-#define reg_NL0       REG(3)	/* FF param/result 1 */
-#define reg_NL1       REG(4)	/* FF param/result 2 */
-#define reg_NL2       REG(5)	/* FF param 3 */
+#define reg_ZERO      REG(0)    /* Should always contain 0 in lisp */
+#define reg_NSP       REG(1)    /* The number/C stack pointer */
+#define reg_POLL      REG(2)    /* Lisp preemption/Mystery SVR4 ABI reg */
+#define reg_NL0       REG(3)    /* FF param/result 1 */
+#define reg_NL1       REG(4)    /* FF param/result 2 */
+#define reg_NL2       REG(5)    /* FF param 3 */
 #define reg_NL3       REG(6)
 #define reg_NL4       REG(7)
 #define reg_NL5       REG(8)
-#define reg_NL6       REG(9) 	/* Last (7th) FF param */
+#define reg_NL6       REG(9)    /* Last (7th) FF param */
 #define reg_FDEFN     REG(10)   /* was NL7 until recently -dan */
 #define reg_NARGS     REG(11)
 #ifdef LISP_FEATURE_DARWIN
-#define reg_CFUNC     REG(12)	/* Silly to blow a reg on FF-name */
-#define reg_NFP       REG(13)	/* Lisp may save around FF-call */
+#define reg_CFUNC     REG(12)   /* Silly to blow a reg on FF-name */
+#define reg_NFP       REG(13)   /* Lisp may save around FF-call */
 #else
-#define reg_NFP       REG(12)	/* Lisp may save around FF-call */
-#define reg_CFUNC     REG(13)	/* Silly to blow a reg on FF-name */
+#define reg_NFP       REG(12)   /* Lisp may save around FF-call */
+#define reg_CFUNC     REG(13)   /* Silly to blow a reg on FF-name */
 #endif
 #define reg_BSP       REG(14)   /* Binding stack pointer */
-#define reg_CFP       REG(15)	/* Control/value stack frame pointer */
-#define reg_CSP       REG(16)	/* Control/value stack top */
-#define reg_ALLOC     REG(17)	/* (Global) dynamic free pointer */
-#define reg_NULL      REG(18)	/* NIL and globals nearby */
-#define reg_CODE      REG(19)	/* Current function object */
-#define reg_CNAME     REG(20)	/* Current function name */
-#define reg_LEXENV    REG(21)	/* And why burn a register for this ? */
+#define reg_CFP       REG(15)   /* Control/value stack frame pointer */
+#define reg_CSP       REG(16)   /* Control/value stack top */
+#define reg_ALLOC     REG(17)   /* (Global) dynamic free pointer */
+#define reg_NULL      REG(18)   /* NIL and globals nearby */
+#define reg_CODE      REG(19)   /* Current function object */
+#define reg_CNAME     REG(20)   /* Current function name */
+#define reg_LEXENV    REG(21)   /* And why burn a register for this ? */
 #define reg_OCFP      REG(22)   /* The caller's reg_CFP */
-#define reg_LRA       REG(23)	/* Tagged lisp return address */
-#define reg_A0        REG(24)	/* First function arg/return value */
-#define reg_A1        REG(25)	/* Second. */
-#define reg_A2        REG(26)	/*  */
-#define reg_A3        REG(27)	/* Last of (only) 4 arg regs */
-#define reg_L0	      REG(28)	/* Tagged temp regs */
+#define reg_LRA       REG(23)   /* Tagged lisp return address */
+#define reg_A0        REG(24)   /* First function arg/return value */
+#define reg_A1        REG(25)   /* Second. */
+#define reg_A2        REG(26)   /*  */
+#define reg_A3        REG(27)   /* Last of (only) 4 arg regs */
+#define reg_L0        REG(28)   /* Tagged temp regs */
 #define reg_L1        REG(29)
-#define reg_L2        REG(30)	/* Last lisp temp reg */
-#define reg_LIP       REG(31)	/* Lisp Interior Pointer, e.g., locative */
+#ifdef LISP_FEATURE_SB_THREAD
+#define reg_THREAD    REG(30)   /* TLS block pointer */
+#else
+#define reg_L2        REG(30)   /* Last lisp temp reg */
+#endif
+#define reg_LIP       REG(31)   /* Lisp Interior Pointer, e.g., locative */
+
+#ifdef LISP_FEATURE_SB_THREAD
+#define REG30_NAME "THREAD"
+#else
+#define REG30_NAME "L2"
+#endif
 
 #define REGNAMES \
-        "ZERO",		"NSP",	        "???",		"NL0", \
-	"NL1",		"NL2",		"NL3P",		"NL4", \
-        "NL5",		"NL6",		"FDEFN",	"NARGS", \
-        "NFP",		"CFUNC",	"BSP",		"CFP", \
-        "CSP",		"ALLOC",	"NULL",		"CODE", \
-        "CNAME",	"LEXENV",	"OCFP",		"LRA", \
-        "A0",	        "A1",	        "A2",		"A3", \
-        "L0",		"L1",		"L2",		"LIP"
+        "ZERO",         "NSP",          "???",          "NL0", \
+        "NL1",          "NL2",          "NL3P",         "NL4", \
+        "NL5",          "NL6",          "FDEFN",        "NARGS", \
+        "NFP",          "CFUNC",        "BSP",          "CFP", \
+        "CSP",          "ALLOC",        "NULL",         "CODE", \
+        "CNAME",        "LEXENV",       "OCFP",         "LRA", \
+        "A0",           "A1",           "A2",           "A3", \
+        "L0",           "L1",           REG30_NAME,     "LIP"
 
 #define BOXED_REGISTERS { \
     reg_FDEFN, reg_CODE, reg_CNAME, reg_LEXENV, reg_OCFP, reg_LRA, \
     reg_A0, reg_A1, reg_A2, reg_A3, \
-    reg_L0, reg_L1, reg_L2 \
+    reg_L0, reg_L1, REG(30) \
 }