# HG changeset patch # User Pascal Bellard # Date 1383920443 0 # Node ID 3c0fd9f4d4a834417000ec4d3be90f5cd5ea1b41 # Parent d9dd83ccc85f054c1dbd426d11d2e116a69e894f memtest/bootloader.S: fix dos exit (again) diff -r d9dd83ccc85f -r 3c0fd9f4d4a8 memtest/stuff/bootloader.S --- a/memtest/stuff/bootloader.S Fri Nov 08 12:52:29 2013 +0000 +++ b/memtest/stuff/bootloader.S Fri Nov 08 14:20:43 2013 +0000 @@ -44,24 +44,20 @@ .ascii "(SliTaz)" end_header: comstart: + cld # assume nothing #ifdef CMDLINE - cld # assume nothing - .byte 0xA3 // mov %ax,[stacktop] - .word stacktop -#else - cld # assume nothing + movw $stacktop, %di #undef HELP #endif pushw $INITSEG popw %es #ifdef CMDLINE - movw %sp, %di movw $0x80, %si lodsb cbw xchgw %ax, %cx jcxz nocmdline - movb $0x3F, 0x7F(%si) + movw $0xA33F, 0x7F(%si) skipspace: lodsb cmpb $0x20, %al @@ -77,7 +73,6 @@ movw $EXEADRS(helpmsg), %si cmpb $'/', %al je puts - movb setup_sects-helpmsg(%si), %ch # endif nocmdline: #endif @@ -102,9 +97,7 @@ #endif movw $0x100, %si movw $end_header, %di -#ifndef HELP movb EXEADRS(setup_sects), %ch -#endif movb $(512-(end_header-_start))/2, %cl rep movsw