X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=ddfbb977f2b1dd6b451d4d4d3becc4426de1dea7;hp=920b49de8219aa41d296b1ed4f9d1d268b483268;hb=641136fee3e2f589f93ad6a7b3213b0247107303;hpb=1bf9ebabcce7731b83c302e8416bba41c3cdf5da;ds=sidebyside

diff --git a/code.c b/code.c
index 920b49d..ddfbb97 100644
--- a/code.c
+++ b/code.c
@@ -260,59 +260,18 @@ static void code_create_header(code_t *code, prog_header_t *code_header, const c
     }
 
     /* ensure all data is in LE format */
-    util_tolittleendian(&code_header->version,              sizeof(code_header->version));
-    util_tolittleendian(&code_header->crc16,                sizeof(code_header->crc16));
-    util_tolittleendian(&code_header->statements.offset,    sizeof(code_header->statements.offset));
-    util_tolittleendian(&code_header->statements.length,    sizeof(code_header->statements.length));
-    util_tolittleendian(&code_header->defs.offset,          sizeof(code_header->defs.offset));
-    util_tolittleendian(&code_header->defs.length,          sizeof(code_header->defs.length));
-    util_tolittleendian(&code_header->fields.offset,        sizeof(code_header->fields.offset));
-    util_tolittleendian(&code_header->fields.length,        sizeof(code_header->fields.length));
-    util_tolittleendian(&code_header->functions.offset,     sizeof(code_header->functions.offset));
-    util_tolittleendian(&code_header->functions.length,     sizeof(code_header->functions.length));
-    util_tolittleendian(&code_header->strings.offset,       sizeof(code_header->strings.offset));
-    util_tolittleendian(&code_header->strings.length,       sizeof(code_header->strings.length));
-    util_tolittleendian(&code_header->globals.offset,       sizeof(code_header->globals.offset));
-    util_tolittleendian(&code_header->globals.length,       sizeof(code_header->globals.length));
-    util_tolittleendian(&code_header->entfield,             sizeof(code_header->entfield));
+    util_swap_header(code_header);
 
     /*
      * These are not part of the header but we ensure LE format here to save on duplicated
      * code.
      */
 
-    for (i = 0; i < vec_size(code->statements); ++i) {
-        util_tolittleendian(& code->statements[i].opcode,   sizeof(code->statements[i].opcode));
-        util_tolittleendian(& code->statements[i].o1,       sizeof(code->statements[i].o1));
-        util_tolittleendian(& code->statements[i].o2,       sizeof(code->statements[i].o2));
-        util_tolittleendian(& code->statements[i].o3,       sizeof(code->statements[i].o3));
-    }
-
-    for (i = 0; i < vec_size(code->defs); ++i) {
-        util_tolittleendian(& code->defs[i].type,   sizeof(code->defs[i].type));
-        util_tolittleendian(& code->defs[i].offset, sizeof(code->defs[i].offset));
-        util_tolittleendian(& code->defs[i].name,   sizeof(code->defs[i].name));
-    }
-
-    for (i = 0; i < vec_size(code->fields); ++i) {
-        util_tolittleendian(& code->fields[i].type,   sizeof(code->fields[i].type));
-        util_tolittleendian(& code->fields[i].offset, sizeof(code->fields[i].offset));
-        util_tolittleendian(& code->fields[i].name,   sizeof(code->fields[i].name));
-    }
-
-    for (i = 0; i < vec_size(code->functions); ++i) {
-        util_tolittleendian(& code->functions[i].entry,         sizeof(code->functions[i].entry));
-        util_tolittleendian(& code->functions[i].firstlocal,    sizeof(code->functions[i].firstlocal));
-        util_tolittleendian(& code->functions[i].locals,        sizeof(code->functions[i].locals));
-        util_tolittleendian(& code->functions[i].profile,       sizeof(code->functions[i].profile));
-        util_tolittleendian(& code->functions[i].name,          sizeof(code->functions[i].name));
-        util_tolittleendian(& code->functions[i].file,          sizeof(code->functions[i].file));
-        util_tolittleendian(& code->functions[i].nargs,         sizeof(code->functions[i].nargs));
-        /* Don't swap argsize[] - it's just a byte array, which Quake uses only as such. */
-    }
-
-    util_tolittleendianarray(code->globals, vec_size(code->globals), sizeof(int32_t));
-
+    util_swap_statements (code->statements);
+    util_swap_defs_fields(code->defs);
+    util_swap_defs_fields(code->fields);
+    util_swap_functions  (code->functions);
+    util_swap_globals    (code->globals);
 
     if (!OPTS_OPTION_BOOL(OPTION_QUIET)) {
         if (lnofile)
@@ -445,9 +404,9 @@ bool code_write(code_t *code, const char *filename, const char *lnofile) {
         if (!fp)
             return false;
 
-        util_tolittleendian     (&version,                                     sizeof(version));
-        util_tolittleendianarray(code->linenums,   vec_size(code->linenums),   sizeof(code->linenums[0]));
-        util_tolittleendianarray(code->columnnums, vec_size(code->columnnums), sizeof(code->columnnums[0]));
+        util_endianswap(&version,         1,                          sizeof(version));
+        util_endianswap(code->linenums,   vec_size(code->linenums),   sizeof(code->linenums[0]));
+        util_endianswap(code->columnnums, vec_size(code->columnnums), sizeof(code->columnnums[0]));
 
         if (fs_file_write("LNOF",                          4,                                      1,                          fp) != 1 ||
             fs_file_write(&version,                        sizeof(version),                        1,                          fp) != 1 ||