diff options
| author | Nicholas Noll <nbnoll@eml.cc> | 2021-12-05 15:17:44 -0800 |
|---|---|---|
| committer | Nicholas Noll <nbnoll@eml.cc> | 2021-12-05 15:17:44 -0800 |
| commit | b48327d357e0818d1a6ae2a064cfa7d1567e1242 (patch) | |
| tree | 4677f228a9846937a7ec71c72a1ab63ab69d68ab /include/base/macro | |
| parent | c200dd832789afa298ba45e0b9efdec96c0e92cc (diff) | |
feat(huge): huge refactor (in progress).
Commented out libc includes to uncover all explicit dependencies.
A large fraction has now been ported over (no testing).
I did not port over the command line tools, such as the rc shell.
These will be done independently - as of now I just want the library to
stand independent.
Compilation currently fails due to the lack of math functions.
Diffstat (limited to 'include/base/macro')
| -rw-r--r-- | include/base/macro/map.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/base/macro/map.h b/include/base/macro/map.h index d7b9e89..1f07eab 100644 --- a/include/base/macro/map.h +++ b/include/base/macro/map.h @@ -44,7 +44,7 @@ static const double HASHFILL = 0.77; #define MAP_RESET(map) \ if((map) && (map)->flag){ \ - memset((map)->flag, 0xAA, map·flagsize((map)->cap)*sizeof(int32)); \ + mem·set((map)->flag, map·flagsize((map)->cap)*sizeof(int32), 0xAA); \ (map)->len = (map)->occ = 0; \ } @@ -85,14 +85,14 @@ static const double HASHFILL = 0.77; else{ \ new_flags = (mem).alloc((heap), map·flagsize(newcap), sizeof(int32)); \ if(!new_flags) return -1; \ - memset(new_flags, 0xaa, map·flagsize(newcap) * sizeof(int32)); \ + mem·set(new_flags, map·flagsize(newcap) * sizeof(int32), 0xAA); \ if((map)->cap < newcap){ /* expand */ \ key_t *new_keys = (mem).alloc((heap), newcap, sizeof(key_t)); \ if(!new_keys){ \ (mem).free((heap), new_flags); \ return -1; \ } \ - memcpy(new_keys, (map)->key, sizeof(key_t) * (map)->cap); \ + mem·copy(new_keys, sizeof(key_t) * (map)->cap, (map)->key); \ (mem).free((heap), (map)->key); \ (map)->key = new_keys; \ val_t *new_vals = (mem).alloc((heap), newcap, sizeof(val_t)); \ @@ -100,7 +100,7 @@ static const double HASHFILL = 0.77; (mem).free((heap), new_flags); \ return -1; \ } \ - memcpy(new_vals, (map)->val, sizeof(val_t) * (map)->cap); \ + mem·copy(new_vals, sizeof(val_t) * (map)->cap, (map)->val); \ (mem).free((heap), (map)->val); \ (map)->val = new_vals; \ } \ @@ -144,12 +144,12 @@ static const double HASHFILL = 0.77; } \ if((map)->cap > newcap){ /* shrink the hash table */ \ key_t *new_keys = (mem).alloc((heap), newcap, sizeof(key_t)); \ - memcpy(new_keys, (map)->key, sizeof(key_t) * (map)->cap); \ + mem·copy(new_keys, sizeof(key_t) * (map)->cap, (map)->key); \ (mem).free((heap), (map)->key); \ (map)->key = new_keys; \ \ val_t *new_vals = (mem).alloc((heap), newcap, sizeof(val_t)); \ - memcpy(new_vals, (map)->val, sizeof(val_t) * (map)->cap); \ + mem·copy(new_vals, sizeof(val_t) * (map)->cap, (map)->val); \ (mem).free((heap), (map)->val); \ (map)->val = new_vals; \ } \ @@ -240,7 +240,7 @@ static const double HASHFILL = 0.77; #define SET_RESET(set) \ if ((set) && (set)->flag) { \ - memset((set)->flag, 0xAA, map·flagsize((set)->cap) * sizeof(int32)); \ + mem·set((set)->flag, map·flagsize((set)->cap) * sizeof(int32), 0xAA); \ (set)->len = (set)->occ = 0; \ } @@ -281,14 +281,14 @@ static const double HASHFILL = 0.77; else{ \ new_flags = mem.alloc((heap), map·flagsize(newcap), sizeof(int32)); \ if(!new_flags) return -1; \ - memset(new_flags, 0xaa, map·flagsize(newcap) * sizeof(int32)); \ + mem·set(new_flags, 0xaa, map·flagsize(newcap) * sizeof(int32)); \ if((set)->cap < newcap) { /* expand */ \ key_t *new_keys = mem.alloc((heap), newcap, sizeof(key_t)); \ if(!new_keys){ \ mem.free((heap), new_flags); \ return -1; \ } \ - memcpy(new_keys, (set)->key, sizeof(key_t) * (set)->cap); \ + mem·copy(new_keys, sizeof(key_t) * (set)->cap, (set)->key); \ mem.free((heap), (set)->key); \ (set)->key = new_keys; \ } \ @@ -324,7 +324,7 @@ static const double HASHFILL = 0.77; } \ if((set)->cap > newcap) { /* shrink the hash table */ \ key_t *new_keys = mem.alloc((heap), newcap, sizeof(key_t)); \ - memcpy(new_keys, (set)->key, sizeof(key_t) * (set)->cap); \ + mem·copy(new_keys, sizeof(key_t) * (set)->cap, (set)->key); \ mem.free((heap), (set)->key); \ (set)->key = new_keys; \ } \ |