lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge upstream/noglib and update some glib related types

Browse Source
This commit is contained in:
Chris Eagle
2016-12-19 12:32:06 -08:00
parent e07e57a862 bd1632e60c
commit f8f9e993a8
11 changed files with 227 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qemu/target-arm/cpu.h
View File

@@ -1285,6 +1285,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx)
return !(env->daif & PSTATE_I);
default:
g_assert_not_reached();
return false;
}
}

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 bidx = cpreg_to_kvm_id(*(uint32_t *)b);