fixed merge

[netwatch.git] / aseg / aseg.asm

diff --git a/aseg/aseg.asm b/aseg/aseg.asm
index b9ae4245a31b84556fd84ee572a72eb4d443e031..7380dc0bac64c0ab689481a4f01f31e7326641ca 100644 (file)
--- a/aseg/aseg.asm
+++ b/aseg/aseg.asm
@@ -1,9 +1,9 @@
        org 0xA8000
 [bits 16]
 entry:
-       mov ax, 0xA800
-       mov ds, ax              ; Take us out of flat unreal mode, and
-       mov es, ax              ; put us in true real mode.
+       mov ax, 0xA800                  ; Take us out of flat unreal mode,
+       mov ds, ax                      ; and put us in true real mode.
+       mov es, ax
        mov fs, ax
        mov gs, ax
        mov ss, ax
@@ -21,40 +21,24 @@ continue:
        mov fs, ax
        mov gs, ax
        mov ss, ax
-       mov esp, [dataptr]
-
-       mov al, [needclear]
-       cmp al, 0
-       jz noclear
-       mov al, 0                       ; clear BSS
-       mov edi, [dataptr+4]
-       mov ecx, [dataptr+8]
-       rep stosb
-       mov [needclear], al
+       mov esp, [dataptr]              ; Load stack pointer.
        
-noclear:
-       mov eax, [dataptr+12]           ; jump into C
-       call eax
+       mov eax, [dataptr+4]            ; Load target jump address
+       call eax                        ; then jump into C.
 
        rsm                             ; and leave SMM
 
        align 0x4
 gdtr:
-       db 0x27, 0x00
+       db 0x17, 0x00
        dd gdt
        align 0x4
 gdt:
-       db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+       db 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00       ; initial null entry
        db 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x93, 0xCF, 0x00       ; data segment
        db 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9B, 0xCF, 0x00       ; code segment
-       db 0xFF, 0xFF, 0x00, 0x80, 0x0A, 0x9B, 0xCF, 0x00       ; code segment for trampoline
-
-needclear:
-       db 0x01
 
 dataptr:
        ; 4 bytes of stack top
-       ; 4 bytes of BSS start
-       ; 4 bytes of BSS length
        ; 4 bytes of C entry point
        ; These show up