BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/trunk/video/ @ 5350

  → /kernel/trunk/video/ @ 5351

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 5350 → Rev 5351

/kernel/trunk/video/blitter.inc
282,7 → 282,7
mov ebp, [d_width_calc_area+ebp*4]
add ebp, ebx
add ebp, [_WinMapAddress]
add ebp, [_display.win_map]
mov eax, [esp+BLITTER.src_y]
imul eax, [esp+BLITTER.stride]
341,7 → 341,7
jnz .inner32
add esi, [esp+BLITTER.stride]
add edi, [_display.pitch]
add edi, [_display.lfb_pitch]
add ebp, [_display.width]
mov edx, [esp+BLITTER.w]
375,7 → 375,7
jnz .hw.inner32
add esi, [esp+BLITTER.stride]
add edi, [_display.pitch]
add edi, [_display.lfb_pitch]
add ebp, [_display.width]
mov edx, [esp+BLITTER.w]
452,7 → 452,7
add esi, [esp+BLITTER.stride]
mov edi, [esp+.extra_var1]
add edi, [_display.pitch]
add edi, [_display.lfb_pitch]
add ebp, [_display.width]
mov edx, [esp+BLITTER.w]
514,7 → 514,7
add esi, [esp+BLITTER.stride]
mov edi, [esp+.extra_var1]
add edi, [_display.pitch]
add edi, [_display.lfb_pitch]
add ebp, [_display.width]
mov edx, [esp+BLITTER.w]

/kernel/trunk/video/cursors.inc
528,7 → 528,7
align 4
@@:
mov edi, ebx
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
mov ecx, [esp]
rep movsb
563,7 → 563,7
align 4
@@:
mov edi, ebx
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
mov ecx, [cur.w]
rep movsd
597,7 → 597,7
align 4
@@:
mov edi, ebx
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
mov ecx, [cur.w]
rep movsw
684,7 → 684,7
align 4
@@:
mov esi, edx
add edx, [_display.pitch]
add edx, [_display.lfb_pitch]
mov ecx, [cur.w]
lea ecx, [ecx+ecx*2]
rep movsb
707,7 → 707,7
mov esi, edx
mov edi, ebx
add edx, 32*4
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
;--------------------------------------
align 4
.pix:
797,7 → 797,7
align 4
@@:
mov esi, edx
add edx, [_display.pitch]
add edx, [_display.lfb_pitch]
mov ecx, [cur.w]
rep movsd
dec eax
819,7 → 819,7
mov esi, edx
mov edi, ebx
add edx, 32*4
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
;--------------------------------------
align 4
.pix:
907,7 → 907,7
align 4
@@:
mov esi, edx
add edx, [_display.pitch]
add edx, [_display.lfb_pitch]
mov ecx, [cur.w]
rep movsw
930,7 → 930,7
mov esi, edx
mov edi, ebx
add edx, 32*4
add ebx, [_display.pitch]
add ebx, [_display.lfb_pitch]
;--------------------------------------
align 4
.pix:

/kernel/trunk/video/vesa20.inc
240,7 → 240,7
sub eax, [putimg.real_sx]
mov [putimg.winmap_newline], eax
; screen new line increment
mov eax, [_display.pitch]
mov eax, [_display.lfb_pitch]
mov ebx, [_display.bytes_per_pixel]
imul ecx, ebx
sub eax, ecx
261,7 → 261,7
mov eax, [d_width_calc_area + eax*4]
add eax, [putimg.abs_cx]
add eax, [_WinMapAddress]
add eax, [_display.win_map]
xchg eax, ebp
mov ecx, [putimg.real_sx]
884,7 → 884,7
; not forced
mov edx, [d_width_calc_area + ebx*4]
add edx, [_WinMapAddress]
add edx, [_display.win_map]
movzx edx, byte [eax+edx]
cmp edx, [CURRENT_TASK]
jne .exit
1448,7 → 1448,7
mov ebx, [_display.bytes_per_pixel]
imul eax, ebx
neg eax
add eax, [_display.pitch]
add eax, [_display.lfb_pitch]
mov [drbar.line_inc_scr], eax
; pointer to screen
mov edx, [drbar.abs_cy]
1464,7 → 1464,7
mov eax, [d_width_calc_area + eax*4]
add eax, [drbar.abs_cx]
add eax, [_WinMapAddress]
add eax, [_display.win_map]
xchg eax, ebp
mov ebx, [drbar.real_sx]
2034,7 → 2034,7
; ebp:=Y*BytesPerScanLine+X*BytesPerPixel+AddrLFB
call calculate_edi
xchg edi, ebp
add ebp, [_WinMapAddress]
add ebp, [_display.win_map]
; Now eax=x, ebx=y, edi->output, ebp=offset in WinMapAddress
; 2) Calculate offset in background memory block
push eax
2256,7 → 2256,7
; qword [esp+36] = 2^32*(BgrDataWidth-1)/(ScreenWidth-1)
sdp3a:
mov eax, [_WinMapAddress]
mov eax, [_display.win_map]
cmp [ebp+eax], byte 1
jnz snbgp
mov eax, [bgr_cur_line+esi]
2332,7 → 2332,7
sub edi, eax
@@:
add edi, [_display.pitch]
add edi, [_display.lfb_pitch]
; restore ecx,edx; advance esi to next background line
mov eax, [esp+28]
mov ebx, [esp+32]