From f80a8960b0f526a2baa6bd57f323e0d87723805d Mon Sep 17 00:00:00 2001 From: Andrew Dent Date: Thu, 30 May 2024 21:54:55 +0000 Subject: [PATCH] Fix EN comments in kernel - Minor tweaks and translations from RU. - Includes work by @rgimad. git-svn-id: svn://kolibrios.org@10070 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/bootcode.inc | 10 +++++----- kernel/trunk/boot/bootvesa.inc | 30 +++++++++++++++--------------- kernel/trunk/core/sched.inc | 4 ++-- kernel/trunk/core/v86.inc | 2 +- kernel/trunk/kernel.asm | 16 ++++++++-------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc index a19658f69e..b923dbe8f3 100644 --- a/kernel/trunk/boot/bootcode.inc +++ b/kernel/trunk/boot/bootcode.inc @@ -414,7 +414,7 @@ sayerr: test al, 2 loopnz @b - mov al, 0xf6 ; Сброс клавиатуры, разрешить сканирование + mov al, 0xf6 ; Keyboard reset, enable scanning out 0x60, al xor cx, cx @@: @@ -704,7 +704,7 @@ end if if defined extended_primary_loader _ask_question bdev,'13',preboot_device ; range accepted for answer: 1-3 else - _ask_question bdev,'14',preboot_device ; range accepted for answer: 1-4 + _ask_question bdev,'14',preboot_device ; range accepted for answer: 1-4 end if _setcursor 14,0 @@ -875,7 +875,7 @@ end if xor dx, dx div bx if lang eq ru -; подождите 5 секунд, 4/3/2 секунды, 1 секунду +; подождите 5 секунд, 4/3/2 секундЫ, 1 секундУ cmp al, 5 mov cl, ' ' jae @f @@ -892,7 +892,7 @@ else if lang eq et mov byte [time_str+10], ' ' @@: else if lang eq sp -; esperar 5/4/3/2 segundos, 1 segundo +; esperar 5/4/3/2 segundo_s_, 1 segundo cmp al, 1 mov cl, 's' ja @f @@ -900,7 +900,7 @@ else if lang eq sp @@: mov [time_str+10], cl else -; wait 5/4/3/2 seconds, 1 second +; wait 5/4/3/2 second_s_, 1 second cmp al, 1 mov cl, 's' ja @f diff --git a/kernel/trunk/boot/bootvesa.inc b/kernel/trunk/boot/bootvesa.inc index eed6573967..35eefbcc58 100644 --- a/kernel/trunk/boot/bootvesa.inc +++ b/kernel/trunk/boot/bootvesa.inc @@ -77,13 +77,13 @@ virtual at $A000 mi VBE_ModeInfo modes_table: end virtual -cursor_pos dw 0 ;временное хранение курсора. +cursor_pos dw 0 ; temporary cursor storage cursor_pos_old dw 0 -home_cursor dw 0 ;current shows rows a table -end_cursor dw 0 ;end of position current shows rows a table -scroll_start dw 0 ;start position of scroll bar -scroll_end dw 0 ;end position of scroll bar -long_v_table = 9 ;long of visible video table +home_cursor dw 0 ; current shows rows a table +end_cursor dw 0 ; end of position current shows rows a table +scroll_start dw 0 ; start position of scroll bar +scroll_end dw 0 ; end position of scroll bar +long_v_table = 9 ; long of visible video table size_of_step = 10 scroll_area_size = long_v_table - 2 int2str: @@ -696,7 +696,7 @@ draw_vmodes_table: jmp .@@_sh ;----------------------------------------------------------------------------- -;Clear arrea of current video page (0xb800) +;Clear area of current video page (0xb800) clear_vmodes_table: pusha ; draw frames @@ -724,17 +724,17 @@ set_vmode: push 0 ;0;x1000 pop es - mov si, word [preboot_graph] ;[preboot_graph] - mov cx, word [es:si+6] ; number of mode + mov si, word [preboot_graph] ;[preboot_graph] + mov cx, word [es:si+6] ; number of mode - mov ax, word [es:si+0] ; resolution X - mov bx, word [es:si+2] ; resolution Y + mov ax, word [es:si+0] ; resolution X + mov bx, word [es:si+2] ; resolution Y - mov word [es:BOOT_LO.x_res], ax ; resolution X - mov word [es:BOOT_LO.y_res], bx ; resolution Y - mov word [es:BOOT_LO.vesa_mode], cx ; number of mode + mov word [es:BOOT_LO.x_res], ax ; resolution X + mov word [es:BOOT_LO.y_res], bx ; resolution Y + mov word [es:BOOT_LO.vesa_mode], cx ; number of mode cmp cx, 0x12 je .mode0x12_0x13 @@ -752,7 +752,7 @@ set_vmode: mov di, mi;0xa000 int 0x10 ; LFB - mov eax, [es:mi.PhysBasePtr];di+0x28] + mov eax, [es:mi.PhysBasePtr] ; di+0x28 mov [es:BOOT_LO.lfb], eax ; ---- vbe voodoo BytesPerLine = 0x10 diff --git a/kernel/trunk/core/sched.inc b/kernel/trunk/core/sched.inc index 067006e689..3a4eb2e29a 100644 --- a/kernel/trunk/core/sched.inc +++ b/kernel/trunk/core/sched.inc @@ -84,8 +84,8 @@ updatecputimes: loop .newupdate ret -;TODO: Надо бы убрать использование do_change_task из V86... -; и после этого перенести обработку APPDATA.counter_add/sum в do_change_task +; TODO: We should remove the use of do_change_task from V86... +; and then move the processing of APPDATA.counter_add/sum to do_change_task align 4 do_change_task: diff --git a/kernel/trunk/core/v86.inc b/kernel/trunk/core/v86.inc index a935734c6d..0234dd0237 100644 --- a/kernel/trunk/core/v86.inc +++ b/kernel/trunk/core/v86.inc @@ -170,7 +170,7 @@ v86_get_lin_addr: ; esi=handle ; out: eax=V86 address, para-aligned (0x10 multiple) ; destroys: nothing -; недописана!!! +; Unfinished !!! ;v86_alloc: ; push ebx ecx edx edi ; lea ebx, [esi+V86_machine.mutex] diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index c8c2d1278e..c6dad66069 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -337,11 +337,11 @@ high_code: or eax, 1 ; bit_0 - System Call Extension (SCE) wrmsr - ; !!!! It`s dirty hack, fix it !!! + ; !!!! FIXME: Hack, fix it !!! ; Bits of EDX : - ; Bit 31–16 During the SYSRET instruction, this field is copied into the CS register + ; Bit 31-16 During the SYSRET instruction, this field is copied into the CS register ; and the contents of this field, plus 8, are copied into the SS register. - ; Bit 15–0 During the SYSCALL instruction, this field is copied into the CS register + ; Bit 15-0 During the SYSCALL instruction, this field is copied into the CS register ; and the contents of this field, plus 8, are copied into the SS register. ; mov edx, (os_code + 16) * 65536 + os_code @@ -2553,8 +2553,8 @@ sys_sheduler: ;now counter in ecx ;(edx:eax) esi:edi => edx:esi ; Fast Call MSR can't be destroy - ; Но MSR_AMD_EFER можно изменять, т.к. в этом регистре лиш - ; включаются/выключаются расширенные возможности + ; But MSR_AMD_EFER can be changed, because in this register only + ; advanced features are enabled/disabled cmp edx, MSR_SYSENTER_CS je @f cmp edx, MSR_SYSENTER_ESP @@ -2857,13 +2857,13 @@ newdw2: cmp eax, [esp+4] je not_this_task - ; check if window in redraw area + ; check if window in redraw area mov edi, eax - cmp ecx, 1 ; limit for background + cmp ecx, 1 ; limit for background jz bgli - mov eax, [esp+4] ;if upper in z-position - no redraw + mov eax, [esp+4] ; if upper in z-position - no redraw test eax, eax jz @f mov al, [eax + WDATA.z_modif]