#include <unistd.h>
#include <errno.h>
-#include "./signal.h"
#include "os.h"
#include "arch.h"
#include "globals.h"
#include "sbcl.h"
#include <sys/types.h>
-#include <signal.h>
+#include "runtime.h"
#include <sys/time.h>
#include <sys/stat.h>
#include <unistd.h>
#include "thread.h" /* dynamic_values_bytes */
-
+#include "cpputil.h" /* PTR_ALIGN... */
#include "validate.h"
-size_t os_vm_page_size;
-int arch_os_thread_init(struct thread *thread)
+int arch_os_thread_init(struct thread *thread)
{
{
void *top_exception_frame;
void *cur_stack_end;
void *cur_stack_start;
- MEMORY_BASIC_INFORMATION stack_memory;
-
+ MEMORY_BASIC_INFORMATION stack_memory;
+
asm volatile ("movl %%fs:0,%0": "=r" (top_exception_frame));
asm volatile ("movl %%fs:4,%0": "=r" (cur_stack_end));
* because that's only what currently has memory behind
* it from being used, so do a quick VirtualQuery() and
* grab the AllocationBase. -AB 2006/11/25
- */
+ */
+
+ if (!VirtualQuery(&stack_memory, &stack_memory, sizeof(stack_memory))) {
+ fprintf(stderr, "VirtualQuery: 0x%lx.\n", GetLastError());
+ lose("Could not query stack memory information.");
+ }
- if (!VirtualQuery(&stack_memory, &stack_memory, sizeof(stack_memory))) {
- fprintf(stderr, "VirtualQuery: 0x%lx.\n", GetLastError());
- lose("Could not query stack memory information.");
- }
- cur_stack_start = stack_memory.AllocationBase;
+ cur_stack_start = stack_memory.AllocationBase
+ /* Kludge: Elide SBCL's guard page from the range. (The
+ * real solution is to not establish SBCL's guard page in
+ * the first place. The trick will be to find a good time
+ * at which to re-enable the Windows guard page when
+ * returning from it though.) */
+ + os_vm_page_size;
/* We use top_exception_frame rather than cur_stack_end to
* elide the last few (boring) stack entries at the bottom of
}
#ifdef LISP_FEATURE_SB_THREAD
- /* this must be called from a function that has an exclusive lock
- * on all_threads
- */
- struct user_desc ldt_entry = {
- 1, 0, 0, /* index, address, length filled in later */
- 1, MODIFY_LDT_CONTENTS_DATA, 0, 0, 0, 1
- };
- int n;
- get_spinlock(&modify_ldt_lock,thread);
- n=modify_ldt(0,local_ldt_copy,sizeof local_ldt_copy);
- /* get next free ldt entry */
-
- if(n) {
- u32 *p;
- for(n=0,p=local_ldt_copy;*p;p+=LDT_ENTRY_SIZE/sizeof(u32))
- n++;
- }
- ldt_entry.entry_number=n;
- ldt_entry.base_addr=(unsigned long) thread;
- ldt_entry.limit=dynamic_values_bytes;
- ldt_entry.limit_in_pages=0;
- if (modify_ldt (1, &ldt_entry, sizeof (ldt_entry)) != 0) {
- modify_ldt_lock=0;
- /* modify_ldt call failed: something magical is not happening */
- return -1;
- }
- __asm__ __volatile__ ("movw %w0, %%fs" : : "q"
- ((n << 3) /* selector number */
- + (1 << 2) /* TI set = LDT */
- + 3)); /* privilege level */
- thread->tls_cookie=n;
- modify_ldt_lock=0;
-
- if(n<0) return 0;
+ TlsSetValue(OUR_TLS_INDEX,thread);
#endif
-
return 1;
}
return 0;
}
+#if defined(LISP_FEATURE_SB_THREAD)
+sigset_t *os_context_sigmask_addr(os_context_t *context)
+{
+ return &context->sigmask;
+}
+#endif
+
os_context_register_t *
os_context_register_addr(os_context_t *context, int offset)
{
- switch(offset) {
- case reg_EAX: return &context->Eax;
- case reg_ECX: return &context->Ecx;
- case reg_EDX: return &context->Edx;
- case reg_EBX: return &context->Ebx;
- case reg_ESP: return &context->Esp;
- case reg_EBP: return &context->Ebp;
- case reg_ESI: return &context->Esi;
- case reg_EDI: return &context->Edi;
- default: return 0;
- }
+ static const size_t offsets[8] = {
+ offsetof(CONTEXT,Eax),
+ offsetof(CONTEXT,Ecx),
+ offsetof(CONTEXT,Edx),
+ offsetof(CONTEXT,Ebx),
+ offsetof(CONTEXT,Esp),
+ offsetof(CONTEXT,Ebp),
+ offsetof(CONTEXT,Esi),
+ offsetof(CONTEXT,Edi),
+ };
+ return
+ (offset >= 0 && offset < 16) ?
+ ((void*)(context->win32_context)) + offsets[offset>>1] : 0;
}
os_context_register_t *
os_context_pc_addr(os_context_t *context)
{
- return &context->Eip; /* REG_EIP */
+ return (void*)&context->win32_context->Eip; /* REG_EIP */
}
os_context_register_t *
os_context_sp_addr(os_context_t *context)
{
- return &context->Esp; /* REG_UESP */
+ return (void*)&context->win32_context->Esp; /* REG_UESP */
}
os_context_register_t *
os_context_fp_addr(os_context_t *context)
{
- return &context->Ebp; /* REG_EBP */
+ return (void*)&context->win32_context->Ebp; /* REG_EBP */
}
unsigned long
os_context_fp_control(os_context_t *context)
{
- return ((((context->FloatSave.ControlWord) & 0xffff) ^ 0x3f) |
- (((context->FloatSave.StatusWord) & 0xffff) << 16));
+ return ((((context->win32_context->FloatSave.ControlWord) & 0xffff) ^ 0x3f) |
+ (((context->win32_context->FloatSave.StatusWord) & 0xffff) << 16));
}
void
os_restore_fp_control(os_context_t *context)
{
- asm ("fldcw %0" : : "m" (context->FloatSave.ControlWord));
+ asm ("fldcw %0" : : "m" (context->win32_context->FloatSave.ControlWord));
}
void