Changeset 7243

Timestamp:

Sep 17, 2007, 5:35:08 PM (13 years ago)

Author:

rme

Message:

Minor IA-32 stuff.

Location:

branches/ia32/lisp-kernel

Files:

• thread_manager.c (modified) (4 diffs)
• x86-constants32.h (modified) (1 diff)
• x86-constants32.s (modified) (1 diff)
• x86-exceptions.h (modified) (1 diff)
• x86-subprims32.s (modified) (1 diff)

branches/ia32/lisp-kernel/thread_manager.c

@@ -554 +554 @@
 #endif
 
-
+#ifdef X8632
+#ifdef DARWIN
+#include <architecture/i386/table.h>
+#include <architecture/i386/sel.h>
+#include <i386/user_ldt.h>
+
+void setup_tcr_extra_segment(TCR *tcr)
+{
+    unsigned int *addr = (unsigned int *)tcr;
+    unsigned int size = sizeof(TCR);
+    ldt_entry_t desc;
+    sel_t sel;
+    int i;
+
+    desc.data.limit00 = (size - 1) & 0xffff;
+    desc.data.limit16 = ((size - 1) >> 16) & 0xf;
+    desc.data.base00 = addr & 0xfff;
+    desc.data.base16 = (addr >> 16) & 0xff;
+    desc.data.base24 = (addr >> 24) & 0xff;
+    desc.data.type = DESC_DATA_WRITE;
+    desc.data.dpl = USER_PRIV;
+    desc.data.present = 1;
+    desc.data.stksz = DESC_CODE_32B;
+    desc.data.granular = DESC_GRAN_BYTE;
+    
+    i = i386_set_ldt(LDT_AUTO_ALLOC, &desc, 1);
+
+    if (i < 0) {
+        perror("i386_set_ldt");
+    } else {
+        sel.index = i;
+        sel.rpl = USER_PRIV;
+        sel.ti = SEL_LDT;
+        tcr->ldt_index = i;
+    }
+}
+#endif
+#endif
 
 /*
@@ -578 +615 @@
 #else
   TCR *tcr = allocate_tcr();
+#ifdef X8632
+  setup_tcr_extra_segment(tcr);
+#endif
 #endif
 
@@ -646 +686 @@
       ((void (*)())ptr_from_lispobj(callback_ptr))(1);
       tsd_set(lisp_global(TCR_KEY), NULL);
+      /* x8632: remove segment descriptor here? */
     }
 #ifdef DARWIN
@@ -757 +798 @@
   tcr->errno_loc = &errno;
   tsd_set(lisp_global(TCR_KEY), TCR_TO_TSD(tcr));
+  /* x8632: load %fs here? */
 #ifdef DARWIN
   extern Boolean use_mach_exception_handling;

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

@@ -384 +384 @@
     void *safe_ref_address;
     int ldt_index;
+    int ldt_selector;
 } TCR;
 

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

@@ -36 +36 @@
 fulltag_misc = 6
 fulltag_immheader = 7
+
+TCR_BIAS = 0
+                
+/*  Thread context record.  */
+
+        _struct(tcr,TCR_BIAS)
+         _node(prev)            /* in doubly-linked list   */
+         _node(next)            /* in doubly-linked list   */
+         _word(node_regs_mask)
+         _node(linear)          /* our linear (non-segment-based) address.   */
+         _node(save_ebp)        /* lisp EBP when in foreign code    */
+         _word(lisp_mxcsr)
+         _word(foreign_mxcsr)   
+         _node(db_link)         /* special binding chain head   */
+         _node(catch_top)       /* top catch frame   */
+         _node(save_vsp)        /* VSP when in foreign code   */
+         _node(save_tsp)        /* TSP when in foreign code   */
+         _node(foreign_sp)      /* Saved foreign SP when in lisp code   */
+         _node(cs_area)         /* cstack area pointer   */
+         _node(vs_area)         /* vstack area pointer   */
+         _node(ts_area)         /* tstack area pointer   */
+         _node(cs_limit)        /* cstack overflow limit   */
+         _word(bytes_consed_low)
+         _word(bytes_consed_high)
+         _node(log2_allocation_quantum)
+         _node(interrupt_pending)
+         _node(xframe)          /* per-thread exception frame list   */
+         _node(errno_loc)       /* per-thread  errno location   */
+         _node(ffi_exception)   /* mxcsr exception bits from ff-call   */
+         _node(osid)            /* OS thread id   */
+         _node(valence)         /* odd when in foreign code       */
+         _node(foreign_exception_status)
+         _node(native_thread_info)
+         _node(native_thread_id)
+         _node(last_allocptr)
+         _node(save_allocptr)
+         _node(save_allocbase)
+         _node(reset_completion)
+         _node(activate)
+         _node(suspend_count)
+         _node(suspend_context)
+         _node(pending_exception_context)
+         _node(suspend)         /* semaphore for suspension notify   */
+         _node(resume)          /* sempahore for resumption notify   */
+         _node(flags)      
+         _node(gc_context)
+         _node(termination_semaphore)
+         _node(unwinding)
+         _node(tlb_limit)
+         _node(tlb_pointer)     /* Consider using tcr+N as tlb_pointer   */
+         _node(shutdown_count)
+         _node(next_tsp)
+         _node(safe_ref_address)
+         _word(ldt_index)
+         _word(ldt_selector)
+        _ends

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

@@ -167 +167 @@
 #define RECOVER_FN_FROM_RIP_WORD0 0x8d4c /* 0x4c 0x8d, little-endian */
 #define RECOVER_FN_FROM_RIP_BYTE2 0x2d  /* third byte of opcode */
+
+#ifdef X8632
+/* The 32-bit immediate value in the instruction
+ * "(mov ($ 0x12345678) (% fn))" at a tagged return address
+ * refers to the associated function.
+ */
+#define RECOVER_FN_OPCODE 0xbf
+#define RECOVER_FN_LENGTH 5
+#endif

branches/ia32/lisp-kernel/x86-subprims32.s

@@ -31 +31 @@
         __(movl $TCR_STATE_FOREIGN, %rcontext:tcr.valence)
         __(emms)
-        __(add $12, %sp)        /* discard alignment space */
+        __(add $12, %esp)       /* discard alignment space */
         __(pop %ebx)
         __(pop %esi)