ds

git-svn-id: https://spexeah.com:8443/svn/Asuro@145 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

.bochsrc

@@ -53,7 +53,7 @@
 #display_library: amigaos
 #display_library: beos
 #display_library: carbon
-#display_library: macintosh
+display_library: sdl
 #display_library: nogui
 #display_library: rfb, options="timeout=60" # time to wait for client
 #display_library: sdl, options="fullscreen" # startup in fullscreen mode
@@ -775,5 +775,5 @@ i440fxsupport: enabled=1
 # romimage: file=:bios:BIOS-bochs-latest, address=0xf0000
 # floppya: 1_44=[fd:], status=inserted
 #=======================================================================
-display_library: sdl
+#display_library: sdl
-magic_break: enabled=1
+#magic_break: enabled=1

src/kernel.pas

@@ -24,23 +24,21 @@ implementation
 procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall; [public, alias: 'kmain'];   
 var
    c    : uint8;
-   mbi  : Pmultiboot_info_t;
-   mbm  : uint32;
    z    : uint32;
    dds  : uint32;
    pint : puint32;
    pint2 : puint32;
-
    keyboard_layout : array [0..1] of TKeyInfo;
    
 begin
-     mbi:= mbinfo;
+     multibootinfo:= mbinfo;
-     mbm:= mbmagic;
+     multibootmagic:= mbmagic;
+
      console.init();
 
      console.writestringln('Booting Asuro...');
 
-     if (mbm <> MULTIBOOT_BOOTLOADER_MAGIC) then begin
+     if (multibootmagic <> MULTIBOOT_BOOTLOADER_MAGIC) then begin
         console.setdefaultattribute(console.combinecolors(Red, Black));
         console.writestringln('Multiboot Compliant Boot-Loader Needed!');
         console.writestringln('HALTING');

src/multiboot.pas

@@ -54,6 +54,10 @@ type
 		      mtype: uint32;
         end;
  
+var
+   multibootinfo  : Pmultiboot_info_t = nil;
+   multibootmagic : uint32;
+
 implementation
  
 end.

src/stub/stub.asm

@@ -81,11 +81,11 @@ _loader:
 	jmp ecx
 
 kstart:
-	   mov dword [BootPageDirectory], 0
+	    mov dword [BootPageDirectory], 0
-        invlpg [0]	   		
+    	invlpg [0]	   		
         mov esp, KERNEL_STACK+KERNEL_STACKSIZE  ;Create kernel stack
         push eax                                ;Multiboot magic number
-	   add ebx, KERNEL_VIRTUAL_BASE
+	    add ebx, KERNEL_VIRTUAL_BASE
         push ebx                                ;Multiboot info
         call kmain                              ;Call kernel entrypoint
         cli                                     ;Clear interrupts

src/vmemorymanager.pas

@@ -81,14 +81,14 @@ begin
         mov eax, rldpd
         mov CR3, eax
     end;
-    console.writestringln('New Page Added:');
+    console.writestringln('VMM: New Page Added:');
 
-    console.writestring('- P:');
+    console.writestring('VMM: - P:');
     console.writehex(page_number);
     console.writestring('-->B:');
     console.writehexln(block);
         
-    console.writestring('- P:[');
+    console.writestring('VMM: - P:[');
     console.writehex(page_number SHL 22);
     console.writestring(' - ');
     console.writehex(((page_number+1) SHL 22));