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

[BOS.git] / kernel / krl_incs / rmode_int.inc

diff --git a/kernel/krl_incs/rmode_int.inc b/kernel/krl_incs/rmode_int.inc
index bd2dbe23aba651cdca2058ab1d2b2d59dd46aa0b..ed5716d9a04144a6699f04384afb9d315fee5019 100755 (executable)
--- a/kernel/krl_incs/rmode_int.inc
+++ b/kernel/krl_incs/rmode_int.inc
@@ -24,7 +24,7 @@ rmode_int:
          mov     word [realmode_cx], cx\r
          mov     word [realmode_dx], dx\r
          call    disable_irqs\r
          mov     word [realmode_cx], cx\r
          mov     word [realmode_dx], dx\r
          call    disable_irqs\r

-         jmp     pword 0x18:do_16pmode-0x10000       ; must substract 0x10000 from\r
+         jmp     pword 0x18:do_16pmode       ; must substract 0x10000 from\r

                                                      ; data addresses becasue of\r
                                                      ; fasm strict "org" behavior\r
 use16\r
                                                      ; data addresses becasue of\r
                                                      ; fasm strict "org" behavior\r
 use16\r


@@ -41,7 +41,7 @@ do_16pmode:
          and     al, 0xFE\r
          mov     cr0, eax\r
 \r
          and     al, 0xFE\r
          mov     cr0, eax\r
 \r

-         jmp     0x1000:(do_realm-0x10000)\r
+         jmp     0x1000:(do_realm)\r

 \r
 do_realm:\r
          mov     ax, cs\r
 \r
 do_realm:\r
          mov     ax, cs\r


@@ -53,34 +53,34 @@ do_realm:
          mov     gs, ax\r
          mov     ss, ax\r
 \r
          mov     gs, ax\r
          mov     ss, ax\r
 \r

-         lidt    [ridtr - 0x10000]                   ; realmode/variables.inc\r
+         lidt    [ridtr]                     ; realmode/variables.inc\r

          sti\r
 \r
          sti\r
 \r

-         mov     ax, word [realmode_ax - 0x10000]\r
-         mov     bx, word [realmode_bx - 0x10000]\r
-         mov     cx, word [realmode_cx - 0x10000]\r
-         mov     dx, word [realmode_dx - 0x10000]\r
+         mov     ax, word [realmode_ax]\r
+         mov     bx, word [realmode_bx]\r
+         mov     cx, word [realmode_cx]\r
+         mov     dx, word [realmode_dx]\r

 \r
          push    ax                                  ; this is some cool shit.. ;)\r
 \r
          push    ax                                  ; this is some cool shit.. ;)\r

-         mov     al, [int_number - 0x10000]          ; interrupt to preform\r
-         mov     [$+5 - 0x10000], al                 ; move it to right pos.\r
+         mov     al, [int_number]            ; interrupt to preform\r
+         mov     [$+5], al                   ; move it to right pos.\r

          pop     ax\r
          db      0xCD                                ; opcode for int.\r
          db      0x00                                ; move int_number here\r
 \r
          jnc     .no_error\r
          pop     ax\r
          db      0xCD                                ; opcode for int.\r
          db      0x00                                ; move int_number here\r
 \r
          jnc     .no_error\r

-         mov     byte [realmode_error - 0x10000], 1\r
+         mov     byte [realmode_error], 1\r

 \r
      .no_error:\r
 \r
      .no_error:\r

-         mov     word [realmode_ax - 0x10000], ax\r
-         mov     word [realmode_bx - 0x10000], bx\r
-         mov     word [realmode_cx - 0x10000], cx\r
-         mov     word [realmode_dx - 0x10000], dx\r
+         mov     word [realmode_ax], ax\r
+         mov     word [realmode_bx], bx\r
+         mov     word [realmode_cx], cx\r
+         mov     word [realmode_dx], dx\r

 \r
          cli\r
 \r
 \r
          cli\r
 \r

-         lgdt    [gdtr - 0x10000]\r
-         lidt    [idtr - 0x10000]\r
+         lgdt    [gdtr]\r
+         lidt    [idtr]\r

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