X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=code.c;h=540093f74457d77bb342cfc7955e12b0931508e9;hp=920b49de8219aa41d296b1ed4f9d1d268b483268;hb=2ddb5ad50ddf958ad5639f79e15ad91c37bdb720;hpb=3070c03fc0df299df630d5bbaddc3b767b0a1566 diff --git a/code.c b/code.c index 920b49d..540093f 100644 --- a/code.c +++ b/code.c @@ -260,21 +260,21 @@ 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_endianswap(&code_header->version, 1, sizeof(code_header->version)); + util_endianswap(&code_header->crc16, 1, sizeof(code_header->crc16)); + util_endianswap(&code_header->statements.offset, 1, sizeof(code_header->statements.offset)); + util_endianswap(&code_header->statements.length, 1, sizeof(code_header->statements.length)); + util_endianswap(&code_header->defs.offset, 1, sizeof(code_header->defs.offset)); + util_endianswap(&code_header->defs.length, 1, sizeof(code_header->defs.length)); + util_endianswap(&code_header->fields.offset, 1, sizeof(code_header->fields.offset)); + util_endianswap(&code_header->fields.length, 1, sizeof(code_header->fields.length)); + util_endianswap(&code_header->functions.offset, 1, sizeof(code_header->functions.offset)); + util_endianswap(&code_header->functions.length, 1, sizeof(code_header->functions.length)); + util_endianswap(&code_header->strings.offset, 1, sizeof(code_header->strings.offset)); + util_endianswap(&code_header->strings.length, 1, sizeof(code_header->strings.length)); + util_endianswap(&code_header->globals.offset, 1, sizeof(code_header->globals.offset)); + util_endianswap(&code_header->globals.length, 1, sizeof(code_header->globals.length)); + util_endianswap(&code_header->entfield, 1, sizeof(code_header->entfield)); /* * These are not part of the header but we ensure LE format here to save on duplicated @@ -282,36 +282,36 @@ static void code_create_header(code_t *code, prog_header_t *code_header, const c */ 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)); + util_endianswap(&code->statements[i].opcode, 1, sizeof(code->statements[i].opcode)); + util_endianswap(&code->statements[i].o1, 1, sizeof(code->statements[i].o1)); + util_endianswap(&code->statements[i].o2, 1, sizeof(code->statements[i].o2)); + util_endianswap(&code->statements[i].o3, 1, 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)); + util_endianswap(&code->defs[i].type, 1, sizeof(code->defs[i].type)); + util_endianswap(&code->defs[i].offset, 1, sizeof(code->defs[i].offset)); + util_endianswap(&code->defs[i].name, 1, 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)); + util_endianswap(&code->fields[i].type, 1, sizeof(code->fields[i].type)); + util_endianswap(&code->fields[i].offset, 1, sizeof(code->fields[i].offset)); + util_endianswap(&code->fields[i].name, 1, 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)); + util_endianswap(&code->functions[i].entry, 1, sizeof(code->functions[i].entry)); + util_endianswap(&code->functions[i].firstlocal, 1, sizeof(code->functions[i].firstlocal)); + util_endianswap(&code->functions[i].locals, 1, sizeof(code->functions[i].locals)); + util_endianswap(&code->functions[i].profile, 1, sizeof(code->functions[i].profile)); + util_endianswap(&code->functions[i].name, 1, sizeof(code->functions[i].name)); + util_endianswap(&code->functions[i].file, 1, sizeof(code->functions[i].file)); + util_endianswap(&code->functions[i].nargs, 1, 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_endianswap(code->globals, vec_size(code->globals), sizeof(int32_t)); if (!OPTS_OPTION_BOOL(OPTION_QUIET)) { @@ -445,9 +445,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 ||