X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=619c1632b00879c72eda8bd132fa55a9c9e0a3f4;hp=1ff54b4075e50a1d0274a355546fd089f4f00480;hb=d570f2d80fed3a3254ff49748d4e2f50ee5e2a2c;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608 diff --git a/sect.c b/sect.c index 1ff54b4..619c163 100644 --- a/sect.c +++ b/sect.c @@ -3,7 +3,7 @@ // SECT.C - Code Generation, Fixups and Section Management // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 -// Source Utilised with the Kind Permission of Landon Dyer +// Source utilised with the kind permission of Landon Dyer // #include "sect.h" @@ -36,6 +36,7 @@ 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 +char * chptr_opcode; // Backup of chptr, updated before entering code generators CHUNK * sfix; // Current (last) fixup chunk LONG fchalloc; // # bytes alloc'd to fixup chunk @@ -80,10 +81,10 @@ void InitSection(void) MakeSection(i, 0); // Construct default sections, make TEXT the current section - MakeSection(ABS, SUSED | SABS | SBSS); // ABS - MakeSection(TEXT, SUSED | TEXT ); // TEXT - MakeSection(DATA, SUSED | DATA ); // DATA - MakeSection(BSS, SUSED | BSS | SBSS); // BSS + MakeSection(ABS, SUSED | SABS | SBSS); // ABS + MakeSection(TEXT, SUSED | TEXT ); // TEXT + MakeSection(DATA, SUSED | DATA ); // DATA + MakeSection(BSS, SUSED | BSS | SBSS); // BSS // MakeSection(M6502, SUSED | TEXT ); // 6502 code section // Switch to TEXT for starters @@ -274,7 +275,7 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) SECT * p; // Shamus: Expression lengths are voodoo ATM (variable "i"). Need to fix // this. -#warning "!!! AddFixup() is filled with VOODOO !!!" +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 @@ -287,18 +288,21 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) // NYAN ! if ((attr & FUMASKRISC) == FU_JR) { +//printf("AddFixup: ((attr & FUMASKRISC) == FU_JR)\n"); // i = 18; // i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2); i = FIXUP_BASE_SIZE + sizeof(SYM *) + sizeof(LONG); } else { +//printf("AddFixup: ((attr & FUMASKRISC) == FU_JR) ELSE\n"); // i = 14; i = FIXUP_BASE_SIZE + sizeof(SYM *); } } else { +//printf("AddFixup: !SYMBOL\n"); attr |= FU_EXPR; for(len=0; fexpr[len]!=ENDEXPR; len++) @@ -312,7 +316,7 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) i = FIXUP_BASE_SIZE + sizeof(WORD) + (len * sizeof(TOKEN)); } - // Maybe alloc another fixup chunk for this one to fit in + // Alloc another fixup chunk for this one to fit in if necessary if ((fchalloc - fchsize) < i) { p = §[cursect]; @@ -360,6 +364,7 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) { // *fchptr.lp++ = (LONG)fexpr[1]; *fchptr.sy++ = symbolPtr[fexpr[1]]; +//printf("AddFixup: adding symbol (%s) [%08X]\n", symbolPtr[fexpr[1]]->sname, symbolPtr[fexpr[1]]->sattr); } // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN ! @@ -376,50 +381,29 @@ int AddFixup(WORD attr, LONG loc, TOKEN * fexpr) } -// -// Resolve all fixups -// -int ResolveAllFixups(void) -{ - unsigned i; - char buf[EBUFSIZ]; - - // Make undefined symbols GLOBL - if (glob_flag) - ForceUndefinedSymbolsGlobal(); - - DEBUG printf("Resolving TEXT sections...\n"); - ResolveFixups(TEXT); - DEBUG printf("Resolving DATA sections...\n"); - ResolveFixups(DATA); - - return 0; -} - - // // Resolve fixups in a section // int ResolveFixups(int sno) { - PTR fup; // Current fixup - WORD * fuend; // End of last fixup (in this chunk) - WORD w; // Fixup word (type+modes+flags) - char * locp; // Location to fix (in cached chunk) - LONG loc; // Location to fixup - VALUE eval; // Expression value - WORD eattr; // Expression attrib - SYM * esym; // External symbol involved in expr - SYM * sy; // (Temp) pointer to a symbol - WORD i; // (Temp) word - WORD tdb; // eattr & TDB + PTR fup; // Current fixup + WORD * fuend; // End of last fixup (in this chunk) + WORD w; // Fixup word (type+modes+flags) + char * locp; // Location to fix (in cached chunk) + LONG loc; // Location to fixup + VALUE eval; // Expression value + WORD eattr; // Expression attrib + SYM * esym; // External symbol involved in expr + SYM * sy; // (Temp) pointer to a symbol + WORD i; // (Temp) word + WORD tdb; // eattr & TDB LONG oaddr; int reg2; WORD flags; unsigned page_jump = 0; unsigned address = 0; - unsigned j; - char buf[EBUFSIZ]; + //unsigned j; + //char buf[EBUFSIZ]; SECT * sc = §[sno]; CHUNK * ch = sc->sffix; @@ -626,45 +610,6 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } else reg2 = (signed)((eval - (loc + 2)) / 2);// & 0x1F; -#if 0 - if ((w & 0x0F00) == FU_MJR) - { - // Main code destination alignment checking here for - // forward declared labels - address = (oaddr) ? oaddr : loc; - - if (((address >= 0xF03000) && (address < 0xF04000) - && (eval < 0xF03000)) || ((eval >= 0xF03000) - && (eval < 0xF04000) && (address < 0xF03000))) - { - warni("* \'jr\' at $%08X - cannot jump relative between " - "main memory and local gpu ram", address); - } - else - { - page_jump = (address & 0xFFFFFF00) - (eval & 0xFFFFFF00); - - if (page_jump) - { - // This jump is to a page outside of the - // current 256 byte page - if (eval % 4) - { - warni("* \'jr\' at $%08X - destination address not aligned for long page jump, insert a \'nop\' before the destination address", address); - } - } - else - { - // This jump is in the current 256 byte page - if ((eval - 2) % 4) - { - warni("* \'jr\' at $%08X - destination address not aligned for short page jump, insert a \'nop\' before the destination address", address); - } - } - } - } -#endif - if ((reg2 < -16) || (reg2 > 15)) { error("relative jump out of range"); @@ -791,58 +736,6 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } case FU_LONG: if ((w & FUMASKRISC) == FU_MOVEI) { -#if 0 - address = loc + 4; - - if (eattr & DEFINED) - { - for(j=0; j 0) - ship_ln(buf); - - if (err_flag) - write(err_fd, buf, (LONG)strlen(buf)); - else - printf("%s\n", buf); - } - } - else - { - if (!(eval & 0x0000000F) || ((eval - 2) % 4)) - { - err_setup(); - sprintf(buf, "* \'jump\' at $%08X - destination address not aligned for short page jump, insert a \'nop\' before the destination address", address); - - if (listing > 0) - ship_ln(buf); - - if (err_flag) - write(err_fd, buf, (LONG)strlen(buf)); - else - printf("%s\n", buf); - } - } - - // Clear this jump as it has been checked - fwdjump[j] = 0; - j = fwindex; - } - } - } -#endif - // Long constant in MOVEI # is word-swapped, so fix it here eval = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000); flags = (MLONG | MMOVEI); @@ -895,7 +788,8 @@ DEBUG { printf("ResolveFixups: cfileno=%u\n", cfileno); } break; default: - interror(4); // Bad fixup type + // Bad fixup type--this should *never* happen! + interror(4); // NOTREACHED } continue; @@ -910,3 +804,24 @@ range: return 0; } +// +// Resolve all fixups +// +int ResolveAllFixups(void) +{ + //unsigned i; + //char buf[EBUFSIZ]; + + // Make undefined symbols GLOBL + if (glob_flag) + ForceUndefinedSymbolsGlobal(); + + DEBUG printf("Resolving TEXT sections...\n"); + ResolveFixups(TEXT); + DEBUG printf("Resolving DATA sections...\n"); + ResolveFixups(DATA); + + return 0; +} + +