space idnentation, macros, strdup again

[xonotic/gmqcc.git] / code.c

diff --git a/code.c b/code.c
index 674eb1aca4a7fdfc0fa75440645e3edbf4a022bf..392508832792f25855734249ed03db5280d4f68a 100644 (file)
--- a/code.c
+++ b/code.c
@@ -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      */
@@ -90,6 +93,10 @@ int code_strings_add(const char *src) {
 }
 
 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
@@ -137,6 +144,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,14 +160,23 @@ 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);