From 2429b5fe88f7ce886b73c52168a802bff842f47f Mon Sep 17 00:00:00 2001 From: "leleraffa97@hotmail.it" Date: Thu, 15 Jun 2017 19:16:17 +0200 Subject: Boot loader structures (WORK IN PROGRESS) Some Program manager structures, macros and functions (WORK IN PROGRESS) --- sw/z80/kernel/boot_loader.c | 13 ++++++ sw/z80/kernel/include/boot.h | 18 ++++++++ sw/z80/kernel/include/progman.h | 63 +++++++++++++++++++++++++ sw/z80/kernel/programs.c | 100 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 sw/z80/kernel/boot_loader.c create mode 100644 sw/z80/kernel/include/boot.h create mode 100644 sw/z80/kernel/include/progman.h create mode 100644 sw/z80/kernel/programs.c (limited to 'sw/z80/kernel') diff --git a/sw/z80/kernel/boot_loader.c b/sw/z80/kernel/boot_loader.c new file mode 100644 index 0000000..b7873ec --- /dev/null +++ b/sw/z80/kernel/boot_loader.c @@ -0,0 +1,13 @@ +#include "boot.h" +#include "progman.h" + +#define DEFAULT_EXEC_STATUS 0x4000 + +struct exec_status *status = EXEC_STATUS; + +void boot_init() { + + *status = DEFAULT_EXEC_STATUS; + + // TODO other stuff +} \ No newline at end of file diff --git a/sw/z80/kernel/include/boot.h b/sw/z80/kernel/include/boot.h new file mode 100644 index 0000000..d581687 --- /dev/null +++ b/sw/z80/kernel/include/boot.h @@ -0,0 +1,18 @@ +#ifndef BOOT_H +#define BOOT_H + +#define LOGIN_PC // TODO find an address in ROM, to perform jumps + +#define EXEC_STATUS // TODO find an address in Kernel space + +struct exec_status { + + volatile int logged_in:1; // authenticated + volatile int k_control:1; // no running programs + volatile int program_id:1; // current running program id, see "progman.h" + volatile int hidden_pc:13; // program counter of the paused program +}; + +void boot_init(); + +#endif \ No newline at end of file diff --git a/sw/z80/kernel/include/progman.h b/sw/z80/kernel/include/progman.h new file mode 100644 index 0000000..b37e9e9 --- /dev/null +++ b/sw/z80/kernel/include/progman.h @@ -0,0 +1,63 @@ +#ifndef PROGRAM_MAN +#define PROGRAM_MAN + +#include "types.h" + +#define PROG_0 0x0 +#define PROG_1 0x1 + +#define PROG_VSTART 0x1000 +#define PROG_0_PREFIX 0xA000 +#define PROG_1_PREFIX 0xC000 + +#define PROG_0_INFO // TODO +#define PROG_1_INFO // TODO find a space in the ram + +struct program_info { + + volatile int enabled:1; + volatile int running:1; + volatile int exiting:1; + volatile int heap_addr:13; + volatile void (*quit_cb)(void); // 16 +}; + +/* +* Initialize the program manager system +*/ + +void progman_init(); + +/* +* Check if it can start a new program +* If it succedes, the program id is returned, +* otherwise it is returned an error number +*/ + +#define PROG_REQ_FULL -1 +#define PROG_REQ_ERR -2 // Maybe we don't need this, but just in case + +int8_t prog_req(struct program_info *info); + +/* +* It sets a quit callback +*/ + +void prog_0_qcb(void (*callback)(void)); +void prog_1_qcb(void (*callback)(void)); + +/* +* It quits a program, if a callback is set, it will be called +*/ + +void prog_0_quit(); +void prog_1_quit(); + +/* +* It forces a program to quit +*/ + +void prog_0_fquit(); +void prog_1_fquit(); + +#endif \ No newline at end of file diff --git a/sw/z80/kernel/programs.c b/sw/z80/kernel/programs.c new file mode 100644 index 0000000..31593d1 --- /dev/null +++ b/sw/z80/kernel/programs.c @@ -0,0 +1,100 @@ +#include "progman.h" + +#define EMPTY_PROG_INFO 0x0 + +struct program_info *prog_0 = PROG_0_INFO, + *prog_1 = PROG_1_INFO; + +void progman_init() { + + *prog_0 = EMPTY_PROG_INFO; + *prog_1 = EMPTY_PROG_INFO; + + // TODO other stuff +} + +int8_t prog_req(struct program_info *info) { + + uint8_t prog; + + if (!prog_0->enabled) { + + prog = PROG_0; + *info = *prog_0; + + } else if (!prog_1->enabled) { + + prog = PROG_1; + *info = *prog_1; + + } else { + + return PROG_REQ_FULL; + } + + return prog; +} + +void prog_0_qcb(void (*callback)(void)) { + + prog_0->quit_cb = callback; +} + +void prog_1_qcb(void (*callback)(void)) { + + prog_1->quit_cb = callback; +} + +void prog_0_quit() { + + if (!prog_0->enabled || prog_0->exiting) + return; + + if (prog_0->quit_cb) + prog_0->quit_cb(); + + // TODO free space in RAM + + *prog_0 = EMPTY_PROG_INFO; + + // TODO jump program counter +} + +void prog_1_quit() { + + if (!prog_1->enabled || prog_1->exiting) + return; + + if (prog_1->quit_cb) + prog_1->quit_cb(); + + // TODO free space in RAM + + *prog_1 = EMPTY_PROG_INFO; + + // TODO jump program counter +} + +void prog_0_fquit() { + + if (!prog_0->enabled) + return; + + // TODO free space in RAM + + *prog_0 = EMPTY_PROG_INFO; + + // TODO jump program counter +} + +void prog_1_fquit() { + + if (!prog_1->enabled) + return; + + // TODO free space in RAM + + *prog_1 = EMPTY_PROG_INFO; + + // TODO jump program counter +} \ No newline at end of file -- cgit v1.2.1 From f85e54f7982d5fefecddccbb11f5aabd478b91d6 Mon Sep 17 00:00:00 2001 From: "leleraffa97@hotmail.it" Date: Mon, 19 Jun 2017 13:46:16 +0200 Subject: Authentication section Programs management --- sw/z80/kernel/boot_loader.c | 30 ++++++++++++++++++++++++++++++ sw/z80/kernel/include/boot.h | 17 +++++++++++++++++ sw/z80/kernel/include/progman.h | 23 +++++++++++++++++++++++ sw/z80/kernel/programs.c | 10 ++++++++++ 4 files changed, 80 insertions(+) (limited to 'sw/z80/kernel') diff --git a/sw/z80/kernel/boot_loader.c b/sw/z80/kernel/boot_loader.c index b7873ec..ddca4f9 100644 --- a/sw/z80/kernel/boot_loader.c +++ b/sw/z80/kernel/boot_loader.c @@ -10,4 +10,34 @@ void boot_init() { *status = DEFAULT_EXEC_STATUS; // TODO other stuff +} + +int8_t authenticate(const char *pwd) { + + const char *c_pwd = PWD_ADDR, *c_req = pwd; + + for (uint8_t i = 0; i < PWD_SIZE; i++) { + + if (*c_pwd != *c_req) + return 0; + + c_pwd++; + c_req++; + } + + return 1; +} + +void set_pwd(const char *pwd) { + + char *c_pwd = PWD_ADDR; + const char *c_req = pwd; + + for (uint8_t i = 0; i < PWD_SIZE; i++) { + + *c_pwd = *c_req; + + c_pwd++; + c_req++; + } } \ No newline at end of file diff --git a/sw/z80/kernel/include/boot.h b/sw/z80/kernel/include/boot.h index d581687..5310e45 100644 --- a/sw/z80/kernel/include/boot.h +++ b/sw/z80/kernel/include/boot.h @@ -1,10 +1,15 @@ #ifndef BOOT_H #define BOOT_H +#include "types.h" + #define LOGIN_PC // TODO find an address in ROM, to perform jumps #define EXEC_STATUS // TODO find an address in Kernel space +#define PWD_ADDR // TODO find an address in ROM, password +#define PWD_SIZE 8 + struct exec_status { volatile int logged_in:1; // authenticated @@ -15,4 +20,16 @@ struct exec_status { void boot_init(); +/* +* It returns 1 if succeded, otherwise 0 +*/ + +int8_t authenticate(const char *pwd); + +/* +* It sets the password in the ROM space, maximum 8 characters +*/ + +void set_pwd(const char *pwd); + #endif \ No newline at end of file diff --git a/sw/z80/kernel/include/progman.h b/sw/z80/kernel/include/progman.h index b37e9e9..0f56bb3 100644 --- a/sw/z80/kernel/include/progman.h +++ b/sw/z80/kernel/include/progman.h @@ -39,6 +39,29 @@ void progman_init(); int8_t prog_req(struct program_info *info); +/* +* It allocates a program in the RAM +* To obtain the right id call prog_req() first +* Basic informations must be allocated and referenced by a program_base struct +*/ + +struct program_base { + + void * inst_set; // pointer to the instructions set + size_t inst_size; // size of the instructions set + void * bss_data; // pointer to the bss/data space + size_t data_size; // size of the bss/data space + size_t stack_size; // size of the stack to determine the stack limit +}; + +void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base); + +/* +* It jumps the program counter to the given one +*/ + +void prog_exec(int8_t id, struct program_info *info); + /* * It sets a quit callback */ diff --git a/sw/z80/kernel/programs.c b/sw/z80/kernel/programs.c index 31593d1..0f75887 100644 --- a/sw/z80/kernel/programs.c +++ b/sw/z80/kernel/programs.c @@ -35,6 +35,16 @@ int8_t prog_req(struct program_info *info) { return prog; } +void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base) { + + // TODO, implements program allocation +} + +void prog_exec(int8_t id, struct program_info *info) { + + // TODO, perform a program counter jump +} + void prog_0_qcb(void (*callback)(void)) { prog_0->quit_cb = callback; -- cgit v1.2.1 From acee9e74f6bd183b284af028b1f08aab666df9be Mon Sep 17 00:00:00 2001 From: "leleraffa97@hotmail.it" Date: Mon, 19 Jun 2017 15:06:25 +0200 Subject: libc memset, memcmp boot improved program allocation --- sw/z80/kernel/boot_loader.c | 25 +++---------------------- sw/z80/kernel/include/progman.h | 1 - sw/z80/kernel/programs.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 24 deletions(-) (limited to 'sw/z80/kernel') diff --git a/sw/z80/kernel/boot_loader.c b/sw/z80/kernel/boot_loader.c index ddca4f9..03a52b5 100644 --- a/sw/z80/kernel/boot_loader.c +++ b/sw/z80/kernel/boot_loader.c @@ -1,5 +1,6 @@ #include "boot.h" #include "progman.h" +#include "string.h" #define DEFAULT_EXEC_STATUS 0x4000 @@ -14,30 +15,10 @@ void boot_init() { int8_t authenticate(const char *pwd) { - const char *c_pwd = PWD_ADDR, *c_req = pwd; - - for (uint8_t i = 0; i < PWD_SIZE; i++) { - - if (*c_pwd != *c_req) - return 0; - - c_pwd++; - c_req++; - } - - return 1; + return !memcmp(PWD_ADDR, pwd, PWD_SIZE); } void set_pwd(const char *pwd) { - char *c_pwd = PWD_ADDR; - const char *c_req = pwd; - - for (uint8_t i = 0; i < PWD_SIZE; i++) { - - *c_pwd = *c_req; - - c_pwd++; - c_req++; - } + memcpy(PWD_ADDR, pwd, PWD_SIZE); } \ No newline at end of file diff --git a/sw/z80/kernel/include/progman.h b/sw/z80/kernel/include/progman.h index 0f56bb3..5d01f1c 100644 --- a/sw/z80/kernel/include/progman.h +++ b/sw/z80/kernel/include/progman.h @@ -51,7 +51,6 @@ struct program_base { size_t inst_size; // size of the instructions set void * bss_data; // pointer to the bss/data space size_t data_size; // size of the bss/data space - size_t stack_size; // size of the stack to determine the stack limit }; void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base); diff --git a/sw/z80/kernel/programs.c b/sw/z80/kernel/programs.c index 0f75887..705ea96 100644 --- a/sw/z80/kernel/programs.c +++ b/sw/z80/kernel/programs.c @@ -1,4 +1,5 @@ #include "progman.h" +#include "string.h" #define EMPTY_PROG_INFO 0x0 @@ -37,9 +38,35 @@ int8_t prog_req(struct program_info *info) { void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base) { - // TODO, implements program allocation + void *addr = (id ? PROG_1_PREFIX : PROG_0_PREFIX) + PROG_VSTART; + + if (info->enabled) { + + if (id) + prog_1_fquit(); // force quit operation + else + prog_0_fquit(); + } + + + memcpy(addr, base->inst_set, base->inst_size); + + addr += base->inst_size; + + memcpy(addr, base->bss_data, base->data_size); + + addr += base->data_size; + + // TODO, empty heap and stack } +/* +* TODO Called from the assembly, system calls +*/ + +extern void exec_0(void); +extern void exec_1(void); + void prog_exec(int8_t id, struct program_info *info) { // TODO, perform a program counter jump -- cgit v1.2.1 From ac89960fbe89141aea31da9a329bfa39d67eede7 Mon Sep 17 00:00:00 2001 From: "leleraffa97@hotmail.it" Date: Fri, 23 Jun 2017 12:18:24 +0200 Subject: Order and update of the struct Separation of boot and login sections Improuved program manager system --- sw/z80/kernel/boot_loader.c | 24 ------- sw/z80/kernel/include/boot.h | 35 ---------- sw/z80/kernel/include/login.h | 23 +++++++ sw/z80/kernel/include/progman.h | 68 +++++++++++++------- sw/z80/kernel/include/syscall.h | 20 ++++++ sw/z80/kernel/include/sysexe.h | 55 ++++++++++++++++ sw/z80/kernel/login.c | 12 ++++ sw/z80/kernel/progman.c | 90 ++++++++++++++++++++++++++ sw/z80/kernel/programs.c | 137 ---------------------------------------- sw/z80/kernel/sysexe.c | 14 ++++ 10 files changed, 260 insertions(+), 218 deletions(-) delete mode 100644 sw/z80/kernel/boot_loader.c delete mode 100644 sw/z80/kernel/include/boot.h create mode 100644 sw/z80/kernel/include/login.h create mode 100644 sw/z80/kernel/include/syscall.h create mode 100644 sw/z80/kernel/include/sysexe.h create mode 100644 sw/z80/kernel/login.c create mode 100644 sw/z80/kernel/progman.c delete mode 100644 sw/z80/kernel/programs.c create mode 100644 sw/z80/kernel/sysexe.c (limited to 'sw/z80/kernel') diff --git a/sw/z80/kernel/boot_loader.c b/sw/z80/kernel/boot_loader.c deleted file mode 100644 index 03a52b5..0000000 --- a/sw/z80/kernel/boot_loader.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "boot.h" -#include "progman.h" -#include "string.h" - -#define DEFAULT_EXEC_STATUS 0x4000 - -struct exec_status *status = EXEC_STATUS; - -void boot_init() { - - *status = DEFAULT_EXEC_STATUS; - - // TODO other stuff -} - -int8_t authenticate(const char *pwd) { - - return !memcmp(PWD_ADDR, pwd, PWD_SIZE); -} - -void set_pwd(const char *pwd) { - - memcpy(PWD_ADDR, pwd, PWD_SIZE); -} \ No newline at end of file diff --git a/sw/z80/kernel/include/boot.h b/sw/z80/kernel/include/boot.h deleted file mode 100644 index 5310e45..0000000 --- a/sw/z80/kernel/include/boot.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef BOOT_H -#define BOOT_H - -#include "types.h" - -#define LOGIN_PC // TODO find an address in ROM, to perform jumps - -#define EXEC_STATUS // TODO find an address in Kernel space - -#define PWD_ADDR // TODO find an address in ROM, password -#define PWD_SIZE 8 - -struct exec_status { - - volatile int logged_in:1; // authenticated - volatile int k_control:1; // no running programs - volatile int program_id:1; // current running program id, see "progman.h" - volatile int hidden_pc:13; // program counter of the paused program -}; - -void boot_init(); - -/* -* It returns 1 if succeded, otherwise 0 -*/ - -int8_t authenticate(const char *pwd); - -/* -* It sets the password in the ROM space, maximum 8 characters -*/ - -void set_pwd(const char *pwd); - -#endif \ No newline at end of file diff --git a/sw/z80/kernel/include/login.h b/sw/z80/kernel/include/login.h new file mode 100644 index 0000000..5fa4b5e --- /dev/null +++ b/sw/z80/kernel/include/login.h @@ -0,0 +1,23 @@ +#ifndef LOGIN_H +#define LOGIN_H + +#include "types.h" + +#define LOGIN_PC // TODO find an address in ROM, to perform jumps + +#define PWD_ADDR // TODO find an address in ROM, password +#define PWD_SIZE 8 + +/* +* It returns 1 if succeded, otherwise 0 +*/ + +int8_t authenticate(const char *pwd); + +/* +* It sets the password in the ROM space, maximum 8 characters +*/ + +void set_pwd(const char *pwd); + +#endif \ No newline at end of file diff --git a/sw/z80/kernel/include/progman.h b/sw/z80/kernel/include/progman.h index 5d01f1c..b59e14a 100644 --- a/sw/z80/kernel/include/progman.h +++ b/sw/z80/kernel/include/progman.h @@ -13,13 +13,41 @@ #define PROG_0_INFO // TODO #define PROG_1_INFO // TODO find a space in the ram -struct program_info { +struct prog_status { - volatile int enabled:1; - volatile int running:1; - volatile int exiting:1; - volatile int heap_addr:13; - volatile void (*quit_cb)(void); // 16 + // The program is in execution + + uint8_t running:1; + + // The program is executing its quit callback + + uint8_t exiting:1; + + uint8_t unused:6; // TODO, find a usage for these bits +}: + +struct prog_data { + + struct prog_status status; + + /* + * The following addresses are needed to map + * map the usable memory for dynamic allocations + */ + + // Virtual address of the heap + + uint8_t heap_addr:12; + + // Virtual address of the stack limit + + uint8_t stack_limit:12; + + /* + * Function called when the program exits normally + */ + + void (*quit_cb)(void); // 16 }; /* @@ -32,20 +60,23 @@ void progman_init(); * Check if it can start a new program * If it succedes, the program id is returned, * otherwise it is returned an error number +* +* ! Disable virtual addresses when this function is called */ #define PROG_REQ_FULL -1 -#define PROG_REQ_ERR -2 // Maybe we don't need this, but just in case -int8_t prog_req(struct program_info *info); +int8_t prog_req(); /* * It allocates a program in the RAM * To obtain the right id call prog_req() first * Basic informations must be allocated and referenced by a program_base struct +* +* ! Disable virtual addresses when this function is called */ -struct program_base { +struct prog_space { void * inst_set; // pointer to the instructions set size_t inst_size; // size of the instructions set @@ -53,33 +84,26 @@ struct program_base { size_t data_size; // size of the bss/data space }; -void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base); +void prog_alloc(int8_t id, struct prog_data *data, const struct prog_space *space); /* * It jumps the program counter to the given one */ -void prog_exec(int8_t id, struct program_info *info); +void prog_exec(int8_t id, struct prog_data *data); /* * It sets a quit callback */ -void prog_0_qcb(void (*callback)(void)); -void prog_1_qcb(void (*callback)(void)); +void prog_0_set_qcb(void (*callback)(void)); +void prog_1_set_qcb(void (*callback)(void)); /* * It quits a program, if a callback is set, it will be called */ -void prog_0_quit(); -void prog_1_quit(); - -/* -* It forces a program to quit -*/ - -void prog_0_fquit(); -void prog_1_fquit(); +void prog_0_quit(uint8_t force); +void prog_1_quit(uint8_t force); #endif \ No newline at end of file diff --git a/sw/z80/kernel/include/syscall.h b/sw/z80/kernel/include/syscall.h new file mode 100644 index 0000000..9641f25 --- /dev/null +++ b/sw/z80/kernel/include/syscall.h @@ -0,0 +1,20 @@ +#ifndef SYS_CALL +#define SYS_CALL + +/* +* Enable / disable virtual address traslation +*/ + +extern void v_addr(uint8_t flag); + +/* +* Programs execution +*/ + +extern void prog_exec_0(void); +extern void prog_exec_1(void); + +extern void prog_stop_0(void); +extern void prog_stop_1(void); + +#endif \ No newline at end of file diff --git a/sw/z80/kernel/include/sysexe.h b/sw/z80/kernel/include/sysexe.h new file mode 100644 index 0000000..9c13c09 --- /dev/null +++ b/sw/z80/kernel/include/sysexe.h @@ -0,0 +1,55 @@ +#ifndef SYS_EXE +#define SYS_EXE + +#define SYS_EXEC_ADDR // TODO find an address in Kernel space + +struct sys_progman { + + // program 0 enabled + + uint8_t prog_0_enabled:1; + + // program 1 enabled + + /* + * Obs: A program is enabled when its space is allocated + * and its virtual program counter is stored in + * the hardware or in the silent_pc. + * An enabled program is not necessarly running, it + * could be paused too. + */ + + uint8_t prog_1_enabled:1; + + // running's program id + + uint8_t prog_running:1; +}; + +struct sys_exec { + + /* + * Virtual addresses are activated + */ + + uint8_t virtual_addr:1; + + struct sys_progman progman; + + /* + * The silent_pc is the place designed to store the + * program counter of the program that's not running + */ + + uint8_t silent_pc:12; +}; + +/* +* Function to access informations +*/ + +uint8_t vaddr_enabled(); + +struct sys_progman * sys_prog_data(struct sys_progman *data); + +#endif \ No newline at end of file diff --git a/sw/z80/kernel/login.c b/sw/z80/kernel/login.c new file mode 100644 index 0000000..5e100bf --- /dev/null +++ b/sw/z80/kernel/login.c @@ -0,0 +1,12 @@ +#include "login.h" +#include "string.h" + +int8_t authenticate(const char *pwd) { + + return !memcmp(PWD_ADDR, pwd, PWD_SIZE); +} + +void set_pwd(const char *pwd) { + + memcpy(PWD_ADDR, pwd, PWD_SIZE); +} \ No newline at end of file diff --git a/sw/z80/kernel/progman.c b/sw/z80/kernel/progman.c new file mode 100644 index 0000000..44888f8 --- /dev/null +++ b/sw/z80/kernel/progman.c @@ -0,0 +1,90 @@ +#include "progman.h" +#include "string.h" +#include "syscall.h" +#include "sysexe.h" + +#define EMPTY_PROG_INFO 0x0 + +volatile struct prog_data *prog_0 = PROG_0_INFO, + *prog_1 = PROG_1_INFO; + +void progman_init() { + + *prog_0 = EMPTY_PROG_INFO; + *prog_1 = EMPTY_PROG_INFO; + + // TODO other stuff +} + +int8_t prog_req() { + + struct sys_progman data; + + sys_prog_data(&data); + + if (data.prog_0_enabled) + return PROG_0; + else if (data.prog_1_enabled) + return PROG_1; + + return PROG_REQ_FULL; +} + +void prog_alloc(int8_t id, struct prog_data *data, const struct prog_space *space) { + + void *addr = (id ? PROG_1_PREFIX : PROG_0_PREFIX) + PROG_VSTART; + + memcpy(addr, base->inst_set, base->inst_size); + + addr += base->inst_size; + + memcpy(addr, base->bss_data, base->data_size); + + addr += base->data_size; + + // TODO, empty heap and stack +} + +void prog_exec(int8_t id, struct prog_data *data) { + + if (id) + prog_exec_1(); // system call + else + prog_exec_0(); // system call +} + +void prog_0_set_qcb(void (*callback)(void)) { + + prog_0->quit_cb = callback; +} + +void prog_1_set_qcb(void (*callback)(void)) { + + prog_1->quit_cb = callback; +} + +void prog_0_quit(uint8_t force) { + + if (!prog_0->enabled || prog_0->exiting) + return; + + if (!force && prog_0->quit_cb) + prog_0->quit_cb(); + + *prog_0 = EMPTY_PROG_INFO; + + prog_stop_0(); // system call +} + +void prog_1_quit(uint8_t force) { + + if (!prog_1->enabled || prog_1->exiting) + return; + + if (!force && prog_1->quit_cb) + prog_1->quit_cb(); + + *prog_1 = EMPTY_PROG_INFO; + + prog_stop_1(); // system call +} \ No newline at end of file diff --git a/sw/z80/kernel/programs.c b/sw/z80/kernel/programs.c deleted file mode 100644 index 705ea96..0000000 --- a/sw/z80/kernel/programs.c +++ /dev/null @@ -1,137 +0,0 @@ -#include "progman.h" -#include "string.h" - -#define EMPTY_PROG_INFO 0x0 - -struct program_info *prog_0 = PROG_0_INFO, - *prog_1 = PROG_1_INFO; - -void progman_init() { - - *prog_0 = EMPTY_PROG_INFO; - *prog_1 = EMPTY_PROG_INFO; - - // TODO other stuff -} - -int8_t prog_req(struct program_info *info) { - - uint8_t prog; - - if (!prog_0->enabled) { - - prog = PROG_0; - *info = *prog_0; - - } else if (!prog_1->enabled) { - - prog = PROG_1; - *info = *prog_1; - - } else { - - return PROG_REQ_FULL; - } - - return prog; -} - -void prog_alloc(int8_t id, struct program_info *info, const struct program_base *base) { - - void *addr = (id ? PROG_1_PREFIX : PROG_0_PREFIX) + PROG_VSTART; - - if (info->enabled) { - - if (id) - prog_1_fquit(); // force quit operation - else - prog_0_fquit(); - } - - - memcpy(addr, base->inst_set, base->inst_size); - - addr += base->inst_size; - - memcpy(addr, base->bss_data, base->data_size); - - addr += base->data_size; - - // TODO, empty heap and stack -} - -/* -* TODO Called from the assembly, system calls -*/ - -extern void exec_0(void); -extern void exec_1(void); - -void prog_exec(int8_t id, struct program_info *info) { - - // TODO, perform a program counter jump -} - -void prog_0_qcb(void (*callback)(void)) { - - prog_0->quit_cb = callback; -} - -void prog_1_qcb(void (*callback)(void)) { - - prog_1->quit_cb = callback; -} - -void prog_0_quit() { - - if (!prog_0->enabled || prog_0->exiting) - return; - - if (prog_0->quit_cb) - prog_0->quit_cb(); - - // TODO free space in RAM - - *prog_0 = EMPTY_PROG_INFO; - - // TODO jump program counter -} - -void prog_1_quit() { - - if (!prog_1->enabled || prog_1->exiting) - return; - - if (prog_1->quit_cb) - prog_1->quit_cb(); - - // TODO free space in RAM - - *prog_1 = EMPTY_PROG_INFO; - - // TODO jump program counter -} - -void prog_0_fquit() { - - if (!prog_0->enabled) - return; - - // TODO free space in RAM - - *prog_0 = EMPTY_PROG_INFO; - - // TODO jump program counter -} - -void prog_1_fquit() { - - if (!prog_1->enabled) - return; - - // TODO free space in RAM - - *prog_1 = EMPTY_PROG_INFO; - - // TODO jump program counter -} \ No newline at end of file diff --git a/sw/z80/kernel/sysexe.c b/sw/z80/kernel/sysexe.c new file mode 100644 index 0000000..f020b88 --- /dev/null +++ b/sw/z80/kernel/sysexe.c @@ -0,0 +1,14 @@ +#include "sysexe.h" + +volatile struct sys_exec *exec_data = SYS_EXEC_ADDR; + +uint8_t vaddr_enabled() { + + return exec_data->virtual_addr; +} + +struct sys_progman * sys_prog_data(struct sys_progman *data) { + + *data = exec_data->sys_progman; + return data; +} \ No newline at end of file -- cgit v1.2.1