X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=1ff54b4075e50a1d0274a355546fd089f4f00480;hp=f797300395474822bef6688f02c9fabfd8f9846a;hb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608;hpb=11a78647f7f170e6ea39dd04a3734a359151debb diff --git a/sect.c b/sect.c index f797300..1ff54b4 100644 --- a/sect.c +++ b/sect.c @@ -13,33 +13,34 @@ #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 - -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 +WORD scattr; // Section attributes +LONG sloc; // Current loc in section -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 +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 -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. @@ -68,9 +69,32 @@ static char fusizoffs[] = { // -// Make a New (Clean) Section +// Initialize sections; setup initial ABS, TEXT, DATA and BSS sections +// +void InitSection(void) +{ + int i; + + // Cleanup all sections + for(i=0; iscattr = attr; @@ -81,16 +105,17 @@ 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 + CHUNK * cp; cursect = sno; SECT * p = §[sno]; - scattr = p->scattr; // Copy section vars + // Copy section vars + scattr = p->scattr; sloc = p->sloc; scode = p->scode; sfix = p->sfix; @@ -118,9 +143,9 @@ void switchsect(int sno) // -// Save Current Section +// Save current section // -void savsect(void) +void SaveSection(void) { SECT * p = §[cursect]; @@ -135,28 +160,6 @@ void savsect(void) } -// -// Initialize Sections; Setup initial ABS, TEXT, DATA and BSS sections -// -void init_sect(void) -{ - int i; - - // Cleanup all sections - for(i=0; ichnext) { fup.cp = (char *)ch->chptr; @@ -194,7 +198,7 @@ int fixtest(int sno, LONG loc) fup.lp += w; } else - ++fup.lp; + fup.lp++; } } @@ -203,11 +207,11 @@ int fixtest(int sno, LONG loc) // -// Check that there are at least `amt' bytes left in the current chunk. If -// there are not, allocate another chunk of at least `amt' bytes (and probably +// Check that there are at least 'amt' bytes left in the current chunk. If +// there are not, allocate another chunk of at least 'amt' bytes (and probably // more). // -// If `amt' is zero, ensure there are at least CH_THRESHOLD bytes, likewise. +// If 'amt' is zero, ensure there are at least CH_THRESHOLD bytes, likewise. // int chcheck(LONG amt) { @@ -256,19 +260,21 @@ int chcheck(LONG amt) } -// This is really wrong. We need to make some proper structures here so we don't -// have to count sizes of objects, that's what the compiler's for! :-P +// This is really wrong. We need to make some proper structures here so we +// don't have to count sizes of objects, that's what the compiler's for! :-P #define FIXUP_BASE_SIZE (sizeof(WORD) + sizeof(LONG) + sizeof(WORD) + sizeof(WORD)) // // 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 @@ -277,8 +283,9 @@ int fixup(WORD attr, LONG loc, TOKEN * fexpr) if (*fexpr == SYMBOL && fexpr[2] == ENDEXPR) { // Just a single symbol - // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN ! - if ((attr & 0x0F00) == FU_JR) + // SCPCD : correct bit mask for attr (else other FU_xxx will match) + // NYAN ! + if ((attr & FUMASKRISC) == FU_JR) { // i = 18; // i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2); @@ -356,7 +363,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; @@ -370,7 +377,7 @@ int fixup(WORD attr, LONG loc, TOKEN * fexpr) // -// Resolve all Fixups +// Resolve all fixups // int ResolveAllFixups(void) { @@ -379,38 +386,19 @@ int ResolveAllFixups(void) // Make undefined symbols GLOBL if (glob_flag) - syg_fix(); + ForceUndefinedSymbolsGlobal(); DEBUG printf("Resolving TEXT sections...\n"); 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; } // -// Resolve Fixups in a Section +// Resolve fixups in a section // int ResolveFixups(int sno) { @@ -439,9 +427,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 section with nothing in it + if (cch == NULL) return 0; do @@ -476,7 +466,8 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } if (cch == NULL) { - interror(7); // Fixup (loc) out of range + // Fixup (loc) out of range + interror(7); // NOTREACHED } } @@ -517,14 +508,20 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } // 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 // @@ -587,7 +584,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; // Fixup one-byte value at locp + 1. case FU_WBYTE: - ++locp; + locp++; // FALLTHROUGH // Fixup one-byte forward references case FU_BYTE: @@ -620,19 +617,16 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } // 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 @@ -669,6 +663,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } } } } +#endif if ((reg2 < -16) || (reg2 > 15)) { @@ -682,7 +677,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; } - if ((w & 0x0F00) == FU_NUM15) + if ((w & FUMASKRISC) == FU_NUM15) { if (eval < -16 || eval > 15) { @@ -696,7 +691,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; } - if ((w & 0x0F00) == FU_NUM31) + if ((w & FUMASKRISC) == FU_NUM31) { if (eval < 0 || eval > 31) { @@ -710,7 +705,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; } - if ((w & 0x0F00) == FU_NUM32) + if ((w & FUMASKRISC) == FU_NUM32) { if (eval < 1 || eval > 32) { @@ -728,7 +723,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; } - if ((w & 0x0F00) == FU_REGONE) + if ((w & FUMASKRISC) == FU_REGONE) { if (eval < 0 || eval > 31) { @@ -742,7 +737,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; } - if ((w & 0x0F00) == FU_REGTWO) + if ((w & FUMASKRISC) == FU_REGTWO) { if (eval < 0 || eval > 31) { @@ -794,8 +789,9 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } // 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) @@ -845,27 +841,34 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } } } } +#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: @@ -880,6 +883,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } *locp |= (eval & 7) << 1; break; + // Fix up 6502 funny branch case FU_6BRA: eval -= (loc + 1); @@ -889,6 +893,7 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } *locp = (char)eval; break; + default: interror(4); // Bad fixup type // NOTREACHED @@ -904,3 +909,4 @@ range: return 0; } +