X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=ff3fc9943e268d7381199e2ab32f895983942b35;hp=4abd99b160a5cf09debca1e43a60a2b0e9189c08;hb=206952b920856ef53b953d3d477f00869b7191fd;hpb=36ff87c130ff7d8d875ba7339dfb197969f8fd21 diff --git a/code.c b/code.c index 4abd99b..ff3fc99 100644 --- a/code.c +++ b/code.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012 * Dale Weiler * * Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -28,8 +28,11 @@ typedef struct { } prog_section; typedef struct { - uint32_t version; /* Program version (6) */ - uint32_t crc16; /* What is this? */ + uint16_t version; /* Program version (6) */ + uint16_t flags; /* see propsal.txt */ + uint16_t crc16; /* What is this? */ + uint16_t skip; /* see propsal.txt */ + prog_section statements; /* prog_section_statement */ prog_section defs; /* prog_section_def */ prog_section fields; /* prog_section_field */ @@ -42,17 +45,17 @@ typedef struct { /* * The macros below expand to a typesafe vector implementation, which * can be viewed in gmqcc.h - * + * * code_statements_data -- raw prog_section_statement array * code_statements_elements -- number of elements * code_statements_allocated -- size of the array allocated * code_statements_add(T) -- add element (returns -1 on error) - * + * * code_vars_data -- raw prog_section_var array * code_vars_elements -- number of elements * code_vars_allocated -- size of the array allocated * code_vars_add(T) -- add element (returns -1 on error) - * + * * code_fields_data -- raw prog_section_field array * code_fields_elements -- number of elements * code_fields_allocated -- size of the array allocated @@ -62,12 +65,12 @@ typedef struct { * code_functions_elements -- number of elements * code_functions_allocated -- size of the array allocated * code_functions_add(T) -- add element (returns -1 on error) - * + * * code_globals_data -- raw prog_section_def array * code_globals_elements -- number of elements * code_globals_allocated -- size of the array allocated * code_globals_add(T) -- add element (returns -1 on error) - * + * * code_chars_data -- raw char* array * code_chars_elements -- number of elements * code_chars_allocated -- size of the array allocated @@ -80,16 +83,11 @@ VECTOR_MAKE(prog_section_function, code_functions ); VECTOR_MAKE(int, code_globals ); VECTOR_MAKE(char, code_chars ); -int code_strings_add(const char *src) { - size_t size = strlen(src); - size_t iter = 0; - while (iter < size) - code_chars_add(src[iter++]); - code_chars_add('\0'); - return code_chars_elements; -} - void code_init() { + /* omit creation of null code */ + if (opts_omit_nullcode) + return; + /* * The way progs.dat is suppose to work is odd, there needs to be * some null (empty) statements, functions, and 28 globals @@ -99,37 +97,37 @@ void code_init() { int i; for(i = 0; i < 28; i++) code_globals_add(0); - + code_chars_add ('\0'); code_functions_add (empty_function); code_statements_add(empty_statement); } -void code_test() { - code_strings_add("m_init"); - code_strings_add("print"); - code_strings_add("hello world\n"); - code_strings_add("m_keydown"); - code_strings_add("m_draw"); - code_strings_add("m_toggle"); - code_strings_add("m_shutdown"); - +void code_test() { + code_chars_put("m_init", 0x6); + code_chars_put("print", 0x5); + code_chars_put("hello world\n", 0xC); + code_chars_put("m_keydown", 0x9); + code_chars_put("m_draw", 0x6); + code_chars_put("m_toggle", 0x8); + code_chars_put("m_shutdown", 0xA); + code_globals_add(1); /* m_init */ code_globals_add(2); /* print */ code_globals_add(14); /* hello world in string table */ - + /* now the defs */ code_defs_add((prog_section_def){.type=TYPE_VOID, .offset=28/*globals[28]*/, .name=1 }); /* m_init */ code_defs_add((prog_section_def){.type=TYPE_FUNCTION,.offset=29/*globals[29]*/, .name=8 }); /* print */ code_defs_add((prog_section_def){.type=TYPE_STRING, .offset=30/*globals[30]*/, .name=14}); /*hello_world*/ - + code_functions_add((prog_section_function){1, 0, 0, 0, .name=1, 0, 0, {0}}); /* m_init */ code_functions_add((prog_section_function){-4, 0, 0, 0, .name=8, 0, 0, {0}}); /* print */ code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13, 0,0, {0}}); /* m_keydown */ code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10, 0,0, {0}}); code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10+7, 0,0, {0}}); code_functions_add((prog_section_function){0, 0, 0, 0, .name=14+13+10+7+9, 0,0, {0}}); - + code_statements_add((prog_section_statement){INSTR_STORE_F, {30}/*30 is hello_world */, {OFS_PARM0}, {0}}); code_statements_add((prog_section_statement){INSTR_CALL1, {29}/*29 is print */, {0}, {0}}); code_statements_add((prog_section_statement){INSTR_RETURN, {0}, {0}, {0}}); @@ -137,6 +135,13 @@ void code_test() { void code_write() { prog_header code_header={0}; + + /* see proposal.txt */ + if (opts_omit_nullcode) { + code_header.skip = 28; + code_header.flags = 1; + } + code_header.version = 6; code_header.crc16 = 0; /* TODO: */ code_header.statements = (prog_section){sizeof(prog_header), code_statements_elements }; @@ -146,15 +151,24 @@ void code_write() { code_header.globals = (prog_section){code_header.functions.offset + sizeof(prog_section_function) *code_functions_elements, code_globals_elements }; code_header.strings = (prog_section){code_header.globals.offset + sizeof(int) *code_globals_elements, code_chars_elements }; code_header.entfield = 0; /* TODO: */ - + + if (opts_darkplaces_stringtablebug) { + util_debug("GEN", "Patching stringtable for -fdarkplaces-stringtablebug\n"); + + /* >= + P */ + code_chars_add('\0'); /* > */ + code_chars_add('\0'); /* = */ + code_chars_add('\0'); /* P */ + } + /* ensure all data is in LE format */ - util_endianswap(&code_header, sizeof(prog_header), 1); - util_endianswap(code_statements_data, sizeof(prog_section_statement), code_statements_elements); - util_endianswap(code_defs_data, sizeof(prog_section_def), code_defs_elements); - util_endianswap(code_fields_data, sizeof(prog_section_field), code_fields_elements); - util_endianswap(code_functions_data, sizeof(prog_section_function), code_functions_elements); - util_endianswap(code_globals_data, sizeof(int), code_globals_elements); - + util_endianswap(&code_header, 1, sizeof(prog_header)); + util_endianswap(code_statements_data, code_statements_elements, sizeof(prog_section_statement)); + util_endianswap(code_defs_data, code_defs_elements, sizeof(prog_section_def)); + util_endianswap(code_fields_data, code_fields_elements, sizeof(prog_section_field)); + util_endianswap(code_functions_data, code_functions_elements, sizeof(prog_section_function)); + util_endianswap(code_globals_data, code_globals_elements, sizeof(int)); + FILE *fp = fopen("program.dat", "wb"); fwrite(&code_header, 1, sizeof(prog_header), fp); fwrite(code_statements_data, 1, sizeof(prog_section_statement)*code_statements_elements, fp); @@ -163,8 +177,8 @@ void code_write() { fwrite(code_functions_data, 1, sizeof(prog_section_function) *code_functions_elements, fp); fwrite(code_globals_data, 1, sizeof(int) *code_globals_elements, fp); fwrite(code_chars_data, 1, 1 *code_chars_elements, fp); - - util_debug("GEN","header:\n"); + + util_debug("GEN","HEADER:\n"); util_debug("GEN"," version: = %d\n", code_header.version ); util_debug("GEN"," crc16: = %d\n", code_header.crc16 ); util_debug("GEN"," entfield: = %d\n", code_header.entfield); @@ -174,11 +188,12 @@ void code_write() { util_debug("GEN"," functions = {.offset = % 8d, .length = % 8d}\n", code_header.functions .offset, code_header.functions .length); util_debug("GEN"," globals = {.offset = % 8d, .length = % 8d}\n", code_header.globals .offset, code_header.globals .length); util_debug("GEN"," strings = {.offset = % 8d, .length = % 8d}\n", code_header.strings .offset, code_header.strings .length); - - /* WRITE out all functions */ - util_debug("GEN", "functions:\n"); - size_t i = 0; + + /* FUNCTIONS */ + util_debug("GEN", "FUNCTIONS:\n"); + size_t i = 1; for (; i < code_functions_elements; i++) { + size_t j = code_functions_data[i].entry; util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize =%0X }\n", code_functions_data[i].entry, code_functions_data[i].firstlocal, @@ -189,14 +204,30 @@ void code_write() { code_functions_data[i].nargs, *((int32_t*)&code_functions_data[i].argsize) ); + util_debug("GEN", " NAME: %s\n", &code_chars_data[code_functions_data[i].name]); + /* Internal functions have no code */ + if (code_functions_data[i].entry >= 0) { + util_debug("GEN", " CODE:\n"); + for (;;) { + if (code_statements_data[j].opcode != INSTR_DONE && + code_statements_data[j].opcode != INSTR_RETURN) + util_debug("GEN", " %s {0x%05d,0x%05d,0x%05d}\n", + asm_instr[code_statements_data[j].opcode].m, + code_statements_data[j].o1.s1, + code_statements_data[j].o2.s2, + code_statements_data[j].o3.s3 + ); + else break; + j++; + } + } } - + mem_d(code_statements_data); mem_d(code_defs_data); mem_d(code_fields_data); mem_d(code_functions_data); mem_d(code_globals_data); mem_d(code_chars_data); - fclose(fp); }