Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 15:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix .org

Browse Source
This commit is contained in:
Vladimir Serbinenko committed 2013-12-24 02:31:44 +01:00
1 parent 3863ea6088
commit aeebec13ab
16 files changed
+38 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

grub-core/boot/i386/pc/boot.S
+10 -10
View File
@@ -165,8 +165,8 @@ start:
* this area. * this area.
*/ */
.org _start + GRUB_BOOT_MACHINE_BPB_START .org GRUB_BOOT_MACHINE_BPB_START
.org _start + 4 .org 4
#endif #endif
#ifdef HYBRID_BOOT #ifdef HYBRID_BOOT
floppy floppy
@@ -174,7 +174,7 @@ start:
scratch scratch
#endif #endif
.org _start + GRUB_BOOT_MACHINE_BPB_END .org GRUB_BOOT_MACHINE_BPB_END
/* /*
* End of BIOS parameter block. * End of BIOS parameter block.
*/ */
@@ -183,14 +183,14 @@ kernel_address:
.word GRUB_BOOT_MACHINE_KERNEL_ADDR .word GRUB_BOOT_MACHINE_KERNEL_ADDR
#ifndef HYBRID_BOOT #ifndef HYBRID_BOOT
.org _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR .org GRUB_BOOT_MACHINE_KERNEL_SECTOR
kernel_sector: kernel_sector:
.long 1 .long 1
kernel_sector_high: kernel_sector_high:
.long 0 .long 0
#endif #endif
.org _start + GRUB_BOOT_MACHINE_BOOT_DRIVE .org GRUB_BOOT_MACHINE_BOOT_DRIVE
boot_drive: boot_drive:
.byte 0xff /* the disk to load kernel from */ .byte 0xff /* the disk to load kernel from */
/* 0xff means use the boot drive */ /* 0xff means use the boot drive */
@@ -208,7 +208,7 @@ LOCAL(after_BPB):
* possible boot drive. If GRUB is installed into a floppy, * possible boot drive. If GRUB is installed into a floppy,
* this does nothing (only jump). * this does nothing (only jump).
*/ */
.org _start + GRUB_BOOT_MACHINE_DRIVE_CHECK .org GRUB_BOOT_MACHINE_DRIVE_CHECK
boot_drive_check: boot_drive_check:
jmp 3f /* grub-setup may overwrite this jump */ jmp 3f /* grub-setup may overwrite this jump */
testb $0x80, %dl testb $0x80, %dl
@@ -511,13 +511,13 @@ LOCAL(message):
*/ */
#ifdef HYBRID_BOOT #ifdef HYBRID_BOOT
.org _start + 0x1b0 .org 0x1b0
kernel_sector: kernel_sector:
.long 1 .long 1
kernel_sector_high: kernel_sector_high:
.long 0 .long 0
#endif #endif
.org _start + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC .org GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC
nt_magic: nt_magic:
.long 0 .long 0
.word 0 .word 0
@@ -528,7 +528,7 @@ nt_magic:
* sneaky, huh? * sneaky, huh?
*/ */
.org _start + GRUB_BOOT_MACHINE_PART_START .org GRUB_BOOT_MACHINE_PART_START
#ifndef HYBRID_BOOT #ifndef HYBRID_BOOT
floppy floppy
@@ -536,7 +536,7 @@ nt_magic:
scratch scratch
#endif #endif
.org _start + GRUB_BOOT_MACHINE_PART_END .org GRUB_BOOT_MACHINE_PART_END
/* the last 2 bytes in the sector 0 contain the signature */ /* the last 2 bytes in the sector 0 contain the signature */
.word GRUB_BOOT_MACHINE_SIGNATURE .word GRUB_BOOT_MACHINE_SIGNATURE
grub-core/boot/i386/pc/cdboot.S
+2 -2
View File
@@ -43,7 +43,7 @@ _start:
LOCAL(next): LOCAL(next):
jmp 1f jmp 1f
.org start + 8 .org 8
bi_pvd: bi_pvd:
.long 0 /* LBA of primary volume descriptor. */ .long 0 /* LBA of primary volume descriptor. */
@@ -168,6 +168,6 @@ err_noboot_msg:
err_cdfail_msg: err_cdfail_msg:
.ascii "cdrom read fails\0" .ascii "cdrom read fails\0"
.org start + 0x7FF .org 0x7FF
.byte 0 .byte 0
grub-core/boot/i386/pc/diskboot.S
+1 -1
View File
@@ -362,7 +362,7 @@ LOCAL(message):
.word 0 .word 0
.word 0 .word 0
.org _start + 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE .org 0x200 - GRUB_BOOT_MACHINE_LIST_SIZE
LOCAL(firstlist): /* this label has to be before the first list entry!!! */ LOCAL(firstlist): /* this label has to be before the first list entry!!! */
/* fill the first data listing with the default */ /* fill the first data listing with the default */
blocklist_default_start: blocklist_default_start:
grub-core/boot/i386/pc/lnxboot.S
+2 -2
View File
@@ -41,7 +41,7 @@ data_start:
xorl %ebp, %ebp xorl %ebp, %ebp
jmp LOCAL(linux_next) jmp LOCAL(linux_next)
.org data_start + 0x1F1 .org 0x1F1
setup_sects: setup_sects:
.byte CODE_SECTORS .byte CODE_SECTORS
@@ -292,4 +292,4 @@ LOCAL(fail):
err_int15_msg: err_int15_msg:
.ascii "move memory fails\0" .ascii "move memory fails\0"
.org _start + CODE_SECTORS * 512 .org _start - data_start + CODE_SECTORS * 512
grub-core/boot/i386/pc/pxeboot.S
+1 -1
View File
@@ -38,5 +38,5 @@ start:
/* This region is a junk. Do you say that this is wasteful? /* This region is a junk. Do you say that this is wasteful?
But I like that the memory layout of the body is consistent But I like that the memory layout of the body is consistent
among different kernels rather than scamping just for 1.5KB. */ among different kernels rather than scamping just for 1.5KB. */
.org _start + 0x8200 - 0x7C00 - 0x200 - 1 .org 0x8200 - 0x7C00 - 0x200 - 1
.byte 0 .byte 0
grub-core/boot/i386/pc/startup_raw.S
+5 -5
View File
@@ -50,23 +50,23 @@ LOCAL (base):
* This is a special data area. * This is a special data area.
*/ */
.org _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE .org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
LOCAL(compressed_size): LOCAL(compressed_size):
.long 0 .long 0
.org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
LOCAL(uncompressed_size): LOCAL(uncompressed_size):
.long 0 .long 0
.org _start + GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY .org GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY
reed_solomon_redundancy: reed_solomon_redundancy:
.long 0 .long 0
.org _start + GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH .org GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_LENGTH
.short (LOCAL(reed_solomon_part) - _start) .short (LOCAL(reed_solomon_part) - _start)
/* /*
* This is the area for all of the special variables. * This is the area for all of the special variables.
*/ */
.org _start + GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE .org GRUB_DECOMPRESSOR_I386_PC_BOOT_DEVICE
LOCAL(boot_dev): LOCAL(boot_dev):
.byte 0xFF, 0xFF, 0xFF .byte 0xFF, 0xFF, 0xFF
LOCAL(boot_drive): LOCAL(boot_drive):
grub-core/boot/i386/qemu/boot.S
+1 -1
View File
@@ -31,7 +31,7 @@ _start:
jmp 1f jmp 1f
.org _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR .org GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
VARIABLE(grub_core_entry_addr) VARIABLE(grub_core_entry_addr)
.long 0 .long 0
1: 1:
grub-core/boot/mips/loongson/fwstart.S
+3 -3
View File
@@ -162,7 +162,7 @@ retry_cs5536:
b continue b continue
.org start + GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START .org GRUB_CPU_LOONGSON_FLASH_TLB_REFILL - GRUB_CPU_LOONGSON_FLASH_START
tlb_refill: tlb_refill:
mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
@@ -196,13 +196,13 @@ tlb_refill:
b fatal b fatal
addiu $a0, $a0, %lo(unhandled_tlb_refill) addiu $a0, $a0, %lo(unhandled_tlb_refill)
.org start + GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START .org GRUB_CPU_LOONGSON_FLASH_CACHE_ERROR - GRUB_CPU_LOONGSON_FLASH_START
cache_error: cache_error:
lui $a0, %hi(unhandled_cache_error) lui $a0, %hi(unhandled_cache_error)
b fatal b fatal
addiu $a0, $a0, %lo(unhandled_cache_error) addiu $a0, $a0, %lo(unhandled_cache_error)
.org start + GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START .org GRUB_CPU_LOONGSON_FLASH_OTHER_EXCEPTION - GRUB_CPU_LOONGSON_FLASH_START
other_exception: other_exception:
mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
grub-core/boot/mips/startup_raw.S
+3 -3
View File
@@ -39,13 +39,13 @@ start:
bal codestart bal codestart
nop nop
base: base:
.org _start + GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE .org GRUB_DECOMPRESSOR_MACHINE_COMPRESSED_SIZE
compressed_size: compressed_size:
.long 0 .long 0
.org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_SIZE
uncompressed_size: uncompressed_size:
.long 0 .long 0
.org _start + GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR .org GRUB_DECOMPRESSOR_MACHINE_UNCOMPRESSED_ADDR
uncompressed_addr: uncompressed_addr:
.long 0 .long 0
codestart: codestart:
grub-core/boot/sparc64/ieee1275/boot.S
+4 -4
View File
@@ -41,9 +41,9 @@ pic_base:
* After loading in that block we will execute it by jumping to the * After loading in that block we will execute it by jumping to the
* load address plus the size of the prepended A.OUT header (32 bytes). * load address plus the size of the prepended A.OUT header (32 bytes).
*/ */
.org _start + GRUB_BOOT_MACHINE_BOOT_DEVPATH .org GRUB_BOOT_MACHINE_BOOT_DEVPATH
boot_path: boot_path:
.org _start + GRUB_BOOT_MACHINE_KERNEL_BYTE .org GRUB_BOOT_MACHINE_KERNEL_BYTE
boot_path_end: boot_path_end:
kernel_byte: .xword (2 << 9) kernel_byte: .xword (2 << 9)
kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR
@@ -52,7 +52,7 @@ kernel_address: .word GRUB_BOOT_MACHINE_KERNEL_ADDR
#define boot_path_end (_start + 1024) #define boot_path_end (_start + 1024)
#include <grub/offsets.h> #include <grub/offsets.h>
.org _start + 8 .org 8
kernel_byte: .xword (2 << 9) kernel_byte: .xword (2 << 9)
kernel_size: .word 512 kernel_size: .word 512
kernel_address: .word GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS kernel_address: .word GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS
@@ -224,7 +224,7 @@ bootpath_known:
#else #else
nop nop
#endif #endif
.org _start + GRUB_BOOT_MACHINE_CODE_END .org GRUB_BOOT_MACHINE_CODE_END
/* the last 4 bytes in the sector 0 contain the signature */ /* the last 4 bytes in the sector 0 contain the signature */
.word GRUB_BOOT_MACHINE_SIGNATURE .word GRUB_BOOT_MACHINE_SIGNATURE
grub-core/boot/sparc64/ieee1275/diskboot.S
+1 -1
View File
@@ -136,7 +136,7 @@ lastlist:
.word 0 .word 0
.word 0 .word 0
.org _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE) .org (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
blocklist_default_start: blocklist_default_start:
.word 0 .word 0
.word 2 .word 2
grub-core/kern/arm/uboot/startup.S
+1 -1
View File
@@ -51,7 +51,7 @@ FUNCTION(_start)
b codestart b codestart
@ Size of final image integrated module blob - set by grub-mkimage @ Size of final image integrated module blob - set by grub-mkimage
.org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
VARIABLE(grub_total_module_size) VARIABLE(grub_total_module_size)
.long 0 .long 0
grub-core/kern/i386/qemu/startup.S
+1 -1
View File
@@ -28,7 +28,7 @@
_start: _start:
jmp codestart jmp codestart
.org _start + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR .org GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
VARIABLE(grub_core_entry_addr) VARIABLE(grub_core_entry_addr)
.long 0 .long 0
grub-core/kern/mips/startup.S
+1 -1
View File
@@ -36,7 +36,7 @@ start:
bal cont bal cont
nop nop
.org _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
VARIABLE(grub_total_modules_size) VARIABLE(grub_total_modules_size)
.long 0 .long 0
grub-core/kern/sparc64/ieee1275/crt0.S
+1 -1
View File
@@ -27,7 +27,7 @@ _start:
ba codestart ba codestart
mov %o4, %o0 mov %o4, %o0
.org EXT_C(_start) + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE .org GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
VARIABLE(grub_total_module_size) VARIABLE(grub_total_module_size)
.word 0 .word 0
grub-core/tests/boot/kernel-8086.S
+1 -1
View File
@@ -46,5 +46,5 @@ message:
.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n" .ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
.byte 0 .byte 0
.org base + 510 .org 510
.short 0xaa55 .short 0xaa55