2013-10-04 18:53:11 +00:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "misc.h"
|
2014-01-21 21:40:13 +00:00
|
|
|
#include "mpconfig.h"
|
|
|
|
#include "qstr.h"
|
2013-10-04 18:53:11 +00:00
|
|
|
|
2014-01-04 15:57:35 +00:00
|
|
|
// NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings)
|
|
|
|
// ultimately we will replace this with a static hash table of some kind
|
|
|
|
// also probably need to include the length in the string data, to allow null bytes in the string
|
|
|
|
|
|
|
|
#if 0 // print debugging info
|
2014-02-16 16:11:42 +00:00
|
|
|
#define DEBUG_printf DEBUG_printf
|
2014-01-04 15:57:35 +00:00
|
|
|
#else // don't print debugging info
|
2014-02-26 16:57:08 +00:00
|
|
|
#define DEBUG_printf(...) (void)0
|
2014-01-04 15:57:35 +00:00
|
|
|
#endif
|
|
|
|
|
2014-01-21 21:40:13 +00:00
|
|
|
// A qstr is an index into the qstr pool.
|
|
|
|
// The data for a qstr contains (hash, length, data).
|
|
|
|
// For now we use very simple encoding, just to get the framework correct:
|
|
|
|
// - hash is 2 bytes (simply the sum of data bytes)
|
|
|
|
// - length is 2 bytes
|
|
|
|
// - data follows
|
|
|
|
// - \0 terminated (for now, so they can be printed using printf)
|
|
|
|
|
|
|
|
#define Q_GET_HASH(q) ((q)[0] | ((q)[1] << 8))
|
|
|
|
#define Q_GET_ALLOC(q) (4 + Q_GET_LENGTH(q) + 1)
|
|
|
|
#define Q_GET_LENGTH(q) ((q)[2] | ((q)[3] << 8))
|
|
|
|
#define Q_GET_DATA(q) ((q) + 4)
|
|
|
|
|
2014-01-22 14:35:10 +00:00
|
|
|
machine_uint_t qstr_compute_hash(const byte *data, uint len) {
|
2014-01-21 21:40:13 +00:00
|
|
|
machine_uint_t hash = 0;
|
|
|
|
for (const byte *top = data + len; data < top; data++) {
|
|
|
|
hash += *data;
|
|
|
|
}
|
|
|
|
return hash & 0xffff;
|
|
|
|
}
|
|
|
|
|
2014-01-04 15:57:35 +00:00
|
|
|
typedef struct _qstr_pool_t {
|
|
|
|
struct _qstr_pool_t *prev;
|
|
|
|
uint total_prev_len;
|
|
|
|
uint alloc;
|
|
|
|
uint len;
|
2014-01-21 21:40:13 +00:00
|
|
|
const byte *qstrs[];
|
2014-01-04 15:57:35 +00:00
|
|
|
} qstr_pool_t;
|
|
|
|
|
|
|
|
const static qstr_pool_t const_pool = {
|
|
|
|
NULL, // no previous pool
|
|
|
|
0, // no previous pool
|
|
|
|
10, // set so that the first dynamically allocated pool is twice this size; must be <= the len (just below)
|
|
|
|
MP_QSTR_number_of, // corresponds to number of strings in array just below
|
|
|
|
{
|
2014-01-21 21:40:13 +00:00
|
|
|
(const byte*) "\0\0\0\0", // invalid/no qstr has empty data
|
|
|
|
(const byte*) "\0\0\0\0", // empty qstr
|
|
|
|
#define Q(id, str) str,
|
|
|
|
// TODO having 'build/' here is a bit of a hack, should take config variable from Makefile
|
2014-01-24 09:05:30 +00:00
|
|
|
#include "build/py/qstrdefs.generated.h"
|
2014-01-04 15:57:35 +00:00
|
|
|
#undef Q
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2014-02-12 16:31:30 +00:00
|
|
|
STATIC qstr_pool_t *last_pool;
|
2013-10-04 18:53:11 +00:00
|
|
|
|
2013-10-23 19:20:17 +00:00
|
|
|
void qstr_init(void) {
|
2014-01-05 19:55:23 +00:00
|
|
|
last_pool = (qstr_pool_t*)&const_pool; // we won't modify the const_pool since it has no allocated room left
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
|
2014-02-12 16:31:30 +00:00
|
|
|
STATIC const byte *find_qstr(qstr q) {
|
2014-01-21 21:40:13 +00:00
|
|
|
// search pool for this qstr
|
|
|
|
for (qstr_pool_t *pool = last_pool; pool != NULL; pool = pool->prev) {
|
|
|
|
if (q >= pool->total_prev_len) {
|
|
|
|
return pool->qstrs[q - pool->total_prev_len];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// not found
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-12 16:31:30 +00:00
|
|
|
STATIC qstr qstr_add(const byte *q_ptr) {
|
2014-01-21 21:40:13 +00:00
|
|
|
DEBUG_printf("QSTR: add hash=%d len=%d data=%.*s\n", Q_GET_HASH(q_ptr), Q_GET_LENGTH(q_ptr), Q_GET_LENGTH(q_ptr), Q_GET_DATA(q_ptr));
|
2014-01-04 15:57:35 +00:00
|
|
|
|
|
|
|
// make sure we have room in the pool for a new qstr
|
|
|
|
if (last_pool->len >= last_pool->alloc) {
|
|
|
|
qstr_pool_t *pool = m_new_obj_var(qstr_pool_t, const char*, last_pool->alloc * 2);
|
|
|
|
pool->prev = last_pool;
|
|
|
|
pool->total_prev_len = last_pool->total_prev_len + last_pool->len;
|
|
|
|
pool->alloc = last_pool->alloc * 2;
|
|
|
|
pool->len = 0;
|
|
|
|
last_pool = pool;
|
|
|
|
DEBUG_printf("QSTR: allocate new pool of size %d\n", last_pool->alloc);
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
2014-01-04 15:57:35 +00:00
|
|
|
|
|
|
|
// add the new qstr
|
2014-01-21 21:40:13 +00:00
|
|
|
last_pool->qstrs[last_pool->len++] = q_ptr;
|
2014-01-04 15:57:35 +00:00
|
|
|
|
|
|
|
// return id for the newly-added qstr
|
|
|
|
return last_pool->total_prev_len + last_pool->len - 1;
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
|
2014-01-22 14:35:10 +00:00
|
|
|
qstr qstr_find_strn(const byte *str, uint str_len) {
|
2014-01-21 21:40:13 +00:00
|
|
|
// work out hash of str
|
2014-01-22 14:35:10 +00:00
|
|
|
machine_uint_t str_hash = qstr_compute_hash((const byte*)str, str_len);
|
2014-01-21 21:40:13 +00:00
|
|
|
|
|
|
|
// search pools for the data
|
2014-01-04 15:57:35 +00:00
|
|
|
for (qstr_pool_t *pool = last_pool; pool != NULL; pool = pool->prev) {
|
2014-01-21 21:40:13 +00:00
|
|
|
for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
|
2014-01-23 18:27:51 +00:00
|
|
|
if (Q_GET_HASH(*q) == str_hash && Q_GET_LENGTH(*q) == str_len && memcmp(Q_GET_DATA(*q), str, str_len) == 0) {
|
2014-01-21 21:40:13 +00:00
|
|
|
return pool->total_prev_len + (q - pool->qstrs);
|
2014-01-04 15:57:35 +00:00
|
|
|
}
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
}
|
2014-01-21 21:40:13 +00:00
|
|
|
|
|
|
|
// not found; return null qstr
|
|
|
|
return 0;
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
|
2014-01-21 21:40:13 +00:00
|
|
|
qstr qstr_from_str(const char *str) {
|
|
|
|
return qstr_from_strn(str, strlen(str));
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
|
2014-01-21 21:40:13 +00:00
|
|
|
qstr qstr_from_strn(const char *str, uint len) {
|
|
|
|
qstr q = qstr_find_strn((const byte*)str, len);
|
|
|
|
if (q == 0) {
|
2014-01-22 14:35:10 +00:00
|
|
|
machine_uint_t hash = qstr_compute_hash((const byte*)str, len);
|
2014-01-21 21:40:13 +00:00
|
|
|
byte *q_ptr = m_new(byte, 4 + len + 1);
|
|
|
|
q_ptr[0] = hash;
|
|
|
|
q_ptr[1] = hash >> 8;
|
|
|
|
q_ptr[2] = len;
|
|
|
|
q_ptr[3] = len >> 8;
|
|
|
|
memcpy(q_ptr + 4, str, len);
|
|
|
|
q_ptr[4 + len] = '\0';
|
|
|
|
q = qstr_add(q_ptr);
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
2014-01-21 21:40:13 +00:00
|
|
|
return q;
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
|
|
|
|
2014-01-21 21:40:13 +00:00
|
|
|
qstr qstr_from_strn_take(char *str, uint alloc_len, uint len) {
|
|
|
|
qstr q = qstr_from_strn(str, len);
|
|
|
|
m_del(char, str, alloc_len);
|
|
|
|
return q;
|
|
|
|
}
|
|
|
|
|
|
|
|
byte *qstr_build_start(uint len, byte **q_ptr) {
|
|
|
|
assert(len <= 65535);
|
|
|
|
*q_ptr = m_new(byte, 4 + len + 1);
|
|
|
|
(*q_ptr)[2] = len;
|
|
|
|
(*q_ptr)[3] = len >> 8;
|
|
|
|
return Q_GET_DATA(*q_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
qstr qstr_build_end(byte *q_ptr) {
|
|
|
|
qstr q = qstr_find_strn(Q_GET_DATA(q_ptr), Q_GET_LENGTH(q_ptr));
|
|
|
|
if (q == 0) {
|
|
|
|
machine_uint_t len = Q_GET_LENGTH(q_ptr);
|
2014-01-22 14:35:10 +00:00
|
|
|
machine_uint_t hash = qstr_compute_hash(Q_GET_DATA(q_ptr), len);
|
2014-01-21 21:40:13 +00:00
|
|
|
q_ptr[0] = hash;
|
|
|
|
q_ptr[1] = hash >> 8;
|
|
|
|
q_ptr[4 + len] = '\0';
|
|
|
|
q = qstr_add(q_ptr);
|
|
|
|
} else {
|
|
|
|
m_del(byte, q_ptr, Q_GET_ALLOC(q_ptr));
|
2014-01-04 15:57:35 +00:00
|
|
|
}
|
2014-01-21 21:40:13 +00:00
|
|
|
return q;
|
|
|
|
}
|
|
|
|
|
|
|
|
machine_uint_t qstr_hash(qstr q) {
|
|
|
|
return Q_GET_HASH(find_qstr(q));
|
|
|
|
}
|
|
|
|
|
|
|
|
uint qstr_len(qstr q) {
|
|
|
|
const byte *qd = find_qstr(q);
|
|
|
|
return Q_GET_LENGTH(qd);
|
|
|
|
}
|
|
|
|
|
|
|
|
// XXX to remove!
|
|
|
|
const char *qstr_str(qstr q) {
|
|
|
|
const byte *qd = find_qstr(q);
|
|
|
|
return (const char*)Q_GET_DATA(qd);
|
|
|
|
}
|
2014-01-04 15:57:35 +00:00
|
|
|
|
2014-01-21 21:40:13 +00:00
|
|
|
const byte *qstr_data(qstr q, uint *len) {
|
|
|
|
const byte *qd = find_qstr(q);
|
|
|
|
*len = Q_GET_LENGTH(qd);
|
|
|
|
return Q_GET_DATA(qd);
|
2013-10-04 18:53:11 +00:00
|
|
|
}
|
2014-01-29 18:56:46 +00:00
|
|
|
|
|
|
|
void qstr_pool_info(uint *n_pool, uint *n_qstr, uint *n_str_data_bytes, uint *n_total_bytes) {
|
|
|
|
*n_pool = 0;
|
|
|
|
*n_qstr = 0;
|
|
|
|
*n_str_data_bytes = 0;
|
|
|
|
*n_total_bytes = 0;
|
|
|
|
for (qstr_pool_t *pool = last_pool; pool != NULL && pool != &const_pool; pool = pool->prev) {
|
|
|
|
*n_pool += 1;
|
|
|
|
*n_qstr += pool->len;
|
|
|
|
for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
|
|
|
|
*n_str_data_bytes += Q_GET_ALLOC(*q);
|
|
|
|
}
|
|
|
|
*n_total_bytes += sizeof(qstr_pool_t) + sizeof(qstr) * pool->alloc;
|
|
|
|
}
|
|
|
|
*n_total_bytes += *n_str_data_bytes;
|
|
|
|
}
|