Changeset 516 for Whitix/branches/hybrid

Timestamp:

05/24/08 09:45:02 (3 months ago)

Author:

mwhitworth

Message:

Add support for loading modules in at boot time.

Files:

• Whitix/branches/hybrid/arch/i386/boot/iso/isoboot.asm (modified) (11 diffs)

Whitix/branches/hybrid/arch/i386/boot/iso/isoboot.asm

@@ -138 +138 @@
         mov si,dapa
         mov [si+4],bx
-        mov bx,es
+        mov bx, es
         mov [si+6],bx
         mov [si+8],eax
@@ -151 +151 @@
         push si
         mov dl,[drive]
-        mov ah,42h
+        mov ah, 0x42
         call Int13WithRetry
         pop si
         pop bp
-        movzx eax,word[si+2]
-        add [si+8],eax
-        sub bp,ax
-        shl ax,7
-        add [si+6],ax
-        and bp,bp
+        movzx eax, word[si+2]
+        add [si+8], eax
+        sub bp, ax
+        shl ax, 7
+        add [si+6], ax
+        and bp, bp
         jnz .loop
         mov eax,[si+8]
@@ -166 +166 @@
         
 Int13WithRetry:
-mov byte [retryCount],6
+        mov byte [retryCount],6
 .try:
         pushad
@@ -203 +203 @@
 
 .realError:
-mov si,ErrorStr
-jmp fail
+        mov si,ErrorStr
+        jmp fail
 
 ;Include library routines such as PrintStr
@@ -220 +220 @@
 ImageDwords dd 0
 ImageSectors dw 0
-maxTransfer db 0
+maxTransfer dw 32
 
 section .bss
@@ -308 +308 @@
 section .text
 AllRead:
-        ;Read the primary volume descriptor into memory.
-        mov eax,[iso_pvd]
-        mov bx,trackBuf
-        call GetOneSec
-
-        ;Get the start sector of the root directory
-        mov eax,[trackBuf+156+2]
-        mov [dirStart],eax
-
-        ;Get the length (converted to sectors) of the root directory
-        mov eax, [trackBuf+156+10]
-        add eax, 2047
-        shr eax, 11 ;Round up to the nearest sector
-        mov [dirLength], eax
+        call DirGetRoot
 
         ;Find /Boot.
@@ -343 +330 @@
         mov di, kernName
         call ReadInFile
+
+        ;Read in Boot.modules
+        mov ax, 0x3000
+        mov es, ax
+        xor bx, bx
+        mov di, bootModsName
+        call ReadInFile
+
+        push dword [fileLength]
+        pop dword [modulesLength]
+
+        ;Change to /System/Modules/Core to load in the boot modules.
+        call DirGetRoot
+
+        mov di, systemName
+        call FindDir
+
+        mov di, modulesName
+        call FindDir
+
+        mov di, coreName
+        call FindDir
+
+        ;Now load the modules into memory and construct an information table.
+        mov ax, 0x3000
+        mov es, ax
+        xor bx, bx
+        call ModulesLoad
+
+        mov ax, 0x2000
+        mov es, ax
+        mov bx, 0xFFFF
+        mov cl, [numModules]
+        mov [es:bx], cl
 
         ;setup.asm puts in the kernel data area
@@ -456 +477 @@
         mov [fileStartSector],eax
         push eax
-        mov eax,[si+10]
+        mov eax, [si+10]
+        mov [fileLength], eax
         add eax,2047
         shr eax,11
@@ -509 +531 @@
         ret
 
+DirGetRoot:
+        ;Read the primary volume descriptor into memory.
+        xor ax, ax
+        mov es, ax
+        mov eax, [iso_pvd]
+        mov bx, trackBuf
+        call GetOneSec
+
+        ;Get the start sector of the root directory
+        mov eax, [trackBuf+156+2]
+        mov [dirStart],eax
+
+        ;Get the length (converted to sectors) of the root directory
+        mov eax, [trackBuf+156+10]
+        add eax, 2047
+        shr eax, 11 ;Round up to the nearest sector
+        mov [dirLength], eax
+
+        ret
+
+; TODO: Use ds instead of es. Makes for simpler code.
+
+ModulesLoad:
+startAgain:
+        mov ax, bx
+        ;Parse the file
+parseLoop:
+        mov cl, [es:bx]
+        cmp cl, byte 10
+        jz newName
+        cmp bx, [modulesLength]
+        jge newName
+        inc bx
+        jmp parseLoop
+
+newName:
+        push bx
+        mov cx, ax
+        sub bx, ax
+
+        call ModuleDoLoad
+
+        pop bx
+        inc bx
+        cmp bx, [modulesLength]
+        jl startAgain
+        ret
+
+;TODO: Optimize this function.
+ModuleDoLoad:
+        push es
+        mov ax, es
+        mov ds, ax
+
+        xor ax, ax
+        mov es, ax
+
+        ;cx contains start of string, bx contains length. Copy over to a buffer and load the file into memory.
+        mov di, moduleName
+        mov si, cx
+        mov cx, bx
+        rep movsb
+
+        ;Add .sys to the end of the filename
+        xor ax, ax
+        mov ds, ax
+
+        mov si, modSuffix
+        mov cx, 5
+        rep movsb
+
+        ;Read in the file.
+        mov ax, [modSegment]
+        mov es, ax
+        mov bx, [modOffset]
+        add bx, 4
+        mov di, moduleName
+
+        call ReadInFile
+
+        mov ax, [fileLength]
+        mov bx, [modOffset]
+        add ax, 3 ;Length + 3 to round up
+        and ax, ~3
+        mov [es:bx], eax
+
+        add ax, 4
+        add [modOffset], ax
+        mov ax, [modOffset]
+        xor dx ,dx
+        mov cx, 16
+        div cx ;Get quotient and remainder. Use shift and and soon.
+
+        add [modSegment], ax
+        mov [modOffset], dx
+
+        inc byte [numModules]
+
+        pop es
+        ret
+
 notFound db "Could not find ", 0
 loaderName db "KeLoader", 0
 kernName db "Kernel", 0
 bootName db "Boot", 0
+bootModsName db "Boot.modules", 0
+systemName db "System", 0
+modulesName db "Modules", 0
+coreName db "Core", 0
+modSuffix db ".sys", 0
 
 dirStart dd 0
@@ -518 +646 @@
 fileStartSector dd 0
 fileSectorLength dd 0
+fileLength dd 0
+modulesLength dd 0
+numModules db 0
+modSegment dw 0x4000
+modOffset dw 0
 
 section .bss
@@ -524 +657 @@
 IsoFileName resb 64
 IsoFileNameEnd equ $
+moduleName resb 16
 
 ;Track buffer at the end of the bootloader