RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-05-02 08:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

infra: round up brick_size to even sizes and addresses

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2024-01-16 14:38:49 +01:00
parent cb517683bb
commit bd3fa16b64
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/brick.c
View File

@ -159,6 +159,7 @@ int generic_brick_init_full(
const char **names) const char **names)
{ {
struct generic_brick *brick = data; struct generic_brick *brick = data;
int brick_size;
int status; int status;
int i; int i;
@ -173,8 +174,10 @@ int generic_brick_init_full(
status = generic_brick_init(brick_type, brick, names ? *names++ : NULL); status = generic_brick_init(brick_type, brick, names ? *names++ : NULL);
if (status) if (status)
return status; return status;
data += brick_type->brick_size; brick_size = brick_type->brick_size;
size -= brick_type->brick_size; brick_size = DIV_ROUND_UP(brick_size, sizeof(void *)) * sizeof(void *);
data += brick_size;
size -= brick_size;
if (size < 0) { if (size < 0) {
BRICK_ERR("Not enough MEMORY\n"); BRICK_ERR("Not enough MEMORY\n");
return -ENOMEM; return -ENOMEM;

2
kernel/brick.h
View File

@ -557,6 +557,8 @@ INLINE int generic_size(const struct generic_brick_type *brick_type)
{ {
int size = brick_type->brick_size; int size = brick_type->brick_size;
int i; int i;
size = DIV_ROUND_UP(size, sizeof(void *)) * sizeof(void *);
size += brick_type->max_inputs * sizeof(void*); size += brick_type->max_inputs * sizeof(void*);
for (i = 0; i < brick_type->max_inputs; i++) { for (i = 0; i < brick_type->max_inputs; i++) {
size += brick_type->default_input_types[i]->input_size; size += brick_type->default_input_types[i]->input_size;

4
kernel/sy_old/sy_generic.c
View File

@ -2842,7 +2842,9 @@ struct mars_brick *mars_make_brick(struct mars_global *global, struct mars_dent
return NULL; return NULL;
} }
size = brick_type->brick_size + size = brick_type->brick_size;
size = DIV_ROUND_UP(size, sizeof(void *)) * sizeof(void *);
size +=
(brick_type->max_inputs + brick_type->max_outputs) * sizeof(void*); (brick_type->max_inputs + brick_type->max_outputs) * sizeof(void*);
input_types = brick_type->default_input_types; input_types = brick_type->default_input_types;
for (i = 0; i < brick_type->max_inputs; i++) { for (i = 0; i < brick_type->max_inputs; i++) {