HelenOSHelenOS-docHelenOS-historic

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/trunk @ 684

  → /kernel/trunk/ @ 685

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 684 → Rev 685

/kernel/trunk/arch/amd64/include/pm.h
146,6 → 146,7
extern struct ptr_16_64 gdtr;
extern struct ptr_16_32 real_bootstrap_gdtr;
extern struct ptr_16_32 protected_bootstrap_gdtr;
extern void pm_init(void);

/kernel/trunk/arch/amd64/src/boot/boot.S
49,6 → 49,7
.section K_TEXT_START, "ax"
.code16
.global kernel_image_start
.global multiboot_image_start
kernel_image_start:
cli
xorw %ax,%ax
95,8 → 96,21
multiboot_image_start:
movl $START_STACK, %esp # initialize stack pointer
# FIXME TODO
lgdt protected_bootstrap_gdtr + BOOT_OFFSET # initialize Global Descriptor Table register
movw $gdtselector(KDATA_DES), %cx
movw %cx, %es
movw %cx, %gs
movw %cx, %fs
movw %cx, %ds # kernel data + stack
movw %cx, %ss
jmpl $gdtselector(KTEXT_DES), $multiboot_meeting_point + BOOT_OFFSET
multiboot_meeting_point:
hlt
# Protected 32-bit. We want to reuse the code-seg descriptor,
# the Default operand size must not be 1 when entering long mode
now_in_prot:
208,3 → 222,8
real_bootstrap_gdtr_boot:
.word gdtselector(GDT_ITEMS)
.long KA2PA(gdt)-BOOT_OFFSET
.global protected_bootstrap_gdtr
protected_bootstrap_gdtr:
.word gdtselector(GDT_ITEMS)
.long KA2PA(gdt)