kotovalexarian-likes-gitlab/bztsrc--bootboot
1
0
Fork 0
mirror of https://gitlab.com/bztsrc/bootboot.git synced 2023-02-13 20:54:32 -05:00
Code Releases Activity

use balign over align for compilation on macOS

Browse source
This commit is contained in:
Stephen von Takach 2022-01-03 23:53:15 +00:00 committed by bzt
parent 6d4df93453
commit b9eceaa3a7
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
x86_64-cb/smp.S
View file

@ -40,14 +40,14 @@
/***************************************************************************** /*****************************************************************************
* things to do on the APs * * things to do on the APs *
*****************************************************************************/ *****************************************************************************/
.align 128 .balign 128
.code16 .code16
/* this code will be relocated to 0x1000 - 0x1100 */ /* this code will be relocated to 0x1000 - 0x1100 */
ap_trampoline: ap_trampoline:
cli cli
cld cld
ljmp $0, $0x1040 ljmp $0, $0x1040
.align 16 .balign 16
// prot mode GDT // prot mode GDT
_L1010_GDT_table: _L1010_GDT_table:
.long 0, 0 .long 0, 0
@ -58,7 +58,7 @@ _L1030_GDT_value:
.word _L1030_GDT_value - _L1010_GDT_table - 1 .word _L1030_GDT_value - _L1010_GDT_table - 1
.long 0x1010 .long 0x1010
.long 0, 0 .long 0, 0
.align 64 .balign 64
_L1040: _L1040:
xorw %ax, %ax xorw %ax, %ax
movw %ax, %ds movw %ax, %ds
@ -67,7 +67,7 @@ _L1040:
orl $1, %eax orl $1, %eax
movl %eax, %cr0 movl %eax, %cr0
ljmp $8, $0x1060 ljmp $8, $0x1060
.align 32 .balign 32
.code32 .code32
_L1060: _L1060:
movw $16, %ax movw $16, %ax
@ -79,7 +79,7 @@ _L1060:
jz 1b jz 1b
// jump back to non-relocated code segment // jump back to non-relocated code segment
ljmp $8, $longmode_init ljmp $8, $longmode_init
.align 128 .balign 128
ap_trampoline_end: ap_trampoline_end:
// long mode GDT (here it is aligned and out of execution flow) // long mode GDT (here it is aligned and out of execution flow)
@ -93,7 +93,7 @@ GDT_value:
.word GDT_value - GDT_table - 1 .word GDT_value - GDT_table - 1
.long GDT_table, 0, 0 .long GDT_table, 0, 0
.word 0 .word 0
.align 8 .balign 8
stack64: stack64:
.long bootboot_startcore .long bootboot_startcore
.long 0 .long 0

12
x86_64-efi/smp.S
View file

@ -34,14 +34,14 @@
/***************************************************************************** /*****************************************************************************
* things to do on the APs * * things to do on the APs *
*****************************************************************************/ *****************************************************************************/
.align 128 .balign 128
.code16 .code16
/* this code will be relocated to 0x8000 - 0x8100 */ /* this code will be relocated to 0x8000 - 0x8100 */
ap_trampoline: ap_trampoline:
cli cli
cld cld
ljmp $0, $0x8040 ljmp $0, $0x8040
.align 16 .balign 16
// prot mode GDT // prot mode GDT
_L8010_GDT_table: _L8010_GDT_table:
.long 0, 0 .long 0, 0
@ -52,7 +52,7 @@ _L8030_GDT_value:
.word _L8030_GDT_value - _L8010_GDT_table - 1 .word _L8030_GDT_value - _L8010_GDT_table - 1
.long 0x8010 .long 0x8010
.long 0, 0 .long 0, 0
.align 64 .balign 64
_L8040: _L8040:
xorw %ax, %ax xorw %ax, %ax
movw %ax, %ds movw %ax, %ds
@ -61,7 +61,7 @@ _L8040:
orl $1, %eax orl $1, %eax
movl %eax, %cr0 movl %eax, %cr0
ljmp $8, $0x8060 ljmp $8, $0x8060
.align 32 .balign 32
.code32 .code32
_L8060: _L8060:
movw $16, %ax movw $16, %ax
@ -80,7 +80,7 @@ _L8060:
lgdtl 0x80E0 lgdtl 0x80E0
movl $0x80C8, %esp // we can't use "ljmp $8, $0x80A0", because we don't know cs movl $0x80C8, %esp // we can't use "ljmp $8, $0x80A0", because we don't know cs
lret lret
.align 32 .balign 32
.code64 .code64
_L80A0: _L80A0:
movl 0x80D0, %eax // load long mode segments movl 0x80D0, %eax // load long mode segments
@ -97,7 +97,7 @@ _L80A0:
// stack frame, because all are saving exactly the same stack frame to the same position // stack frame, because all are saving exactly the same stack frame to the same position
movl $0x8800, %esp movl $0x8800, %esp
jmp *%rax jmp *%rax
.align 32 .balign 32
_L80C0_cr3_value: _L80C0_cr3_value:
.long 0, 0 .long 0, 0
.long 0x80A0 .long 0x80A0