From 49ac7a5c3694c9bd3811513b97e5075fab66b3d3 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Fri, 28 Jun 2013 09:32:37 +0000 Subject: [PATCH] Kernel: remove some absolute adressing variables git-svn-id: svn://kolibrios.org@3727 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/const.inc | 33 +++++++------- kernel/trunk/data32.inc | 96 ++++++++++++++++++++++++++--------------- kernel/trunk/kernel.asm | 3 -- 3 files changed, 79 insertions(+), 53 deletions(-) diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index 35fdf74000..c8dd63aa5c 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -193,11 +193,11 @@ TASK_DATA equ (OS_BASE+0x0003020) TASK_EVENT equ (OS_BASE+0x0003020) CDDataBuf equ (OS_BASE+0x0007000) -FLOPPY_BUFF equ (OS_BASE+0x0008000) +FLOPPY_BUFF equ (OS_BASE+0x0008000) ;18*512 idts equ (OS_BASE+0x000B100) WIN_STACK equ (OS_BASE+0x000C000) WIN_POS equ (OS_BASE+0x000C400) -FDD_BUFF equ (OS_BASE+0x000D000) +FDD_BUFF equ (OS_BASE+0x000D000) ;512 WIN_TEMP_XY equ (OS_BASE+0x000F300) KEY_COUNT equ (OS_BASE+0x000F400) @@ -222,29 +222,32 @@ SLOT_BASE equ (OS_BASE+0x0080000) VGABasePtr equ (OS_BASE+0x00A0000) -RAMDISK equ (OS_BASE+0x0100000) -RAMDISK_FAT equ (OS_BASE+0x0280000) -FLOPPY_FAT equ (OS_BASE+0x0282000) +;RAMDISK equ (OS_BASE+0x0100000) +;RAMDISK_FAT equ (OS_BASE+0x0280000) +;FLOPPY_FAT equ (OS_BASE+0x0282000) -CLEAN_ZONE equ 0x284000 -IDE_DMA equ 0x284000 +;CLEAN_ZONE equ 0x284000 +;IDE_DMA equ 0x284000 -BgrAuxTable equ (OS_BASE+0x0298000) +CLEAN_ZONE equ (_CLEAN_ZONE-OS_BASE) +IDE_DMA equ (_IDE_DMA-OS_BASE) + +;BgrAuxTable equ (OS_BASE+0x0298000) ; unused? SB16Buffer equ (OS_BASE+0x02A0000) SB16_Status equ (OS_BASE+0x02B0000) -BUTTON_INFO equ (OS_BASE+0x02B3FEE) +;BUTTON_INFO equ (OS_BASE+0x02B3FEE) -BPSLine_calc_area equ (OS_BASE+0x02C4000) -d_width_calc_area equ (OS_BASE+0x02CA000) +;BPSLine_calc_area equ (OS_BASE+0x02C4000) +;d_width_calc_area equ (OS_BASE+0x02CA000) -RESERVED_PORTS equ (OS_BASE+0x02D0000) -BOOT_VAR equ (OS_BASE+0x02E0000) +;RESERVED_PORTS equ (OS_BASE+0x02D0000) +;BOOT_VAR equ (OS_BASE+0x02E0000) -draw_data equ (OS_BASE+0x0320000) +;draw_data equ (OS_BASE+0x0320000) -sys_pgmap equ (OS_BASE+0x0324000) +;sys_pgmap equ (OS_BASE+0x0324000) UPPER_KERNEL_PAGES equ (OS_BASE+0x0400000) diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index 62544c1abd..073a8f1158 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -361,56 +361,60 @@ srv.bk rd 1 align 16 -_display display_t +_display display_t -_WinMapAddress rd 1 -_WinMapSize rd 1 +_WinMapAddress rd 1 +_WinMapSize rd 1 -LFBAddress rd 1 -Screen_Max_X rd 1 -Screen_Max_Y rd 1 +LFBAddress rd 1 +Screen_Max_X rd 1 +Screen_Max_Y rd 1 -SCR_MODE rw 2 +SCR_MODE rw 2 -PUTPIXEL rd 1 -GETPIXEL rd 1 +PUTPIXEL rd 1 +GETPIXEL rd 1 if VESA_1_2_VIDEO -BANK_SWITCH rd 1 reserved for vesa 1.2 -BANK_RW rd 1 +BANK_SWITCH rd 1 reserved for vesa 1.2 +BANK_RW rd 1 end if -REDRAW_BACKGROUND rb 4 +REDRAW_BACKGROUND rb 4 -mouseunder rd 16*24 +draw_data: rb 16*256 +BPSLine_calc_area rd 1440 +d_width_calc_area rd 1140 -MOUSE_PICTURE rd 1 +mouseunder rd 16*24 -MOUSE_SCROLL_H rw 1 -MOUSE_X: rw 1 -MOUSE_Y: rw 1 -MOUSE_SCROLL_V rw 1 +MOUSE_PICTURE rd 1 -X_UNDER rw 1 -Y_UNDER rw 1 -COLOR_TEMP rd 1 -MOUSE_COLOR_MEM rd 1 +MOUSE_SCROLL_H rw 1 +MOUSE_X: rw 1 +MOUSE_Y: rw 1 +MOUSE_SCROLL_V rw 1 -BTN_DOWN: rb 4 +X_UNDER rw 1 +Y_UNDER rw 1 +COLOR_TEMP rd 1 +MOUSE_COLOR_MEM rd 1 -def_cursor rd 1 -def_cursor_clock rd 1 -current_cursor rd 1 -hw_cursor rd 1 -cur_saved_base rd 1 +BTN_DOWN: rb 4 -cur.lock rd 1 ;1 - lock update, 2- hide -cur.left rd 1 ;cursor clip box -cur.top rd 1 -cur.right rd 1 -cur.bottom rd 1 -cur.w rd 1 -cur.h rd 1 +def_cursor rd 1 +def_cursor_clock rd 1 +current_cursor rd 1 +hw_cursor rd 1 +cur_saved_base rd 1 + +cur.lock rd 1 ;1 - lock update, 2- hide +cur.left rd 1 ;cursor clip box +cur.top rd 1 +cur.right rd 1 +cur.bottom rd 1 +cur.w rd 1 +cur.h rd 1 ipc_tmp rd 1 ipc_pdir rd 1 @@ -546,3 +550,25 @@ align 16 DRIVE_DATA: rb DRIVE_DATA_SIZE IncludeUGlobals + +uglobals_size = $ - endofcode + +if ~ lang eq sp +diff16 "end of .bss",0,$ +end if + +org (OS_BASE+0x0100000) + +RAMDISK: rb 2880*512 +RAMDISK_FAT: rb 2856*2 +FLOPPY_FAT: rb 2856*2 + +_CLEAN_ZONE: + +align 4096 +_IDE_DMA rb 16*512 +BgrAuxTable rb 32768 +BUTTON_INFO rb 64*1024 +RESERVED_PORTS: rb 64*1024 +BOOT_VAR: rb 64*1024 +sys_pgmap: rb 1024*1024/8 diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index c60c36eb14..6b5e0e251b 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -5466,7 +5466,6 @@ calculate_fast_getting_offset_for_WinMapAddress: ; calculate data area for fast getting offset to _WinMapAddress xor eax, eax mov ecx, [_display.height] - inc ecx mov edi, d_width_calc_area cld @@: @@ -5481,7 +5480,6 @@ calculate_fast_getting_offset_for_LFB: ; calculate data area for fast getting offset to LFB xor eax, eax mov ecx, [_display.height] - inc ecx mov edi, BPSLine_calc_area cld @@: @@ -5873,7 +5871,6 @@ include "data32.inc" __REV__ = __REV -uglobals_size = $ - endofcode if ~ lang eq sp diff16 "end of kernel code",0,$ end if