/*
* Copyright (C) 2012
- * Dale Weiler
+ * 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
} prog_section;
typedef struct {
- uint16_t version; /* Program version (6) */
- uint16_t flags; /* see propsal.txt */
+ uint32_t version; /* Program version (6) */
uint16_t crc16; /* What is this? */
uint16_t skip; /* see propsal.txt */
prog_section_function empty_function = {0,0,0,0,0,0,0,{0}};
prog_section_statement empty_statement = {0,{0},{0},{0}};
int i = 0;
-
+
/* omit creation of null code */
if (opts_omit_nullcode)
return;
code_statements_add(empty_statement);
}
+uint32_t code_genstring(const char *str)
+{
+ uint32_t off = code_chars_elements;
+ while (*str) {
+ code_chars_add(*str);
+ ++str;
+ }
+ return off;
+}
+
+uint32_t code_cachedstring(const char *str)
+{
+ size_t s = 0;
+ /* We could implement knuth-morris-pratt or something
+ * and also take substrings, but I'm uncomfortable with
+ * pointing to subparts of strings for the sake of clarity...
+ */
+ while (s < code_chars_elements) {
+ if (!strcmp(str, code_chars_data + s))
+ return s;
+ while (code_chars_data[s]) ++s;
+ ++s;
+ }
+ 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_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}};
-
+
code_chars_put("m_init", 0x6);
code_chars_put("print", 0x5);
code_chars_put("hello world\n", 0xC);
code_statements_add(s3);
}
-void code_write() {
- prog_header code_header = {0};
- prog_section statements;
- prog_section defs;
- prog_section fields;
- prog_section functions;
- prog_section globals;
- prog_section strings;
- FILE *fp = NULL;
- size_t it = 1;
+bool code_write(const char *filename) {
+ prog_header code_header;
+ FILE *fp = NULL;
+ size_t it = 2;
/* see proposal.txt */
- if (opts_omit_nullcode) {
- code_header.skip = 28;
- code_header.flags = 1;
- }
-
- statements.offset = sizeof(prog_header);
- statements.length = code_statements_elements;
- defs.offset = code_header.statements.offset + sizeof(prog_section_statement) * code_statements_elements;
- defs.length = code_defs_elements;
- fields.offset = code_header.defs.offset + sizeof(prog_section_def) * code_defs_elements;
- fields.length = code_fields_elements;
- functions.offset = code_header.fields.offset + sizeof(prog_section_field) * code_fields_elements;
- functions.length = code_functions_elements;
- globals.offset = code_header.functions.offset + sizeof(prog_section_function) * code_functions_elements;
- globals.length = code_globals_elements;
- strings.offset = code_header.globals.offset + sizeof(int) * code_globals_elements;
- strings.length = code_chars_elements;
-
- code_header.version = 6;
- code_header.crc16 = 0; /* TODO: */
- code_header.statements = statements;
- code_header.defs = defs;
- code_header.fields = fields;
- code_header.functions = functions;
- code_header.globals = globals;
- code_header.strings = strings;
- code_header.entfield = 0; /* TODO: */
+ if (opts_omit_nullcode) {}
+ code_header.statements.offset = sizeof(prog_header);
+ code_header.statements.length = code_statements_elements;
+ code_header.defs.offset = code_header.statements.offset + (sizeof(prog_section_statement) * code_statements_elements);
+ code_header.defs.length = code_defs_elements;
+ code_header.fields.offset = code_header.defs.offset + (sizeof(prog_section_def) * code_defs_elements);
+ code_header.fields.length = code_fields_elements;
+ code_header.functions.offset = code_header.fields.offset + (sizeof(prog_section_field) * code_fields_elements);
+ code_header.functions.length = code_functions_elements;
+ code_header.globals.offset = code_header.functions.offset + (sizeof(prog_section_function) * code_functions_elements);
+ code_header.globals.length = code_globals_elements;
+ code_header.strings.offset = code_header.globals.offset + (sizeof(int32_t) * code_globals_elements);
+ code_header.strings.length = code_chars_elements;
+ code_header.version = 6;
+ code_header.crc16 = 0; /* TODO: */
+ code_header.entfield = 0; /* TODO: */
if (opts_darkplaces_stringtablebug) {
util_debug("GEN", "Patching stringtable for -fdarkplaces-stringtablebug\n");
}
/* ensure all data is in LE format */
- 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));
+ 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(int32_t));
- 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);
- fwrite (code_defs_data, 1, sizeof(prog_section_def) *code_defs_elements, fp);
- fwrite (code_fields_data, 1, sizeof(prog_section_field) *code_fields_elements, fp);
- 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);
+ fp = fopen(filename, "wb");
+ if (!fp)
+ return false;
+
+ if (1 != fwrite(&code_header, sizeof(prog_header), 1, fp) ||
+ 1 != fwrite(code_statements_data, sizeof(prog_section_statement)*code_statements_elements, 1, fp) ||
+ 1 != fwrite(code_defs_data, sizeof(prog_section_def) *code_defs_elements, 1, fp) ||
+ 1 != fwrite(code_fields_data, sizeof(prog_section_field) *code_fields_elements, 1, fp) ||
+ 1 != fwrite(code_functions_data, sizeof(prog_section_function) *code_functions_elements, 1, fp) ||
+ 1 != fwrite(code_globals_data, sizeof(int32_t) *code_globals_elements, 1, fp) ||
+ 1 != fwrite(code_chars_data, 1 *code_chars_elements, 1, fp))
+ {
+ fclose(fp);
+ return false;
+ }
util_debug("GEN","HEADER:\n");
util_debug("GEN"," version: = %d\n", code_header.version );
util_debug("GEN", "FUNCTIONS:\n");
for (; it < code_functions_elements; it++) {
size_t j = code_functions_data[it].entry;
- util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize =%0X }\n",
+ util_debug("GEN", " {.entry =% 5d, .firstlocal =% 5d, .locals =% 5d, .profile =% 5d, .name =% 5d, .file =% 5d, .nargs =% 5d, .argsize ={%d,%d,%d,%d,%d,%d,%d,%d} }\n",
code_functions_data[it].entry,
code_functions_data[it].firstlocal,
code_functions_data[it].locals,
code_functions_data[it].name,
code_functions_data[it].file,
code_functions_data[it].nargs,
- *((int32_t*)&code_functions_data[it].argsize)
+ code_functions_data[it].argsize[0],
+ code_functions_data[it].argsize[1],
+ code_functions_data[it].argsize[2],
+ code_functions_data[it].argsize[3],
+ code_functions_data[it].argsize[4],
+ code_functions_data[it].argsize[5],
+ code_functions_data[it].argsize[6],
+ code_functions_data[it].argsize[7]
+
);
util_debug("GEN", " NAME: %s\n", &code_chars_data[code_functions_data[it].name]);
/* Internal functions have no code */
if (code_functions_data[it].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",
+ if (code_statements_data[j].opcode != AINSTR_END)
+ util_debug("GEN", " %s {0x%05x,0x%05x,0x%05x}\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
+ code_statements_data[j].o2.s1,
+ code_statements_data[j].o3.s1
);
- else break;
+ else {
+ util_debug("GEN", " DONE {0x00000,0x00000,0x00000}\n");
+ break;
+ }
j++;
}
}
mem_d(code_globals_data);
mem_d(code_chars_data);
fclose(fp);
+ return true;
}