diff --git a/kernel/trunk/core/sys32.inc b/kernel/trunk/core/sys32.inc index 5203a8e2cb..25fdc41887 100644 --- a/kernel/trunk/core/sys32.inc +++ b/kernel/trunk/core/sys32.inc @@ -185,22 +185,26 @@ show_error_parameters: cmp dword [esp+4+4], os_code ; CS jnz @f - mov esi,system_error - call sys_msg_board_str + ;mov esi,system_error + ;call sys_msg_board_str + DEBUGF 1,"%s",system_error @@: mov eax, [esp+4] ; EIP mov [write_error_to],process_eip+43 call writehex - mov esi,process_error - call sys_msg_board_str + ;mov esi,process_error + ;call sys_msg_board_str + DEBUGF 1,"%s",process_error - mov esi,process_pid - call sys_msg_board_str + ;mov esi,process_pid + ;call sys_msg_board_str + DEBUGF 1,"%s",process_pid - mov esi,process_eip - call sys_msg_board_str + ;mov esi,process_eip + ;call sys_msg_board_str + DEBUGF 1,"%s",process_eip ret @@ -480,8 +484,9 @@ terminate: ; terminate application add esp, 4 ret @@: - mov esi,process_terminating - call sys_msg_board_str + ;mov esi,process_terminating + ;call sys_msg_board_str + DEBUGF 1,"%s",process_terminating @@: cli cmp [application_table_status],0 @@ -505,8 +510,9 @@ term9: push esi call [eax+APPOBJ.destroy] - mov esi, msg_obj_destroy - call sys_msg_board_str + ;mov esi, msg_obj_destroy + ;call sys_msg_board_str + DEBUGF 1,"%s",msg_obj_destroy pop esi jmp @B @@: @@ -807,8 +813,9 @@ term9: mov [DONT_DRAW_MOUSE],byte 0 ; draw mouse mov [application_table_status],0 - mov esi,process_terminated - call sys_msg_board_str + ;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 c17f298748..613200c6ac 100644 --- a/kernel/trunk/core/taskman.inc +++ b/kernel/trunk/core/taskman.inc @@ -105,8 +105,9 @@ proc fs_execute test eax, eax jz .err_hdr - mov esi, new_process_loading - call sys_msg_board_str ; write message to message board + ;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 @@ -811,8 +812,9 @@ proc new_sys_threads mov [app_eip], ebx mov [app_esp], ecx - mov esi,new_process_loading - call sys_msg_board_str + ;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 @@ -865,8 +867,9 @@ proc new_sys_threads stdcall set_app_params ,[slot],eax,dword 0,\ dword 0,dword 0 - mov esi,new_process_running - call sys_msg_board_str ;output information about succefull startup + ;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 @@ -1061,8 +1064,9 @@ proc set_app_params stdcall,slot:dword, params:dword,\ mov eax,[CURRENT_TASK] mov [SLOT_BASE+ebx*8+0xac],eax ;set debugger PID - current .no_debug: - mov esi,new_process_running - call sys_msg_board_str ;output information about succefull startup + ;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/fdo.inc b/kernel/trunk/fdo.inc index 4c2ba67482..d3d1b0e3ac 100644 --- a/kernel/trunk/fdo.inc +++ b/kernel/trunk/fdo.inc @@ -236,7 +236,8 @@ debug_beginf pushad movzx ebx,al mov eax,1 - ; call sys_msg_board + mov ecx,sys_msg_board + call ecx ; sys_msg_board popad ret debug_endf @@ -249,7 +250,8 @@ debug_beginf movzx ebx,byte[edx] or bl,bl jz .l2 - ; call sys_msg_board + mov ecx,sys_msg_board + call ecx ; sys_msg_board inc edx jmp .l1 .l2: ret diff --git a/kernel/trunk/macros.inc b/kernel/trunk/macros.inc index e37b79bcb2..b7d8f4e232 100644 --- a/kernel/trunk/macros.inc +++ b/kernel/trunk/macros.inc @@ -41,8 +41,8 @@ macro diff16 title,l1,l2 local s,d s = l2-l1 display title,': 0x' - repeat 8 - d = 48 + s shr ((8-%) shl 2) and $0F + repeat 16 + d = 48 + s shr ((16-%) shl 2) and $0F if d > 57 d = d + 65-57-1 end if