diff --git a/src/sys/boot/bootsec.asm b/src/sys/boot/bootsec.asm index d3783a2..1d15566 100755 --- a/src/sys/boot/bootsec.asm +++ b/src/sys/boot/bootsec.asm @@ -56,9 +56,9 @@ xor ax, ax mov ds, ax mov dl, [bootdrv] -;mji mov bx, 0x60 + mov bx, 0x60 ; mjikaboom - mov bx, 0x0a000 +;mji mov bx, 0x0a000 mov es, bx mov eax, 1 mov ecx, [krnl_size] @@ -75,9 +75,9 @@ mov al,0x0c out dx,al ;lets convert the ELF file to a linear binary so we can execute it -;mji cmp dword [0x600],464c457fh ; The ELF signature is \07fELF + cmp dword [0x600],464c457fh ; The ELF signature is \07fELF ;mjikaboom - mov ax, 0x0a000 + mov ax, 0x60 mov es, ax cmp dword [es:0],464c457fh ; The ELF signature is \07fELF jne ldr_ELF_err ; Ugh... not an ELF file !!! @@ -102,23 +102,23 @@ hlt skip_err_handler: -;mji mov eax, [0x600+18h] + mov eax, [0x600+18h] ;mjikaboom - mov eax, [0x0a0000+18h] +;mji mov eax, [0x0a0000+18h] mov [krnl_entry], eax xor ecx,ecx ; Get the number of sections in cx -;mji mov cx,[0x600+2ch] + mov cx,[0x600+2ch] ;mjikaboom - mov cx,[0x0a0000+2ch] +;mji mov cx,[0x0a0000+2ch] sectionloop: dec ecx ; Next section push ecx ; Save cx on the stack while we load ; the section into memory -;mji mov bx, 0x600 ; access image location + mov bx, 0x600 ; access image location ;mjikaboom - mov bx, 0x0a0000 ; access image location +;mji mov bx, 0x0a0000 ; access image location mov ax,[bx+2ah] ; Get the program header entry size mul cx ; Calculate the offset from the start @@ -137,9 +137,9 @@ mov dword eax,[bx+14h] ; eax <= the size of the section mov dword ebx,[bx+4h] ; Get the offset of the segment in ; the ELF file -;mji add ebx, 0x600 ; + add ebx, 0x600 ; ;mjikaboom - add ebx, 0x0a0000 ; +;mji add ebx, 0x0a0000 ; ; set up for memcopy