| Message ID | 20191203053144.24216-1-masahiroy@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [U-Boot] x86: use data32 directive instead of macro for operand-size prefix | expand |
On Tue, Dec 3, 2019 at 1:32 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > This file defines 'a32' and 'o32' macros to avoid magic numbers > of operand/address-size prefixing. > > GAS supports 'data32' and 'addr32' for that purpose. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > arch/x86/cpu/start16.S | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
On Sun, Dec 8, 2019 at 6:43 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Tue, Dec 3, 2019 at 1:32 PM Masahiro Yamada <masahiroy@kernel.org> wrote: > > > > This file defines 'a32' and 'o32' macros to avoid magic numbers > > of operand/address-size prefixing. > > > > GAS supports 'data32' and 'addr32' for that purpose. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > arch/x86/cpu/start16.S | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > Tested-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86, thanks!
diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 474efe4df5f4..bcabd76741ef 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -13,8 +13,6 @@ #include <asm/processor-flags.h> #define BOOT_SEG 0xffff0000 /* linear segment of boot code */ -#define a32 .byte 0x67; -#define o32 .byte 0x66; .section .start16, "ax" .code16 @@ -33,8 +31,8 @@ start16: wbinvd /* load the temporary Global Descriptor Table */ -o32 cs lidt idt_ptr -o32 cs lgdt gdt_ptr +data32 cs lidt idt_ptr +data32 cs lgdt gdt_ptr /* Now, we enter protected mode */ movl %cr0, %eax @@ -49,7 +47,7 @@ ff: movw $code32start, %ax movw %ax, %bp movl %ecx, %eax -o32 cs ljmp *(%bp) +data32 cs ljmp *(%bp) /* 48-bit far pointer */ code32start:
This file defines 'a32' and 'o32' macros to avoid magic numbers of operand/address-size prefixing. GAS supports 'data32' and 'addr32' for that purpose. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- arch/x86/cpu/start16.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)