[tkreuzer] 52341: [ASM] Use CR, LF and NUL in .ascii macro instead of using .asciz or "\r" "\n", since the latter is not portable
Author: tkreuzer Date: Sat Jun 18 14:50:24 2011 New Revision: 52341
URL: http://svn.reactos.org/svn/reactos?rev=52341&view=rev Log: [ASM] Use CR, LF and NUL in .ascii macro instead of using .asciz or "\r" "\n", since the latter is not portable
Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/include/asm/asm.inc
Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.S... ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -406,9 +406,9 @@
msgDiskError: - .asciz "Disk error\r\n" + .ascii "Disk error", CR, LF, NUL msgFreeLdr: - .asciz "ldr not found\r\n" + .ascii "ldr not found", CR, LF, NUL // Sorry, need the space... //msgAnyKey: // .asciz "Press any key to restart\r\n"
Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat32... ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -522,11 +522,11 @@ jmp Reboot
msgFreeLdr: - .asciz "freeldr.sys not found\r\n" + .ascii "freeldr.sys not found", CR, LF, NUL filename: .ascii "FREELDR SYS" msgLoading: - .asciz "Loading FreeLoader...\r\n" + .ascii "Loading FreeLoader...\r\n", CR, LF, NUL
.org 1022 // Pad to 1022 bytes
Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isobo... ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -923,67 +923,67 @@
isolinux_banner: - .asciz CR, LF, "Loading IsoBoot...", CR, LF + .ascii CR, LF, "Loading IsoBoot...", CR, LF, NUL copyright_str: - .asciz " (C) 1994-2002 H. Peter Anvin", CR, LF + .ascii " (C) 1994-2002 H. Peter Anvin", CR, LF, NUL presskey_msg: - .asciz "Press any key to boot from CD" + .ascii "Press any key to boot from CD", NUL dot_msg: - .asciz "." + .ascii ".", NUL
#ifdef DEBUG_MESSAGES startup_msg: - .asciz "Startup, DL = '" + .ascii "Startup, DL = '", NUL spec_ok_msg: - .asciz "packet OK, drive = " + .ascii "packet OK, drive = ", NUL secsize_msg: - .asciz "size appears to be " + .ascii "size appears to be ", NUL rootloc_msg: - .asciz "Root dir loc: " + .ascii "Root dir loc: ", NUL rootlen_msg: - .asciz "Root dir len: " + .ascii "Root dir len: ", NUL rootsect_msg: - .asciz "Root dir len(sect): " + .ascii "Root dir len(sect): ", NUL fileloc_msg: - .asciz "SETUPLDR loc: " + .ascii "SETUPLDR loc: ", NUL filelen_msg: - .asciz "SETUPLDR len: " + .ascii "SETUPLDR len: ", NUL filesect_msg: - .asciz "SETUPLDR len(sect): " + .ascii "SETUPLDR len(sect): ", NUL findfail_msg: - .asciz "Failed to find file!" + .ascii "Failed to find file!", NUL startldr_msg: - .asciz "Starting SETUPLDR.SYS" + .ascii "Starting SETUPLDR.SYS", NUL #endif
spec_err_msg: - .asciz "Load spec failed, trying wing ...", CR, LF + .ascii "Load spec failed, trying wing ...", CR, LF, NUL maybe_msg: - .asciz "Found smth at drive = " + .ascii "Found smth at drive = ", NUL alright_msg: - .asciz "might be ok, continuing...", CR, LF + .ascii "might be ok, continuing...", CR, LF, NUL nothing_msg: - .asciz "Failed locate CD-ROM; boot failed.", CR, LF + .ascii "Failed locate CD-ROM; boot failed.", CR, LF, NUL
isolinux_str: - .asciz "IsoBoot: " + .ascii "IsoBoot: ", NUL crlf_msg: - .asciz CR, LF + .ascii CR, LF, NUL diskerr_msg: - .asciz "Disk error " + .ascii "Disk error ", NUL ondrive_str: - .asciz ", drive " + .ascii ", drive ", NUL
err_bootfailed: - .asciz CR, LF, "failed.." + .ascii CR, LF, "failed..", NUL isolinux_dir: - .asciz "\LOADER" + .ascii "\LOADER", NUL no_dir_msg: - .asciz "LOADER dir not found.", CR, LF + .ascii "LOADER dir not found.", CR, LF, NUL isolinux_bin: - .asciz "SETUPLDR.SYS" + .ascii "SETUPLDR.SYS", NUL no_isolinux_msg: - .asciz "SETUPLDR not found.", CR, LF + .ascii "SETUPLDR not found.", CR, LF, NUL
//
Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=523... ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -44,10 +44,10 @@ #define ENDFUNC .ENDP
/* MASM doesn't have an ASCII macro */ -.ASCII MACRO text +.ASCII MACRO text:VARARG DB text ENDM -.ascii MACRO text +.ascii MACRO text:VARARG DB text ENDM
@@ -162,6 +162,7 @@
#define CR 13 #define LF 10 +#define NUL 0
#else /***********************************************************************/
@@ -312,5 +313,6 @@
#define CR "\r" #define LF "\n" +#define NUL "\0"
#endif
-
tkreuzer＠svn.reactos.org