From 7859c6d46f7c086a54dd42146ba279b2a1d0ddb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80?= Date: Sun, 17 Nov 2024 09:51:46 +0100 Subject: [PATCH] revert 1b88ec0ac27d7cb98580c0b884eaef5605433d6c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert update comments for ksys_draw_bitmap_palette && add .vscode dir to .gitignore Yes, I use vscode. Я перепутал ветки :( --- .gitignore | 3 --- contrib/sdk/sources/newlib/libc/include/sys/ksys.h | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 111e2100d4..668346f52f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,3 @@ ehthumbs_vista.db ### macOS ### .DS_Store ._* - -# vscode folder -.vscode/ diff --git a/contrib/sdk/sources/newlib/libc/include/sys/ksys.h b/contrib/sdk/sources/newlib/libc/include/sys/ksys.h index 36fc2e2904..a9c7281e44 100644 --- a/contrib/sdk/sources/newlib/libc/include/sys/ksys.h +++ b/contrib/sdk/sources/newlib/libc/include/sys/ksys.h @@ -1223,10 +1223,10 @@ KOSAPI void _ksys_debug_puts(const char* s) KOSAPI void ksys_draw_bitmap_palette(void* bitmap, int x, int y, int w, int h, int bpp, void* palette, int offset) { asm_inline( - "pushl %%ebp\n\t" // save EBP register - "movl %0, %%ebp\n\t" // mov offset to EBP register - "int $0x40\n\t" // system call - "popl %%ebp" // restore EBP register + "pushl %%ebp\n\t" // save EBP register + "movl %0, %%ebp\n\t" // 0x24 - "offset" param + "int $0x40\n\t" + "popl %%ebp" // restore EBP register :: "X"(offset), "a"(65),