X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=ir.h;h=d3ad5b3715ca919ebd83dbc7be280cfe30f4bcbf;hb=8ab51544be3756c57424af50302d8e2b058f65b1;hp=49b337039efa87591190ef7a7e4748152ca161b6;hpb=1bf4aa379a9a3bdac39c814bd8ab49493962c674;p=xonotic%2Fgmqcc.git diff --git a/ir.h b/ir.h index 49b3370..d3ad5b3 100644 --- a/ir.h +++ b/ir.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012 * Wolfgang Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -23,8 +23,6 @@ #ifndef GMQCC_IR_HDR #define GMQCC_IR_HDR -#include "astir.h" - /* ir_value */ typedef struct @@ -39,7 +37,7 @@ typedef struct ir_value_s { char *name; int vtype; int store; - lex_ctx_t context; + lex_ctx context; MEM_VECTOR_MAKE(struct ir_instr_s*, reads); MEM_VECTOR_MAKE(struct ir_instr_s*, writes); @@ -49,7 +47,7 @@ typedef struct ir_value_s { union { float vfloat; int vint; - vector_t vvec; + vector vvec; char *vstring; struct ir_value_s *vpointer; } constval; @@ -67,22 +65,26 @@ ir_value* ir_value_out(struct ir_function_s *owner, const char *name, int st, in void ir_value_delete(ir_value*); void ir_value_set_name(ir_value*, const char *name); -MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, reads) -MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, writes) +MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, reads); +MEM_VECTOR_PROTO_ALL(ir_value, struct ir_instr_s*, writes); bool GMQCC_WARN ir_value_set_float(ir_value*, float f); +#if 0 bool GMQCC_WARN ir_value_set_int(ir_value*, int i); +#endif bool GMQCC_WARN ir_value_set_string(ir_value*, const char *s); -bool GMQCC_WARN ir_value_set_vector(ir_value*, vector_t v); +bool GMQCC_WARN ir_value_set_vector(ir_value*, vector v); /*bool ir_value_set_pointer_v(ir_value*, ir_value* p); */ /*bool ir_value_set_pointer_i(ir_value*, int i); */ -MEM_VECTOR_PROTO(ir_value, ir_life_entry_t, life) +MEM_VECTOR_PROTO(ir_value, ir_life_entry_t, life); /* merge an instruction into the life-range */ /* returns false if the lifepoint was already known */ bool ir_value_life_merge(ir_value*, size_t); /* check if a value lives at a specific point */ bool ir_value_lives(ir_value*, size_t); +/* check if the life-range of 2 values overlaps */ +bool ir_values_overlap(ir_value*, ir_value*); void ir_value_dump(ir_value*, int (*oprintf)(const char*,...)); void ir_value_dump_life(ir_value *self, int (*oprintf)(const char*,...)); @@ -97,7 +99,7 @@ typedef struct ir_phi_entry_s typedef struct ir_instr_s { int opcode; - lex_ctx_t context; + lex_ctx context; ir_value* (_ops[3]); struct ir_block_s* (bops[2]); @@ -112,7 +114,7 @@ typedef struct ir_instr_s ir_instr* ir_instr_new(struct ir_block_s *owner, int opcode); void ir_instr_delete(ir_instr*); -MEM_VECTOR_PROTO(ir_value, ir_phi_entry_t, phi) +MEM_VECTOR_PROTO(ir_value, ir_phi_entry_t, phi); bool GMQCC_WARN ir_instr_op(ir_instr*, int op, ir_value *value, bool writing); void ir_instr_dump(ir_instr* in, char *ind, int (*oprintf)(const char*,...)); @@ -121,7 +123,7 @@ void ir_instr_dump(ir_instr* in, char *ind, int (*oprintf)(const char*,...)); typedef struct ir_block_s { char *label; - lex_ctx_t context; + lex_ctx context; bool final; /* once a jump is added we're done */ MEM_VECTOR_MAKE(ir_instr*, instr); @@ -142,14 +144,26 @@ void ir_block_delete(ir_block*); bool ir_block_set_label(ir_block*, const char *label); -MEM_VECTOR_PROTO(ir_block, ir_instr*, instr) -MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, exits) -MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, entries) +MEM_VECTOR_PROTO(ir_block, ir_instr*, instr); +MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, exits); +MEM_VECTOR_PROTO_ALL(ir_block, ir_block*, entries); ir_value* ir_block_create_binop(ir_block*, const char *label, int op, ir_value *left, ir_value *right); bool GMQCC_WARN ir_block_create_store_op(ir_block*, int op, ir_value *target, ir_value *what); bool GMQCC_WARN ir_block_create_store(ir_block*, ir_value *target, ir_value *what); +bool GMQCC_WARN ir_block_create_storep(ir_block*, ir_value *target, ir_value *what); + +/* field must be of TYPE_FIELD */ +ir_value* ir_block_create_load_from_ent(ir_block*, const char *label, ir_value *ent, ir_value *field, int outype); + +ir_value* ir_block_create_fieldaddress(ir_block*, const char *label, ir_value *entity, ir_value *field); + +/* This is to create an instruction of the form + * %label := opcode a, b + */ +ir_value* ir_block_create_general_instr(ir_block *self, const char *label, + int op, ir_value *a, ir_value *b, int outype); ir_value* ir_block_create_add(ir_block*, const char *label, ir_value *l, ir_value *r); ir_value* ir_block_create_sub(ir_block*, const char *label, ir_value *l, ir_value *r); @@ -162,7 +176,7 @@ bool GMQCC_WARN ir_phi_add(ir_instr*, ir_block *b, ir_value *v); bool GMQCC_WARN ir_block_create_return(ir_block*, ir_value *opt_value); bool GMQCC_WARN ir_block_create_if(ir_block*, ir_value *cond, - ir_block *ontrue, ir_block *onfalse); + ir_block *ontrue, ir_block *onfalse); /* A 'goto' is an actual 'goto' coded in QC, whereas * a 'jump' is a virtual construct which simply names the * next block to go to. @@ -172,7 +186,7 @@ bool GMQCC_WARN ir_block_create_if(ir_block*, ir_value *cond, bool GMQCC_WARN ir_block_create_jump(ir_block*, ir_block *to); bool GMQCC_WARN ir_block_create_goto(ir_block*, ir_block *to); -MEM_VECTOR_PROTO_ALL(ir_block, ir_value*, living) +MEM_VECTOR_PROTO_ALL(ir_block, ir_value*, living); void ir_block_dump(ir_block*, char *ind, int (*oprintf)(const char*,...)); @@ -197,7 +211,7 @@ typedef struct ir_function_s ir_block* first; ir_block* last; - lex_ctx_t context; + lex_ctx context; /* for temp allocation */ size_t run_id; @@ -211,8 +225,8 @@ void ir_function_delete(ir_function*); bool GMQCC_WARN ir_function_collect_value(ir_function*, ir_value *value); bool ir_function_set_name(ir_function*, const char *name); -MEM_VECTOR_PROTO(ir_function, int, params) -MEM_VECTOR_PROTO(ir_function, ir_block*, blocks) +MEM_VECTOR_PROTO(ir_function, int, params); +MEM_VECTOR_PROTO(ir_function, ir_block*, blocks); ir_value* ir_function_get_local(ir_function *self, const char *name); ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype); @@ -241,8 +255,8 @@ void ir_builder_delete(ir_builder*); bool ir_builder_set_name(ir_builder *self, const char *name); -MEM_VECTOR_PROTO(ir_builder, ir_function*, functions) -MEM_VECTOR_PROTO(ir_builder, ir_value*, globals) +MEM_VECTOR_PROTO(ir_builder, ir_function*, functions); +MEM_VECTOR_PROTO(ir_builder, ir_value*, globals); ir_function* ir_builder_get_function(ir_builder*, const char *fun); ir_function* ir_builder_create_function(ir_builder*, const char *name);