6502/x65
1
0
Fork 0
mirror of https://github.com/ksherlock/x65.git synced 2025-02-06 09:29:57 +00:00
Code Issues Projects Releases Wiki Activity

Fixing analyzer issues

Browse Source
This commit is contained in:
Carl-Henrik Skårstedt 2015-11-15 22:15:34 -08:00
parent 563ff4d1ec
commit 7fbe9661fa
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
x65.cpp
View File

@ -5941,12 +5941,15 @@ static int _AddStrPool(const strref str, pairArray<unsigned int, int> *pLookup,
StatusCode Asm::WriteObjectFile(strref filename) StatusCode Asm::WriteObjectFile(strref filename)
{ {
if (allSections.size()==0)
return ERROR_NOT_A_SECTION;
if (FILE *f = fopen(strown<512>(filename).c_str(), "wb")) { if (FILE *f = fopen(strown<512>(filename).c_str(), "wb")) {
struct ObjFileHeader hdr = { 0 }; struct ObjFileHeader hdr = { 0 };
hdr.id = 0x7836; hdr.id = 0x7836;
hdr.sections = (short)allSections.size(); hdr.sections = (short)allSections.size();
hdr.relocs = 0; hdr.relocs = 0;
hdr.bindata = 0; hdr.bindata = 0;
for (std::vector<Section>::iterator s = allSections.begin(); s!=allSections.end(); ++s) { for (std::vector<Section>::iterator s = allSections.begin(); s!=allSections.end(); ++s) {
if (s->type != ST_REMOVED) { if (s->type != ST_REMOVED) {
if (s->pRelocs) if (s->pRelocs)
@ -5965,6 +5968,11 @@ StatusCode Asm::WriteObjectFile(strref filename)
hdr.labels++; hdr.labels++;
} }
short *aRemapSects = hdr.sections ? (short*)malloc(sizeof(short) * hdr.sections) : nullptr;
if (!aRemapSects) {
fclose(f);
return ERROR_OUT_OF_MEMORY;
}
// include space for external protected labels // include space for external protected labels
for (std::vector<ExtLabels>::iterator el = externals.begin(); el != externals.end(); ++el) for (std::vector<ExtLabels>::iterator el = externals.begin(); el != externals.end(); ++el)
@ -5982,9 +5990,6 @@ StatusCode Asm::WriteObjectFile(strref filename)
struct ObjFileMapSymbol *aMapSyms = hdr.map_symbols ? (struct ObjFileMapSymbol*)calloc(hdr.map_symbols, sizeof(struct ObjFileMapSymbol)) : nullptr; struct ObjFileMapSymbol *aMapSyms = hdr.map_symbols ? (struct ObjFileMapSymbol*)calloc(hdr.map_symbols, sizeof(struct ObjFileMapSymbol)) : nullptr;
int sect = 0, reloc = 0, labs = 0, late = 0, map_sym = 0; int sect = 0, reloc = 0, labs = 0, late = 0, map_sym = 0;
short *aRemapSects = (short*)malloc(sizeof(short) * hdr.sections);
if (!aRemapSects)
return ERROR_OUT_OF_MEMORY;
memset(aRemapSects, 0xff, sizeof(short) * hdr.sections); memset(aRemapSects, 0xff, sizeof(short) * hdr.sections);
// discard the removed sections by making a table of skipped indices // discard the removed sections by making a table of skipped indices
@ -6378,8 +6383,7 @@ StatusCode Asm::WriteA2GS_OMF(strref filename, bool full_collapse)
std::vector<int> SegLookup; // inverse of SegNum std::vector<int> SegLookup; // inverse of SegNum
SegNum.reserve(allSections.size()); SegNum.reserve(allSections.size());
SegLookup.reserve(allSections.size()); SegLookup.reserve(allSections.size());
int reloc_max = 0; int reloc_max = 1;
int num_valid_seg = 0;
// OMF super instructions work by incremental addresses, sort relocs to simplify output // OMF super instructions work by incremental addresses, sort relocs to simplify output
for (std::vector<Section>::iterator s = allSections.begin(); s != allSections.end(); ++s) { for (std::vector<Section>::iterator s = allSections.begin(); s != allSections.end(); ++s) {
@ -6397,14 +6401,18 @@ StatusCode Asm::WriteA2GS_OMF(strref filename, bool full_collapse)
for (std::vector<int>::iterator i = SegNum.begin(); i != SegNum.end(); ++i) for (std::vector<int>::iterator i = SegNum.begin(); i != SegNum.end(); ++i)
SegLookup[*i] = (int)(&*i - &SegNum[0]); SegLookup[*i] = (int)(&*i - &SegNum[0]);
unsigned char *instructions = (unsigned char*)malloc(reloc_max * 16);
if (!instructions)
return ERROR_OUT_OF_MEMORY;
// open a file for writing // open a file for writing
FILE *f = fopen(strown<512>(filename).c_str(), "wb"); FILE *f = fopen(strown<512>(filename).c_str(), "wb");
if (!f) if (!f) {
free(instructions);
return ERROR_CANT_WRITE_TO_FILE; return ERROR_CANT_WRITE_TO_FILE;
}
// consume all the relocs // consume all the relocs
unsigned char *instructions = (unsigned char*)malloc(reloc_max * 16);
unsigned char zeroes[256] = { 0 };
struct OMFSegHdr hdr = { 0 }; // initialize segment header struct OMFSegHdr hdr = { 0 }; // initialize segment header
hdr.NumLen[0] = 4; // numbers are 4 bytes under GS OS hdr.NumLen[0] = 4; // numbers are 4 bytes under GS OS
hdr.Version[0] = 2; // version is 2 for GS OS hdr.Version[0] = 2; // version is 2 for GS OS
@ -6465,8 +6473,7 @@ StatusCode Asm::WriteA2GS_OMF(strref filename, bool full_collapse)
} else } else
++r; ++r;
} }
if (inst_curr == (instruction_offs + 6)) inst_curr = instruction_offs; // rewind - no records if (inst_curr > (instruction_offs + 6)) {
else {
_writeNBytes(instructions + len_offs, 4, inst_curr - instruction_offs - 5); _writeNBytes(instructions + len_offs, 4, inst_curr - instruction_offs - 5);
instruction_offs = inst_curr; instruction_offs = inst_curr;
} }
@ -6521,8 +6528,7 @@ StatusCode Asm::WriteA2GS_OMF(strref filename, bool full_collapse)
if (instruction_offs > 5) if (instruction_offs > 5)
fwrite(instructions + 5, instruction_offs - 5, 1, f); // reloc instructions fwrite(instructions + 5, instruction_offs - 5, 1, f); // reloc instructions
} }
// print a list of super instructions for each section free(instructions);
fclose(f); fclose(f);
return STATUS_OK; return STATUS_OK;
} }
@ -6595,8 +6601,10 @@ int main(int argc, char **argv)
allinstr_file = arg.after('='); allinstr_file = arg.after('=');
} else if (arg.has_prefix(org)) { } else if (arg.has_prefix(org)) {
arg = arg.after('='); arg = arg.after('=');
if (arg && arg.get_first() == '$') assembler.default_org = (arg + 1).ahextoui(); if (arg && arg.get_first() == '$' && arg.get_len()>1)
else if (arg.is_number()) assembler.default_org = arg.atoi(); assembler.default_org = (arg + 1).ahextoui();
else if (arg.is_number())
assembler.default_org = arg.atoi();
} else if (arg.has_prefix(acc) && arg[acc.get_len()] == '=') { } else if (arg.has_prefix(acc) && arg[acc.get_len()] == '=') {
assembler.accumulator_16bit = arg.after('=').atoi() == 16; assembler.accumulator_16bit = arg.after('=').atoi() == 16;
} else if (arg.has_prefix(xy) && arg[xy.get_len()] == '=') { } else if (arg.has_prefix(xy) && arg[xy.get_len()] == '=') {