mirror of
https://github.com/love2d/megasource.git
synced 2026-08-17 03:02:49 +02:00
Update LuaJIT to the latest 2.1.0 source (0bee44c)
This commit is contained in:
Alex Szpakowski
+100
-62
@@ -9,13 +9,14 @@
|
||||
|
||||
#include "lj_gc.h"
|
||||
#include "lj_err.h"
|
||||
#include "lj_str.h"
|
||||
#include "lj_buf.h"
|
||||
#include "lj_ctype.h"
|
||||
#include "lj_cparse.h"
|
||||
#include "lj_frame.h"
|
||||
#include "lj_vm.h"
|
||||
#include "lj_char.h"
|
||||
#include "lj_strscan.h"
|
||||
#include "lj_strfmt.h"
|
||||
|
||||
/*
|
||||
** Important note: this is NOT a validating C parser! This is a minimal
|
||||
@@ -27,6 +28,24 @@
|
||||
** If in doubt, please check the input against your favorite C compiler.
|
||||
*/
|
||||
|
||||
/* -- Miscellaneous ------------------------------------------------------- */
|
||||
|
||||
/* Match string against a C literal. */
|
||||
#define cp_str_is(str, k) \
|
||||
((str)->len == sizeof(k)-1 && !memcmp(strdata(str), k, sizeof(k)-1))
|
||||
|
||||
/* Check string against a linear list of matches. */
|
||||
int lj_cparse_case(GCstr *str, const char *match)
|
||||
{
|
||||
MSize len;
|
||||
int n;
|
||||
for (n = 0; (len = (MSize)*match++); n++, match += len) {
|
||||
if (str->len == len && !memcmp(match, strdata(str), len))
|
||||
return n;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* -- C lexer ------------------------------------------------------------- */
|
||||
|
||||
/* C lexer token names. */
|
||||
@@ -46,9 +65,9 @@ static const char *cp_tok2str(CPState *cp, CPToken tok)
|
||||
if (tok > CTOK_OFS)
|
||||
return ctoknames[tok-CTOK_OFS-1];
|
||||
else if (!lj_char_iscntrl(tok))
|
||||
return lj_str_pushf(cp->L, "%c", tok);
|
||||
return lj_strfmt_pushf(cp->L, "%c", tok);
|
||||
else
|
||||
return lj_str_pushf(cp->L, "char(%d)", tok);
|
||||
return lj_strfmt_pushf(cp->L, "char(%d)", tok);
|
||||
}
|
||||
|
||||
/* End-of-line? */
|
||||
@@ -85,24 +104,10 @@ static LJ_NOINLINE CPChar cp_get_bs(CPState *cp)
|
||||
return cp_get(cp);
|
||||
}
|
||||
|
||||
/* Grow save buffer. */
|
||||
static LJ_NOINLINE void cp_save_grow(CPState *cp, CPChar c)
|
||||
{
|
||||
MSize newsize;
|
||||
if (cp->sb.sz >= CPARSE_MAX_BUF/2)
|
||||
cp_err(cp, LJ_ERR_XELEM);
|
||||
newsize = cp->sb.sz * 2;
|
||||
lj_str_resizebuf(cp->L, &cp->sb, newsize);
|
||||
cp->sb.buf[cp->sb.n++] = (char)c;
|
||||
}
|
||||
|
||||
/* Save character in buffer. */
|
||||
static LJ_AINLINE void cp_save(CPState *cp, CPChar c)
|
||||
{
|
||||
if (LJ_UNLIKELY(cp->sb.n + 1 > cp->sb.sz))
|
||||
cp_save_grow(cp, c);
|
||||
else
|
||||
cp->sb.buf[cp->sb.n++] = (char)c;
|
||||
lj_buf_putb(&cp->sb, c);
|
||||
}
|
||||
|
||||
/* Skip line break. Handles "\n", "\r", "\r\n" or "\n\r". */
|
||||
@@ -122,20 +127,20 @@ LJ_NORET static void cp_errmsg(CPState *cp, CPToken tok, ErrMsg em, ...)
|
||||
tokstr = NULL;
|
||||
} else if (tok == CTOK_IDENT || tok == CTOK_INTEGER || tok == CTOK_STRING ||
|
||||
tok >= CTOK_FIRSTDECL) {
|
||||
if (cp->sb.n == 0) cp_save(cp, '$');
|
||||
if (sbufP(&cp->sb) == sbufB(&cp->sb)) cp_save(cp, '$');
|
||||
cp_save(cp, '\0');
|
||||
tokstr = cp->sb.buf;
|
||||
tokstr = sbufB(&cp->sb);
|
||||
} else {
|
||||
tokstr = cp_tok2str(cp, tok);
|
||||
}
|
||||
L = cp->L;
|
||||
va_start(argp, em);
|
||||
msg = lj_str_pushvf(L, err2msg(em), argp);
|
||||
msg = lj_strfmt_pushvf(L, err2msg(em), argp);
|
||||
va_end(argp);
|
||||
if (tokstr)
|
||||
msg = lj_str_pushf(L, err2msg(LJ_ERR_XNEAR), msg, tokstr);
|
||||
msg = lj_strfmt_pushf(L, err2msg(LJ_ERR_XNEAR), msg, tokstr);
|
||||
if (cp->linenumber > 1)
|
||||
msg = lj_str_pushf(L, "%s at line %d", msg, cp->linenumber);
|
||||
msg = lj_strfmt_pushf(L, "%s at line %d", msg, cp->linenumber);
|
||||
lj_err_callermsg(L, msg);
|
||||
}
|
||||
|
||||
@@ -164,7 +169,7 @@ static CPToken cp_number(CPState *cp)
|
||||
TValue o;
|
||||
do { cp_save(cp, cp->c); } while (lj_char_isident(cp_get(cp)));
|
||||
cp_save(cp, '\0');
|
||||
fmt = lj_strscan_scan((const uint8_t *)cp->sb.buf, &o, STRSCAN_OPT_C);
|
||||
fmt = lj_strscan_scan((const uint8_t *)sbufB(&cp->sb), &o, STRSCAN_OPT_C);
|
||||
if (fmt == STRSCAN_INT) cp->val.id = CTID_INT32;
|
||||
else if (fmt == STRSCAN_U32) cp->val.id = CTID_UINT32;
|
||||
else if (!(cp->mode & CPARSE_MODE_SKIP))
|
||||
@@ -177,7 +182,7 @@ static CPToken cp_number(CPState *cp)
|
||||
static CPToken cp_ident(CPState *cp)
|
||||
{
|
||||
do { cp_save(cp, cp->c); } while (lj_char_isident(cp_get(cp)));
|
||||
cp->str = lj_str_new(cp->L, cp->sb.buf, cp->sb.n);
|
||||
cp->str = lj_buf_str(cp->L, &cp->sb);
|
||||
cp->val.id = lj_ctype_getname(cp->cts, &cp->ct, cp->str, cp->tmask);
|
||||
if (ctype_type(cp->ct->info) == CT_KW)
|
||||
return ctype_cid(cp->ct->info);
|
||||
@@ -263,11 +268,11 @@ static CPToken cp_string(CPState *cp)
|
||||
}
|
||||
cp_get(cp);
|
||||
if (delim == '"') {
|
||||
cp->str = lj_str_new(cp->L, cp->sb.buf, cp->sb.n);
|
||||
cp->str = lj_buf_str(cp->L, &cp->sb);
|
||||
return CTOK_STRING;
|
||||
} else {
|
||||
if (cp->sb.n != 1) cp_err_token(cp, '\'');
|
||||
cp->val.i32 = (int32_t)(char)cp->sb.buf[0];
|
||||
if (sbuflen(&cp->sb) != 1) cp_err_token(cp, '\'');
|
||||
cp->val.i32 = (int32_t)(char)*sbufB(&cp->sb);
|
||||
cp->val.id = CTID_INT32;
|
||||
return CTOK_INTEGER;
|
||||
}
|
||||
@@ -296,7 +301,7 @@ static void cp_comment_cpp(CPState *cp)
|
||||
/* Lexical scanner for C. Only a minimal subset is implemented. */
|
||||
static CPToken cp_next_(CPState *cp)
|
||||
{
|
||||
lj_str_resetbuf(&cp->sb);
|
||||
lj_buf_reset(&cp->sb);
|
||||
for (;;) {
|
||||
if (lj_char_isident(cp->c))
|
||||
return lj_char_isdigit(cp->c) ? cp_number(cp) : cp_ident(cp);
|
||||
@@ -385,8 +390,7 @@ static void cp_init(CPState *cp)
|
||||
cp->depth = 0;
|
||||
cp->curpack = 0;
|
||||
cp->packstack[0] = 255;
|
||||
lj_str_initbuf(&cp->sb);
|
||||
lj_str_resizebuf(cp->L, &cp->sb, LJ_MIN_SBUF);
|
||||
lj_buf_init(cp->L, &cp->sb);
|
||||
lua_assert(cp->p != NULL);
|
||||
cp_get(cp); /* Read-ahead first char. */
|
||||
cp->tok = 0;
|
||||
@@ -398,7 +402,7 @@ static void cp_init(CPState *cp)
|
||||
static void cp_cleanup(CPState *cp)
|
||||
{
|
||||
global_State *g = G(cp->L);
|
||||
lj_str_freebuf(g, &cp->sb);
|
||||
lj_buf_free(g, &cp->sb);
|
||||
}
|
||||
|
||||
/* Check and consume optional token. */
|
||||
@@ -590,28 +594,34 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri)
|
||||
k->id = k2.id > k3.id ? k2.id : k3.id;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 1:
|
||||
if (cp_opt(cp, CTOK_OROR)) {
|
||||
cp_expr_sub(cp, &k2, 2); k->i32 = k->u32 || k2.u32; k->id = CTID_INT32;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 2:
|
||||
if (cp_opt(cp, CTOK_ANDAND)) {
|
||||
cp_expr_sub(cp, &k2, 3); k->i32 = k->u32 && k2.u32; k->id = CTID_INT32;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 3:
|
||||
if (cp_opt(cp, '|')) {
|
||||
cp_expr_sub(cp, &k2, 4); k->u32 = k->u32 | k2.u32; goto arith_result;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 4:
|
||||
if (cp_opt(cp, '^')) {
|
||||
cp_expr_sub(cp, &k2, 5); k->u32 = k->u32 ^ k2.u32; goto arith_result;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 5:
|
||||
if (cp_opt(cp, '&')) {
|
||||
cp_expr_sub(cp, &k2, 6); k->u32 = k->u32 & k2.u32; goto arith_result;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 6:
|
||||
if (cp_opt(cp, CTOK_EQ)) {
|
||||
cp_expr_sub(cp, &k2, 7); k->i32 = k->u32 == k2.u32; k->id = CTID_INT32;
|
||||
@@ -620,6 +630,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri)
|
||||
cp_expr_sub(cp, &k2, 7); k->i32 = k->u32 != k2.u32; k->id = CTID_INT32;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 7:
|
||||
if (cp_opt(cp, '<')) {
|
||||
cp_expr_sub(cp, &k2, 8);
|
||||
@@ -654,6 +665,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri)
|
||||
k->id = CTID_INT32;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 8:
|
||||
if (cp_opt(cp, CTOK_SHL)) {
|
||||
cp_expr_sub(cp, &k2, 9); k->u32 = k->u32 << k2.u32;
|
||||
@@ -666,6 +678,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri)
|
||||
k->u32 = k->u32 >> k2.u32;
|
||||
continue;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 9:
|
||||
if (cp_opt(cp, '+')) {
|
||||
cp_expr_sub(cp, &k2, 10); k->u32 = k->u32 + k2.u32;
|
||||
@@ -675,6 +688,7 @@ static void cp_expr_infix(CPState *cp, CPValue *k, int pri)
|
||||
} else if (cp_opt(cp, '-')) {
|
||||
cp_expr_sub(cp, &k2, 10); k->u32 = k->u32 - k2.u32; goto arith_result;
|
||||
}
|
||||
/* fallthrough */
|
||||
case 10:
|
||||
if (cp_opt(cp, '*')) {
|
||||
cp_expr_unary(cp, &k2); k->u32 = k->u32 * k2.u32; goto arith_result;
|
||||
@@ -943,8 +957,6 @@ static CTypeID cp_decl_intern(CPState *cp, CPDecl *decl)
|
||||
|
||||
/* -- C declaration parser ------------------------------------------------ */
|
||||
|
||||
#define H_(le, be) LJ_ENDIAN_SELECT(0x##le, 0x##be)
|
||||
|
||||
/* Reset declaration state to declaration specifier. */
|
||||
static void cp_decl_reset(CPDecl *decl)
|
||||
{
|
||||
@@ -1021,7 +1033,7 @@ static void cp_decl_asm(CPState *cp, CPDecl *decl)
|
||||
if (cp->tok == CTOK_STRING) {
|
||||
GCstr *str = cp->str;
|
||||
while (cp_next(cp) == CTOK_STRING) {
|
||||
lj_str_pushf(cp->L, "%s%s", strdata(str), strdata(cp->str));
|
||||
lj_strfmt_pushf(cp->L, "%s%s", strdata(str), strdata(cp->str));
|
||||
cp->L->top--;
|
||||
str = strV(cp->L->top);
|
||||
}
|
||||
@@ -1073,44 +1085,57 @@ static void cp_decl_gccattribute(CPState *cp, CPDecl *decl)
|
||||
if (cp->tok == CTOK_IDENT) {
|
||||
GCstr *attrstr = cp->str;
|
||||
cp_next(cp);
|
||||
switch (attrstr->hash) {
|
||||
case H_(64a9208e,8ce14319): case H_(8e6331b2,95a282af): /* aligned */
|
||||
switch (lj_cparse_case(attrstr,
|
||||
"\007aligned" "\013__aligned__"
|
||||
"\006packed" "\012__packed__"
|
||||
"\004mode" "\010__mode__"
|
||||
"\013vector_size" "\017__vector_size__"
|
||||
#if LJ_TARGET_X86
|
||||
"\007regparm" "\013__regparm__"
|
||||
"\005cdecl" "\011__cdecl__"
|
||||
"\010thiscall" "\014__thiscall__"
|
||||
"\010fastcall" "\014__fastcall__"
|
||||
"\007stdcall" "\013__stdcall__"
|
||||
"\012sseregparm" "\016__sseregparm__"
|
||||
#endif
|
||||
)) {
|
||||
case 0: case 1: /* aligned */
|
||||
cp_decl_align(cp, decl);
|
||||
break;
|
||||
case H_(42eb47de,f0ede26c): case H_(29f48a09,cf383e0c): /* packed */
|
||||
case 2: case 3: /* packed */
|
||||
decl->attr |= CTFP_PACKED;
|
||||
break;
|
||||
case H_(0a84eef6,8dfab04c): case H_(995cf92c,d5696591): /* mode */
|
||||
case 4: case 5: /* mode */
|
||||
cp_decl_mode(cp, decl);
|
||||
break;
|
||||
case H_(0ab31997,2d5213fa): case H_(bf875611,200e9990): /* vector_size */
|
||||
case 6: case 7: /* vector_size */
|
||||
{
|
||||
CTSize vsize = cp_decl_sizeattr(cp);
|
||||
if (vsize) CTF_INSERT(decl->attr, VSIZEP, lj_fls(vsize));
|
||||
}
|
||||
break;
|
||||
#if LJ_TARGET_X86
|
||||
case H_(5ad22db8,c689b848): case H_(439150fa,65ea78cb): /* regparm */
|
||||
case 8: case 9: /* regparm */
|
||||
CTF_INSERT(decl->fattr, REGPARM, cp_decl_sizeattr(cp));
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
case H_(18fc0b98,7ff4c074): case H_(4e62abed,0a747424): /* cdecl */
|
||||
case 10: case 11: /* cdecl */
|
||||
CTF_INSERT(decl->fattr, CCONV, CTCC_CDECL);
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
case H_(72b2e41b,494c5a44): case H_(f2356d59,f25fc9bd): /* thiscall */
|
||||
case 12: case 13: /* thiscall */
|
||||
CTF_INSERT(decl->fattr, CCONV, CTCC_THISCALL);
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
case H_(0d0ffc42,ab746f88): case H_(21c54ba1,7f0ca7e3): /* fastcall */
|
||||
case 14: case 15: /* fastcall */
|
||||
CTF_INSERT(decl->fattr, CCONV, CTCC_FASTCALL);
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
case H_(ef76b040,9412e06a): case H_(de56697b,c750e6e1): /* stdcall */
|
||||
case 16: case 17: /* stdcall */
|
||||
CTF_INSERT(decl->fattr, CCONV, CTCC_STDCALL);
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
case H_(ea78b622,f234bd8e): case H_(252ffb06,8d50f34b): /* sseregparm */
|
||||
case 18: case 19: /* sseregparm */
|
||||
decl->fattr |= CTF_SSEREGPARM;
|
||||
decl->fattr |= CTFP_CCONV;
|
||||
break;
|
||||
@@ -1142,16 +1167,13 @@ static void cp_decl_msvcattribute(CPState *cp, CPDecl *decl)
|
||||
while (cp->tok == CTOK_IDENT) {
|
||||
GCstr *attrstr = cp->str;
|
||||
cp_next(cp);
|
||||
switch (attrstr->hash) {
|
||||
case H_(bc2395fa,98f267f8): /* align */
|
||||
if (cp_str_is(attrstr, "align")) {
|
||||
cp_decl_align(cp, decl);
|
||||
break;
|
||||
default: /* Ignore all other attributes. */
|
||||
} else { /* Ignore all other attributes. */
|
||||
if (cp_opt(cp, '(')) {
|
||||
while (cp->tok != ')' && cp->tok != CTOK_EOF) cp_next(cp);
|
||||
cp_check(cp, ')');
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
cp_check(cp, ')');
|
||||
@@ -1731,17 +1753,16 @@ static CTypeID cp_decl_abstract(CPState *cp)
|
||||
static void cp_pragma(CPState *cp, BCLine pragmaline)
|
||||
{
|
||||
cp_next(cp);
|
||||
if (cp->tok == CTOK_IDENT &&
|
||||
cp->str->hash == H_(e79b999f,42ca3e85)) { /* pack */
|
||||
if (cp->tok == CTOK_IDENT && cp_str_is(cp->str, "pack")) {
|
||||
cp_next(cp);
|
||||
cp_check(cp, '(');
|
||||
if (cp->tok == CTOK_IDENT) {
|
||||
if (cp->str->hash == H_(738e923c,a1b65954)) { /* push */
|
||||
if (cp_str_is(cp->str, "push")) {
|
||||
if (cp->curpack < CPARSE_MAX_PACKSTACK) {
|
||||
cp->packstack[cp->curpack+1] = cp->packstack[cp->curpack];
|
||||
cp->curpack++;
|
||||
}
|
||||
} else if (cp->str->hash == H_(6c71cf27,6c71cf27)) { /* pop */
|
||||
} else if (cp_str_is(cp->str, "pop")) {
|
||||
if (cp->curpack > 0) cp->curpack--;
|
||||
} else {
|
||||
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
|
||||
@@ -1763,6 +1784,16 @@ static void cp_pragma(CPState *cp, BCLine pragmaline)
|
||||
}
|
||||
}
|
||||
|
||||
/* Handle line number. */
|
||||
static void cp_line(CPState *cp, BCLine hashline)
|
||||
{
|
||||
BCLine newline = cp->val.u32;
|
||||
/* TODO: Handle file name and include it in error messages. */
|
||||
while (cp->tok != CTOK_EOF && cp->linenumber == hashline)
|
||||
cp_next(cp);
|
||||
cp->linenumber = newline;
|
||||
}
|
||||
|
||||
/* Parse multiple C declarations of types or extern identifiers. */
|
||||
static void cp_decl_multi(CPState *cp)
|
||||
{
|
||||
@@ -1775,12 +1806,21 @@ static void cp_decl_multi(CPState *cp)
|
||||
continue;
|
||||
}
|
||||
if (cp->tok == '#') { /* Workaround, since we have no preprocessor, yet. */
|
||||
BCLine pragmaline = cp->linenumber;
|
||||
if (!(cp_next(cp) == CTOK_IDENT &&
|
||||
cp->str->hash == H_(f5e6b4f8,1d509107))) /* pragma */
|
||||
BCLine hashline = cp->linenumber;
|
||||
CPToken tok = cp_next(cp);
|
||||
if (tok == CTOK_INTEGER) {
|
||||
cp_line(cp, hashline);
|
||||
continue;
|
||||
} else if (tok == CTOK_IDENT && cp_str_is(cp->str, "line")) {
|
||||
if (cp_next(cp) != CTOK_INTEGER) cp_err_token(cp, tok);
|
||||
cp_line(cp, hashline);
|
||||
continue;
|
||||
} else if (tok == CTOK_IDENT && cp_str_is(cp->str, "pragma")) {
|
||||
cp_pragma(cp, hashline);
|
||||
continue;
|
||||
} else {
|
||||
cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);
|
||||
cp_pragma(cp, pragmaline);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
scl = cp_decl_spec(cp, &decl, CDF_TYPEDEF|CDF_EXTERN|CDF_STATIC);
|
||||
if ((cp->tok == ';' || cp->tok == CTOK_EOF) &&
|
||||
@@ -1846,8 +1886,6 @@ static void cp_decl_single(CPState *cp)
|
||||
if (cp->tok != CTOK_EOF) cp_err_token(cp, CTOK_EOF);
|
||||
}
|
||||
|
||||
#undef H_
|
||||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
/* Protected callback for C parser. */
|
||||
|
||||
Reference in New Issue
Block a user