zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix quickjs crash on windows

master
huxingyi 2019-07-21 05:22:10 -07:00
parent f2cc4a11e1
commit 48540e297d
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/quickjs/quickjs-2019-07-09/cutils.h vendored
View File

@ -48,9 +48,9 @@
#else #else
#define no_inline __attribute__((noinline)) #define no_inline __attribute__((noinline))
#endif #endif
#if defined(_MSC_VER) //#if defined(_MSC_VER)
#define _Atomic(type) type //#define _Atomic(type) type
#endif //#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <BaseTsd.h> #include <BaseTsd.h>

33
thirdparty/quickjs/quickjs-2019-07-09/quickjs.c vendored
View File

@ -655,8 +655,10 @@ typedef struct JSShapeProperty {
} JSShapeProperty; } JSShapeProperty;
struct JSShape { struct JSShape {
uint32_t prop_hash_end[1]; /* hash table of size hash_mask + 1 #if !defined(_MSC_VER)
uint32_t prop_hash_end[0]; /* hash table of size hash_mask + 1
before the start of the structure. */ before the start of the structure. */
#endif
JSRefCountHeader header; /* must come first, 32-bit */ JSRefCountHeader header; /* must come first, 32-bit */
JSGCHeader gc_header; /* must come after JSRefCountHeader, 8-bit */ JSGCHeader gc_header; /* must come after JSRefCountHeader, 8-bit */
/* true if the shape is inserted in the shape hash table. If not, /* true if the shape is inserted in the shape hash table. If not,
@ -674,6 +676,11 @@ struct JSShape {
JSObject *proto; JSObject *proto;
JSShapeProperty prop[0]; /* prop_size elements */ JSShapeProperty prop[0]; /* prop_size elements */
}; };
#if defined(_MSC_VER)
#define prop_hash_end_field_of_shape(shape) ((uint32_t *)(shape))
#else
#define prop_hash_end_field_of_shape(shape) (shape)->prop_hash_end
#endif
struct JSObject { struct JSObject {
JSRefCountHeader header; /* must come first, 32-bit */ JSRefCountHeader header; /* must come first, 32-bit */
JSGCHeader gc_header; /* must come after JSRefCountHeader, 8-bit */ JSGCHeader gc_header; /* must come after JSRefCountHeader, 8-bit */
@ -3814,7 +3821,7 @@ static inline JSShape *get_shape_from_alloc(void *sh_alloc, size_t hash_size)
static inline void *get_alloc_from_shape(JSShape *sh) static inline void *get_alloc_from_shape(JSShape *sh)
{ {
return sh->prop_hash_end - ((intptr_t)sh->prop_hash_mask + 1); return prop_hash_end_field_of_shape(sh) - ((intptr_t)sh->prop_hash_mask + 1);
} }
static inline JSShapeProperty *get_shape_prop(JSShape *sh) static inline JSShapeProperty *get_shape_prop(JSShape *sh)
@ -3925,7 +3932,7 @@ static no_inline JSShape *js_new_shape2(JSContext *ctx, JSObject *proto,
if (proto) if (proto)
JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, proto)); JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, proto));
sh->proto = proto; sh->proto = proto;
memset(sh->prop_hash_end - hash_size, 0, sizeof(sh->prop_hash_end[0]) * memset(prop_hash_end_field_of_shape(sh) - hash_size, 0, sizeof(prop_hash_end_field_of_shape(sh)[0]) *
hash_size); hash_size);
sh->prop_hash_mask = hash_size - 1; sh->prop_hash_mask = hash_size - 1;
sh->prop_count = 0; sh->prop_count = 0;
@ -4045,13 +4052,13 @@ static no_inline int resize_properties(JSContext *ctx, JSShape **psh,
sizeof(JSShape) + sizeof(sh->prop[0]) * old_sh->prop_count); sizeof(JSShape) + sizeof(sh->prop[0]) * old_sh->prop_count);
new_hash_mask = new_hash_size - 1; new_hash_mask = new_hash_size - 1;
sh->prop_hash_mask = new_hash_mask; sh->prop_hash_mask = new_hash_mask;
memset(sh->prop_hash_end - new_hash_size, 0, memset(prop_hash_end_field_of_shape(sh) - new_hash_size, 0,
sizeof(sh->prop_hash_end[0]) * new_hash_size); sizeof(prop_hash_end_field_of_shape(sh)[0]) * new_hash_size);
for(i = 0, pr = sh->prop; i < sh->prop_count; i++, pr++) { for(i = 0, pr = sh->prop; i < sh->prop_count; i++, pr++) {
if (pr->atom != JS_ATOM_NULL) { if (pr->atom != JS_ATOM_NULL) {
h = ((uintptr_t)pr->atom & new_hash_mask); h = ((uintptr_t)pr->atom & new_hash_mask);
pr->hash_next = sh->prop_hash_end[-h - 1]; pr->hash_next = prop_hash_end_field_of_shape(sh)[-h - 1];
sh->prop_hash_end[-h - 1] = i + 1; prop_hash_end_field_of_shape(sh)[-h - 1] = i + 1;
} }
} }
js_free(ctx, get_alloc_from_shape(old_sh)); js_free(ctx, get_alloc_from_shape(old_sh));
@ -4107,8 +4114,8 @@ static int add_shape_property(JSContext *ctx, JSShape **psh,
/* add in hash table */ /* add in hash table */
hash_mask = sh->prop_hash_mask; hash_mask = sh->prop_hash_mask;
h = atom & hash_mask; h = atom & hash_mask;
pr->hash_next = sh->prop_hash_end[-h - 1]; pr->hash_next = prop_hash_end_field_of_shape(sh)[-h - 1];
sh->prop_hash_end[-h - 1] = sh->prop_count; prop_hash_end_field_of_shape(sh)[-h - 1] = sh->prop_count;
return 0; return 0;
} }
@ -4662,7 +4669,7 @@ static force_inline JSShapeProperty *find_own_property1(JSObject *p,
intptr_t h; intptr_t h;
sh = p->shape; sh = p->shape;
h = (uintptr_t)atom & sh->prop_hash_mask; h = (uintptr_t)atom & sh->prop_hash_mask;
h = sh->prop_hash_end[-h - 1]; h = prop_hash_end_field_of_shape(sh)[-h - 1];
prop = get_shape_prop(sh); prop = get_shape_prop(sh);
while (h) { while (h) {
pr = &prop[h - 1]; pr = &prop[h - 1];
@ -4683,7 +4690,7 @@ static force_inline JSShapeProperty *find_own_property(JSProperty **ppr,
intptr_t h; intptr_t h;
sh = p->shape; sh = p->shape;
h = (uintptr_t)atom & sh->prop_hash_mask; h = (uintptr_t)atom & sh->prop_hash_mask;
h = sh->prop_hash_end[-h - 1]; h = prop_hash_end_field_of_shape(sh)[-h - 1];
prop = get_shape_prop(sh); prop = get_shape_prop(sh);
while (h) { while (h) {
pr = &prop[h - 1]; pr = &prop[h - 1];
@ -7205,7 +7212,7 @@ static int delete_property(JSContext *ctx, JSObject *p, JSAtom atom)
redo: redo:
sh = p->shape; sh = p->shape;
h1 = atom & sh->prop_hash_mask; h1 = atom & sh->prop_hash_mask;
h = sh->prop_hash_end[-h1 - 1]; h = prop_hash_end_field_of_shape(sh)[-h1 - 1];
prop = get_shape_prop(sh); prop = get_shape_prop(sh);
lpr = NULL; lpr = NULL;
lpr_idx = 0; /* prevent warning */ lpr_idx = 0; /* prevent warning */
@ -7226,7 +7233,7 @@ static int delete_property(JSContext *ctx, JSObject *p, JSAtom atom)
lpr = get_shape_prop(sh) + lpr_idx; lpr = get_shape_prop(sh) + lpr_idx;
lpr->hash_next = pr->hash_next; lpr->hash_next = pr->hash_next;
} else { } else {
sh->prop_hash_end[-h1 - 1] = pr->hash_next; prop_hash_end_field_of_shape(sh)[-h1 - 1] = pr->hash_next;
} }
/* free the entry */ /* free the entry */
pr1 = &p->prop[h - 1]; pr1 = &p->prop[h - 1];