Changeset a6d4ceb in mainline for arch/amd64

Timestamp:

2006-04-13T14:27:30Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

963074b3

Parents:

1ace9ea

Message:

Move arch/thread.h to arch/proc/thread.h on all architectures.
Replace ARCH_THREAD_DATA with new thread_arch_t arch on all architectures.
Similarily, add task_arch_t arch on all architectures.
On amd64 and ia32, grow the TSS segment by 64K + 1B to support IO port
permission bitmap. For the same reason, define per task IO port permission bitmaps
on ia32 and amd64.

Location:

arch/amd64

Files:

• include/pm.h (modified) (1 diff)
• include/proc/task.h (added)
• include/proc/thread.h (moved) (moved from arch/amd64/include/thread.h ) (1 diff)
• src/amd64.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

arch/amd64/include/pm.h

@@ -139 +139 @@
         __u64 reserve3;
         __u16 reserve4;
-        __u16 iomap;
+        __u16 iomap_base;
+        __u8 iomap[0x10000 + 1];        /* 64K + 1 terminating byte */
 } __attribute__ ((packed));
 

arch/amd64/include/proc/thread.h

@@ -30 +30 @@
 #define __amd64_THREAD_H__
 
-#define ARCH_THREAD_DATA __native tls;
+#include <arch/types.h>
+
+typedef struct {
+        __native tls;
+} thread_arch_t;
 
 #endif

arch/amd64/src/amd64.c

@@ -174 +174 @@
 __native sys_tls_set(__native addr)
 {
-        THREAD->tls = addr;
+        THREAD->arch.tls = addr;
         write_msr(AMD_MSR_FS, addr);
         return 0;

arch/amd64/src/proc/scheduler.c

@@ -48 +48 @@
 
         /* TLS support - set FS to thread local storage */
-        write_msr(AMD_MSR_FS, THREAD->tls);
+        write_msr(AMD_MSR_FS, THREAD->arch.tls);
 
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT

arch/amd64/src/proc/thread.c

@@ -35 +35 @@
 void thread_create_arch(thread_t *t)
 {
-        t->tls = 0;
+        t->arch.tls = 0;
 }