X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=util.c;h=ecae50516514e45db673cd10966ac408a010b0d1;hp=4b641a679bd1251d80696b68a6144b64e24e2621;hb=a68f0fcb355db42acabe72da5939fbd1b04f6016;hpb=2f356f12e65b7c10c1beaaa865b6664b701bd410 diff --git a/util.c b/util.c index 4b641a6..ecae505 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -21,168 +21,45 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include -#include -#include "gmqcc.h" - -/* TODO: remove globals ... */ -uint64_t mem_ab = 0; -uint64_t mem_db = 0; -uint64_t mem_at = 0; -uint64_t mem_dt = 0; - -struct memblock_t { - const char *file; - unsigned int line; - size_t byte; - struct memblock_t *next; - struct memblock_t *prev; -}; - -static struct memblock_t *mem_start = NULL; - -void *util_memory_a(size_t byte, unsigned int line, const char *file) { - struct memblock_t *info = (struct memblock_t*)malloc(sizeof(struct memblock_t) + byte); - void *data = (void*)(info+1); - if (!info) return NULL; - info->line = line; - info->byte = byte; - info->file = file; - info->prev = NULL; - info->next = mem_start; - if (mem_start) - mem_start->prev = info; - mem_start = info; - - util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line); - mem_at++; - mem_ab += info->byte; - - return data; -} - -void util_memory_d(void *ptrn, unsigned int line, const char *file) { - struct memblock_t *info = NULL; - - if (!ptrn) return; - info = ((struct memblock_t*)ptrn - 1); - - util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line); - mem_db += info->byte; - mem_dt++; - - if (info->prev) - info->prev->next = info->next; - if (info->next) - info->next->prev = info->prev; - if (info == mem_start) - mem_start = info->next; - - free(info); -} - -void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file) { - struct memblock_t *oldinfo = NULL; - - struct memblock_t *newinfo; - - if (!ptrn) - return util_memory_a(byte, line, file); - if (!byte) { - util_memory_d(ptrn, line, file); - return NULL; - } - - oldinfo = ((struct memblock_t*)ptrn - 1); - newinfo = ((struct memblock_t*)malloc(sizeof(struct memblock_t) + byte)); - - util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line); +#include +#include - /* new data */ - if (!newinfo) { - util_memory_d(oldinfo+1, line, file); - return NULL; - } - - /* copy old */ - memcpy(newinfo+1, oldinfo+1, oldinfo->byte); - - /* free old */ - if (oldinfo->prev) - oldinfo->prev->next = oldinfo->next; - if (oldinfo->next) - oldinfo->next->prev = oldinfo->prev; - if (oldinfo == mem_start) - mem_start = oldinfo->next; - - /* fill info */ - newinfo->line = line; - newinfo->byte = byte; - newinfo->file = file; - newinfo->prev = NULL; - newinfo->next = mem_start; - if (mem_start) - mem_start->prev = newinfo; - mem_start = newinfo; - - mem_ab -= oldinfo->byte; - mem_ab += newinfo->byte; - - free(oldinfo); - - return newinfo+1; -} - -void util_meminfo() { - struct memblock_t *info; - - if (!opts.memchk) - return; - - for (info = mem_start; info; info = info->next) { - util_debug("MEM", "lost: % 8u (bytes) at %s:%u\n", - info->byte, - info->file, - info->line); - } - - util_debug("MEM", "Memory information:\n\ - Total allocations: %llu\n\ - Total deallocations: %llu\n\ - Total allocated: %llu (bytes)\n\ - Total deallocated: %llu (bytes)\n\ - Leaks found: lost %llu (bytes) in %d allocations\n", - mem_at, mem_dt, - mem_ab, mem_db, - (mem_ab - mem_db), - (mem_at - mem_dt) - ); -} +#include "gmqcc.h" /* - * Some string utility functions, because strdup uses malloc, and we want - * to track all memory (without replacing malloc). + * Initially this was handled with a table in the gmqcc.h header, but + * much to my surprise the contents of the table was duplicated for + * each translation unit, causing all these strings to be duplicated + * for every .c file it was included into. This method culls back on + * it. This is a 'utility' function because the executor also depends + * on this for dissasembled bytecode. */ -char *util_strdup(const char *s) { - size_t len = 0; - char *ptr = NULL; - - if (!s) - return NULL; - - if ((len = strlen(s)) && (ptr = (char*)mem_a(len+1))) { - memcpy(ptr, s, len); - ptr[len] = '\0'; - } - return ptr; -} +const char *util_instr_str[VINSTR_END] = { + "DONE", "MUL_F", "MUL_V", "MUL_FV", + "MUL_VF", "DIV_F", "ADD_F", "ADD_V", + "SUB_F", "SUB_V", "EQ_F", "EQ_V", + "EQ_S", "EQ_E", "EQ_FNC", "NE_F", + "NE_V", "NE_S", "NE_E", "NE_FNC", + "LE", "GE", "LT", "GT", + "LOAD_F", "LOAD_V", "LOAD_S", "LOAD_ENT", + "LOAD_FLD", "LOAD_FNC", "ADDRESS", "STORE_F", + "STORE_V", "STORE_S", "STORE_ENT", "STORE_FLD", + "STORE_FNC", "STOREP_F", "STOREP_V", "STOREP_S", + "STOREP_ENT", "STOREP_FLD", "STOREP_FNC", "RETURN", + "NOT_F", "NOT_V", "NOT_S", "NOT_ENT", + "NOT_FNC", "IF", "IFNOT", "CALL0", + "CALL1", "CALL2", "CALL3", "CALL4", + "CALL5", "CALL6", "CALL7", "CALL8", + "STATE", "GOTO", "AND", "OR", + "BITAND", "BITOR" +}; void util_debug(const char *area, const char *ms, ...) { va_list va; - if (!opts.debug) + if (!OPTS_OPTION_BOOL(OPTION_DEBUG)) return; - if (!strcmp(area, "MEM") && !opts.memchk) + if (!strcmp(area, "MEM") && !OPTS_OPTION_BOOL(OPTION_MEMCHK)) return; va_start(va, ms); @@ -194,7 +71,7 @@ void util_debug(const char *area, const char *ms, ...) { /* * only required if big endian .. otherwise no need to swap * data. - */ + */ #if PLATFORM_BYTE_ORDER == GMQCC_BYTE_ORDER_BIG static GMQCC_INLINE void util_swap16(uint16_t *d, size_t l) { while (l--) { @@ -257,7 +134,7 @@ void util_endianswap(void *_data, size_t length, unsigned int typesize) { util_swap64((uint32_t*)_data, length>>3); return; - default: abort(); /* please blow the fuck up! */ + default: exit(EXIT_FAILURE); /* please blow the fuck up! */ } # endif #endif @@ -334,7 +211,7 @@ static const uint16_t util_crc16_table[] = { /* Non - Reflected */ uint16_t util_crc16(uint16_t current, const char *k, size_t len) { register uint16_t h = current; - for (; len; --len, ++k) + for (; len; --len, ++k) h = util_crc16_table[(h>>8)^((unsigned char)*k)]^(h<<8); return h; } @@ -342,242 +219,44 @@ uint16_t util_crc16(uint16_t current, const char *k, size_t len) { #if 0 uint16_t util_crc16(const char *k, int len, const short clamp) { register uint16_t h= (uint16_t)0xFFFFFFFF; - for (; len; --len, ++k) + for (; len; --len, ++k) h = util_crc16_table[(h^((unsigned char)*k))&0xFF]^(h>>8); - return (~h)%clamp; + return (~h)%clamp; } #endif -size_t util_strtocmd(const char *in, char *out, size_t outsz) { - size_t sz = 1; - for (; *in && sz < outsz; ++in, ++out, ++sz) - *out = (*in == '-') ? '_' : (isalpha(*in) && !isupper(*in)) ? *in + 'A' - 'a': *in; - *out = 0; - return sz-1; -} - -size_t util_strtononcmd(const char *in, char *out, size_t outsz) { +/* + * modifier is the match to make and the transpsition from it, while add is the upper-value that determines the + * transposion from uppercase to lower case. + */ +static GMQCC_INLINE size_t util_strtransform(const char *in, char *out, size_t outsz, const char *mod, int add) { size_t sz = 1; - for (; *in && sz < outsz; ++in, ++out, ++sz) - *out = (*in == '_') ? '-' : (isalpha(*in) && isupper(*in)) ? *in + 'a' - 'A' : *in; + for (; *in && sz < outsz; ++in, ++out, ++sz) { + *out = (*in == mod[0]) + ? mod[1] + : (util_isalpha(*in) && util_isupper(*in + add)) + ? *in + add + : *in; + } *out = 0; return sz-1; } -/* TODO: rewrite ... when I redo the ve cleanup */ -void _util_vec_grow(void **a, size_t i, size_t s) { - vector_t *d = vec_meta(*a); - size_t m = *a ? 2 * d->allocated +i : i+1; - void *p = mem_r((*a ? d : NULL), s * m + sizeof(vector_t)); - - if (!*a) - ((vector_t*)p)->used = 0; - *a = (vector_t*)p + 1; - - vec_meta(*a)->allocated = m; -} - -/* - * Hash table for generic data, based on dynamic memory allocations - * all around. This is the internal interface, please look for - * EXPOSED INTERFACE comment below - */ -typedef struct hash_node_t { - char *key; /* the key for this node in table */ - void *value; /* pointer to the data as void* */ - struct hash_node_t *next; /* next node (linked list) */ -} hash_node_t; - -GMQCC_INLINE size_t util_hthash(hash_table_t *ht, const char *key) { - const uint32_t mix = 0x5BD1E995; - const uint32_t rot = 24; - size_t size = strlen(key); - uint32_t hash = 0x1EF0 /* LICRC TAB */ ^ size; - uint32_t alias = 0; - const unsigned char *data = (const unsigned char*)key; - - while (size >= 4) { - alias = *(uint32_t*)data; - - alias *= mix; - alias ^= alias >> rot; - alias *= mix; - - hash *= mix; - hash ^= alias; - - data += 4; - size -= 4; - } - - switch (size) { - case 3: hash ^= data[2] << 16; - case 2: hash ^= data[1] << 8; - case 1: hash ^= data[0]; - hash *= mix; - } - - hash ^= hash >> 13; - hash *= mix; - hash ^= hash >> 15; - - return (size_t) (hash % ht->size); -} - -hash_node_t *_util_htnewpair(const char *key, void *value) { - hash_node_t *node; - if (!(node = (hash_node_t*)mem_a(sizeof(hash_node_t)))) - return NULL; - - if (!(node->key = util_strdup(key))) { - mem_d(node); - return NULL; - } - - node->value = value; - node->next = NULL; - - return node; -} - -/* - * EXPOSED INTERFACE for the hashtable implementation - * util_htnew(size) -- to make a new hashtable - * util_htset(table, key, value, sizeof(value)) -- to set something in the table - * util_htget(table, key) -- to get something from the table - * util_htdel(table) -- to delete the table - */ -hash_table_t *util_htnew(size_t size) { - hash_table_t *hashtable = NULL; - if (size < 1) - return NULL; - - if (!(hashtable = (hash_table_t*)mem_a(sizeof(hash_table_t)))) - return NULL; - - if (!(hashtable->table = (hash_node_t**)mem_a(sizeof(hash_node_t*) * size))) { - mem_d(hashtable); - return NULL; - } - - hashtable->size = size; - memset(hashtable->table, 0, sizeof(hash_node_t*) * size); - - return hashtable; -} - -void util_htseth(hash_table_t *ht, const char *key, size_t bin, void *value) { - hash_node_t *newnode = NULL; - hash_node_t *next = NULL; - hash_node_t *last = NULL; - - next = ht->table[bin]; - - while (next && next->key && strcmp(key, next->key) > 0) - last = next, next = next->next; - - /* already in table, do a replace */ - if (next && next->key && strcmp(key, next->key) == 0) { - next->value = value; - } else { - /* not found, grow a pair man :P */ - newnode = _util_htnewpair(key, value); - if (next == ht->table[bin]) { - newnode->next = next; - ht->table[bin] = newnode; - } else if (!next) { - last->next = newnode; - } else { - newnode->next = next; - last->next = newnode; - } - } -} - -void util_htset(hash_table_t *ht, const char *key, void *value) { - util_htseth(ht, key, util_hthash(ht, key), value); -} - -void *util_htgeth(hash_table_t *ht, const char *key, size_t bin) { - hash_node_t *pair = ht->table[bin]; - - while (pair && pair->key && strcmp(key, pair->key) > 0) - pair = pair->next; - - if (!pair || !pair->key || strcmp(key, pair->key) != 0) - return NULL; - - return pair->value; -} - -void *util_htget(hash_table_t *ht, const char *key) { - return util_htgeth(ht, key, util_hthash(ht, key)); +size_t util_strtocmd(const char *in, char *out, size_t outsz) { + return util_strtransform(in, out, outsz, "-_", 'A'-'a'); } - -void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin) { - hash_node_t *pair; - size_t len, keylen; - int cmp; - - keylen = strlen(key); - - pair = ht->table[bin]; - while (pair && pair->key) { - len = strlen(pair->key); - if (len < keylen) { - pair = pair->next; - continue; - } - if (keylen == len) { - cmp = strcmp(key, pair->key); - if (cmp == 0) - return pair->value; - if (cmp < 0) - return NULL; - pair = pair->next; - continue; - } - cmp = strcmp(key, pair->key + len - keylen); - if (cmp == 0) { - uintptr_t up = (uintptr_t)pair->value; - up += len - keylen; - return (void*)up; - } - pair = pair->next; - } - return NULL; +size_t util_strtononcmd(const char *in, char *out, size_t outsz) { + return util_strtransform(in, out, outsz, "_-", 'a'-'A'); } - -/* - * Free all allocated data in a hashtable, this is quite the amount - * of work. - */ -void util_htdel(hash_table_t *ht) { - size_t i = 0; - for (; i < ht->size; i++) { - hash_node_t *n = ht->table[i]; - hash_node_t *p; - - /* free in list */ - while (n) { - if (n->key) - mem_d(n->key); - p = n; - n = n->next; - mem_d(p); - } - - } - /* free table */ - mem_d(ht->table); - mem_d(ht); +size_t util_optimizationtostr(const char *in, char *out, size_t outsz) { + return util_strtransform(in, out, outsz, "_ ", 'a'-'A'); } /* * Portable implementation of vasprintf/asprintf. Assumes vsnprintf * exists, otherwise compiler error. * - * TODO: fix for MSVC .... + * TODO: fix for MSVC .... */ int util_vasprintf(char **dat, const char *fmt, va_list args) { int ret; @@ -589,16 +268,15 @@ int util_vasprintf(char **dat, const char *fmt, va_list args) { * formatted string if it overflows. However there is a MSVC * intrinsic (which is documented wrong) called _vcsprintf which * will return the required amount to allocate. - */ + */ #ifdef _MSC_VER - char *str; if ((len = _vscprintf(fmt, args)) < 0) { *dat = NULL; return -1; } - tmp = mem_a(len + 1); - if ((ret = _vsnprintf(tmp, len+1, fmt, args)) != len) { + tmp = (char*)mem_a(len + 1); + if ((ret = _vsnprintf_s(tmp, len+1, len+1, fmt, args)) != len) { mem_d(tmp); *dat = NULL; return -1; @@ -624,7 +302,7 @@ int util_vasprintf(char **dat, const char *fmt, va_list args) { } /* not large enough ... */ - tmp = mem_a(len + 1); + tmp = (char*)mem_a(len + 1); if ((ret = vsnprintf(tmp, len + 1, fmt, args)) != len) { mem_d(tmp); *dat = NULL; @@ -634,8 +312,6 @@ int util_vasprintf(char **dat, const char *fmt, va_list args) { *dat = tmp; return len; #endif - /* never reached ... */ - return -1; } int util_asprintf(char **ret, const char *fmt, ...) { va_list args; @@ -647,6 +323,92 @@ int util_asprintf(char **ret, const char *fmt, ...) { return read; } +/* + * These are various re-implementations (wrapping the real ones) of + * string functions that MSVC consideres unsafe. We wrap these up and + * use the safe varations on MSVC. + */ +#ifdef _MSC_VER + static char **util_strerror_allocated() { + static char **data = NULL; + return data; + } + + static void util_strerror_cleanup(void) { + size_t i; + char **data = util_strerror_allocated(); + for (i = 0; i < vec_size(data); i++) + mem_d(data[i]); + vec_free(data); + } + + const char *util_strerror(int num) { + char *allocated = NULL; + static bool install = false; + static size_t tries = 0; + char **vector = util_strerror_allocated(); + + /* try installing cleanup handler */ + while (!install) { + if (tries == 32) + return "(unknown)"; + + install = !atexit(&util_strerror_cleanup); + tries ++; + } + + allocated = (char*)mem_a(4096); /* A page must be enough */ + strerror_s(allocated, 4096, num); + + vec_push(vector, allocated); + return (const char *)allocated; + } + + int util_snprintf(char *src, size_t bytes, const char *format, ...) { + int rt; + va_list va; + va_start(va, format); + + rt = vsprintf_s(src, bytes, format, va); + va_end (va); + + return rt; + } + + char *util_strcat(char *dest, const char *src) { + strcat_s(dest, strlen(src), src); + return dest; + } + + char *util_strncpy(char *dest, const char *src, size_t num) { + strncpy_s(dest, num, src, num); + return dest; + } +#else + const char *util_strerror(int num) { + return strerror(num); + } + + int util_snprintf(char *src, size_t bytes, const char *format, ...) { + int rt; + va_list va; + va_start(va, format); + rt = vsnprintf(src, bytes, format, va); + va_end (va); + + return rt; + } + + char *util_strcat(char *dest, const char *src) { + return strcat(dest, src); + } + + char *util_strncpy(char *dest, const char *src, size_t num) { + return strncpy(dest, src, num); + } + +#endif /*! _MSC_VER */ + /* * Implementation of the Mersenne twister PRNG (pseudo random numer * generator). Implementation of MT19937. Has a period of 2^19937-1 @@ -666,7 +428,7 @@ int util_asprintf(char **ret, const char *fmt, ...) { static uint32_t mt_state[MT_SIZE]; static size_t mt_index = 0; -static GMQCC_INLINE void mt_generate() { +static GMQCC_INLINE void mt_generate(void) { /* * The loop has been unrolled here: the original paper and implemenation * Called for the following code: @@ -684,7 +446,7 @@ static GMQCC_INLINE void mt_generate() { * a branch that is executed every iteration from [0, MT_SIZE). * * Please see: http://www.quadibloc.com/crypto/co4814.htm for more - * information on how this clever trick works. + * information on how this clever trick works. */ static const uint32_t matrix[2] = { 0x00000000, @@ -702,7 +464,7 @@ static GMQCC_INLINE void mt_generate() { * Said loop has been unrolled for MT_SPACE (226 iterations), opposed * to [0, MT_SIZE) (634 iterations). */ - for (i = 0; i < MT_SPACE; ++i) { + for (i = 0; i < MT_SPACE-1; ++i) { y = (0x80000000 & mt_state[i]) | (0x7FFFFFF & mt_state[i + 1]); mt_state[i] = mt_state[i + MT_PERIOD] ^ (y >> 1) ^ matrix[y & 1]; @@ -717,7 +479,7 @@ static GMQCC_INLINE void mt_generate() { * = 2*2*3*3*11]) */ i = MT_SPACE; - while (i < MT_SIZE - 1) { + while (i < MT_SIZE-2) { /* * We expand this 11 times .. manually, no macros are required * here. This all fits in the CPU cache.