From c84192cba489c4eb658e45db58bb028bed8a4efa Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Fri, 20 Feb 2009 12:01:31 +0000 Subject: [PATCH] * commented redundant messages for window moving and process creating * added CPU frequency output in boot log git-svn-id: svn://kolibrios.org@1038 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/sys32.inc | 6 ++---- kernel/trunk/core/taskman.inc | 4 ---- kernel/trunk/data32.inc | 5 +++-- kernel/trunk/gui/window.inc | 20 ++++++++++---------- kernel/trunk/kernel.asm | 23 ++++++++++++++++++++--- 5 files changed, 35 insertions(+), 23 deletions(-) diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc index a522b1ea25..3669f1ef0b 100644 --- a/kernel/trunk/core/sys32.inc +++ b/kernel/trunk/core/sys32.inc @@ -421,8 +421,8 @@ sys_threads: jmp new_sys_threads iglobal - process_terminating db 'K : Process - terminating',13,10,0 - process_terminated db 'K : Process - done',13,10,0 +; process_terminating db 'K : Process - terminating',13,10,0 +; process_terminated db 'K : Process - done',13,10,0 msg_obj_destroy db 'K : destroy app object',13,10,0 endg @@ -445,7 +445,6 @@ terminate: ; terminate application @@: ;mov esi,process_terminating ;call sys_msg_board_str - DEBUGF 1,"%s",process_terminating @@: cli cmp [application_table_status],0 @@ -805,7 +804,6 @@ term9: mov [application_table_status],0 ;mov esi,process_terminated ;call sys_msg_board_str - DEBUGF 1,"%s",process_terminated add esp, 4 ret restore .slot diff --git a/kernel/trunk/core/taskman.inc b/kernel/trunk/core/taskman.inc index 28579cde38..dfce86dfb5 100644 --- a/kernel/trunk/core/taskman.inc +++ b/kernel/trunk/core/taskman.inc @@ -140,7 +140,6 @@ proc fs_execute ;mov esi, new_process_loading ;call sys_msg_board_str ; write message to message board - DEBUGF 1,"%s",new_process_loading .wait_lock: cmp [application_table_status],0 @@ -850,7 +849,6 @@ proc new_sys_threads ;mov esi,new_process_loading ;call sys_msg_board_str - DEBUGF 1,"%s",new_process_loading .wait_lock: cmp [application_table_status],0 je .get_lock @@ -905,7 +903,6 @@ proc new_sys_threads ;mov esi,new_process_running ;call sys_msg_board_str ;output information about succefull startup - DEBUGF 1,"%s",new_process_running mov [application_table_status],0 ;unlock application_table_status mutex mov eax,[process_number] ;set result @@ -1104,7 +1101,6 @@ proc set_app_params stdcall,slot:dword, params:dword,\ mov [CURRENT_TASK+ebx+TASKDATA.state], cl ;mov esi,new_process_running ;call sys_msg_board_str ;output information about succefull startup - DEBUGF 1,"%s",new_process_running ret endp diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index e7fc0f8697..f21a76fe12 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -63,6 +63,7 @@ keymap_alt: boot_setostask db 'Setting OS task',0 boot_allirqs db 'Unmasking all IRQs',0 boot_tsc db 'Reading TSC',0 + boot_cpufreq db 'CPU frequency is ',' ',' MHz',0 boot_pal_ega db 'Setting EGA/CGA 320x200 palette',0 boot_pal_vga db 'Setting VGA 640x480 palette',0 boot_failed db 'Failed to start first app',0 @@ -71,8 +72,8 @@ if preboot_blogesc boot_tasking db 'All set - press ESC to start',0 end if -new_process_loading db 'K : New Process - loading',13,10,0 -new_process_running db 'K : New Process - done',13,10,0 +;new_process_loading db 'K : New Process - loading',13,10,0 +;new_process_running db 'K : New Process - done',13,10,0 start_not_enough_memory db 'K : New Process - not enough memory',13,10,0 msg_unresolved db 'unresolved ',0 diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index 5661382685..793dda681a 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -1166,10 +1166,10 @@ restore_minimized_window: ret -iglobal - window_moving db 'K : Window - move/resize',13,10,0 - window_moved db 'K : Window - done',13,10,0 -endg +;iglobal +; window_moving db 'K : Window - move/resize',13,10,0 +; window_moved db 'K : Window - done',13,10,0 +;endg ; check window touch align 4 @@ -1316,10 +1316,10 @@ endg .continue: - push esi - mov esi, window_moving - call sys_msg_board_str - pop esi +; push esi +; mov esi, window_moving +; call sys_msg_board_str +; pop esi mov ecx, [timer_ticks] ; double-click ? mov edx, ecx @@ -1684,8 +1684,8 @@ endg mov [MOUSE_BACKGROUND],byte 0 ; no mouse under mov [MOUSE_DOWN],byte 0 ; react to mouse up/down - mov esi,window_moved - call sys_msg_board_str +; mov esi,window_moved +; call sys_msg_board_str popad diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index bf550421fc..02630b7fdc 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -730,9 +730,26 @@ no_lib_load: sub eax,ecx shl eax,2 mov [CPU_FREQ],eax ; save tsc / sec - mov ebx, 1000000 - div ebx - mov [stall_mcs], eax +; 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 + + mov ebx, edx + movzx ecx, word [boot_y] + add ecx, (10+17*6) shl 16 - 10 ; 'CPU frequency is ' + mov edx, 0xFFFFFF + mov edi, 1 + mov eax, 0x00040000 + call display_number_force ; SET VARIABLES