WebSVN – Kolibri OS – Diff – /kernel/trunk/kernel.asm

 format binary as "mnt"
 include 'macros.inc'
 include 'struct.inc'
-$Revision: 8270 $
+$Revision: 8329 $
 ; 1 = normal layout
         dec     ecx
         jnz     .shift
-        ; if given memory address belongs to kernel then error
-        push    ebx
-        mov     eax, ebx
-        mov     ebx, 128
+        ; if given memory address belongs to kernel then error
-        call    is_region_userspace
-        pop     ebx
-        test    eax, eax
+        stdcall is_region_userspace, ebx, 128
         jz      .addr_error
         mov     eax, keymap
 .shift:
 ; 2 = layout with pressed Shift
         dec     ecx
         jnz     .alt
-        push    ebx
-        mov     eax, ebx
-        mov     ebx, 128
-        call    is_region_userspace
-        pop     ebx
-        test    eax, eax
+        stdcall is_region_userspace, ebx, 128
         jz      .addr_error
         mov     eax, keymap_shift
 .alt:
 ; 3 = layout with pressed Alt
         dec     ecx
         jne     .country
-        push    ebx
-        mov     eax, ebx
-        mov     ebx, 128
-        call    is_region_userspace
-        pop     ebx
-        test    eax, eax
+        stdcall is_region_userspace, ebx, 128
         jz      .addr_error
         mov     eax, keymap_alt
         and     dword [esp+32], 0
         ret
 ;------------------------------------------------------------------------------
 sysfn_getversion:       ; 18.13 = get kernel ID and version
         ; if given memory address belongs to kernel then error
-        mov     eax, ecx
-        mov     ebx, version_end-version_inf
+        stdcall is_region_userspace, ecx, version_end-version_inf
-        call    is_region_userspace
-        test    eax, eax
         jz      .addr_error
         mov     edi, ecx
         mov     esi, version_inf
 ;  +22 dword     start in mem
 ;  +26 dword     used mem
 ;  +30 dword     PID , process idenfification number
+;
         ; if given memory address belongs to kernel then error
-        push    ebx
-        mov     eax, ebx
-        mov     ebx, 0x4C
-        call    is_region_userspace
+        stdcall is_region_userspace, ebx, 0x4C
-        pop     ebx
-        test    eax, eax
         jz      .addr_error
         cmp     ecx, -1 ; who am I ?
         jne     .no_who_am_i
 align 4
 undefined_syscall:                      ; Undefined system call
         mov     [esp + 32], dword -1
         ret
 align 4
+; check if given memory region lays in lower 2gb (userspace memory) or not
-; check if given memory region lays in lower 2gb (userspace memory) or not
+align 4
+proc is_region_userspace stdcall, base:dword, len:dword
-is_region_userspace:
+; in:
-; in:  eax = base
+;      base = base address of region
-;      ebx = len
+;      len = lenght of region
+; out: ZF = 1 if region in userspace memory
-; out: eax = 1 if region in userspace memory, 0 if not
+;      ZF = 0 otherwise
+        push    eax ebx
-        push    esi edi ecx
+        mov     eax, [base]
+        cmp     eax, OS_BASE
+        ja      @f
+        mov     ebx, 0xFFFFFFFF
+        sub     ebx, [base]
+        inc     ebx
-        cmp     eax, OS_BASE
+        cmp     [len], ebx
         ja      @f
-        add     eax, ebx
+        add     eax, [len]
         cmp     eax, OS_BASE
         ja      @f
         mov     eax, 1
+        jmp     .ret
-        jmp     .ret
+@@:
-@@:
+        xor     eax, eax
+.ret:
-        xor     eax, eax
+        test    eax, eax
-.ret:
+        pop     ebx eax
-        pop     ecx edi esi
+        ret

Subversion Repositories Kolibri OS

(root)/kernel/trunk/kernel.asm – Rev 8270 → 8329