KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

[KERNEL] #3 Preparing to merge legacy TASKDATA into APPDATA:

Browse Source 
- get rid of CURRENT_TASK
- to APPDATA added new fields which will be used instead of TASKDATA's
- other small fixes

git-svn-id: svn://kolibrios.org@8869 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Rustem Gimadutdinov (rgimad)
2021-06-17 09:41:16 +00:00
parent 41386908d7
commit 2359531a17
20 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
kernel/trunk/const.inc
View File

@@ -220,7 +220,7 @@ OS_BASE = 0x80000000
window_data = OS_BASE + 0x0001000
TASK_TABLE = OS_BASE + 0x0003000
CURRENT_TASK = OS_BASE + 0x0003000
;CURRENT_TASK = OS_BASE + 0x0003000
;TASK_COUNT = OS_BASE + 0x0003004
TASK_BASE = OS_BASE + 0x0003010
TASK_DATA = OS_BASE + 0x0003020
@@ -276,7 +276,7 @@ LFB_BASE = 0xFE000000
new_app_base = 0;
twdw = CURRENT_TASK - window_data
twdw = TASK_TABLE - window_data
std_application_base_address = new_app_base
RING0_STACK_SIZE = 0x2000
@@ -504,15 +504,17 @@ struct APPDATA
wait_test dd ? ;+96 +++
wait_param dd ? ;+100 +++
tls_base dd ? ;+104
dd ? ;+108
dd ? ;+112
event_mask dd ? ;+108 ; stores event types allowed for task
tid dd ? ;+112 ; thread id
draw_bgr_x dd ? ;+116
draw_bgr_y dd ? ;+120
dd ? ;+124
state db ? ;+124 ; thread state
db ? ;+125
dw ? ;+126
wnd_shape dd ? ;+128
wnd_shape_scale dd ? ;+132
dd ? ;+136
dd ? ;+140
mem_start dd ? ;+136 ;;
counter_sum dd ? ;+140 ;;
saved_box BOX ;+144
ipc_start dd ? ;+160
ipc_size dd ? ;+164
@@ -529,7 +531,9 @@ struct APPDATA
wnd_clientbox BOX ;+216
priority dd ? ;+232
in_schedule LHEAD ;+236
rd 3 ;+244
counter_add dd ? ;+244 ;;
cpu_usage dd ? ;+248 ;;
dd ? ;+252
ends
assert sizeof.APPDATA = 256
@@ -537,19 +541,20 @@ assert sizeof.APPDATA = 256
APP_OBJ_OFFSET = 48
APP_EV_OFFSET = 40
; Note: in future TASKDATA will be merged into APPDATA
struct TASKDATA
event_mask dd ? ; mask which stores event types allowed for task
pid dd ?
dw ?
state db ?
db ?
dw ?
wnd_number db ?
db ?
mem_start dd ?
counter_sum dd ?
counter_add dd ?
cpu_usage dd ?
event_mask dd ? ;+0 mask which stores event types allowed for task
pid dd ? ;+4
dw ? ;+8
state db ? ;+10
db ? ;+11
dw ? ;+12
wnd_number db ? ;+14
db ? ;+15
mem_start dd ? ;+16
counter_sum dd ? ;+20
counter_add dd ? ;+24
cpu_usage dd ? ;+28
ends
TSTATE_RUNNING = 0