From d613a640388d7bfba3486e06779afdf8eeec43c6 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Sun, 28 Apr 2013 12:43:27 +0000 Subject: [PATCH] kernel: cleanup git-svn-id: svn://kolibrios.org@3486 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/memory.inc | 27 --------------------------- kernel/trunk/data32.inc | 1 - kernel/trunk/kernel.asm | 9 --------- 3 files changed, 37 deletions(-) diff --git a/kernel/trunk/core/memory.inc b/kernel/trunk/core/memory.inc index ca9d92575d..1b428d6799 100644 --- a/kernel/trunk/core/memory.inc +++ b/kernel/trunk/core/memory.inc @@ -1470,33 +1470,6 @@ proc set_mtrr stdcall, base:dword,size:dword,mem_type:dword ret endp -align 4 -proc stall stdcall, delay:dword - push ecx - push edx - push ebx - push eax - - mov eax, [delay] - mul [stall_mcs] - mov ebx, eax ;low - mov ecx, edx ;high - rdtsc - add ebx, eax - adc ecx, edx -@@: - rdtsc - sub eax, ebx - sbb edx, ecx - jb @B - - pop eax - pop ebx - pop edx - pop ecx - ret -endp - align 4 proc create_ring_buffer stdcall, size:dword, flags:dword locals diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 87815cafe9..4189fa9729 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -392,7 +392,6 @@ default_io_map rd 1 LFBSize rd 1 -stall_mcs rd 1 current_slot rd 1 ; status diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 0f0f0f4696..b4b6ce3e68 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -842,15 +842,6 @@ end if shl eax, 2 mov dword [cpu_freq], eax mov dword [cpu_freq+4], edx - mov ebx, 1000000 - div ebx -; вообще-то производительность в данном конкретном месте -; совершенно некритична, но чтобы заткнуть любителей -; оптимизирующих компиляторов ЯВУ... -; mov edx, 2251799814 -; mul edx -; shr edx, 19 - mov [stall_mcs], edx ; PRINT CPU FREQUENCY mov esi, boot_cpufreq call boot_log