KolibriOS/umka
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace some hardcoded values with macros

Browse Source
This commit is contained in:
Ivan Baravy 2021-07-17 03:03:36 +03:00
parent 9fa1ef9625
commit ffa2480f2a
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/016_#f01_#draw_all.ref.log
View File

@ -54,6 +54,30 @@ font smoothing: 0 - off
2: 2 2: 2
3: 3 3: 3
4: 4 4: 4
/> dump_taskdata 5
event_mask: 0
pid: 0
state: 0x0
wnd_number: 0
counter_sum: 0
counter_add: 0
cpu_usage: 0
/> dump_appdata 5
app_name:
except_mask: 0
dbg_state: 0
cur_dir: (null)
draw_bgr_x: 0
draw_bgr_y: 0
event_mask: 0
terminate_protection: 0
keyboard_mode: 0
captionEncoding: 0
exec_params: (null)
wnd_caption: (null)
wnd_clientbox (ltwh): 0 0 0 0
priority: 0
in_schedule: prev (4294306402), next (4294306402)
/> process_info -1 /> process_info -1
cpu_usage: 0 cpu_usage: 0

2
test/016_#f01_#draw_all.t
View File

@ -30,6 +30,8 @@ set_window_colors 0 0 0 0 0 0 0 0 0 0
dump_win_stack 5 dump_win_stack 5
dump_win_pos 5 dump_win_pos 5
dump_taskdata 5
dump_appdata 5
process_info -1 process_info -1
get_skin_height get_skin_height

12
umka.asm
View File

@ -118,7 +118,6 @@ window_data equ __pew01
TASK_TABLE equ __pew02 TASK_TABLE equ __pew02
TASK_BASE equ __pew03 TASK_BASE equ __pew03
TASK_DATA equ __pew04 TASK_DATA equ __pew04
TASK_EVENT equ __pew05
CDDataBuf equ __pew06 CDDataBuf equ __pew06
idts equ __pew07 idts equ __pew07
WIN_STACK equ __pew08 WIN_STACK equ __pew08
@ -142,7 +141,7 @@ HEAP_BASE equ __pew23
include 'const.inc' include 'const.inc'
restore window_data restore window_data
restore TASK_TABLE restore TASK_TABLE
restore TASK_BASE,TASK_DATA,TASK_EVENT,CDDataBuf,idts,WIN_STACK,WIN_POS restore TASK_BASE,TASK_DATA,CDDataBuf,idts,WIN_STACK,WIN_POS
restore FDD_BUFF,WIN_TEMP_XY,KEY_COUNT,KEY_BUFF,BTN_COUNT,BTN_BUFF,BTN_ADDR restore FDD_BUFF,WIN_TEMP_XY,KEY_COUNT,KEY_BUFF,BTN_COUNT,BTN_BUFF,BTN_ADDR
restore MEM_AMOUNT,SYS_SHUTDOWN,SLOT_BASE,sys_proc,VGABasePtr restore MEM_AMOUNT,SYS_SHUTDOWN,SLOT_BASE,sys_proc,VGABasePtr
restore HEAP_BASE restore HEAP_BASE
@ -718,13 +717,12 @@ fpu_owner dd ?
uglobal uglobal
align 64 align 64
os_base: rb 0x1000 os_base: rb PAGE_SIZE
window_data: rb 0x2000 window_data: rb sizeof.WDATA * 256
TASK_TABLE: rb 4 TASK_TABLE: rb 4
rb 12 rb 12
TASK_BASE rd 4 TASK_BASE rd 4
TASK_DATA rd 0x7f8 TASK_DATA rd 0x7f8
TASK_EVENT = TASK_DATA
CDDataBuf: rd 0x1840 CDDataBuf: rd 0x1840
idts rd 0x3c0 idts rd 0x3c0
WIN_STACK rw 0x200 WIN_STACK rw 0x200
@ -738,8 +736,8 @@ BTN_BUFF rd 0x261
BTN_ADDR dd ? BTN_ADDR dd ?
MEM_AMOUNT rd 0x1d MEM_AMOUNT rd 0x1d
SYS_SHUTDOWN db ? SYS_SHUTDOWN db ?
sys_proc rd 0x800 sys_proc: rb sizeof.TASKDATA * 256
SLOT_BASE: rd 0x8000 SLOT_BASE: rb sizeof.APPDATA * 256
VGABasePtr rb 640*480 VGABasePtr rb 640*480
rb PAGE_SIZE - (($-bss_base) AND (PAGE_SIZE-1)) ; align on page rb PAGE_SIZE - (($-bss_base) AND (PAGE_SIZE-1)) ; align on page
HEAP_BASE rb UMKA_MEMORY_BYTES - (HEAP_BASE - os_base + \ HEAP_BASE rb UMKA_MEMORY_BYTES - (HEAP_BASE - os_base + \