[tkreuzer] 52324: [FREELDR] - convert mb.S to portable syntax - remove obsolete reactos_memory_map - Make use of CR / LF in isoboot.S
Author: tkreuzer Date: Fri Jun 17 22:26:11 2011 New Revision: 52324
URL: http://svn.reactos.org/svn/reactos?rev=52324&view=rev Log: [FREELDR] - convert mb.S to portable syntax - remove obsolete reactos_memory_map - Make use of CR / LF in isoboot.S
Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S
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] Fri Jun 17 22:26:11 2011 @@ -923,9 +923,9 @@
isolinux_banner: - .asciz "\r\nLoading IsoBoot...\r\n" + .asciz CR, LF, "Loading IsoBoot...", CR, LF copyright_str: - .asciz " (C) 1994-2002 H. Peter Anvin\r\n" + .asciz " (C) 1994-2002 H. Peter Anvin", CR, LF presskey_msg: .asciz "Press any key to boot from CD" dot_msg: @@ -957,33 +957,33 @@ #endif
spec_err_msg: - .asciz "Load spec failed, trying wing ...\r\n" + .asciz "Load spec failed, trying wing ...", CR, LF maybe_msg: .asciz "Found smth at drive = " alright_msg: - .asciz "might be ok, continuing...\r\n" + .asciz "might be ok, continuing...", CR, LF nothing_msg: - .asciz "Failed locate CD-ROM; boot failed.\r\n" + .asciz "Failed locate CD-ROM; boot failed.", CR, LF
isolinux_str: .asciz "IsoBoot: " crlf_msg: - .asciz "\r\n" + .asciz CR, LF diskerr_msg: .asciz "Disk error " ondrive_str: .asciz ", drive "
err_bootfailed: - .asciz "\r\nfailed.." + .asciz CR, LF, "failed.." isolinux_dir: .asciz "\LOADER" no_dir_msg: - .asciz "LOADER dir not found.\r\n" + .asciz "LOADER dir not found.", CR, LF isolinux_bin: .asciz "SETUPLDR.SYS" no_isolinux_msg: - .asciz "SETUPLDR not found.\r\n" + .asciz "SETUPLDR not found.", CR, LF
//
Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMakeL... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Jun 17 22:26:11 2011 @@ -14,13 +14,13 @@ arch/i386/i386idt.c arch/i386/i386trap.S arch/i386/i386pnp.cmake.S - arch/i386/i386bug.c) + arch/i386/i386bug.c + arch/i386/mb.S) if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE arch/i386/drvmap.S arch/i386/linux.S - arch/i386/multiboot.S - arch/i386/mb.S) + arch/i386/multiboot.S) else() list(APPEND FREELDR_BASE64K_SOURCE arch/i386/realmode.S)
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S [iso-8859-1] Fri Jun 17 22:26:11 2011 @@ -17,39 +17,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
- .text - .code16 - +#include <asm.inc> #include <arch/pc/x86common.h> #include <multiboot.h>
- /* - * Here we assume the kernel is loaded at 1mb - * This boots the kernel - */ - .code32 - .globl _PageDirectoryStart +.code32 +PUBLIC _PageDirectoryStart
- .globl _startup_pagedirectory - .globl _lowmem_pagetable - .globl _kernel_pagetable - .globl _apic_pagetable +PUBLIC _startup_pagedirectory +PUBLIC _lowmem_pagetable +PUBLIC _kernel_pagetable +PUBLIC _apic_pagetable +PUBLIC _PageDirectoryEnd
- .globl _PageDirectoryEnd - - // - // Boot information structure - // - -EXTERN(_reactos_memory_map_descriptor_size) - .long 0 - -EXTERN(_reactos_memory_map) - .rept (32 * /*sizeof(memory_map_t)*/24) - .byte 0 - .endr - +#ifndef _USE_ML .bss +#endif _PageDirectoryStart: _startup_pagedirectory: .fill 4096, 1, 0 @@ -64,3 +47,5 @@ .fill 4096, 1, 0
_PageDirectoryEnd: + +END
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i... ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Fri Jun 17 22:26:11 2011 @@ -6,19 +6,6 @@
// globals -PUBLIC _PageDirectoryStart -_PageDirectoryStart: -PUBLIC _PageDirectoryEnd -_PageDirectoryEnd: - -PUBLIC _startup_pagedirectory -_startup_pagedirectory: -PUBLIC _apic_pagetable -_apic_pagetable: -PUBLIC _kernel_pagetable -_kernel_pagetable: -PUBLIC _lowmem_pagetable -_lowmem_pagetable:
PUBLIC _BootOldLinuxKernel _BootOldLinuxKernel:
-
tkreuzer＠svn.reactos.org