vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>

Browse source 
Use .asciz instead of .string

	* i386/pc/diskboot.S: use .asciz instead of .string
	* i386/pc/boot.S: likewise
	* include/grub/dl.h (GRUB_MOD_DEP): likewise
	(GRUB_MOD_NAME): likewise
This commit is contained in:
phcoder 2009-06-04 19:28:02 +00:00
parent 3eb5ed4ec0
commit 5389763d12
4 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
Use .asciz instead of .string
* i386/pc/diskboot.S: use .asciz instead of .string
* i386/pc/boot.S: likewise
* include/grub/dl.h (GRUB_MOD_DEP): likewise
(GRUB_MOD_NAME): likewise
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com> 2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
gfxpayload support gfxpayload support

13
boot/i386/pc/boot.S
View file

@ -390,11 +390,11 @@ general_error:
int $0x18 int $0x18
stop: jmp stop stop: jmp stop
notification_string: .string "GRUB " notification_string: .asciz "GRUB "
geometry_error_string: .string "Geom" geometry_error_string: .asciz "Geom"
hd_probe_error_string: .string "Hard Disk" hd_probe_error_string: .asciz "Hard Disk"
read_error_string: .string "Read" read_error_string: .asciz "Read"
general_error_string: .string " Error" general_error_string: .asciz " Error"
/* /*
* message: write the string pointed to by %si * message: write the string pointed to by %si
@ -464,7 +464,8 @@ probe_loop:
MSG(fd_probe_error_string) MSG(fd_probe_error_string)
jmp general_error jmp general_error
fd_probe_error_string: .string "Floppy" /* "Floppy" */
fd_probe_error_string: .asciz "Floppy"
1: 1:
/* perform read */ /* perform read */

12
boot/i386/pc/diskboot.S
View file

@ -326,14 +326,14 @@ general_error:
/* go here when you need to stop the machine hard after an error condition */ /* go here when you need to stop the machine hard after an error condition */
stop: jmp stop stop: jmp stop
notification_string: .string "loading" notification_string: .asciz "loading"
notification_step: .string "." notification_step: .asciz "."
notification_done: .string "\r\n" notification_done: .asciz "\r\n"
geometry_error_string: .string "Geom" geometry_error_string: .asciz "Geom"
read_error_string: .string "Read" read_error_string: .asciz "Read"
general_error_string: .string " Error" general_error_string: .asciz " Error"
/* /*
* message: write the string pointed to by %si * message: write the string pointed to by %si

4
include/grub/dl.h
View file

@ -41,10 +41,10 @@ static void \
grub_mod_fini (void) grub_mod_fini (void)
#define GRUB_MOD_NAME(name) \ #define GRUB_MOD_NAME(name) \
__asm__ (".section .modname\n.string \"" #name "\"\n") __asm__ (".section .modname\n.asciz \"" #name "\"\n")
#define GRUB_MOD_DEP(name) \ #define GRUB_MOD_DEP(name) \
__asm__ (".section .moddeps\n.string \"" #name "\"\n") __asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
struct grub_dl_segment struct grub_dl_segment
{ {