[2248] 2009-06-04 Vladimir Serbinenko <[email protected]>

Revision: 2248
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2248
Author:   phcoder
Date:     2009-06-04 19:28:02 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
2009-06-04  Vladimir Serbinenko  <[email protected]>

	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
	

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/boot/i386/pc/boot.S
    trunk/grub2/boot/i386/pc/diskboot.S
    trunk/grub2/include/grub/dl.h

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-06-04 18:22:45 UTC (rev 2247)
+++ trunk/grub2/ChangeLog	2009-06-04 19:28:02 UTC (rev 2248)
@@ -1,5 +1,14 @@
 2009-06-04  Vladimir Serbinenko  <[email protected]>
 
+	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  <[email protected]>
+
 	gfxpayload support
 
 	* commands/videotest.c (grub_cmd_videotest): use grub_video_set_mode

Modified: trunk/grub2/boot/i386/pc/boot.S
===================================================================
--- trunk/grub2/boot/i386/pc/boot.S	2009-06-04 18:22:45 UTC (rev 2247)
+++ trunk/grub2/boot/i386/pc/boot.S	2009-06-04 19:28:02 UTC (rev 2248)
@@ -390,11 +390,11 @@
         int	$0x18
 stop:	jmp	stop
 
-notification_string:	.string "GRUB "
-geometry_error_string:	.string "Geom"
-hd_probe_error_string:	.string "Hard Disk"
-read_error_string:	.string "Read"
-general_error_string:	.string " Error"
+notification_string:	.asciz "GRUB "
+geometry_error_string:	.asciz "Geom"
+hd_probe_error_string:	.asciz "Hard Disk"
+read_error_string:	.asciz "Read"
+general_error_string:	.asciz " Error"
 
 /*
  * message: write the string pointed to by %si
@@ -464,7 +464,8 @@
 	MSG(fd_probe_error_string)
 	jmp	general_error
 
-fd_probe_error_string:	.string "Floppy"
+/* "Floppy" */
+fd_probe_error_string:	.asciz "Floppy"
 
 1:
 	/* perform read */

Modified: trunk/grub2/boot/i386/pc/diskboot.S
===================================================================
--- trunk/grub2/boot/i386/pc/diskboot.S	2009-06-04 18:22:45 UTC (rev 2247)
+++ trunk/grub2/boot/i386/pc/diskboot.S	2009-06-04 19:28:02 UTC (rev 2248)
@@ -326,14 +326,14 @@
 /* go here when you need to stop the machine hard after an error condition */
 stop:	jmp	stop
 
-notification_string:	.string "loading"
+notification_string:	.asciz "loading"
 
-notification_step:	.string "."
-notification_done:	.string "\r\n"
+notification_step:	.asciz "."
+notification_done:	.asciz "\r\n"
 	
-geometry_error_string:	.string "Geom"
-read_error_string:	.string "Read"
-general_error_string:	.string " Error"
+geometry_error_string:	.asciz "Geom"
+read_error_string:	.asciz "Read"
+general_error_string:	.asciz " Error"
 
 /*
  * message: write the string pointed to by %si

Modified: trunk/grub2/include/grub/dl.h
===================================================================
--- trunk/grub2/include/grub/dl.h	2009-06-04 18:22:45 UTC (rev 2247)
+++ trunk/grub2/include/grub/dl.h	2009-06-04 19:28:02 UTC (rev 2248)
@@ -41,10 +41,10 @@
 grub_mod_fini (void)
 
 #define GRUB_MOD_NAME(name)	\
-__asm__ (".section .modname\n.string \"" #name "\"\n")
+__asm__ (".section .modname\n.asciz \"" #name "\"\n")
 
 #define GRUB_MOD_DEP(name)	\
-__asm__ (".section .moddeps\n.string \"" #name "\"\n")
+__asm__ (".section .moddeps\n.asciz \"" #name "\"\n")
 
 struct grub_dl_segment
 {