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

Populate appdata_t structure, use _Static_assert's from C11.

Browse Source
This commit is contained in:
Ivan Baravy 2020-10-10 04:03:30 +03:00
parent ae9c2198b6
commit 477978175d
2 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -5,10 +5,10 @@ WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op \
-Wswitch -Wswitch-enum -Wpedantic \
#-Wconversion -Wsign-conversion
NOWARNINGS=-Wno-address-of-packed-member
CFLAGS=$(WARNINGS) $(NOWARNINGS) -std=c99 -g -O0 -D_FILE_OFFSET_BITS=64 \
-DNDEBUG -masm=intel -D_POSIX_C_SOURCE=200809L -Ilinux
CFLAGS=$(WARNINGS) $(NOWARNINGS) -std=c11 -g -O0 -D_FILE_OFFSET_BITS=64 \
-DNDEBUG -masm=intel -D_POSIX_C_SOURCE=200809L -Ilinux -fno-pie
CFLAGS_32=$(CFLAGS) -m32
LDFLAGS=
LDFLAGS=-no-pie
LDFLAGS_32=$(LDFLAGS) -m32
all: umka_shell umka_fuse umka_os umka_ping umka.sym umka.prp umka.lst tags \

78
umka.h
View File

@ -20,6 +20,10 @@ typedef struct {
uint32_t left, top, width, height;
} box_t;
typedef struct {
uint32_t dr0, dr1, dr2, dr3, dr7;
} dbg_regs_t;
typedef struct {
uint32_t cpu_usage;
uint16_t window_stack_position;
@ -37,6 +41,8 @@ typedef struct {
uint8_t pad3[1024-71];
} __attribute__((packed)) process_information_t;
_Static_assert(sizeof(process_information_t) == 0x400, "must be 0x400 bytes long");
typedef struct {
uint32_t frame, grab, work_3d_dark, work_3d_light, grab_text, work,
work_button, work_button_text, work_text, work_graph;
@ -450,43 +456,43 @@ typedef struct {
uint32_t saved_esp; // +64
uint32_t io_map[2]; // +68
uint32_t dbg_state; // +76
/*
cur_dir dd ? ;+80
wait_timeout dd ? ;+84
saved_esp0 dd ? ;+88
wait_begin dd ? ;+92 +++
wait_test dd ? ;+96 +++
wait_param dd ? ;+100 +++
tls_base dd ? ;+104
dd ? ;+108
event_filter dd ? ;+112
draw_bgr_x dd ? ;+116
draw_bgr_y dd ? ;+120
dd ? ;+124
wnd_shape dd ? ;+128
wnd_shape_scale dd ? ;+132
dd ? ;+136
dd ? ;+140
saved_box BOX ;+144
ipc_start dd ? ;+160
ipc_size dd ? ;+164
event_mask dd ? ;+168
debugger_slot dd ? ;+172
terminate_protection dd ? ;+176
keyboard_mode db ? ;+180
captionEncoding db ?
rb 2
exec_params dd ? ;+184
dbg_event_mem dd ? ;+188
dbg_regs DBG_REGS ;+192
wnd_caption dd ? ;+212
wnd_clientbox BOX ;+216
priority dd ? ;+232
in_schedule LHEAD ;+236
*/
uint8_t pad[256-80];
char *cur_dir; // +80
uint32_t wait_timeout; // +84
uint32_t saved_esp0; // +88
uint32_t wait_begin; // +92
int (*wait_test)(void); // +96
void *wait_param; // +100
void *tls_base; // +104
uint32_t pad2; // +108
uint32_t event_filter; // +112
uint32_t draw_bgr_x; // +116
uint32_t draw_bgr_y; // +120
uint32_t pad3; // +124
uint8_t *wnd_shape; // +128
uint32_t wnd_shape_scale; // +132
uint32_t pad4; // +136
uint32_t pad5; // +140
box_t saved_box; // +144
uint32_t *ipc_start; // +160
size_t ipc_size; // +164
uint32_t event_mask; // +168
uint32_t debugger_slot; // +172
uint32_t terminate_protection; // +176
uint8_t keyboard_mode; // +180
uint8_t captionEncoding; // +181
uint8_t pad6[2]; // +182
char *exec_params; // +184
void *dbg_event_mem; // +188
dbg_regs_t dbg_regs; // +192
char *wnd_caption; // +212
box_t wnd_clientbox; // +216
uint32_t priority; // +232
lhead_t in_schedule; // +236
uint32_t pad8[3]; // +244
} appdata_t;
_Static_assert(sizeof(appdata_t) == 256, "must be 0x100 bytes long");
typedef struct {
uint32_t event_mask;
uint32_t pid;
@ -502,6 +508,8 @@ typedef struct {
uint32_t cpu_usage;
} taskdata_t;
_Static_assert(sizeof(taskdata_t) == 32, "must be 0x20 bytes long");
#define UMKA_SHELL 1u
#define UMKA_FUSE 2u
#define UMKA_OS 3u