/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Dale Weiler
* Wolfgang Bumiller
*
*/
#include "gmqcc.h"
-prog_section_statement *code_statements;
-int *code_linenums;
-prog_section_def *code_defs;
-prog_section_field *code_fields;
-prog_section_function *code_functions;
-int *code_globals;
-char *code_chars;
-uint16_t code_crc;
-uint32_t code_entfields;
-
-void code_push_statement(prog_section_statement *stmt, int linenum)
+/* This is outrageous! */
+#define QCINT_ENTRY void*
+#define QCINT_TO_HASH_ENTRY(q) ((void*)(uintptr_t)(q))
+#define HASH_ENTRY_TO_QCINT(h) ((qcint)(uintptr_t)(h))
+
+void code_push_statement(code_t *code, prog_section_statement *stmt, int linenum)
{
- vec_push(code_statements, *stmt);
- vec_push(code_linenums, linenum);
+ vec_push(code->statements, *stmt);
+ vec_push(code->linenums, linenum);
}
-void code_pop_statement()
+void code_pop_statement(code_t *code)
{
- vec_pop(code_statements);
- vec_pop(code_linenums);
+ vec_pop(code->statements);
+ vec_pop(code->linenums);
}
-void code_init() {
- prog_section_function empty_function = {0,0,0,0,0,0,0,{0}};
- prog_section_statement empty_statement = {0,{0},{0},{0}};
- prog_section_def empty_def = {0, 0, 0};
- int i = 0;
+code_t *code_init() {
+ static prog_section_function empty_function = {0,0,0,0,0,0,0,{0,0,0,0,0,0,0,0}};
+ static prog_section_statement empty_statement = {0,{0},{0},{0}};
+ static prog_section_def empty_def = {0, 0, 0};
+
+ code_t *code = (code_t*)mem_a(sizeof(code_t));
+ int i = 0;
- code_entfields = 0;
+ memset(code, 0, sizeof(code_t));
+ code->entfields = 0;
+ code->string_cache = util_htnew(OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS) ? 0x100 : 1024);
/*
* The way progs.dat is suppose to work is odd, there needs to be
* some null (empty) statements, functions, and 28 globals
*/
for(; i < 28; i++)
- vec_push(code_globals, 0);
+ vec_push(code->globals, 0);
+
+ vec_push(code->chars, '\0');
+ vec_push(code->functions, empty_function);
- vec_push(code_chars, '\0');
- vec_push(code_functions, empty_function);
- code_push_statement(&empty_statement, 0);
- vec_push(code_defs, empty_def);
- vec_push(code_fields, empty_def);
+ code_push_statement(code, &empty_statement, 0);
+
+ vec_push(code->defs, empty_def);
+ vec_push(code->fields, empty_def);
+
+ return code;
}
-uint32_t code_genstring(const char *str)
+void *code_util_str_htgeth(hash_table_t *ht, const char *key, size_t bin);
+
+uint32_t code_genstring(code_t *code, const char *str)
{
- uint32_t off = vec_size(code_chars);
- while (*str) {
- vec_push(code_chars, *str);
- ++str;
+ uint32_t off;
+ size_t hash;
+ QCINT_ENTRY existing;
+
+ if (!str)
+ return 0;
+
+ if (!*str) {
+ if (!code->string_cached_empty) {
+ code->string_cached_empty = vec_size(code->chars);
+ vec_push(code->chars, 0);
+ }
+ return code->string_cached_empty;
}
- vec_push(code_chars, 0);
- return off;
-}
-uint32_t code_cachedstring(const char *str)
-{
- size_t s = 0;
- /* We could implement knuth-morris-pratt or something
- * and also take substrings, but I'm uncomfortable with
- * pointing to subparts of strings for the sake of clarity...
- */
- while (s < vec_size(code_chars)) {
- if (!strcmp(str, code_chars + s))
- return s;
- while (code_chars[s]) ++s;
- ++s;
+ if (OPTS_OPTIMIZATION(OPTIM_OVERLAP_STRINGS)) {
+ hash = ((unsigned char*)str)[strlen(str)-1];
+ existing = code_util_str_htgeth(code->string_cache, str, hash);
+ } else {
+ hash = util_hthash(code->string_cache, str);
+ existing = util_htgeth(code->string_cache, str, hash);
}
- return code_genstring(str);
+
+ if (existing)
+ return HASH_ENTRY_TO_QCINT(existing);
+
+ off = vec_size(code->chars);
+ vec_upload(code->chars, str, strlen(str)+1);
+
+ util_htseth(code->string_cache, str, hash, QCINT_TO_HASH_ENTRY(off));
+ return off;
}
-qcint code_alloc_field (size_t qcsize)
+qcint code_alloc_field (code_t *code, size_t qcsize)
{
- qcint pos = (qcint)code_entfields;
- code_entfields += qcsize;
+ qcint pos = (qcint)code->entfields;
+ code->entfields += qcsize;
return pos;
}
-bool code_write(const char *filename, const char *lnofile) {
+bool code_write(code_t *code, const char *filename, const char *lnofile) {
prog_header code_header;
FILE *fp = NULL;
size_t it = 2;
code_header.statements.offset = sizeof(prog_header);
- code_header.statements.length = vec_size(code_statements);
- code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * vec_size(code_statements));
- code_header.defs.length = vec_size(code_defs);
- code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * vec_size(code_defs));
- code_header.fields.length = vec_size(code_fields);
- code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * vec_size(code_fields));
- code_header.functions.length = vec_size(code_functions);
- code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * vec_size(code_functions));
- code_header.globals.length = vec_size(code_globals);
- code_header.strings.offset = code_header.globals.offset + (sizeof(int32_t) * vec_size(code_globals));
- code_header.strings.length = vec_size(code_chars);
+ code_header.statements.length = vec_size(code->statements);
+ code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * vec_size(code->statements));
+ code_header.defs.length = vec_size(code->defs);
+ code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * vec_size(code->defs));
+ code_header.fields.length = vec_size(code->fields);
+ code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * vec_size(code->fields));
+ code_header.functions.length = vec_size(code->functions);
+ code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * vec_size(code->functions));
+ code_header.globals.length = vec_size(code->globals);
+ code_header.strings.offset = code_header.globals.offset + (sizeof(int32_t) * vec_size(code->globals));
+ code_header.strings.length = vec_size(code->chars);
code_header.version = 6;
- if (opts.forcecrc)
- code_header.crc16 = opts.forced_crc;
+
+ if (OPTS_OPTION_BOOL(OPTION_FORCECRC))
+ code_header.crc16 = OPTS_OPTION_U16(OPTION_FORCED_CRC);
else
- code_header.crc16 = code_crc;
- code_header.entfield = code_entfields;
+ code_header.crc16 = code->crc;
+ code_header.entfield = code->entfields;
if (OPTS_FLAG(DARKPLACES_STRING_TABLE_BUG)) {
util_debug("GEN", "Patching stringtable for -fdarkplaces-stringtablebug\n");
/* >= + P */
- vec_push(code_chars, '\0'); /* > */
- vec_push(code_chars, '\0'); /* = */
- vec_push(code_chars, '\0'); /* P */
+ vec_push(code->chars, '\0'); /* > */
+ vec_push(code->chars, '\0'); /* = */
+ vec_push(code->chars, '\0'); /* P */
}
/* ensure all data is in LE format */
util_endianswap(&code_header.strings, 2, sizeof(code_header.statements.offset));
util_endianswap(&code_header.globals, 2, sizeof(code_header.statements.offset));
util_endianswap(&code_header.entfield, 1, sizeof(code_header.entfield));
- util_endianswap(code_statements, vec_size(code_statements), sizeof(prog_section_statement));
- util_endianswap(code_defs, vec_size(code_defs), sizeof(prog_section_def));
- util_endianswap(code_fields, vec_size(code_fields), sizeof(prog_section_field));
- util_endianswap(code_functions, vec_size(code_functions), sizeof(prog_section_function));
- util_endianswap(code_globals, vec_size(code_globals), sizeof(int32_t));
+ util_endianswap(code->statements, vec_size(code->statements), sizeof(prog_section_statement));
+ util_endianswap(code->defs, vec_size(code->defs), sizeof(prog_section_def));
+ util_endianswap(code->fields, vec_size(code->fields), sizeof(prog_section_field));
+ util_endianswap(code->functions, vec_size(code->functions), sizeof(prog_section_function));
+ util_endianswap(code->globals, vec_size(code->globals), sizeof(int32_t));
if (lnofile) {
- uint32_t lnotype = *(unsigned int*)"LNOF";
uint32_t version = 1;
- fp = util_fopen(lnofile, "wb");
+ fp = fs_file_open(lnofile, "wb");
if (!fp)
return false;
- util_endianswap(&version, 1, sizeof(version));
- util_endianswap(code_linenums, vec_size(code_linenums), sizeof(code_linenums[0]));
+ util_endianswap(&version, 1, sizeof(version));
+ util_endianswap(code->linenums, vec_size(code->linenums), sizeof(code->linenums[0]));
+
- if (fwrite(&lnotype, sizeof(lnotype), 1, fp) != 1 ||
- fwrite(&version, sizeof(version), 1, fp) != 1 ||
- fwrite(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 ||
- fwrite(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 ||
- fwrite(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 ||
- fwrite(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 ||
- fwrite(code_linenums, sizeof(code_linenums[0]), vec_size(code_linenums), fp) != vec_size(code_linenums))
+ if (fs_file_write("LNOF", 4, 1, fp) != 1 ||
+ fs_file_write(&version, sizeof(version), 1, fp) != 1 ||
+ fs_file_write(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 ||
+ fs_file_write(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 ||
+ fs_file_write(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 ||
+ fs_file_write(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 ||
+ fs_file_write(code->linenums, sizeof(code->linenums[0]), vec_size(code->linenums), fp) != vec_size(code->linenums))
{
con_err("failed to write lno file\n");
}
- fclose(fp);
+ fs_file_close(fp);
fp = NULL;
}
- fp = util_fopen(filename, "wb");
+ fp = fs_file_open(filename, "wb");
if (!fp)
return false;
- if (1 != fwrite(&code_header, sizeof(prog_header) , 1 , fp) ||
- vec_size(code_statements) != fwrite(code_statements, sizeof(prog_section_statement), vec_size(code_statements), fp) ||
- vec_size(code_defs) != fwrite(code_defs, sizeof(prog_section_def) , vec_size(code_defs) , fp) ||
- vec_size(code_fields) != fwrite(code_fields, sizeof(prog_section_field) , vec_size(code_fields) , fp) ||
- vec_size(code_functions) != fwrite(code_functions, sizeof(prog_section_function) , vec_size(code_functions) , fp) ||
- vec_size(code_globals) != fwrite(code_globals, sizeof(int32_t) , vec_size(code_globals) , fp) ||
- vec_size(code_chars) != fwrite(code_chars, 1 , vec_size(code_chars) , fp))
+ if (1 != fs_file_write(&code_header, sizeof(prog_header) , 1 , fp) ||
+ vec_size(code->statements) != fs_file_write(code->statements, sizeof(prog_section_statement), vec_size(code->statements), fp) ||
+ vec_size(code->defs) != fs_file_write(code->defs, sizeof(prog_section_def) , vec_size(code->defs) , fp) ||
+ vec_size(code->fields) != fs_file_write(code->fields, sizeof(prog_section_field) , vec_size(code->fields) , fp) ||
+ vec_size(code->functions) != fs_file_write(code->functions, sizeof(prog_section_function) , vec_size(code->functions) , fp) ||
+ vec_size(code->globals) != fs_file_write(code->globals, sizeof(int32_t) , vec_size(code->globals) , fp) ||
+ vec_size(code->chars) != fs_file_write(code->chars, 1 , vec_size(code->chars) , fp))
{
- fclose(fp);
+ fs_file_close(fp);
return false;
}
/* FUNCTIONS */
util_debug("GEN", "FUNCTIONS:\n");
- for (; it < vec_size(code_functions); it++) {
- size_t j = code_functions[it].entry;
+ for (; it < vec_size(code->functions); it++) {
+ size_t j = code->functions[it].entry;
util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize ={%d,%d,%d,%d,%d,%d,%d,%d} }\n",
- code_functions[it].entry,
- code_functions[it].firstlocal,
- code_functions[it].locals,
- code_functions[it].profile,
- code_functions[it].name,
- code_functions[it].file,
- code_functions[it].nargs,
- code_functions[it].argsize[0],
- code_functions[it].argsize[1],
- code_functions[it].argsize[2],
- code_functions[it].argsize[3],
- code_functions[it].argsize[4],
- code_functions[it].argsize[5],
- code_functions[it].argsize[6],
- code_functions[it].argsize[7]
+ code->functions[it].entry,
+ code->functions[it].firstlocal,
+ code->functions[it].locals,
+ code->functions[it].profile,
+ code->functions[it].name,
+ code->functions[it].file,
+ code->functions[it].nargs,
+ code->functions[it].argsize[0],
+ code->functions[it].argsize[1],
+ code->functions[it].argsize[2],
+ code->functions[it].argsize[3],
+ code->functions[it].argsize[4],
+ code->functions[it].argsize[5],
+ code->functions[it].argsize[6],
+ code->functions[it].argsize[7]
);
- util_debug("GEN", " NAME: %s\n", &code_chars[code_functions[it].name]);
+ util_debug("GEN", " NAME: %s\n", &code->chars[code->functions[it].name]);
/* Internal functions have no code */
- if (code_functions[it].entry >= 0) {
+ if (code->functions[it].entry >= 0) {
util_debug("GEN", " CODE:\n");
for (;;) {
- if (code_statements[j].opcode != INSTR_DONE)
+ if (code->statements[j].opcode != INSTR_DONE)
util_debug("GEN", " %-12s {% 5i,% 5i,% 5i}\n",
- asm_instr[code_statements[j].opcode].m,
- code_statements[j].o1.s1,
- code_statements[j].o2.s1,
- code_statements[j].o3.s1
+ asm_instr[code->statements[j].opcode].m,
+ code->statements[j].o1.s1,
+ code->statements[j].o2.s1,
+ code->statements[j].o3.s1
);
else {
util_debug("GEN", " DONE {0x00000,0x00000,0x00000}\n");
}
}
- vec_free(code_statements);
- vec_free(code_linenums);
- vec_free(code_defs);
- vec_free(code_fields);
- vec_free(code_functions);
- vec_free(code_globals);
- vec_free(code_chars);
- fclose(fp);
+ vec_free(code->statements);
+ vec_free(code->linenums);
+ vec_free(code->defs);
+ vec_free(code->fields);
+ vec_free(code->functions);
+ vec_free(code->globals);
+ vec_free(code->chars);
+
+ util_htdel(code->string_cache);
+
+ fs_file_close(fp);
+ mem_d(code);
return true;
}
projects / xonotic / gmqcc.git / blobdiff