made it assemble under os x, moved loading position of kernel + install script for osx

[BOS.git] / kernel / kernel.asm

diff --git a/kernel/kernel.asm b/kernel/kernel.asm
old mode 100755 (executable)
new mode 100644 (file)
index 40c2225..df6d48f
--- a/kernel/kernel.asm
+++ b/kernel/kernel.asm
@@ -1,24 +1,24 @@
 ;-------------------------------------------------------;\r
 ;-------------------------------------------------------;\r

-;                     BOS kernel                        ;\r
+;                    BOS kernel                        ;\r

 ;-------------------------------------------------------;\r
 ;-------------------------------------------------------;\r

-;    BOS 32-bit kernel, expects to be loaded at 64kb    ;\r
-;    in mem.   Small amount of 16-bit code included.    ;\r
-;                                                       ;\r
-;      For any comments on this code, mail me.          ;\r
-;   http://bos.asmhackers.net/   asmhacker@gmail.com    ;\r
-;                                                       ;\r
-;             by: Christoffer Bubach, 2003-2005         ;\r
+;    BOS 32-bit kernel, expects to be loaded at 64kb   ;\r
+;    in mem.   Small amount of 16-bit code included.   ;\r
+;                                                      ;\r
+;      For any comments on this code, mail me.         ;\r
+;   http://bos.asmhackers.net/  asmhacker@gmail.com    ;\r
+;                                                      ;\r
+;            by: Christoffer Bubach, 2003-2005         ;\r

 ;-------------------------------------------------------;\r
 use16\r
 ;-------------------------------------------------------;\r
 use16\r

-org 0x10000\r
+org 0x8000\r

 \r
 ;---------------------------;\r
 ;  jump to starting point   ;\r
 ;---------------------------;\r
 \r
 ;---------------------------;\r
 ;  jump to starting point   ;\r
 ;---------------------------;\r

-         jmp     start\r
+         jmp     start\r

 \r
 ;----------------------------------------;\r
 \r
 ;----------------------------------------;\r

-;     16-bit include files               ;\r
+;     16-bit include files              ;\r

 ;----------------------------------------;\r
          include  'realmode/a20.inc'                 ; Function to set the a20-gate.\r
          include  'realmode/gdt.inc'                 ; Global Description Table.\r
 ;----------------------------------------;\r
          include  'realmode/a20.inc'                 ; Function to set the a20-gate.\r
          include  'realmode/gdt.inc'                 ; Global Description Table.\r


@@ -30,7 +30,7 @@ org 0x10000
 \r
 \r
 ;--------------------------;\r
 \r
 \r
 ;--------------------------;\r

-;   16-bit entry point     ;\r
+;   16-bit entry point    ;\r

 ;--------------------------;\r
 start:\r
          cli\r
 ;--------------------------;\r
 start:\r
          cli\r


@@ -48,10 +48,10 @@ start:
 \r
          cli\r
          mov     ax, cs                              ; save cs\r
 \r
          cli\r
          mov     ax, cs                              ; save cs\r

-         mov     [realmode_cs - 0x10000], ax         ; in variables.inc\r
+         mov     [realmode_cs], ax           ; in variables.inc\r

 \r
 \r

-         lgdt    [gdtr - 0x10000]                    ; Load the GDT descriptor\r
-         lidt    [idtr - 0x10000]                    ; Load the IDT descriptor\r
+         lgdt    [gdtr]                      ; Load the GDT descriptor\r
+         lidt    [idtr]                      ; Load the IDT descriptor\r

 \r
          mov     eax, cr0\r
          or      al, 1\r
 \r
          mov     eax, cr0\r
          or      al, 1\r


@@ -62,7 +62,7 @@ start:
 \r
 \r
 ;--------------------------;\r
 \r
 \r
 ;--------------------------;\r

-;   32-bit entry point     ;\r
+;   32-bit entry point    ;\r

 ;--------------------------;\r
 use32\r
 flush:\r
 ;--------------------------;\r
 use32\r
 flush:\r


@@ -84,7 +84,7 @@ flush:
          call    init_cmd\r
          jmp     shell\r
 \r
          call    init_cmd\r
          jmp     shell\r
 \r

-         ;int     0x32\r
+         ;int     0x32\r

 \r
      .hang:\r
          cli\r
 \r
      .hang:\r
          cli\r


@@ -93,7 +93,7 @@ flush:
 \r
 \r
 ;----------------------------------------;\r
 \r
 \r
 ;----------------------------------------;\r

-;     32-bit include files               ;\r
+;     32-bit include files              ;\r

 ;----------------------------------------;\r
          include  'krl_incs/idt.inc'                 ; The Interrupt Description Table.\r
          include  'krl_incs/text.inc'                ; The default textmode functions.\r
 ;----------------------------------------;\r
          include  'krl_incs/idt.inc'                 ; The Interrupt Description Table.\r
          include  'krl_incs/text.inc'                ; The default textmode functions.\r


@@ -112,7 +112,7 @@ flush:
          include  'krl_incs/time_date.inc'           ; Print time and date.\r
          include  'krl_incs/timer.inc'               ; Timer IRQ.\r
          include  'krl_incs/vga.inc'                 ; VGA functions.\r
          include  'krl_incs/time_date.inc'           ; Print time and date.\r
          include  'krl_incs/timer.inc'               ; Timer IRQ.\r
          include  'krl_incs/vga.inc'                 ; VGA functions.\r

-       ;  include  'krl_incs/font8x16.inc'            ; Standard font.\r
+       ;  include  'krl_incs/font8x16.inc'            ; Standard font.\r

          include  'krl_incs/dma.inc'                 ; DMA code.\r
          include  'krl_incs/fdc.inc'                 ; Floppy code.\r
          include  'krl_incs/mario.inc'               ; Mario sprite.\r
          include  'krl_incs/dma.inc'                 ; DMA code.\r
          include  'krl_incs/fdc.inc'                 ; Floppy code.\r
          include  'krl_incs/mario.inc'               ; Mario sprite.\r