fixed clear .bss code

[bootcensus] / src / startup.s

diff --git a/src/startup.s b/src/startup.s
index 42e4b21..82f548e 100644 (file)
--- a/src/startup.s
+++ b/src/startup.s
@@ -15,18 +15,29 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
        .code32
-       .section .startup
+       .section .startup,"ax"
 
        .extern _bss_start
        .extern _bss_end
+       .extern pcboot_main
 
+       # zero the BSS section
        xor %eax, %eax
-       mov _bss_start, %edi
-       mov _bss_size, %ecx
+       mov $_bss_start, %edi
+       mov $_bss_size, %ecx
+       cmp $0, %ecx
+       jz skip_bss_zero
        shr $4, %ecx
        rep stosl
+skip_bss_zero:
 
+       call pcboot_main
+       # pcboot_main never returns
+0:     cli
+       hlt
+       jmp 0b
 
+       .global logohack
 logohack:
        # copy palette
        mov $logo_pal, %esi
@@ -131,8 +142,6 @@ xval: .long 0
 yval: .long 0
 frameno: .long 0
 
-numbuf: .space 16
-
 logo_pal:
        .incbin "logo.pal"