X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=d4277fcc0aad7f501d4b2b89d179945ab3b60033;hp=53ba02b85edd65aa786d444a82a985d7169014f2;hb=062214e62031c26d372edc2e68473ebb64f6a506;hpb=d16b8ea0ee65b2ad901ca6b0624c07e6e4930cc4 diff --git a/sect.c b/sect.c index 53ba02b..d4277fc 100644 --- a/sect.c +++ b/sect.c @@ -13,67 +13,89 @@ #include "listing.h" #include "mach.h" #include "mark.h" -#include "risca.h" +#include "riscasm.h" #include "symbol.h" #include "token.h" + +// Function prototypes +void MakeSection(int, WORD); +void SwitchSection(int); + // Section descriptors -SECT sect[NSECTS]; // All sections... -int cursect; // Current section number +SECT sect[NSECTS]; // All sections... +int cursect; // Current section number // These are copied from the section descriptor, the current code chunk // descriptor and the current fixup chunk descriptor when a switch is made into // a section. They are copied back to the descriptors when the section is left. -WORD scattr; // Section attributes -LONG sloc; // Current loc in section +WORD scattr; // Section attributes +LONG sloc; // Current loc in section -CHUNK * scode; // Current (last) code chunk -LONG challoc; // # bytes alloc'd to code chunk -LONG ch_size; // # bytes used in code chunk -char * chptr; // Deposit point in code chunk buffer +CHUNK * scode; // Current (last) code chunk +LONG challoc; // # bytes alloc'd to code chunk +LONG ch_size; // # bytes used in code chunk +char * chptr; // Deposit point in code chunk buffer -CHUNK * sfix; // Current (last) fixup chunk -LONG fchalloc; // # bytes alloc'd to fixup chunk -LONG fchsize; // # bytes used in fixup chunk -PTR fchptr; // Deposit point in fixup chunk buffer - -unsigned fwdjump[MAXFWDJUMPS]; // forward jump check table -unsigned fwindex = 0; // forward jump index +CHUNK * sfix; // Current (last) fixup chunk +LONG fchalloc; // # bytes alloc'd to fixup chunk +LONG fchsize; // # bytes used in fixup chunk +PTR fchptr; // Deposit point in fixup chunk buffer // Return a size (SIZB, SIZW, SIZL) or 0, depending on what kind of fixup is // associated with a location. static char fusiztab[] = { - 0, // FU_QUICK - 1, // FU_BYTE - 2, // FU_WORD - 2, // FU_WBYTE - 4, // FU_LONG - 1, // FU_BBRA - 0, // (unused) - 1, // FU_6BRA + 0, // FU_QUICK + 1, // FU_BYTE + 2, // FU_WORD + 2, // FU_WBYTE + 4, // FU_LONG + 1, // FU_BBRA + 0, // (unused) + 1, // FU_6BRA }; // Offset to REAL fixup location static char fusizoffs[] = { - 0, // FU_QUICK - 0, // FU_BYTE - 0, // FU_WORD - 1, // FU_WBYTE - 0, // FU_LONG - 1, // FU_BBRA - 0, // (unused) - 0, // FU_6BRA + 0, // FU_QUICK + 0, // FU_BYTE + 0, // FU_WORD + 1, // FU_WBYTE + 0, // FU_LONG + 1, // FU_BBRA + 0, // (unused) + 0, // FU_6BRA }; // -// Make a New (Clean) Section +// Initialize Sections; Setup initial ABS, TEXT, DATA and BSS sections // -void mksect(int sno, WORD attr) +void InitSection(void) { - SECT * p; // Section pointer + int i; + + // Cleanup all sections + for(i=0; iscattr = attr; p->sloc = 0; p->scode = p->sfcode = NULL; @@ -82,10 +104,10 @@ void mksect(int sno, WORD attr) // -// Switch to Another Section (Copy Section & Chunk Descriptors to Global Vars -// for Fast Access) +// Switch to another section (copy section & chunk descriptors to global vars +// for fast access) // -void switchsect(int sno) +void SwitchSection(int sno) { CHUNK * cp; // Chunk pointer cursect = sno; @@ -119,45 +141,23 @@ void switchsect(int sno) // -// Save Current Section +// Save current section // -void savsect(void) +void SaveSection(void) { SECT * p = §[cursect]; - p->scattr = scattr; // Bailout section vars + p->scattr = scattr; // Bailout section vars p->sloc = sloc; - if (scode != NULL) // Bailout code chunk + if (scode != NULL) // Bailout code chunk scode->ch_size = ch_size; - if (sfix != NULL) // Bailout fixup chunk + if (sfix != NULL) // Bailout fixup chunk sfix->ch_size = fchsize; } -// -// Initialize Sections; Setup initial ABS, TEXT, DATA and BSS sections -// -void init_sect(void) -{ - int i; - - // Cleanup all sections - for(i=0; i= (int)amt) return 0; if (amt < CH_CODE_SIZE) amt = CH_CODE_SIZE; + DEBUG { printf(" amt (adjusted)=%u\n", amt); } SECT * p = §[cursect]; CHUNK * cp = malloc(sizeof(CHUNK) + amt); @@ -260,13 +263,14 @@ int chcheck(LONG amt) // // Arrange for a fixup on a location // -int fixup(WORD attr, LONG loc, TOKEN * fexpr) +int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) { LONG i; LONG len = 0; CHUNK * cp; SECT * p; - // Shamus: Expression lengths are voodoo ATM (varibale "i"). Need to fix this. + // Shamus: Expression lengths are voodoo ATM (variable "i"). Need to fix this. +#warning "!!! AddFixup() is filled with VOODOO !!!" DEBUG printf("FIXUP@$%X: $%X\n", loc, attr); // Compute length of expression (could be faster); determine if it's the @@ -276,10 +280,11 @@ int fixup(WORD attr, LONG loc, TOKEN * fexpr) { // Just a single symbol // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN ! - if ((attr & 0x0F00) == FU_JR) + if ((attr & FUMASKRISC) == FU_JR) { // i = 18; - i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2); +// i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2); + i = FIXUP_BASE_SIZE + sizeof(SYM *) + sizeof(LONG); } else { @@ -353,7 +358,7 @@ int fixup(WORD attr, LONG loc, TOKEN * fexpr) } // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN ! - if ((attr & 0x0F00) == FU_JR) + if ((attr & FUMASKRISC) == FU_JR) { if (orgactive) *fchptr.lp++ = orgaddr; @@ -382,25 +387,6 @@ int ResolveAllFixups(void) ResolveFixups(TEXT); DEBUG printf("Resolving DATA sections...\n"); ResolveFixups(DATA); - - // We need to do a final check of forward 'jump' destination addresses that - // are external - for(i=0; i 0) - ship_ln(buf); - - if (err_flag) - write(err_fd, buf, (LONG)strlen(buf)); - else - printf("%s\n", buf); - } - } return 0; } @@ -436,9 +422,11 @@ int ResolveFixups(int sno) if (ch == NULL) return 0; - CHUNK * cch = sc->sfcode; // "cache" first chunk + // "Cache" first chunk + CHUNK * cch = sc->sfcode; - if (cch == NULL) // Can't fixup a sect with nothing in it + // Can't fixup a sect with nothing in it + if (cch == NULL) return 0; do @@ -452,6 +440,10 @@ int ResolveFixups(int sno) loc = *fup.lp++; cfileno = *fup.wp++; curlineno = (int)*fup.wp++; +DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } + // This is based on global vars cfileno, curfname :-P + // This approach is kinda meh as well. I think we can do better than this. + SetFilenameForErrorReporting(); esym = NULL; @@ -469,7 +461,8 @@ int ResolveFixups(int sno) if (cch == NULL) { - interror(7); // Fixup (loc) out of range + // Fixup (loc) out of range + interror(7); // NOTREACHED } } @@ -510,14 +503,20 @@ int ResolveFixups(int sno) // If the expression is undefined and no external symbol is // involved, then it's an error. - if (!(eattr & DEFINED) && esym == NULL) + if (!(eattr & DEFINED) && (esym == NULL)) { error(undef_error); continue; } - if (((w & 0x0F00) == FU_MOVEI) && esym) +// It seems that this is completely unnecessary! +#if 0 + if (((w & FUMASKRISC) == FU_MOVEI) && esym) +//{ +//printf("DoFixups: Setting symbol attre to RISCSYM...\n"); esym->sattre |= RISCSYM; +//} +#endif // Do the fixup // @@ -580,7 +579,7 @@ int ResolveFixups(int sno) break; // Fixup one-byte value at locp + 1. case FU_WBYTE: - ++locp; + locp++; // FALLTHROUGH // Fixup one-byte forward references case FU_BYTE: @@ -613,19 +612,16 @@ int ResolveFixups(int sno) // the word could be unaligned in the section buffer, so we have to // be careful. case FU_WORD: - if (((w & 0x0F00) == FU_JR) || ((w & 0x0F00) == FU_MJR)) + if ((w & FUMASKRISC) == FU_JR)// || ((w & 0x0F00) == FU_MJR)) { oaddr = *fup.lp++; if (oaddr) - { reg2 = (signed)((eval - (oaddr + 2)) / 2);// & 0x1F; - } else - { reg2 = (signed)((eval - (loc + 2)) / 2);// & 0x1F; - } +#if 0 if ((w & 0x0F00) == FU_MJR) { // Main code destination alignment checking here for @@ -662,6 +658,7 @@ int ResolveFixups(int sno) } } } +#endif if ((reg2 < -16) || (reg2 > 15)) { @@ -675,7 +672,7 @@ int ResolveFixups(int sno) break; } - if ((w & 0x0F00) == FU_NUM15) + if ((w & FUMASKRISC) == FU_NUM15) { if (eval < -16 || eval > 15) { @@ -689,7 +686,7 @@ int ResolveFixups(int sno) break; } - if ((w & 0x0F00) == FU_NUM31) + if ((w & FUMASKRISC) == FU_NUM31) { if (eval < 0 || eval > 31) { @@ -703,7 +700,7 @@ int ResolveFixups(int sno) break; } - if ((w & 0x0F00) == FU_NUM32) + if ((w & FUMASKRISC) == FU_NUM32) { if (eval < 1 || eval > 32) { @@ -721,7 +718,7 @@ int ResolveFixups(int sno) break; } - if ((w & 0x0F00) == FU_REGONE) + if ((w & FUMASKRISC) == FU_REGONE) { if (eval < 0 || eval > 31) { @@ -735,7 +732,7 @@ int ResolveFixups(int sno) break; } - if ((w & 0x0F00) == FU_REGTWO) + if ((w & FUMASKRISC) == FU_REGTWO) { if (eval < 0 || eval > 31) { @@ -787,8 +784,9 @@ int ResolveFixups(int sno) // the long could be unaligned in the section buffer, so be careful // (again). case FU_LONG: - if ((w & 0x0F00) == FU_MOVEI) + if ((w & FUMASKRISC) == FU_MOVEI) { +#if 0 address = loc + 4; if (eattr & DEFINED) @@ -838,27 +836,34 @@ int ResolveFixups(int sno) } } } +#endif + // Long constant in MOVEI # is word-swapped, so fix it here eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000); - flags = (MLONG|MMOVEI); + flags = (MLONG | MMOVEI); } else flags = MLONG; if (!(eattr & DEFINED)) { +//printf("Fixup (long): Symbol undefined. loc = $%X, long = $%X, flags = $%x\n", loc, eval, flags); rmark(sno, loc, 0, flags, esym); } else if (tdb) { +//printf("Fixup (long): TDB = $%X. loc =$%X, long = $%X, flags = $%x\n", tdb, loc, eval, flags); rmark(sno, loc, tdb, flags, NULL); } +//else +//printf("Fixup (long): TDB = $%X. loc =$%X, long = $%X, flags = $%x\n", tdb, loc, eval, flags); *locp++ = (char)(eval >> 24); *locp++ = (char)(eval >> 16); *locp++ = (char)(eval >> 8); *locp = (char)eval; break; + // Fixup a 3-bit "QUICK" reference in bits 9..1 // (range of 1..8) in a word. Really bits 1..3 in a byte. case FU_QUICK: @@ -873,6 +878,7 @@ int ResolveFixups(int sno) *locp |= (eval & 7) << 1; break; + // Fix up 6502 funny branch case FU_6BRA: eval -= (loc + 1); @@ -882,6 +888,7 @@ int ResolveFixups(int sno) *locp = (char)eval; break; + default: interror(4); // Bad fixup type // NOTREACHED @@ -897,3 +904,4 @@ range: return 0; } +