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

  → /trunk/ @ 1810

  → /trunk/ @ 1811

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1810 → Rev 1811

/trunk/kernel/arch/amd64/include/pm.h
68,8 → 68,8
#define gdtselector(des) ((des)<<3)
#define idtselector(des) ((des)<<4)
#define gdtselector(des) ((des) << 3)
#define idtselector(des) ((des) << 4)
#define PL_KERNEL 0
#define PL_USER 3

/trunk/kernel/arch/amd64/include/boot/boot.h
26,7 → 26,7
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/** @addtogroup amd64
/** @addtogroup amd64
* @{
*/
/** @file
46,6 → 46,5
#endif
/** @}
/** @}
*/

/trunk/kernel/arch/ia32/include/pm.h
46,7 → 46,7
#define UTEXT_DES 3
#define UDATA_DES 4
#define TSS_DES 5
#define TLS_DES 6 /* Pointer to Thread-Local-Storage data */
#define TLS_DES 6 /* Pointer to Thread-Local-Storage data */
#ifdef CONFIG_FB
58,7 → 58,7
#endif /* CONFIG_FB */
#define selector(des) ((des)<<3)
#define selector(des) ((des) << 3)
#define PL_KERNEL 0
#define PL_USER 3

/trunk/kernel/arch/ia32/src/boot/boot.S
36,9 → 36,6
.section K_TEXT_START, "ax"
KTEXT=8
KDATA=16
.code32
.align 4
.global multiboot_image_start
56,7 → 53,7
movl $START_STACK, %esp # initialize stack pointer
lgdt KA2PA(bootstrap_gdtr) # initialize Global Descriptor Table register
movw $KDATA, %cx
movw $selector(KDATA_DES), %cx
movw %cx, %es
movw %cx, %fs
movw %cx, %gs
63,7 → 60,7
movw %cx, %ds # kernel data + stack
movw %cx, %ss
jmpl $KTEXT, $multiboot_meeting_point
jmpl $selector(KTEXT_DES), $multiboot_meeting_point
multiboot_meeting_point:
pushl %ebx # save parameters from GRUB
384,7 → 381,7
jmp 9f
9:
ljmpl $KTEXT, $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
ljmpl $selector(KTEXT_DES), $(vesa_init_protect - vesa_init + VESA_INIT_SEGMENT << 4)
0:# No prefered mode found
mov $0x111, %cx
411,7 → 408,7
vesa_init_protect:
popl %esp
movw $KDATA, %cx
movw $selector(KDATA_DES), %cx
movw %cx, %es
movw %cx, %fs
movw %cx, %gs
418,7 → 415,7
movw %cx, %ds # kernel data + stack
movw %cx, %ss
jmpl $KTEXT, $vesa_meeting_point
jmpl $selector(KTEXT_DES), $vesa_meeting_point
.align 4
e_vesa_init: