Date: Tue, 22 Apr 2003 14:23:29 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 29453 for review Message-ID: <200304222123.h3MLNTZA002818@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=29453 Change 29453 by peter@peter_overcee on 2003/04/22 14:22:37 renumber GUCODE/GUDATA - XXX GUDATA isn't needed in long mode. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#16 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#68 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#16 (text+ko) ==== @@ -176,10 +176,10 @@ #define GNULL_SEL 0 /* Null Descriptor */ #define GCODE_SEL 1 /* Kernel Code Descriptor */ #define GDATA_SEL 2 /* Kernel Data Descriptor */ -#define GPROC0_SEL 3 /* Task state process slot zero and up */ -/* slot 4 is second half of GPROC0_SEL */ -#define GUCODE_SEL 5 /* User Code Descriptor */ -#define GUDATA_SEL 6 /* User Data Descriptor */ +#define GUCODE_SEL 3 /* User Code Descriptor */ +#define GUDATA_SEL 4 /* User Data Descriptor */ +#define GPROC0_SEL 5 /* TSS for entering kernel etc */ +/* slot 6 is second half of GPROC0_SEL */ #define NGDT 7 #ifdef _KERNEL ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#68 (text+ko) ==== @@ -584,7 +584,25 @@ 1, /* long */ 1, /* default 32 vs 16 bit size */ 1 /* limit granularity (byte/page units)*/ }, -/* GPROC0_SEL 3 Proc 0 Tss Descriptor */ +/* GUCODE_SEL 3 Code Descriptor for user */ +{ 0x0, /* segment base address */ + 0xfffff, /* length - all address space */ + SDT_MEMERA, /* segment type */ + SEL_UPL, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 1, /* long */ + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, +/* GUDATA_SEL 4 Code Descriptor for user */ +{ 0x0, /* segment base address */ + 0xfffff, /* length - all address space */ + SDT_MEMRWA, /* segment type */ + SEL_UPL, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 1, /* long */ + 0, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, +/* GPROC0_SEL 5 Proc 0 Tss Descriptor */ { 0x0, /* segment base address */ sizeof(struct x86_64tss)-1,/* length - all address space */ @@ -603,24 +621,6 @@ 0, /* long */ 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, -/* GUCODE_SEL 5 Code Descriptor for user */ -{ 0x0, /* segment base address */ - 0xfffff, /* length - all address space */ - SDT_MEMERA, /* segment type */ - SEL_UPL, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 1, /* long */ - 0, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, -/* GUDATA_SEL 6 Code Descriptor for user */ -{ 0x0, /* segment base address */ - 0xfffff, /* length - all address space */ - SDT_MEMRWA, /* segment type */ - SEL_UPL, /* segment descriptor priority level */ - 1, /* segment descriptor present */ - 1, /* long */ - 0, /* default 32 vs 16 bit size */ - 1 /* limit granularity (byte/page units)*/ }, }; void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304222123.h3MLNTZA002818>