Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8160 → Rev 8159

/kernel/trunk/kernel.asm
1746,14 → 1746,8
dec ecx
jnz .shift
 
; if given memory address belongs to kernel then error
push ebx
mov eax, ebx
mov ebx, 128
call is_region_userspace
pop ebx
test eax, eax
jz .addr_error
cmp ebx, 0x7FFFFFFF ; if given memory address belongs to kernel then error
ja .addr_error
 
mov eax, keymap
mov ecx, 128
1765,13 → 1759,8
dec ecx
jnz .alt
 
push ebx
mov eax, ebx
mov ebx, 128
call is_region_userspace
pop ebx
test eax, eax
jz .addr_error
cmp ebx, 0x7FFFFFFF
ja .addr_error
 
mov eax, keymap_shift
mov ecx, 128
1783,13 → 1772,8
dec ecx
jne .country
 
push ebx
mov eax, ebx
mov ebx, 128
call is_region_userspace
pop ebx
test eax, eax
jz .addr_error
cmp ebx, 0x7FFFFFFF
ja .addr_error
 
mov eax, keymap_alt
mov ecx, 128
5663,30 → 5647,12
; -----------------------------------------
 
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
is_region_userspace:
; in: eax = base
; ebx = len
; out: eax = 1 if region in userspace memory, 0 if not
push esi edi ecx
add eax, ebx
cmp eax, OS_BASE
ja @f
 
mov eax, 1
jmp .ret
 
@@:
xor eax, eax
.ret:
pop ecx edi esi
ret
 
if ~ lang eq sp
diff16 "end of .text segment",0,$
end if