Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/src/boot/boot.S

    r1d3d2cf r22c3444  
    8585       
    8686        /* Kernel data + stack */
    87         movw $GDT_SELECTOR(KDATA_DES), %cx
     87        movw $gdtselector(KDATA_DES), %cx
    8888        movw %cx, %es
    8989        movw %cx, %ds
     
    9494         * when _visible_ part of GS does not point to user-mode segment.
    9595         */
    96         movw $GDT_SELECTOR(UDATA_DES), %cx
     96        movw $gdtselector(UDATA_DES), %cx
    9797        movw %cx, %fs
    9898        movw %cx, %gs
    9999       
    100         jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot_meeting_point
     100        jmpl $gdtselector(KTEXT32_DES), $multiboot_meeting_point
    101101        multiboot_meeting_point:
    102102       
     
    182182       
    183183        /* At this point we are in compatibility mode */
    184         jmpl $GDT_SELECTOR(KTEXT_DES), $start64
     184        jmpl $gdtselector(KTEXT_DES), $start64
    185185
    186186/** Print string to EGA display (in light red) and halt.
     
    645645.section K_DATA_START, "aw", @progbits
    646646
     647.global bootstrap_gdtr
    647648bootstrap_gdtr:
    648         .word GDT_SELECTOR(GDT_ITEMS)
     649        .word gdtselector(GDT_ITEMS)
    649650        .long KA2PA(gdt)
    650651
Note: See TracChangeset for help on using the changeset viewer.