Skip to content

X
xv6-public
提交 7b644318 创建 作者: rsc's avatar rsc
浏览文件
操作

clean up %fs %gs use

上级 e97519a6
隐藏空白字符变更
内嵌 并排
正在显示 包含 5 行增加 和 8 行删除
bootasm.S
浏览文件 @ 7b644318
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#define SEG_KCODE 1 // kernel code #define SEG_KCODE 1 // kernel code
#define SEG_KDATA 2 // kernel data+stack #define SEG_KDATA 2 // kernel data+stack
#define SEG_KCPU 3 // kernel per-cpu data
#define CR0_PE 1 // protected mode enable bit #define CR0_PE 1 // protected mode enable bit
...@@ -63,7 +62,7 @@ start32: ...@@ -63,7 +62,7 @@ start32:
movw %ax, %ds # -> DS: Data Segment movw %ax, %ds # -> DS: Data Segment
movw %ax, %es # -> ES: Extra Segment movw %ax, %es # -> ES: Extra Segment
movw %ax, %ss # -> SS: Stack Segment movw %ax, %ss # -> SS: Stack Segment
movw $(SEG_KCPU<<3), %ax # Our per-cpu segment selector movw $0, %ax # Zero segments not ready for use
movw %ax, %fs # -> FS movw %ax, %fs # -> FS
movw %ax, %gs # -> GS movw %ax, %gs # -> GS
......
proc.c
浏览文件 @ 7b644318
...@@ -93,9 +93,9 @@ ksegment(void) ...@@ -93,9 +93,9 @@ ksegment(void)
c1->gdt[SEG_UDATA] = SEG_NULL; c1->gdt[SEG_UDATA] = SEG_NULL;
c1->gdt[SEG_TSS] = SEG_NULL; c1->gdt[SEG_TSS] = SEG_NULL;
lgdt(c1->gdt, sizeof(c1->gdt)); lgdt(c1->gdt, sizeof(c1->gdt));
loadfsgs(SEG_KCPU << 3);
// Initialize cpu-local variables. // Initialize cpu-local variables.
setgs(SEG_KCPU << 3);
c = c1; c = c1;
cp = 0; cp = 0;
} }
......
trapasm.S
浏览文件 @ 7b644318
...@@ -13,10 +13,7 @@ alltraps: ...@@ -13,10 +13,7 @@ alltraps:
pushal pushal
# Set up data and per-cpu segments. # Set up data and per-cpu segments.
# Can find out KDATA from %ss.
# Assume that KCPU is KDATA+1.
movw $(SEG_KDATA<<3), %ax movw $(SEG_KDATA<<3), %ax
movw %ss, %ax
movw %ax, %ds movw %ax, %ds
movw %ax, %es movw %ax, %es
movw $(SEG_KCPU<<3), %ax movw $(SEG_KCPU<<3), %ax
......
x86.h
浏览文件 @ 7b644318
...@@ -104,9 +104,10 @@ xchg(volatile uint *addr, uint newval) ...@@ -104,9 +104,10 @@ xchg(volatile uint *addr, uint newval)
} }
static inline void static inline void
setgs(ushort gs) loadfsgs(ushort v)
{ {
asm volatile("movw %0, %%gs" : : "r" (gs)); asm volatile("movw %0, %%fs" : : "r" (v));
asm volatile("movw %0, %%gs" : : "r" (v));
} }
static inline void static inline void
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论