[Jnode-svn-commits] SF.net SVN: jnode:[4396] trunk/core/src

[<fd...@us...>]

Revision: 4396
          http://jnode.svn.sourceforge.net/jnode/?rev=4396&view=rev
Author:   fduminy
Date:     2008-08-03 21:50:40 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
kernel cleanup :
- removed unneeded native method Unsafe.getVbeInfos() (using multiboot_vbe kernel data)
- removed unneeded multiboot_vbe kernel data (+its copying code, which contained a bug)
- improved comments in assembly code

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java
    trunk/core/src/native/x86/i386.h
    trunk/core/src/native/x86/kernel.asm
    trunk/core/src/native/x86/unsafex86.asm

Modified: trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java	2008-08-03 16:26:28 UTC (rev 4395)
+++ trunk/core/src/core/org/jnode/vm/x86/UnsafeX86.java	2008-08-03 21:50:40 UTC (rev 4396)
@@ -83,8 +83,6 @@
      */
     static final native int getMultibootMMapLength();
 
-    public static final native Address getVbeInfos();
-
     public static final native Address getVbeControlInfos();
 
     public static final native Address getVbeModeInfos();

Modified: trunk/core/src/native/x86/kernel.asm
===================================================================
--- trunk/core/src/native/x86/kernel.asm	2008-08-03 16:26:28 UTC (rev 4395)
+++ trunk/core/src/native/x86/kernel.asm	2008-08-03 21:50:40 UTC (rev 4396)
@@ -100,29 +100,16 @@
 	test dword [multiboot_info+MBI_FLAGS],MBF_VBE
 	jz vbe_info_done ; no vbe info, jump to end
 	
-	; Copy vbe infos
-	; Get start address
-	mov esi,[multiboot_info+MBI_VBECTRLINFO]
-	; Get destination address
-	mov edi,multiboot_vbe
-	; Copy the VBE_ESIZE bytes
-	mov ecx,VBE_ESIZE
+    ; Copy VBE control informations
+	mov esi,[multiboot_info+MBI_VBECTRLINFO] ; Get start address	
+	mov edi,vbe_control_info                 ; Get destination address	
+	mov ecx,VBECTRLINFO_SIZE                 ; Copy the VBECTRLINFO_SIZE bytes
 	rep movsb
-
-	; Get start address
-	mov esi,[multiboot_info+MBI_VBECTRLINFO]
-	; Get destination address
-	mov edi,vbe_control_info
-	; Copy the VBECTRLINFO_SIZE bytes
-	mov ecx,VBECTRLINFO_SIZE
-	rep movsb
 	
-	; Get start address
-	mov esi,[multiboot_info+MBI_VBEMODEINFO]
-	; Get destination address
-	mov edi,vbe_mode_info
-	; Copy the VBEMODEINFO_SIZE bytes
-	mov ecx,VBEMODEINFO_SIZE
+	; Copy VBE mode informations
+	mov esi,[multiboot_info+MBI_VBEMODEINFO]  ; Get start address	
+	mov edi,vbe_mode_info                     ; Get destination address	
+	mov ecx,VBEMODEINFO_SIZE                  ; Copy the VBEMODEINFO_SIZE bytes
 	rep movsb	
 vbe_info_done:
 
@@ -314,10 +301,7 @@
 	dd 0				; Entries
 	times (MBI_MMAP_MAX * MBMMAP_ESIZE) db 0
 
-; vbe informations
-multiboot_vbe:
-	times (VBE_ESIZE) db 0
-	
+; vbe informations in multiboot header
 vbe_control_info:	
 	times (VBECTRLINFO_SIZE) db 0
 

Modified: trunk/core/src/native/x86/unsafex86.asm
===================================================================
--- trunk/core/src/native/x86/unsafex86.asm	2008-08-03 16:26:28 UTC (rev 4395)
+++ trunk/core/src/native/x86/unsafex86.asm	2008-08-03 21:50:40 UTC (rev 4396)
@@ -82,11 +82,6 @@
 	mov eax,[multiboot_mmap]
 	ret
 
-; Address getVbeInfos();
-GLABEL Q53org5jnode2vm3x869UnsafeX8623getVbeInfos2e2829Lorg2fvmmagic2funboxed2fAddress3b
-	mov AAX,multiboot_vbe
-	ret
-
 ; Address getVbeControlInfos();
 GLABEL Q53org5jnode2vm3x869UnsafeX8623getVbeControlInfos2e2829Lorg2fvmmagic2funboxed2fAddress3b
 	mov AAX,vbe_control_info


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.