schme/hiload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blind reformat all files

Browse Source
This commit is contained in:
Kasper
2025-03-21 21:24:46 +02:00
parent cf5b6602d5
commit 3c5cd9844d
11 changed files with 696 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/array/sc_array.h
View File

@@ -33,11 +33,11 @@
#define SC_ARRAY_H
#include <assert.h>
#include <string.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#define SC_ARRAY_VERSION "2.0.0"
@@ -98,8 +98,7 @@
break; \
} \
_cap = (a)->cap == 0 ? 8 : (a)->cap * 2; \
_p = sc_array_realloc((a)->elems, \
_cap * sizeof(*((a)->elems))); \
_p = sc_array_realloc((a)->elems, _cap * sizeof(*((a)->elems))); \
if (_p == NULL) { \
(a)->oom = true; \
break; \
@@ -151,7 +150,7 @@
size_t idx = (i); \
assert(idx < (a)->size); \
\
const size_t _cnt = (a)->size - (idx) - 1; \
const size_t _cnt = (a)->size - (idx)-1; \
if (_cnt > 0) { \
memmove(&((a)->elems[idx]), &((a)->elems[idx + 1]), \
_cnt * sizeof(*((a)->elems))); \

4
src/auditor/auditor-x86_64.c
View File

@@ -62,7 +62,7 @@ uintptr_t la_symbind64(Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
uintptr_t *defcook, unsigned int *flags,
const char *symname) {
printf("la_symbind64(): symname = %s; sym->st_value = %p\n", symname,
(void*)sym->st_value);
(void *)sym->st_value);
printf(" ndx = %u; flags = %#x", ndx, *flags);
printf("; refcook = %p; defcook = %p\n", refcook, defcook);
@@ -73,7 +73,7 @@ Elf64_Addr la_i86_gnu_pltenter(Elf64_Sym *sym, unsigned int ndx,
uintptr_t *refcook, uintptr_t *defcook,
La_x86_64_regs *regs, unsigned int *flags,
const char *symname, long *framesizep) {
printf("la_x86_64_gnu_pltenter(): %s (%p)\n", symname, (void*)sym->st_value);
printf("la_x86_64_gnu_pltenter(): %s (%p)\n", symname, (void *)sym->st_value);
return sym->st_value;
}

1
src/compilation.h
View File

@@ -7,5 +7,4 @@ typedef struct {
const char *command;
} CompileCommand;
#endif // COMPILATION_H_

10
src/memory.c
View File

@@ -14,14 +14,16 @@ HiloadResult memory_find_pointer(uptr ptr,
size_t *index) {
for (size_t i = 0; i < sc_array_size(regions); i++) {
uptr start = regions->elems[i].region_start;
// we assume a sorted region by start address, so we can do a quick discard here.
// very useful for relative vs absolute address checks
if (ptr < start) return HILOAD_FAIL;
// we assume a sorted region by start address, so we can do a quick discard
// here. very useful for relative vs absolute address checks
if (ptr < start)
return HILOAD_FAIL;
uptr end = regions->elems[i].region_end;
if (ptr_in_range(ptr, start, end)) {
if (index)
*index = i;
sc_log_debug("Pointer match (%p) found in index: %u, range: %p - %p\n", ptr, i, start, end);
sc_log_debug("Pointer match (%p) found in index: %u, range: %p - %p\n",
ptr, i, start, end);
return HILOAD_OK;
}
}

11
src/memory.h
View File

@@ -1,9 +1,9 @@
#ifndef MEMORY_H_
#define MEMORY_H_
#include "array.h"
#include "str.h"
#include "types.h"
#include "array.h"
#include <assert.h>
@@ -24,14 +24,15 @@ typedef struct {
const char *pathname;
} MemoryRegion;
sc_array_def(MemoryRegion, memreg);
/* A pointer that can be used to place the memory regions into. Clears regions before use, but uses the same buffer. */
/* A pointer that can be used to place the memory regions into. Clears regions
* before use, but uses the same buffer. */
HiloadResult read_memory_maps_self(struct sc_array_memreg *regions);
/* Return index the pointer is found in */
HiloadResult memory_find_pointer(uptr ptr, struct sc_array_memreg* const regions, size_t *index);
HiloadResult memory_find_pointer(uptr ptr,
struct sc_array_memreg *const regions,
size_t *index);
#endif // MEMORY_H_

467
src/str.c
View File

@@ -35,60 +35,61 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "str.h"
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
// append to destination and return the end pointer
static inline
void* mem_append(void* dest, const void* src, const size_t n)
{
static inline void *mem_append(void *dest, const void *src, const size_t n) {
return memcpy(dest, src, n) + n;
}
// string deallocation
void str_free(const str s)
{
if(str_is_owner(s))
free((void*)s.ptr);
void str_free(const str s) {
if (str_is_owner(s))
free((void *)s.ptr);
}
// version of str_free() for str_auto macro
void str_free_auto(const str* const ps)
{
if(ps)
void str_free_auto(const str *const ps) {
if (ps)
str_free(*ps);
}
// memory allocation helpers
#define ALLOC(n) \
({ \
void* const ___p = malloc(n); \
if(!___p) return ENOMEM; \
({ \
void *const ___p = malloc(n); \
if (!___p) \
return ENOMEM; \
___p; \
})
})
#define REALLOC(p, n) \
({ \
void* const ___p = realloc((p), (n)); \
if(!___p) return ENOMEM; \
void *const ___p = realloc((p), (n)); \
if (!___p) \
return ENOMEM; \
___p; \
})
})
// errno checker
#define RETURN_ON_ERROR(expr) \
while((expr) < 0) do { const int __err = errno; if(__err != EINTR) return __err; } while(0)
while ((expr) < 0) \
do { \
const int __err = errno; \
if (__err != EINTR) \
return __err; \
} while (0)
// swap
void str_swap(str* const s1, str* const s2)
{
void str_swap(str *const s1, str *const s2) {
const str tmp = *s1;
*s1 = *s2;
@@ -96,98 +97,89 @@ void str_swap(str* const s1, str* const s2)
}
// empty string
const char* const str_empty_string = "";
const char *const str_empty_string = "";
// string comparison ---------------------------------------------------------------------
// compare two strings lexicographically
int str_cmp(const str s1, const str s2)
{
// string comparison
// --------------------------------------------------------------------- compare
// two strings lexicographically
int str_cmp(const str s1, const str s2) {
const size_t n1 = str_len(s1), n2 = str_len(s2);
// either string may be missing a null terminator, hence "memcmp"
const int res = memcmp(str_ptr(s1), str_ptr(s2), (n1 < n2) ? n1 : n2);
if(res != 0 || n1 == n2)
if (res != 0 || n1 == n2)
return res;
return (n1 < n2) ? -1 : 1;
}
// case-insensitive comparison
int str_cmp_ci(const str s1, const str s2)
{
int str_cmp_ci(const str s1, const str s2) {
const size_t n1 = str_len(s1), n2 = str_len(s2);
// either string may be missing a null terminator, hence "strNcasecmp"
const int res = strncasecmp(str_ptr(s1), str_ptr(s2), (n1 < n2) ? n1 : n2);
if(res != 0 || n1 == n2)
if (res != 0 || n1 == n2)
return res;
return (n1 < n2) ? -1 : 1;
}
// test for prefix
bool str_has_prefix(const str s, const str prefix)
{
bool str_has_prefix(const str s, const str prefix) {
const size_t n = str_len(prefix);
return (n == 0)
|| (str_len(s) >= n && memcmp(str_ptr(s), str_ptr(prefix), n) == 0);
return (n == 0) ||
(str_len(s) >= n && memcmp(str_ptr(s), str_ptr(prefix), n) == 0);
}
// test for suffix
bool str_has_suffix(const str s, const str suffix)
{
bool str_has_suffix(const str s, const str suffix) {
const size_t n = str_len(suffix);
return (n == 0)
|| (str_len(s) >= n && memcmp(str_end(s) - n, str_ptr(suffix), n) == 0);
return (n == 0) ||
(str_len(s) >= n && memcmp(str_end(s) - n, str_ptr(suffix), n) == 0);
}
// string constructors -----------------------------------------------------------------
// create a reference to the given range of chars
str str_ref_chars(const char* const s, const size_t n)
{
return (s && n > 0) ? ((str){ s, str_ref_info(n) }) : str_null;
// string constructors
// ----------------------------------------------------------------- create a
// reference to the given range of chars
str str_ref_chars(const char *const s, const size_t n) {
return (s && n > 0) ? ((str){s, str_ref_info(n)}) : str_null;
}
str str_ref_from_ptr(const char* const s)
{
str str_ref_from_ptr(const char *const s) {
return s ? str_ref_chars(s, strlen(s)) : str_null;
}
// take ownership of the given range of chars
str str_acquire_chars(const char* const s, const size_t n)
{
if(!s)
str str_acquire_chars(const char *const s, const size_t n) {
if (!s)
return str_null;
if(n == 0)
{
free((void*)s);
if (n == 0) {
free((void *)s);
return str_null;
}
return (str){ s, str_owner_info(n) };
return (str){s, str_owner_info(n)};
}
// take ownership of the given C string
str str_acquire(const char* const s)
{
str str_acquire(const char *const s) {
return s ? str_acquire_chars(s, strlen(s)) : str_null;
}
// allocate a copy of the given string
int str_dup_impl(str* const dest, const str s)
{
int str_dup_impl(str *const dest, const str s) {
const size_t n = str_len(s);
if(n == 0)
if (n == 0)
str_clear(dest);
else
{
char* const p = memcpy(ALLOC(n + 1), str_ptr(s), n);
else {
char *const p = memcpy(ALLOC(n + 1), str_ptr(s), n);
p[n] = 0;
str_assign(dest, str_acquire_chars(p, n));
@@ -200,9 +192,7 @@ int str_dup_impl(str* const dest, const str s)
#define STR_MAX_FILE_SIZE (64 * 1024 * 1024 - 1)
#endif
static
int get_file_size(const int fd, off_t* const size)
{
static int get_file_size(const int fd, off_t *const size) {
// stat the file
struct stat info;
@@ -211,8 +201,7 @@ int get_file_size(const int fd, off_t* const size)
*size = info.st_size;
// only regular files are allowed
switch(info.st_mode & S_IFMT)
{
switch (info.st_mode & S_IFMT) {
case S_IFREG:
return (info.st_size > STR_MAX_FILE_SIZE) ? EFBIG : 0;
case S_IFDIR:
@@ -222,33 +211,27 @@ int get_file_size(const int fd, off_t* const size)
}
}
static
int read_from_fd(const int fd, void* p, off_t* const psize)
{
const void* const end = p + *psize;
static int read_from_fd(const int fd, void *p, off_t *const psize) {
const void *const end = p + *psize;
ssize_t n;
do
{
do {
RETURN_ON_ERROR(n = read(fd, p, end - p));
p += n;
} while(n > 0 && p < end);
} while (n > 0 && p < end);
*psize -= end - p;
return 0;
}
static
int read_from_fd_cont(const int fd, void* p, off_t* const psize)
{
const void* end = p + *psize;
static int read_from_fd_cont(const int fd, void *p, off_t *const psize) {
const void *end = p + *psize;
void *buf = p;
ssize_t n;
ssize_t nread = 0;
do
{
do {
RETURN_ON_ERROR(n = read(fd, p, end - p));
p += n;
@@ -262,44 +245,36 @@ int read_from_fd_cont(const int fd, void* p, off_t* const psize)
end = buf + *psize;
}
} while(n > 0);
} while (n > 0);
return 0;
}
static
int str_from_fd(const int fd, const off_t size, str* const dest)
{
if(size == 0)
{
static int str_from_fd(const int fd, const off_t size, str *const dest) {
if (size == 0) {
str_clear(dest);
return 0;
}
char* buff = ALLOC(size + 1);
char *buff = ALLOC(size + 1);
off_t n = size;
const int err = read_from_fd(fd, buff, &n);
if(err != 0)
{
if (err != 0) {
free(buff);
return err;
}
if(n == 0)
{
if (n == 0) {
free(buff);
str_clear(dest);
return 0;
}
if(n < size)
{
char* const p = realloc(buff, n + 1);
if (n < size) {
char *const p = realloc(buff, n + 1);
if(!p)
{
if (!p) {
free(buff);
return ENOMEM;
}
@@ -312,34 +287,28 @@ int str_from_fd(const int fd, const off_t size, str* const dest)
return 0;
}
static
int str_from_stream_cont(const int fd, str* const dest, int *nmax)
{
static int str_from_stream_cont(const int fd, str *const dest, int *nmax) {
const size_t start_size = 8192;
char* buff = ALLOC(start_size + 1);
char *buff = ALLOC(start_size + 1);
off_t n = start_size;
const int err = read_from_fd_cont(fd, buff, &n);
if(err != 0)
{
if (err != 0) {
free(buff);
return err;
}
if(n == 0)
{
if (n == 0) {
free(buff);
str_clear(dest);
return 0;
}
if(n < start_size)
{
char* const p = realloc(buff, n + 1);
if (n < start_size) {
char *const p = realloc(buff, n + 1);
if(!p)
{
if (!p) {
free(buff);
return ENOMEM;
}
@@ -352,8 +321,7 @@ int str_from_stream_cont(const int fd, str* const dest, int *nmax)
return 0;
}
int str_from_file(str* const dest, const char* const file_name)
{
int str_from_file(str *const dest, const char *const file_name) {
int fd;
RETURN_ON_ERROR(fd = open(file_name, O_CLOEXEC | O_RDONLY));
@@ -361,15 +329,14 @@ int str_from_file(str* const dest, const char* const file_name)
off_t size = 0;
int err = get_file_size(fd, &size);
if(err == 0)
if (err == 0)
err = str_from_fd(fd, size, dest);
close(fd);
return err;
}
int str_from_stream(str* const dest, const char* const file_name, int *nread)
{
int str_from_stream(str *const dest, const char *const file_name, int *nread) {
int fd;
RETURN_ON_ERROR(fd = open(file_name, O_CLOEXEC | O_RDONLY));
@@ -390,30 +357,25 @@ int str_from_stream(str* const dest, const char* const file_name, int *nread)
return err;
}
// string composition -----------------------------------------------------------------------
// string composition
// -----------------------------------------------------------------------
// append string
static inline
char* append_str(char* p, const str s)
{
static inline char *append_str(char *p, const str s) {
return mem_append(p, str_ptr(s), str_len(s));
}
static
size_t total_length(const str* src, size_t count)
{
static size_t total_length(const str *src, size_t count) {
size_t sum = 0;
for(; count > 0; --count)
for (; count > 0; --count)
sum += str_len(*src++);
return sum;
}
// concatenate strings
int str_cat_range_impl(str* const dest, const str* src, size_t count)
{
if(!src)
{
int str_cat_range_impl(str *const dest, const str *src, size_t count) {
if (!src) {
str_clear(dest);
return 0;
}
@@ -421,19 +383,18 @@ int str_cat_range_impl(str* const dest, const str* src, size_t count)
// calculate total length
const size_t num = total_length(src, count);
if(num == 0)
{
if (num == 0) {
str_clear(dest);
return 0;
}
// allocate
char* const buff = ALLOC(num + 1);
char *const buff = ALLOC(num + 1);
// copy bytes
char* p = buff;
char *p = buff;
for(; count > 0; --count)
for (; count > 0; --count)
p = append_str(p, *src++);
// null-terminate and assign
@@ -443,13 +404,11 @@ int str_cat_range_impl(str* const dest, const str* src, size_t count)
}
// writing to file descriptor
int str_cpy_to_fd(const int fd, const str s)
{
int str_cpy_to_fd(const int fd, const str s) {
size_t n = str_len(s);
const void* p = str_ptr(s);
const void *p = str_ptr(s);
while(n > 0)
{
while (n > 0) {
ssize_t m;
RETURN_ON_ERROR(m = write(fd, p, n));
@@ -462,28 +421,22 @@ int str_cpy_to_fd(const int fd, const str s)
}
// writing to byte stream
int str_cpy_to_stream(FILE* const stream, const str s)
{
int str_cpy_to_stream(FILE *const stream, const str s) {
const size_t n = str_len(s);
return (n > 0 && fwrite(str_ptr(s), 1, n, stream) < n) ? EIO : 0;
}
// write iovec
static
int write_iovec(const int fd, struct iovec* pv, unsigned nv)
{
while(nv > 0)
{
static int write_iovec(const int fd, struct iovec *pv, unsigned nv) {
while (nv > 0) {
ssize_t n;
RETURN_ON_ERROR(n = writev(fd, pv, nv));
// discard items already written
for(; nv > 0; ++pv, --nv)
{
if(n < (ssize_t)pv->iov_len)
{
for (; nv > 0; ++pv, --nv) {
if (n < (ssize_t)pv->iov_len) {
pv->iov_base += n;
pv->iov_len -= n;
break;
@@ -497,87 +450,79 @@ int write_iovec(const int fd, struct iovec* pv, unsigned nv)
}
// concatenate to file descriptor
static
struct iovec* vec_append(struct iovec* const pv, const str s)
{
*pv = (struct iovec){ (void*)str_ptr(s), str_len(s) };
static struct iovec *vec_append(struct iovec *const pv, const str s) {
*pv = (struct iovec){(void *)str_ptr(s), str_len(s)};
return pv + 1;
}
static
struct iovec* vec_append_nonempty(struct iovec* const pv, const str s)
{
static struct iovec *vec_append_nonempty(struct iovec *const pv, const str s) {
return str_is_empty(s) ? pv : vec_append(pv, s);
}
int str_cat_range_to_fd(const int fd, const str* src, size_t count)
{
if(!src)
int str_cat_range_to_fd(const int fd, const str *src, size_t count) {
if (!src)
return 0;
struct iovec v[IOV_MAX];
while(count > 0)
{
struct iovec* p = vec_append_nonempty(v, *src++);
while (count > 0) {
struct iovec *p = vec_append_nonempty(v, *src++);
while(--count > 0 && p < v + IOV_MAX)
while (--count > 0 && p < v + IOV_MAX)
p = vec_append_nonempty(p, *src++);
const size_t n = p - v;
if(n == 0)
if (n == 0)
break;
const int ret = write_iovec(fd, v, n);
if(ret != 0)
if (ret != 0)
return ret;
}
return 0;
}
int str_cat_range_to_stream(FILE* const stream, const str* src, size_t count)
{
if(!src)
int str_cat_range_to_stream(FILE *const stream, const str *src, size_t count) {
if (!src)
return 0;
int err = 0;
for(; count > 0 && err == 0; --count)
for (; count > 0 && err == 0; --count)
err = str_cpy(stream, *src++);
return err;
}
// join strings
int str_join_range_impl(str* const dest, const str sep, const str* src, size_t count)
{
int str_join_range_impl(str *const dest, const str sep, const str *src,
size_t count) {
// test for simple cases
if(str_is_empty(sep))
if (str_is_empty(sep))
return str_cat_range(dest, src, count);
if(!src || count == 0)
{
if (!src || count == 0) {
str_clear(dest);
return 0;
}
if(count == 1)
if (count == 1)
return str_cpy(dest, *src);
// calculate total length
const size_t num = total_length(src, count) + str_len(sep) * (count - 1);
// allocate
char* const buff = ALLOC(num + 1);
char *const buff = ALLOC(num + 1);
// copy bytes
char* p = append_str(buff, *src++);
char *p = append_str(buff, *src++);
while(--count > 0)
while (--count > 0)
p = append_str(append_str(p, sep), *src++);
// null-terminate and assign
@@ -586,75 +531,72 @@ int str_join_range_impl(str* const dest, const str sep, const str* src, size_t c
return 0;
}
int str_join_range_to_fd(const int fd, const str sep, const str* src, size_t count)
{
if(str_is_empty(sep))
int str_join_range_to_fd(const int fd, const str sep, const str *src,
size_t count) {
if (str_is_empty(sep))
return str_cat_range(fd, src, count);
if(!src || count == 0)
if (!src || count == 0)
return 0;
if(count == 1)
if (count == 1)
return str_cpy(fd, *src);
struct iovec v[IOV_MAX];
struct iovec* p = vec_append_nonempty(v, *src++);
struct iovec *p = vec_append_nonempty(v, *src++);
for(--count; count > 0; p = v)
{
for (--count; count > 0; p = v) {
p = vec_append_nonempty(vec_append(p, sep), *src++);
while(--count > 0 && p < v + IOV_MAX - 1)
while (--count > 0 && p < v + IOV_MAX - 1)
p = vec_append_nonempty(vec_append(p, sep), *src++);
const size_t n = p - v;
if(n == 0)
if (n == 0)
break;
const int ret = write_iovec(fd, v, n);
if(ret != 0)
if (ret != 0)
return ret;
}
return 0;
}
int str_join_range_to_stream(FILE* const stream, const str sep, const str* src, size_t count)
{
if(str_is_empty(sep))
int str_join_range_to_stream(FILE *const stream, const str sep, const str *src,
size_t count) {
if (str_is_empty(sep))
return str_cat_range(stream, src, count);
if(!src || count == 0)
if (!src || count == 0)
return 0;
int err = str_cpy(stream, *src++);
while(--count > 0 && err == 0)
while (--count > 0 && err == 0)
err = str_cat(stream, sep, *src++);
return err;
}
// searching and sorting --------------------------------------------------------------------
// string partitioning
bool str_partition(const str src, const str patt, str* const prefix, str* const suffix)
{
// searching and sorting
// -------------------------------------------------------------------- string
// partitioning
bool str_partition(const str src, const str patt, str *const prefix,
str *const suffix) {
const size_t patt_len = str_len(patt);
if(patt_len > 0 && !str_is_empty(src))
{
const char* s = memmem(str_ptr(src), str_len(src), str_ptr(patt), patt_len);
if (patt_len > 0 && !str_is_empty(src)) {
const char *s = memmem(str_ptr(src), str_len(src), str_ptr(patt), patt_len);
if(s)
{
if(prefix)
if (s) {
if (prefix)
str_assign(prefix, str_ref_chars(str_ptr(src), s - str_ptr(src)));
if(suffix)
{
if (suffix) {
s += patt_len;
str_assign(suffix, str_ref_chars(s, str_end(src) - s));
}
@@ -663,90 +605,85 @@ bool str_partition(const str src, const str patt, str* const prefix, str* const
}
}
if(prefix)
if (prefix)
str_assign(prefix, str_ref(src));
if(suffix)
if (suffix)
str_clear(suffix);
return false;
}
// comparison functions
int str_order_asc(const void* const s1, const void* const s2)
{
return str_cmp(*(const str*)s1, *(const str*)s2);
int str_order_asc(const void *const s1, const void *const s2) {
return str_cmp(*(const str *)s1, *(const str *)s2);
}
int str_order_desc(const void* const s1, const void* const s2)
{
return -str_cmp(*(const str*)s1, *(const str*)s2);
int str_order_desc(const void *const s1, const void *const s2) {
return -str_cmp(*(const str *)s1, *(const str *)s2);
}
int str_order_asc_ci(const void* const s1, const void* const s2)
{
return str_cmp_ci(*(const str*)s1, *(const str*)s2);
int str_order_asc_ci(const void *const s1, const void *const s2) {
return str_cmp_ci(*(const str *)s1, *(const str *)s2);
}
int str_order_desc_ci(const void* const s1, const void* const s2)
{
return -str_cmp_ci(*(const str*)s1, *(const str*)s2);
int str_order_desc_ci(const void *const s1, const void *const s2) {
return -str_cmp_ci(*(const str *)s1, *(const str *)s2);
}
// sorting
void str_sort_range(const str_cmp_func cmp, str* const array, const size_t count)
{
if(array && count > 1)
void str_sort_range(const str_cmp_func cmp, str *const array,
const size_t count) {
if (array && count > 1)
qsort(array, count, sizeof(array[0]), cmp);
}
// searching
const str* str_search_range(const str key, const str* const array, const size_t count)
{
if(!array || count == 0)
const str *str_search_range(const str key, const str *const array,
const size_t count) {
if (!array || count == 0)
return NULL;
if(count == 1)
if (count == 1)
return str_eq(key, array[0]) ? array : NULL;
return bsearch(&key, array, count, sizeof(str), str_order_asc);
}
// partitioning
size_t str_partition_range(bool (*pred)(const str), str* const array, const size_t count)
{
if(!array)
size_t str_partition_range(bool (*pred)(const str), str *const array,
const size_t count) {
if (!array)
return 0;
const str* const end = array + count;
str* p = array;
const str *const end = array + count;
str *p = array;
while(p < end && pred(*p))
while (p < end && pred(*p))
++p;
for(str* s = p + 1; s < end; ++s)
if(pred(*s))
for (str *s = p + 1; s < end; ++s)
if (pred(*s))
str_swap(p++, s);
return p - array;
}
// unique partitioning
size_t str_unique_range(str* const array, const size_t count)
{
if(!array || count == 0)
size_t str_unique_range(str *const array, const size_t count) {
if (!array || count == 0)
return 0;
if(count == 1)
if (count == 1)
return 1;
str_sort_range(str_order_asc, array, count);
const str* const end = array + count;
str* p = array;
const str *const end = array + count;
str *p = array;
for(str* s = array + 1; s < end; ++s)
if(!str_eq(*p, *s) && (++p < s))
for (str *s = array + 1; s < end; ++s)
if (!str_eq(*p, *s) && (++p < s))
str_swap(p, s);
return p + 1 - array;
@@ -755,15 +692,14 @@ size_t str_unique_range(str* const array, const size_t count)
// string iterator function
#ifdef __STDC_UTF_32__
char32_t str_cp_iterator_next(str_cp_iterator* const it)
{
if(it->curr >= it->end)
char32_t str_cp_iterator_next(str_cp_iterator *const it) {
if (it->curr >= it->end)
return CPI_END_OF_STRING;
char32_t c;
const size_t n = mbrtoc32(&c, it->curr, it->end - it->curr, &it->state);
switch(n) // see https://en.cppreference.com/w/c/string/multibyte/mbrtoc32
switch (n) // see https://en.cppreference.com/w/c/string/multibyte/mbrtoc32
{
case 0: // null character (U+0000) is allowed
++it->curr;
@@ -782,54 +718,47 @@ char32_t str_cp_iterator_next(str_cp_iterator* const it)
#endif // ifdef __STDC_UTF_32__
// tokeniser
static inline
bool is_delim(const str_tok_state* const state, const char c)
{
static inline bool is_delim(const str_tok_state *const state, const char c) {
return state->bits[(unsigned char)c >> 3] & (1 << (c & 0x7));
}
static inline
void set_bit(str_tok_state* const state, const char c)
{
static inline void set_bit(str_tok_state *const state, const char c) {
state->bits[(unsigned char)c >> 3] |= (1 << (c & 0x7));
}
void str_tok_delim(str_tok_state* const state, const str delim_set)
{
void str_tok_delim(str_tok_state *const state, const str delim_set) {
memset(state->bits, 0, sizeof(state->bits));
const char* const end = str_end(delim_set);
const char *const end = str_end(delim_set);
for(const char* s = str_ptr(delim_set); s < end; ++s)
for (const char *s = str_ptr(delim_set); s < end; ++s)
set_bit(state, *s);
}
void str_tok_init(str_tok_state* const state, const str src, const str delim_set)
{
void str_tok_init(str_tok_state *const state, const str src,
const str delim_set) {
state->src = str_ptr(src);
state->end = str_end(src);
str_tok_delim(state, delim_set);
}
bool str_tok(str* const dest, str_tok_state* const state)
{
bool str_tok(str *const dest, str_tok_state *const state) {
// token start
const char* begin = state->src;
const char *begin = state->src;
while(begin < state->end && is_delim(state, *begin))
while (begin < state->end && is_delim(state, *begin))
++begin;
if(begin == state->end)
{
if (begin == state->end) {
str_clear(dest);
return false;
}
// token end
const char* end = begin + 1;
const char *end = begin + 1;
while(end < state->end && !is_delim(state, *end))
while (end < state->end && !is_delim(state, *end))
++end;
state->src = end;

215
src/str.h
View File

@@ -32,100 +32,108 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
#ifdef __cplusplus
extern "C" {
#endif
// string type ----------------------------------------------------------------------------
typedef struct
{
const char* ptr;
// string type
// ----------------------------------------------------------------------------
typedef struct {
const char *ptr;
size_t info;
} str;
// NULL string
#define str_null ((str){ 0, 0 })
#define str_null ((str){0, 0})
// helper macros
#define str_ref_info(n) ((n) << 1)
#define str_owner_info(n) (str_ref_info(n) | 1)
// string properties ----------------------------------------------------------------------
// length of the string
static inline
size_t str_len(const str s) { return s.info >> 1; }
// string properties
// ---------------------------------------------------------------------- length
// of the string
static inline size_t str_len(const str s) { return s.info >> 1; }
// pointer to the string
static inline
const char* str_ptr(const str s)
{
extern const char* const str_empty_string;
static inline const char *str_ptr(const str s) {
extern const char *const str_empty_string;
return s.ptr ? s.ptr : str_empty_string;
}
// end of the string
static inline
const char* str_end(const str s) { return str_ptr(s) + str_len(s); }
static inline const char *str_end(const str s) {
return str_ptr(s) + str_len(s);
}
// test if the string is empty
static inline
bool str_is_empty(const str s) { return str_len(s) == 0; }
static inline bool str_is_empty(const str s) { return str_len(s) == 0; }
// test if the string is allocated on the heap
static inline
bool str_is_owner(const str s) { return (s.info & 1) != 0; }
static inline bool str_is_owner(const str s) { return (s.info & 1) != 0; }
// test if the string is a reference
static inline
bool str_is_ref(const str s) { return !str_is_owner(s); }
static inline bool str_is_ref(const str s) { return !str_is_owner(s); }
// string memory control -------------------------------------------------------------------
// free memory allocated for the string
// string memory control
// ------------------------------------------------------------------- free
// memory allocated for the string
void str_free(const str s);
// automatic cleanup
void str_free_auto(const str* const ps);
void str_free_auto(const str *const ps);
#define str_auto str __attribute__((cleanup(str_free_auto)))
// string movements -----------------------------------------------------------------------
// free target string, then assign the new value to it
static inline
void str_assign(str* const ps, const str s) { str_free(*ps); *ps = s; }
// string movements
// ----------------------------------------------------------------------- free
// target string, then assign the new value to it
static inline void str_assign(str *const ps, const str s) {
str_free(*ps);
*ps = s;
}
// move the string, resetting the source to str_null
static inline
str str_move(str* const ps) { const str t = *ps; *ps = str_null; return t; }
static inline str str_move(str *const ps) {
const str t = *ps;
*ps = str_null;
return t;
}
// pass ownership of the string
static inline
str str_pass(str* const ps) { const str t = *ps; ps->info &= ~(size_t)1; return t; }
static inline str str_pass(str *const ps) {
const str t = *ps;
ps->info &= ~(size_t)1;
return t;
}
// swap two string objects
void str_swap(str* const s1, str* const s2);
void str_swap(str *const s1, str *const s2);
// string helpers --------------------------------------------------------------------------
// string helpers
// --------------------------------------------------------------------------
// reset the string to str_null
static inline
void str_clear(str* const ps) { str_assign(ps, str_null); }
static inline void str_clear(str *const ps) { str_assign(ps, str_null); }
// compare two strings lexicographically
int str_cmp(const str s1, const str s2);
// test if two strings match
static inline
bool str_eq(const str s1, const str s2) { return str_cmp(s1, s2) == 0; }
static inline bool str_eq(const str s1, const str s2) {
return str_cmp(s1, s2) == 0;
}
// case-insensitive comparison
int str_cmp_ci(const str s1, const str s2);
// case-insensitive match
static inline
bool str_eq_ci(const str s1, const str s2) { return str_cmp_ci(s1, s2) == 0; }
static inline bool str_eq_ci(const str s1, const str s2) {
return str_cmp_ci(s1, s2) == 0;
}
// test for prefix
bool str_has_prefix(const str s, const str prefix);
@@ -133,11 +141,12 @@ bool str_has_prefix(const str s, const str prefix);
// test for suffix
bool str_has_suffix(const str s, const str suffix);
// string composition ------------------------------------------------------------------
// string composition
// ------------------------------------------------------------------
// implementation helpers
int str_dup_impl(str* const dest, const str s);
int str_dup_impl(str *const dest, const str s);
int str_cpy_to_fd(const int fd, const str s);
int str_cpy_to_stream(FILE* const stream, const str s);
int str_cpy_to_stream(FILE *const stream, const str s);
// copy string
#define str_cpy(dest, src) \
@@ -148,9 +157,9 @@ int str_cpy_to_stream(FILE* const stream, const str s);
)((dest), (src))
// implementation helpers
int str_cat_range_impl(str* const dest, const str* src, size_t count);
int str_cat_range_to_fd(const int fd, const str* src, size_t count);
int str_cat_range_to_stream(FILE* const stream, const str* src, size_t count);
int str_cat_range_impl(str *const dest, const str *src, size_t count);
int str_cat_range_to_fd(const int fd, const str *src, size_t count);
int str_cat_range_to_stream(FILE *const stream, const str *src, size_t count);
// concatenate range of strings
#define str_cat_range(dest, src, count) \
@@ -162,15 +171,18 @@ int str_cat_range_to_stream(FILE* const stream, const str* src, size_t count);
// concatenate string arguments
#define str_cat(dest, ...) \
({ \
const str args[] = { __VA_ARGS__ }; \
str_cat_range((dest), args, sizeof(args)/sizeof(args[0])); \
})
({ \
const str args[] = {__VA_ARGS__}; \
str_cat_range((dest), args, sizeof(args) / sizeof(args[0])); \
})
// implementation helpers
int str_join_range_impl(str* const dest, const str sep, const str* src, size_t count);
int str_join_range_to_fd(const int fd, const str sep, const str* src, size_t count);
int str_join_range_to_stream(FILE* const stream, const str sep, const str* src, size_t count);
int str_join_range_impl(str *const dest, const str sep, const str *src,
size_t count);
int str_join_range_to_fd(const int fd, const str sep, const str *src,
size_t count);
int str_join_range_to_stream(FILE *const stream, const str sep, const str *src,
size_t count);
// join strings around the separator
#define str_join_range(dest, sep, src, count) \
@@ -182,19 +194,21 @@ int str_join_range_to_stream(FILE* const stream, const str sep, const str* src,
// join string arguments around the separator
#define str_join(dest, sep, ...) \
({ \
const str args[] = { __VA_ARGS__ }; \
str_join_range((dest), (sep), args, sizeof(args)/sizeof(args[0])); \
})
({ \
const str args[] = {__VA_ARGS__}; \
str_join_range((dest), (sep), args, sizeof(args) / sizeof(args[0])); \
})
// constructors ----------------------------------------------------------------------------
// constructors
// ----------------------------------------------------------------------------
// string reference from a string literal
#define str_lit(s) ((str){ "" s, str_ref_info(sizeof(s) - 1) })
#define str_lit(s) ((str){"" s, str_ref_info(sizeof(s) - 1)})
static inline
str str_ref_impl(const str s) { return (str){ s.ptr, s.info & ~(size_t)1 }; }
static inline str str_ref_impl(const str s) {
return (str){s.ptr, s.info & ~(size_t)1};
}
str str_ref_from_ptr(const char* const s);
str str_ref_from_ptr(const char *const s);
// string reference from anything
#define str_ref(s) \
@@ -205,45 +219,51 @@ str str_ref_from_ptr(const char* const s);
)(s)
// create a reference to the given range of chars
str str_ref_chars(const char* const s, const size_t n);
str str_ref_chars(const char *const s, const size_t n);
// take ownership of the given range of chars
str str_acquire_chars(const char* const s, const size_t n);
str str_acquire_chars(const char *const s, const size_t n);
// take ownership of the given string
str str_acquire(const char* const s);
str str_acquire(const char *const s);
// string from file
int str_from_file(str* const dest, const char* const file_name);
int str_from_file(str *const dest, const char *const file_name);
// read maximum nread bytes from file, write bytes read. 0 reads until EOS.
int str_from_stream(str* const dest, const char* const file_name, int *nread);
int str_from_stream(str *const dest, const char *const file_name, int *nread);
// searching and sorting --------------------------------------------------------------------
// string partitioning (substring search)
bool str_partition(const str src, const str patt, str* const prefix, str* const suffix);
// searching and sorting
// -------------------------------------------------------------------- string
// partitioning (substring search)
bool str_partition(const str src, const str patt, str *const prefix,
str *const suffix);
// comparison functions
typedef int (*str_cmp_func)(const void*, const void*);
typedef int (*str_cmp_func)(const void *, const void *);
int str_order_asc(const void* const s1, const void* const s2);
int str_order_desc(const void* const s1, const void* const s2);
int str_order_asc_ci(const void* const s1, const void* const s2);
int str_order_desc_ci(const void* const s1, const void* const s2);
int str_order_asc(const void *const s1, const void *const s2);
int str_order_desc(const void *const s1, const void *const s2);
int str_order_asc_ci(const void *const s1, const void *const s2);
int str_order_desc_ci(const void *const s1, const void *const s2);
// sort array of strings
void str_sort_range(const str_cmp_func cmp, str* const array, const size_t count);
void str_sort_range(const str_cmp_func cmp, str *const array,
const size_t count);
// searching
const str* str_search_range(const str key, const str* const array, const size_t count);
const str *str_search_range(const str key, const str *const array,
const size_t count);
// partitioning
size_t str_partition_range(bool (*pred)(const str), str* const array, const size_t count);
size_t str_partition_range(bool (*pred)(const str), str *const array,
const size_t count);
// unique partitioning
size_t str_unique_range(str* const array, const size_t count);
size_t str_unique_range(str *const array, const size_t count);
// UTF-32 codepoint iterator ----------------------------------------------------------------
// UTF-32 codepoint iterator
// ----------------------------------------------------------------
#ifdef __STDC_UTF_32__
#include <uchar.h>
@@ -258,38 +278,37 @@ size_t str_unique_range(str* const array, const size_t count);
// implementation
#define for_each_cp(var, src, it) \
for(str_cp_iterator it = str_make_cp_iterator(src); (var = str_cp_iterator_next(&it)) <= 0x10FFFFu;)
for (str_cp_iterator it = str_make_cp_iterator(src); \
(var = str_cp_iterator_next(&it)) <= 0x10FFFFu;)
#define CAT1(x, y) CAT2(x, y)
#define CAT2(x, y) x ## y
#define CAT2(x, y) x##y
typedef struct
{
const char* curr;
const char* const end;
typedef struct {
const char *curr;
const char *const end;
mbstate_t state;
} str_cp_iterator;
static inline
str_cp_iterator str_make_cp_iterator(const str s)
{
return (str_cp_iterator){ .curr = str_ptr(s), .end = str_end(s) };
static inline str_cp_iterator str_make_cp_iterator(const str s) {
return (str_cp_iterator){.curr = str_ptr(s), .end = str_end(s)};
}
char32_t str_cp_iterator_next(str_cp_iterator* const it);
char32_t str_cp_iterator_next(str_cp_iterator *const it);
#endif // ifdef __STDC_UTF_32__
// tokeniser --------------------------------------------------------------------------------
typedef struct
{
// tokeniser
// --------------------------------------------------------------------------------
typedef struct {
unsigned char bits[32]; // 256 / 8
const char *src, *end;
} str_tok_state;
void str_tok_init(str_tok_state* const state, const str src, const str delim_set);
bool str_tok(str* const dest, str_tok_state* const state);
void str_tok_delim(str_tok_state* const state, const str delim_set);
void str_tok_init(str_tok_state *const state, const str src,
const str delim_set);
bool str_tok(str *const dest, str_tok_state *const state);
void str_tok_delim(str_tok_state *const state, const str delim_set);
#ifdef __cplusplus
}

2
src/symbols.h
View File

@@ -8,7 +8,6 @@
#include <stddef.h>
#include <stdint.h>
typedef struct {
struct sc_array_str names;
struct sc_array_ptr addresses;
@@ -16,7 +15,6 @@ typedef struct {
sc_array_def(SymbolInfos, syms);
struct dl_phdr_info;
struct sc_array_memreg;
HiloadResult hi_create_symbol_info(SymbolInfos *,

2
src/types.h
View File

@@ -1,8 +1,8 @@
#ifndef TYPES_H_
#define TYPES_H_
#include <stdint.h>
#include <stddef.h>
#include <stdint.h>
typedef uint8_t u8;
typedef uint16_t u16;

2
test/manual/minimal_lib.h
View File

@@ -10,5 +10,5 @@ static int otherValue = 0;
int getNewValue(int x);
#pragma GCC visibility pop
}
} // namespace minimal_lib
#endif // MINIMAL_LIB_H_