mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 12:54:27 +00:00
amd64 gdt_segs: use designated initializers
Sponsored by: The FreeBSD Foundation MFC after: 3 days
This commit is contained in:
parent
be707ee095
commit
1d6230b07f
|
@ -354,8 +354,8 @@ CTASSERT(sizeof(struct nmi_pcpu) == 16);
|
|||
* slots as corresponding segments for i386 kernel.
|
||||
*/
|
||||
struct soft_segment_descriptor gdt_segs[] = {
|
||||
/* GNULL_SEL 0 Null Descriptor */
|
||||
{ .ssd_base = 0x0,
|
||||
[GNULL_SEL] = { /* 0 Null Descriptor */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0x0,
|
||||
.ssd_type = 0,
|
||||
.ssd_dpl = 0,
|
||||
|
@ -363,8 +363,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 0 },
|
||||
/* GNULL2_SEL 1 Null Descriptor */
|
||||
{ .ssd_base = 0x0,
|
||||
[GNULL2_SEL] = { /* 1 Null Descriptor */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0x0,
|
||||
.ssd_type = 0,
|
||||
.ssd_dpl = 0,
|
||||
|
@ -372,8 +372,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 0 },
|
||||
/* GUFS32_SEL 2 32 bit %gs Descriptor for user */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUFS32_SEL] = { /* 2 32 bit %gs Descriptor for user */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMRWA,
|
||||
.ssd_dpl = SEL_UPL,
|
||||
|
@ -381,8 +381,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 1,
|
||||
.ssd_gran = 1 },
|
||||
/* GUGS32_SEL 3 32 bit %fs Descriptor for user */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUGS32_SEL] = { /* 3 32 bit %fs Descriptor for user */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMRWA,
|
||||
.ssd_dpl = SEL_UPL,
|
||||
|
@ -390,8 +390,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 1,
|
||||
.ssd_gran = 1 },
|
||||
/* GCODE_SEL 4 Code Descriptor for kernel */
|
||||
{ .ssd_base = 0x0,
|
||||
[GCODE_SEL] = { /* 4 Code Descriptor for kernel */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMERA,
|
||||
.ssd_dpl = SEL_KPL,
|
||||
|
@ -399,8 +399,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 1,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 1 },
|
||||
/* GDATA_SEL 5 Data Descriptor for kernel */
|
||||
{ .ssd_base = 0x0,
|
||||
[GDATA_SEL] = { /* 5 Data Descriptor for kernel */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMRWA,
|
||||
.ssd_dpl = SEL_KPL,
|
||||
|
@ -408,8 +408,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 1,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 1 },
|
||||
/* GUCODE32_SEL 6 32 bit Code Descriptor for user */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUCODE32_SEL] = { /* 6 32 bit Code Descriptor for user */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMERA,
|
||||
.ssd_dpl = SEL_UPL,
|
||||
|
@ -417,8 +417,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 1,
|
||||
.ssd_gran = 1 },
|
||||
/* GUDATA_SEL 7 32/64 bit Data Descriptor for user */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUDATA_SEL] = { /* 7 32/64 bit Data Descriptor for user */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMRWA,
|
||||
.ssd_dpl = SEL_UPL,
|
||||
|
@ -426,8 +426,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 1,
|
||||
.ssd_gran = 1 },
|
||||
/* GUCODE_SEL 8 64 bit Code Descriptor for user */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUCODE_SEL] = { /* 8 64 bit Code Descriptor for user */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0xfffff,
|
||||
.ssd_type = SDT_MEMERA,
|
||||
.ssd_dpl = SEL_UPL,
|
||||
|
@ -435,8 +435,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 1,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 1 },
|
||||
/* GPROC0_SEL 9 Proc 0 Tss Descriptor */
|
||||
{ .ssd_base = 0x0,
|
||||
[GPROC0_SEL] = { /* 9 Proc 0 TSS Descriptor */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = sizeof(struct amd64tss) + IOPERM_BITMAP_SIZE - 1,
|
||||
.ssd_type = SDT_SYSTSS,
|
||||
.ssd_dpl = SEL_KPL,
|
||||
|
@ -444,8 +444,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 0 },
|
||||
/* Actually, the TSS is a system descriptor which is double size */
|
||||
{ .ssd_base = 0x0,
|
||||
[GPROC0_SEL + 1] = { /* 10 Proc 0 TSS descriptor, double size */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0x0,
|
||||
.ssd_type = 0,
|
||||
.ssd_dpl = 0,
|
||||
|
@ -453,8 +453,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 0 },
|
||||
/* GUSERLDT_SEL 11 LDT Descriptor */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUSERLDT_SEL] = { /* 11 LDT Descriptor */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0x0,
|
||||
.ssd_type = 0,
|
||||
.ssd_dpl = 0,
|
||||
|
@ -462,8 +462,8 @@ struct soft_segment_descriptor gdt_segs[] = {
|
|||
.ssd_long = 0,
|
||||
.ssd_def32 = 0,
|
||||
.ssd_gran = 0 },
|
||||
/* GUSERLDT_SEL 12 LDT Descriptor, double size */
|
||||
{ .ssd_base = 0x0,
|
||||
[GUSERLDT_SEL + 1] = { /* 12 LDT Descriptor, double size */
|
||||
.ssd_base = 0x0,
|
||||
.ssd_limit = 0x0,
|
||||
.ssd_type = 0,
|
||||
.ssd_dpl = 0,
|
||||
|
|
Loading…
Reference in a new issue