Changeset 7017 for branches

Timestamp:

Aug 7, 2007, 7:35:23 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

Changes for x8632.

Location:

branches/ia32/lisp-kernel

Files:

• image.c (modified) (1 diff)
• lisp-debug.c (modified) (2 diffs)
• lisp_globals.h (modified) (1 diff)
• lisptypes.h (modified) (1 diff)
• pmcl-kernel.c (modified) (2 diffs)
• thread_manager.c (modified) (1 diff)
• x86-constants32.h (modified) (5 diffs)
• x86-exceptions.h (modified) (1 diff)

branches/ia32/lisp-kernel/image.c

@@ -27 +27 @@
 
 
-#ifdef PPC64
+#if defined(PPC64) || defined(X8632)
 #define RELOCATABLE_FULLTAG_MASK \
   ((1<<fulltag_cons)|(1<<fulltag_misc))

branches/ia32/lisp-kernel/lisp-debug.c

@@ -107 +107 @@
                      "rbp", "rsp", "r8 ", "r9 ", "r10", "r11", "r12", "r13",
                      "r14", "r15", "rip", "rfl"};
+#endif
+#endif
+
+#ifdef X8632
+#ifdef DARWIN
+char *Iregnames[] = {"eax", "ebx", "ecx", "edx", "edi", "esi",
+                     "ebp", "???", "efl", "eip"};
 #endif
 #endif
@@ -564 +571 @@
           xpGPR(xp, Iip), xpGPR(xp, Iflags));
 #endif
+
+#ifdef X8632
+  fprintf(stderr, "%%eax = 0x%08X  %%ebx = 0x%08X\n  %%ecx = 0x%08X  %%edx = 0x%08X\n",
+          xpGPR(xp, REG_EAX), xpGPR(xp, REG_EBX), xpGPR(xp, REG_ECX), xpGPR(xp, REG_EDX));
+  fprintf(stderr, "%%edi = 0x%08X  %%esi = 0x%08X\n  %%ebp = 0x%08X  %%esp = 0x%08X\n",
+          xpGPR(xp, REG_EDI), xpGPR(xp, REG_ESI), xpGPR(xp, REG_EBP), xpGPR(xp, REG_ESP));
+  fprintf(stderr, "%%eip = 0x%08X  %%eflags = 0x%08X\n",
+          xpGPR(xp, REG_EIP), xpGPR(xp, REG_EFL));
+#endif
+
   return debug_continue;
 }

branches/ia32/lisp-kernel/lisp_globals.h

@@ -87 +87 @@
 #endif
 
+/* xxx not sure about this... */
+#ifdef X8632
+#define lisp_global(g) (((LispObj *) 0x3000)[(g)])
+#define nrs_symbol(s) (((lispsymbol *) 0x3008)[(s)])
+#endif
 
 #define nrs_T                           (nrs_symbol(0))         /* t */

branches/ia32/lisp-kernel/lisptypes.h

@@ -146 +146 @@
 #endif /* _STRUCT_MCONTEXT64 */
 #endif /* X86_64 */
+
+#ifdef X8632
+/* Assume rational <i386/ucontext.h> */
+typedef mcontext_t MCONTEXT_T;
+typedef ucontext_t ExceptionInformation;
+#endif
+
 #endif /* #ifdef DARWIN */
 

branches/ia32/lisp-kernel/pmcl-kernel.c

@@ -89 +89 @@
 Boolean running_under_rosetta = false;
 
-#if WORD_SIZE == 64
+#if WORD_SIZE == 64 || defined(X8632)
 /* Assume that if the OS is new enough to support PPC64/X8664, it has
    a reasonable dlfcn.h
@@ -1838 +1838 @@
 #endif
 #ifdef DARWIN
-#if defined(PPC64) || defined(X8664)
+#if defined(PPC64) || defined(X86)
   if (handle == NULL) {
     handle = RTLD_DEFAULT;

branches/ia32/lisp-kernel/thread_manager.c

@@ -1025 +1025 @@
 #ifdef X8664
 #define NSAVEREGS 4
+#endif
+#ifdef X8632
+#define NSAVEREGS 0
 #endif
     for (i = 0; i < NSAVEREGS; i++) {

branches/ia32/lisp-kernel/x86-constants32.h

@@ -7 +7 @@
 #define REG_EDI 4
 #define REG_ESI 5
-#define REG_EAX 6
-#define REG_EBP 7
+#define REG_EBP 6
+#define REG_ESP 7
 #define REG_EFL 9
 #define REG_EIP 10
@@ -40 +40 @@
 
 #define tag_fixnum 0
-#define tag_lis 1
+#define tag_list 1
 #define tag_misc 2
 #define tag_imm 3
@@ -119 +119 @@
 #define subtag_istruct NODE_SUBTAG(16)
 #define max_non_array_node_subtag ((19<<ntagbits)|fulltag_immheader)
+
+/* xxx confused about this */
+#define unbound SUBTAG(fulltag_imm, 6)
+#define undefined unbound
+#define unbound_marker unbound
+#define subtag_character SUBTAG(fulltag_imm, 9)
+#define slot_unbound SUBTAG(fulltag_imm, 10)
+#define slot_unbound_marker slot_unbound
+#define no_thread_local_binding_marker SUBTAG(fulltag_imm,30)
+
 
 typedef struct cons {
@@ -365 +375 @@
     void *resume;                 /* resumption semaphore */
     natural flags;
-    ExceptionInformation* gc_context;
+    ExceptionInformation *gc_context;
     void *termination_semaphore;
     signed_natural unwinding;
@@ -377 +387 @@
 #define nil_value (0x3000 + (fulltag_cons))
 #define t_value (0x3008 + (fulltag_misc))
+#define misc_header_offset -fulltag_misc
+#define misc_data_offset misc_header_offset + node_size
 
 #define heap_segment_size 0x00010000

branches/ia32/lisp-kernel/x86-exceptions.h

@@ -38 +38 @@
 #define xpFPRvector(x) ((natural *)(&(UC_MCONTEXT(x)->__fs.__fpu_xmm0)))
 #define xpMMXreg(x,n)  (xpFPRvector(x)[n])
+#else /* X8632 */
+#define xpGPRvector(x) ((natural *)(&((x)->uc_mcontext->ss)))
+#define xpGPR(x,gprno) (xpGPRvector(x)[gprno])
+#define set_xpGPR(x,gpr,new) xpGPR((x),(gpr)) = (natural)(new)
+#define xpPC(x) (xpGPR(x,Iip))
+#define xpFPRvector(x) ((natural *)(&((x)->uc_mcontext->fs.fpu_xmm0)))
 #endif
 #include <mach/mach.h>