yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-09 22:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'noglib' of https://github.com/cseagle/unicorn into noglib

Browse source
This commit is contained in:
Nguyen Anh Quynh 2016-12-20 11:33:46 +08:00
parent 6d747d1a13 f8f9e993a8
commit 14d04493f1
4 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
qemu/glib_compat.c
View file

@ -65,15 +65,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
This may be marginally better than what glib does in their direct_hash This may be marginally better than what glib does in their direct_hash
but someone with some chops in this space should fix if it needs improving but someone with some chops in this space should fix if it needs improving
*/ */
uint32_t g_direct_hash(const void *v) guint g_direct_hash(const void *v)
{ {
#ifdef __HAVE_64_BIT_PTRS #ifdef __HAVE_64_BIT_PTRS
uint64_t hash = (uint64_t)v; uint64_t hash = (uint64_t)v;
hash = (hash >> 4) | (hash << 60); hash = (hash >> 4) | (hash << 60);
hash = hash ^ (hash >> 32); hash = hash ^ (hash >> 32);
return (uint32_t)hash; return (guint)hash;
#else #else
uint32_t hash = (uint32_t)v; guint hash = (guint)v;
hash = (hash >> 3) | (hash << 29); hash = (hash >> 3) | (hash << 29);
return hash; return hash;
#endif #endif
@ -88,10 +88,10 @@ int g_direct_equal(const void *v1, const void *v2)
djb2+ string hashing djb2+ string hashing
see: http://www.cse.yorku.ca/~oz/hash.html see: http://www.cse.yorku.ca/~oz/hash.html
*/ */
uint32_t g_str_hash(const void *v) guint g_str_hash(const void *v)
{ {
const char *s = (const char*)v; const char *s = (const char*)v;
uint32_t hash = 5381; guint hash = 5381;
while (*s) { while (*s) {
hash = ((hash << 5) + hash) ^ (int)*s; hash = ((hash << 5) + hash) ^ (int)*s;
s++; s++;
@ -108,9 +108,9 @@ int g_str_equal(const void *v1, const void *v2)
Bob Jenkins integer hash algorithm Bob Jenkins integer hash algorithm
see: http://burtleburtle.net/bob/hash/integer.html see: http://burtleburtle.net/bob/hash/integer.html
*/ */
uint32_t g_int_hash(const void *v) guint g_int_hash(const void *v)
{ {
uint32_t hash = *(const uint32_t*)v; guint hash = *(const guint*)v;
hash = (hash + 0x7ed55d16) + (hash << 12); hash = (hash + 0x7ed55d16) + (hash << 12);
hash = (hash ^ 0xc761c23c) ^ (hash >> 19); hash = (hash ^ 0xc761c23c) ^ (hash >> 19);
hash = (hash + 0x165667b1) + (hash << 5); hash = (hash + 0x165667b1) + (hash << 5);
@ -134,7 +134,7 @@ GList *g_list_first(GList *list)
return list; return list;
} }
void g_list_foreach(GList *list, list_func func, void* user_data) void g_list_foreach(GList *list, GFunc func, void* user_data)
{ {
GList *lp; GList *lp;
for (lp = list; lp; lp = lp->next) { for (lp = list; lp; lp = lp->next) {
@ -156,7 +156,7 @@ void g_list_free(GList *list)
} }
} }
GList *g_list_insert_sorted(GList *list, void* data, compare_func compare) GList *g_list_insert_sorted(GList *list, void* data, GCompareFunc compare)
{ {
GList *i; GList *i;
GList *n = (GList*)g_malloc(sizeof(GList)); GList *n = (GList*)g_malloc(sizeof(GList));
@ -197,7 +197,7 @@ GList *g_list_remove_link(GList *list, GList *llink)
return list; return list;
} }
GList *g_list_sort(GList *list, compare_func compare) GList *g_list_sort(GList *list, GCompareFunc compare)
{ {
GList *i, *it, *j; GList *i, *it, *j;
/* base case for singletons or empty lists */ /* base case for singletons or empty lists */
@ -264,7 +264,7 @@ GSList *g_slist_append(GSList *list, void* data)
return head; return head;
} }
void g_slist_foreach(GSList *list, list_func func, void* user_data) void g_slist_foreach(GSList *list, GFunc func, void* user_data)
{ {
GSList *lp; GSList *lp;
for (lp = list; lp; lp = lp->next) { for (lp = list; lp; lp = lp->next) {
@ -299,7 +299,7 @@ GSList *g_slist_prepend(GSList *list, void* data)
return head; return head;
} }
GSList *g_slist_sort(GSList *list, compare_func compare) GSList *g_slist_sort(GSList *list, GCompareFunc compare)
{ {
GSList *i, *it, *j; GSList *i, *it, *j;
/* base case for singletons or empty lists */ /* base case for singletons or empty lists */
@ -345,7 +345,7 @@ GSList *g_slist_sort(GSList *list, compare_func compare)
return list; return list;
} }
GSList *g_slist_find_custom(GSList *list, const void *data, compare_func func) GSList *g_slist_find_custom(GSList *list, const void *data, GCompareFunc func)
{ {
GSList *lp; GSList *lp;
for (lp = list; lp; lp = lp->next) { for (lp = list; lp; lp = lp->next) {
@ -432,7 +432,7 @@ int g_hash_table_insert(GHashTable *hash_table, void* key, void* value)
{ {
if (hash_table == NULL) return 1; if (hash_table == NULL) return 1;
GSList *lp; GSList *lp;
uint32_t hash = (*hash_table->hash_func)(key); guint hash = (*hash_table->hash_func)(key);
int bnum = hash % hash_table->size; int bnum = hash % hash_table->size;
for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) { for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) {
KeyValue *kv = (KeyValue*)(lp->data); KeyValue *kv = (KeyValue*)(lp->data);
@ -457,7 +457,7 @@ void* g_hash_table_lookup(GHashTable *hash_table, const void* key)
{ {
if (hash_table == NULL) return NULL; if (hash_table == NULL) return NULL;
GSList *lp; GSList *lp;
uint32_t hash = (*hash_table->hash_func)(key); guint hash = (*hash_table->hash_func)(key);
int bnum = hash % hash_table->size; int bnum = hash % hash_table->size;
for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) { for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) {
KeyValue *kv = (KeyValue*)(lp->data); KeyValue *kv = (KeyValue*)(lp->data);
@ -511,7 +511,7 @@ int g_hash_table_remove(GHashTable *hash_table, const void* key)
{ {
GSList *lp, *prev = NULL; GSList *lp, *prev = NULL;
if (hash_table == NULL) return 0; if (hash_table == NULL) return 0;
uint32_t hash = (*hash_table->hash_func)(key); guint hash = (*hash_table->hash_func)(key);
int bnum = hash % hash_table->size; int bnum = hash % hash_table->size;
for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) { for (lp = hash_table->buckets[bnum]; lp; lp = lp->next) {
KeyValue *kv = (KeyValue*)(lp->data); KeyValue *kv = (KeyValue*)(lp->data);
@ -551,7 +551,7 @@ GHashTable *g_hash_table_ref(GHashTable *hash_table)
return hash_table; return hash_table;
} }
uint32_t g_hash_table_size(GHashTable *hash_table) guint g_hash_table_size(GHashTable *hash_table)
{ {
return hash_table ? hash_table->num_entries : 0; return hash_table ? hash_table->num_entries : 0;
} }

31
qemu/include/glib_compat.h
View file

@ -39,18 +39,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
/* typedefs for glib related types that may still be referenced */ /* typedefs for glib related types that may still be referenced */
typedef void* gpointer; typedef void* gpointer;
typedef const void *gconstpointer; typedef const void *gconstpointer;
typedef uint32_t guint; typedef int gint;
typedef unsigned int guint;
typedef char gchar; typedef char gchar;
typedef int gboolean; typedef int gboolean;
typedef int (*GCompareFunc)(const void *v1, const void *v2); typedef void (*GFunc)(void* data, void* user_data);
typedef gint (*GCompareFunc)(const void *v1, const void *v2);
typedef void (*GDestroyNotify)(void *data); typedef void (*GDestroyNotify)(void *data);
uint32_t g_direct_hash(const void *v); guint g_direct_hash(const void *v);
int g_direct_equal(const void *v1, const void *v2); int g_direct_equal(const void *v1, const void *v2);
uint32_t g_str_hash(const void *v); guint g_str_hash(const void *v);
int g_str_equal(const void *v1, const void *v2); int g_str_equal(const void *v1, const void *v2);
uint32_t g_int_hash(const void *v); guint g_int_hash(const void *v);
int g_int_equal(const void *v1, const void *v2); int g_int_equal(const void *v1, const void *v2);
typedef struct _GList { typedef struct _GList {
@ -59,17 +61,14 @@ typedef struct _GList {
struct _GList *prev; struct _GList *prev;
} GList; } GList;
typedef void (*list_func)(void* data, void* user_data);
typedef int (*compare_func)(const void *d1, const void *d2);
GList *g_list_first(GList *list); GList *g_list_first(GList *list);
void g_list_foreach(GList *list, list_func func, void* user_data); void g_list_foreach(GList *list, GFunc func, void* user_data);
void g_list_free(GList *list); void g_list_free(GList *list);
GList *g_list_insert_sorted(GList *list, void* data, compare_func compare); GList *g_list_insert_sorted(GList *list, void* data, GCompareFunc compare);
#define g_list_next(list) (list->next) #define g_list_next(list) (list->next)
GList *g_list_prepend(GList *list, void* data); GList *g_list_prepend(GList *list, void* data);
GList *g_list_remove_link(GList *list, GList *llink); GList *g_list_remove_link(GList *list, GList *llink);
GList *g_list_sort(GList *list, compare_func compare); GList *g_list_sort(GList *list, GCompareFunc compare);
typedef struct _GSList { typedef struct _GSList {
void *data; void *data;
@ -77,15 +76,15 @@ typedef struct _GSList {
} GSList; } GSList;
GSList *g_slist_append(GSList *list, void* data); GSList *g_slist_append(GSList *list, void* data);
void g_slist_foreach(GSList *list, list_func func, void* user_data); void g_slist_foreach(GSList *list, GFunc func, void* user_data);
void g_slist_free(GSList *list); void g_slist_free(GSList *list);
void g_slist_free_full(GSList *list, GDestroyNotify free_func); void g_slist_free_full(GSList *list, GDestroyNotify free_func);
GSList *g_slist_prepend(GSList *list, void* data); GSList *g_slist_prepend(GSList *list, void* data);
GSList *g_slist_sort(GSList *list, compare_func compare); GSList *g_slist_sort(GSList *list, GCompareFunc compare);
GSList *g_slist_find_custom(GSList *list, const void *data, compare_func func); GSList *g_slist_find_custom(GSList *list, const void *data, GCompareFunc func);
GSList *g_slist_remove(GSList *list, const void *data); GSList *g_slist_remove(GSList *list, const void *data);
typedef uint32_t (*GHashFunc)(const void *key); typedef guint (*GHashFunc)(const void *key);
typedef int (*GEqualFunc)(const void *a, const void *b); typedef int (*GEqualFunc)(const void *a, const void *b);
typedef void (*GHFunc)(void* key, void* value, void* user_data); typedef void (*GHFunc)(void* key, void* value, void* user_data);
typedef int (*GHRFunc)(void* key, void* value, void* user_data); typedef int (*GHRFunc)(void* key, void* value, void* user_data);
@ -104,7 +103,7 @@ void g_hash_table_remove_all(GHashTable *hash_table);
int g_hash_table_remove(GHashTable *hash_table, const void* key); int g_hash_table_remove(GHashTable *hash_table, const void* key);
void g_hash_table_unref(GHashTable *hash_table); void g_hash_table_unref(GHashTable *hash_table);
GHashTable *g_hash_table_ref(GHashTable *hash_table); GHashTable *g_hash_table_ref(GHashTable *hash_table);
uint32_t g_hash_table_size(GHashTable *hash_table); guint g_hash_table_size(GHashTable *hash_table);
/* replacement for g_malloc dependency */ /* replacement for g_malloc dependency */
void *g_malloc(size_t size); void *g_malloc(size_t size);

2
qemu/include/qemu/range.h
View file

@ -119,7 +119,7 @@ static inline GList *g_list_insert_sorted_merged(GList *list,
return list; return list;
} }
static inline int32_t range_compare(gconstpointer a, gconstpointer b) static inline gint range_compare(gconstpointer a, gconstpointer b)
{ {
Range *ra = (Range *)a, *rb = (Range *)b; Range *ra = (Range *)a, *rb = (Range *)b;
if (ra->begin == rb->begin && ra->end == rb->end) { if (ra->begin == rb->begin && ra->end == rb->end) {

2
qemu/target-arm/helper.c
View file

@ -155,7 +155,7 @@ static void count_cpreg(gpointer key, gpointer opaque)
} }
} }
static int32_t cpreg_key_compare(gconstpointer a, gconstpointer b) static gint cpreg_key_compare(gconstpointer a, gconstpointer b)
{ {
uint64_t aidx = cpreg_to_kvm_id(*(uint32_t *)a); uint64_t aidx = cpreg_to_kvm_id(*(uint32_t *)a);
uint64_t bidx = cpreg_to_kvm_id(*(uint32_t *)b); uint64_t bidx = cpreg_to_kvm_id(*(uint32_t *)b);