darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-27 06:02:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite intrinsic system in C++

Browse source
This commit is contained in:
Dale Weiler 2015-01-15 18:11:41 -05:00
parent 76278e8b97
commit e2ba77a546
3 changed files with 536 additions and 576 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1064
intrin.cpp
View file

File diff suppressed because it is too large Load diff

21
parser.cpp
View file

@ -588,7 +588,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
return false;
} else if (!(out = fold_op(parser->fold, op, exprs))) {
/* generate a call to __builtin_mod */
ast_expression *mod = intrin_func(parser->intrin, "mod");
ast_expression *mod = parser->m_intrin.func("mod");
ast_call *call = nullptr;
if (!mod) return false; /* can return null for missing floor */
@ -658,7 +658,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
}
if (!(out = fold_op(parser->fold, op, exprs))) {
ast_expression *shift = intrin_func(parser->intrin, (op->id == opid2('<','<')) ? "__builtin_lshift" : "__builtin_rshift");
ast_expression *shift = parser->m_intrin.func((op->id == opid2('<','<')) ? "__builtin_lshift" : "__builtin_rshift");
ast_call *call = ast_call_new(parser_ctx(parser), shift);
call->params.push_back(exprs[0]);
call->params.push_back(exprs[1]);
@ -676,7 +676,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
}
if(!(out = fold_op(parser->fold, op, exprs))) {
ast_expression *shift = intrin_func(parser->intrin, (op->id == opid3('<','<','=')) ? "__builtin_lshift" : "__builtin_rshift");
ast_expression *shift = parser->m_intrin.func((op->id == opid3('<','<','=')) ? "__builtin_lshift" : "__builtin_rshift");
ast_call *call = ast_call_new(parser_ctx(parser), shift);
call->params.push_back(exprs[0]);
call->params.push_back(exprs[1]);
@ -755,7 +755,7 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
}
if (!(out = fold_op(parser->fold, op, exprs))) {
ast_call *gencall = ast_call_new(parser_ctx(parser), intrin_func(parser->intrin, "pow"));
ast_call *gencall = ast_call_new(parser_ctx(parser), parser->m_intrin.func("pow"));
gencall->params.push_back(exprs[0]);
gencall->params.push_back(exprs[1]);
out = (ast_expression*)gencall;
@ -1189,7 +1189,7 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
* TODO handle this at the intrinsic level with an ast_intrinsic
* node and codegen.
*/
if ((fun = sy->out[fid].out) == intrin_debug_typestring(parser->intrin)) {
if ((fun = sy->out[fid].out) == parser->m_intrin.debug_typestring()) {
char ty[1024];
if (fid+2 != sy->out.size() || sy->out.back().block) {
parseerror(parser, "intrinsic __builtin_debug_typestring requires exactly 1 parameter");
@ -1233,7 +1233,7 @@ static bool parser_close_call(parser_t *parser, shunt *sy)
for (i = 0; i < paramcount; i++)
vec_push(exprs, sy->out[fid+1 + i].out);
if (!(foldval = intrin_fold(parser->intrin, (ast_value*)fun, exprs))) {
if (!(foldval = parser->m_intrin.fold((ast_value*)fun, exprs))) {
vec_free(exprs);
goto fold_leave;
}
@ -1595,7 +1595,7 @@ static bool parse_sya_operand(parser_t *parser, shunt *sy, bool with_labels)
* use the identifier as is.
*/
if (!strncmp(parser_tokval(parser), "__builtin_", 10)) {
var = intrin_func(parser->intrin, parser_tokval(parser));
var = parser->m_intrin.func(parser_tokval(parser));
}
/*
@ -1603,7 +1603,7 @@ static bool parse_sya_operand(parser_t *parser, shunt *sy, bool with_labels)
* the first one masks for __builtin though, we emit warning here.
*/
if (!var) {
if ((var = intrin_func(parser->intrin, parser_tokval(parser)))) {
if ((var = parser->m_intrin.func(parser_tokval(parser)))) {
(void)!compile_warning(
parser_ctx(parser),
WARN_BUILTINS,
@ -6017,8 +6017,8 @@ parser_t *parser_create()
parser->reserved_version = nullptr;
}
parser->fold = fold_init (parser);
parser->intrin = intrin_init(parser);
parser->fold = fold_init(parser);
parser->m_intrin = intrin(parser);
return parser;
}
@ -6116,7 +6116,6 @@ static void parser_remove_ast(parser_t *parser)
util_htdel(parser->aliases);
fold_cleanup(parser->fold);
intrin_cleanup(parser->intrin);
}
void parser_cleanup(parser_t *parser)

27
parser.h
View file

@ -3,9 +3,9 @@
#include "gmqcc.h"
#include "lexer.h"
#include "ast.h"
#include "intrin.h"
struct parser_t;
struct intrin_t;
struct fold_t {
parser_t *parser;
@ -16,23 +16,11 @@ struct fold_t {
hash_table_t *imm_string_dotranslate; /* map<string, ast_value*> */
};
struct intrin_func_t {
ast_expression *(*intrin)(intrin_t *);
const char *name;
const char *alias;
size_t args;
};
struct intrin_t {
std::vector<intrin_func_t> intrinsics;
std::vector<ast_expression*> generated;
parser_t *parser;
fold_t *fold;
};
#define parser_ctx(p) ((p)->lex->tok.ctx)
struct parser_t {
parser_t() { }
lex_file *lex;
int tok;
@ -89,7 +77,7 @@ struct parser_t {
size_t max_param_count;
fold_t *fold;
intrin_t *intrin;
intrin m_intrin;
};
@ -111,11 +99,4 @@ ast_expression *fold_binary (lex_ctx_t ctx, int, ast_expression *, ast_e
int fold_cond_ifthen (ir_value *, ast_function *, ast_ifthen *);
int fold_cond_ternary (ir_value *, ast_function *, ast_ternary *);
/* intrin.c */
intrin_t *intrin_init (parser_t *parser);
void intrin_cleanup (intrin_t *intrin);
ast_expression *intrin_fold (intrin_t *intrin, ast_value *, ast_expression **);
ast_expression *intrin_func (intrin_t *intrin, const char *name);
ast_expression *intrin_debug_typestring(intrin_t *intrin);
#endif