yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Two fixes to get unicorn build better with MSVC. (#1136)

Browse Source 
* Change MSVC keywords.

typename, class, and class are all keywords for MSVC. Adding a suffix for
all of them allows a successful compilation under VC 2017 (15.9).

* Switch from /ZI to /Zi to avoid crashes at longjmp in debug builds.
This commit is contained in:
Fish
2019-09-04 09:53:37 -07:00
committed by Nguyen Anh Quynh
parent 1c1eecd863
commit 626d72d6df
20 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qemu/include/hw/qdev-core.h
View File

@ -276,9 +276,9 @@ DeviceState *qdev_find_recursive(BusState *bus, const char *id);
typedef int (qbus_walkerfn)(BusState *bus, void *opaque);
typedef int (qdev_walkerfn)(DeviceState *dev, void *opaque);
void qbus_create_inplace(void *bus, size_t size, const char *typename,
void qbus_create_inplace(void *bus, size_t size, const char *typename_,
DeviceState *parent, const char *name);
BusState *qbus_create(const char *typename, DeviceState *parent, const char *name);
BusState *qbus_create(const char *typename_, DeviceState *parent, const char *name);
/* Returns > 0 if either devfn or busfn skip walk somewhere in cursion,
* < 0 if either devfn or busfn terminate walk somewhere in cursion,
* 0 otherwise. */

4
qemu/include/qom/cpu.h
View File

@ -402,7 +402,7 @@ void cpu_reset(CPUState *cpu);
*
* Returns: A #CPUClass or %NULL if not matching class is found.
*/
ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename, const char *cpu_model);
ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename_, const char *cpu_model);
/**
* cpu_generic_init:
@ -413,7 +413,7 @@ ObjectClass *cpu_class_by_name(struct uc_struct *uc, const char *typename, const
*
* Returns: A #CPUState or %NULL if an error occurred.
*/
CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename, const char *cpu_model);
CPUState *cpu_generic_init(struct uc_struct *uc, const char *typename_, const char *cpu_model);
/**
* cpu_has_work:

20
qemu/include/qom/object.h
View File

@ -409,7 +409,7 @@ struct ObjectClass
struct Object
{
/*< private >*/
ObjectClass *class;
ObjectClass *class_;
ObjectFree *free;
QTAILQ_HEAD(, ObjectProperty) properties;
uint32_t ref;
@ -478,7 +478,7 @@ struct TypeInfo
bool abstract;
void *parent_type;
ObjectClass *class;
ObjectClass *class_;
InterfaceInfo *interfaces;
};
@ -604,7 +604,7 @@ struct InterfaceClass
*
* Returns: The newly allocated and instantiated object.
*/
Object *object_new(struct uc_struct *, const char *typename);
Object *object_new(struct uc_struct *, const char *typename_);
/**
* object_initialize:
@ -616,7 +616,7 @@ Object *object_new(struct uc_struct *, const char *typename);
* have already been allocated. The returned object has a reference count of 1,
* and will be finalized when the last reference is dropped.
*/
void object_initialize(struct uc_struct *uc, void *obj, size_t size, const char *typename);
void object_initialize(struct uc_struct *uc, void *obj, size_t size, const char *typename_);
/**
* object_dynamic_cast:
@ -628,7 +628,7 @@ void object_initialize(struct uc_struct *uc, void *obj, size_t size, const char
*
* Returns: This function returns @obj on success or #NULL on failure.
*/
Object *object_dynamic_cast(struct uc_struct *uc, Object *obj, const char *typename);
Object *object_dynamic_cast(struct uc_struct *uc, Object *obj, const char *typename_);
/**
* object_dynamic_cast_assert:
@ -639,7 +639,7 @@ Object *object_dynamic_cast(struct uc_struct *uc, Object *obj, const char *typen
* This function is not meant to be called directly, but only through
* the wrapper macro OBJECT_CHECK.
*/
Object *object_dynamic_cast_assert(struct uc_struct *uc, Object *obj, const char *typename,
Object *object_dynamic_cast_assert(struct uc_struct *uc, Object *obj, const char *typename_,
const char *file, int line, const char *func);
/**
@ -692,7 +692,7 @@ Type type_register(struct uc_struct *uc, const TypeInfo *info);
* the wrapper macros OBJECT_CLASS_CHECK and INTERFACE_CHECK.
*/
ObjectClass *object_class_dynamic_cast_assert(struct uc_struct *uc, ObjectClass *klass,
const char *typename,
const char *typename_,
const char *file, int line,
const char *func);
@ -711,7 +711,7 @@ ObjectClass *object_class_dynamic_cast_assert(struct uc_struct *uc, ObjectClass
* it. (FIXME: perhaps this can be detected at type definition time?)
*/
ObjectClass *object_class_dynamic_cast(struct uc_struct *uc, ObjectClass *klass,
const char *typename);
const char *typename_);
/**
* object_class_get_parent:
@ -743,7 +743,7 @@ bool object_class_is_abstract(ObjectClass *klass);
*
* Returns: The class for @typename or %NULL if not found.
*/
ObjectClass *object_class_by_name(struct uc_struct *uc, const char *typename);
ObjectClass *object_class_by_name(struct uc_struct *uc, const char *typename_);
void object_class_foreach(struct uc_struct *uc, void (*fn)(ObjectClass *klass, void *opaque),
const char *implements_type, bool include_abstract,
@ -1034,7 +1034,7 @@ Object *object_resolve_path(struct uc_struct *uc, const char *path, bool *ambigu
*
* Returns: The matched object or NULL on path lookup failure.
*/
Object *object_resolve_path_type(struct uc_struct *uc, const char *path, const char *typename,
Object *object_resolve_path_type(struct uc_struct *uc, const char *path, const char *typename_,
bool *ambiguous);
/**