X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=code.c;h=0ad8becb8de54bc50c47cb434164bb46a95f2c62;hb=4224ac5ca008f10dd981980cb0c215ed4d2fb03a;hp=372e7eb63c68bb797216a159f9a897d9d7541106;hpb=906f319673f6a2eddb62e59acc970b9497f3e96a;p=xonotic%2Fgmqcc.git diff --git a/code.c b/code.c index 372e7eb..0ad8bec 100644 --- a/code.c +++ b/code.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2012 - * Dale Weiler, Wolfgang Bumiller + * Dale Weiler + * Wolfgang Bumiller * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -23,14 +24,26 @@ #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; -uint16_t code_crc; -uint32_t code_entfields; +void code_push_statement(prog_section_statement *stmt, int linenum) +{ + vec_push(code_statements, *stmt); + vec_push(code_linenums, linenum); +} + +void code_pop_statement() +{ + vec_pop(code_statements); + vec_pop(code_linenums); +} void code_init() { prog_section_function empty_function = {0,0,0,0,0,0,0,{0}}; @@ -40,10 +53,6 @@ void code_init() { code_entfields = 0; - /* omit creation of null code */ - if (OPTS_FLAG(OMIT_NULL_BYTES)) - return; - /* * The way progs.dat is suppose to work is odd, there needs to be * some null (empty) statements, functions, and 28 globals @@ -53,7 +62,7 @@ void code_init() { vec_push(code_chars, '\0'); vec_push(code_functions, empty_function); - vec_push(code_statements, empty_statement); + code_push_statement(&empty_statement, 0); vec_push(code_defs, empty_def); vec_push(code_fields, empty_def); } @@ -85,47 +94,6 @@ uint32_t code_cachedstring(const char *str) return code_genstring(str); } -void code_test() { - prog_section_def d1 = { TYPE_VOID, 28, 1 }; - prog_section_def d2 = { TYPE_FUNCTION, 29, 8 }; - prog_section_def d3 = { TYPE_STRING, 30, 14}; - prog_section_function f1 = { 1, 0, 0, 0, 1, 0,0, {0}}; - prog_section_function f2 = {-4, 0, 0, 0, 8, 0,0, {0}}; - prog_section_function f3 = { 0, 0, 0, 0, 14+13, 0,0, {0}}; - prog_section_function f4 = { 0, 0, 0, 0, 14+13+10, 0,0, {0}}; - prog_section_function f5 = { 0, 0, 0, 0, 14+13+10+7, 0,0, {0}}; - prog_section_function f6 = { 0, 0, 0, 0, 14+13+10+7+9, 0,0, {0}}; - prog_section_statement s1 = { INSTR_STORE_F, {30}, {OFS_PARM0}, {0}}; - prog_section_statement s2 = { INSTR_CALL1, {29}, {0}, {0}}; - prog_section_statement s3 = { INSTR_RETURN, {0}, {0}, {0}}; - - strcpy(vec_add(code_chars, 0x7), "m_init"); - strcpy(vec_add(code_chars, 0x6), "print"); - strcpy(vec_add(code_chars, 0xD), "hello world\n"); - strcpy(vec_add(code_chars, 0xA), "m_keydown"); - strcpy(vec_add(code_chars, 0x7), "m_draw"); - strcpy(vec_add(code_chars, 0x9), "m_toggle"); - strcpy(vec_add(code_chars, 0xB), "m_shutdown"); - - vec_push(code_globals, 1); /* m_init */ - vec_push(code_globals, 2); /* print */ - vec_push(code_globals, 14); /* hello world in string table */ - - /* now the defs */ - vec_push(code_defs, d1); /* m_init */ - vec_push(code_defs, d2); /* print */ - vec_push(code_defs, d3); /*hello_world*/ - vec_push(code_functions, f1); /* m_init */ - vec_push(code_functions, f2); /* print */ - vec_push(code_functions, f3); /* m_keydown */ - vec_push(code_functions, f4); - vec_push(code_functions, f5); - vec_push(code_functions, f6); - vec_push(code_statements, s1); - vec_push(code_statements, s2); - vec_push(code_statements, s3); -} - qcint code_alloc_field (size_t qcsize) { qcint pos = (qcint)code_entfields; @@ -133,13 +101,11 @@ qcint code_alloc_field (size_t qcsize) return pos; } -bool code_write(const char *filename) { +bool code_write(const char *filename, const char *lnofile) { prog_header code_header; FILE *fp = NULL; size_t it = 2; - /* see proposal.txt */ - if (OPTS_FLAG(OMIT_NULL_BYTES)) {} 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)); @@ -153,8 +119,8 @@ bool code_write(const char *filename) { 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.forcecrc) + code_header.crc16 = opts.forced_crc; else code_header.crc16 = code_crc; code_header.entfield = code_entfields; @@ -169,26 +135,61 @@ bool code_write(const char *filename) { } /* ensure all data is in LE format */ - util_endianswap(&code_header, 1, sizeof(prog_header)); + util_endianswap(&code_header.version, 1, sizeof(code_header.version)); + util_endianswap(&code_header.crc16, 1, sizeof(code_header.crc16)); + util_endianswap(&code_header.statements, 2, sizeof(code_header.statements.offset)); + util_endianswap(&code_header.defs, 2, sizeof(code_header.statements.offset)); + util_endianswap(&code_header.fields, 2, sizeof(code_header.statements.offset)); + util_endianswap(&code_header.functions, 2, sizeof(code_header.statements.offset)); + 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)); - fp = util_fopen(filename, "wb"); + if (lnofile) { + uint32_t lnotype = *(unsigned int*)"LNOF"; + uint32_t version = 1; + + fp = 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])); + + + if (file_write(&lnotype, sizeof(lnotype), 1, fp) != 1 || + file_write(&version, sizeof(version), 1, fp) != 1 || + file_write(&code_header.defs.length, sizeof(code_header.defs.length), 1, fp) != 1 || + file_write(&code_header.globals.length, sizeof(code_header.globals.length), 1, fp) != 1 || + file_write(&code_header.fields.length, sizeof(code_header.fields.length), 1, fp) != 1 || + file_write(&code_header.statements.length, sizeof(code_header.statements.length), 1, fp) != 1 || + 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"); + } + + file_close(fp); + fp = NULL; + } + + fp = 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 != file_write(&code_header, sizeof(prog_header) , 1 , fp) || + vec_size(code_statements) != file_write(code_statements, sizeof(prog_section_statement), vec_size(code_statements), fp) || + vec_size(code_defs) != file_write(code_defs, sizeof(prog_section_def) , vec_size(code_defs) , fp) || + vec_size(code_fields) != file_write(code_fields, sizeof(prog_section_field) , vec_size(code_fields) , fp) || + vec_size(code_functions) != file_write(code_functions, sizeof(prog_section_function) , vec_size(code_functions) , fp) || + vec_size(code_globals) != file_write(code_globals, sizeof(int32_t) , vec_size(code_globals) , fp) || + vec_size(code_chars) != file_write(code_chars, 1 , vec_size(code_chars) , fp)) { - fclose(fp); + file_close(fp); return false; } @@ -230,7 +231,7 @@ bool code_write(const char *filename) { if (code_functions[it].entry >= 0) { util_debug("GEN", " CODE:\n"); for (;;) { - if (code_statements[j].opcode != AINSTR_END) + 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, @@ -247,11 +248,12 @@ bool code_write(const char *filename) { } 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); + file_close(fp); return true; }