//
#include "sect.h"
+#include "direct.h"
#include "error.h"
+#include "expr.h"
+#include "listing.h"
#include "mach.h"
-#include "token.h"
#include "mark.h"
-#include "expr.h"
-#include "symbol.h"
#include "risca.h"
-#include "listing.h"
+#include "symbol.h"
+#include "token.h"
// Section descriptors
SECT sect[NSECTS]; // All sections...
//
void switchsect(int sno)
{
- SECT * p; // Section pointer
- CHUNK * cp; // Chunk pointer
-
+ CHUNK * cp; // Chunk pointer
cursect = sno;
- p = §[sno];
+ SECT * p = §[sno];
- scattr = p->scattr; // Copy section vars
+ scattr = p->scattr; // Copy section vars
sloc = p->sloc;
scode = p->scode;
sfix = p->sfix;
+ // Copy code chunk vars
if ((cp = scode) != NULL)
- { // Copy code chunk vars
+ {
challoc = cp->challoc;
ch_size = cp->ch_size;
chptr = cp->chptr + ch_size;
else
challoc = ch_size = 0;
+ // Copy fixup chunk vars
if ((cp = sfix) != NULL)
- { // Copy fixup chunk vars
+ {
fchalloc = cp->challoc;
fchsize = cp->ch_size;
fchptr.cp = cp->chptr + fchsize;
//
void init_sect(void)
{
- int i; // Iterator
+ int i;
// Cleanup all sections
- for(i=0; i<NSECTS; ++i)
+ for(i=0; i<NSECTS; i++)
mksect(i, 0);
// Construct default sections, make TEXT the current section
- mksect(ABS, SUSED|SABS|SBSS); // ABS
- mksect(TEXT, SUSED|TEXT ); // TEXT
- mksect(DATA, SUSED|DATA ); // DATA
- mksect(BSS, SUSED|BSS |SBSS); // BSS
-// mksect(M6502, SUSED|TEXT ); // 6502 code section
+ mksect(ABS, SUSED | SABS | SBSS); // ABS
+ mksect(TEXT, SUSED | TEXT ); // TEXT
+ mksect(DATA, SUSED | DATA ); // DATA
+ mksect(BSS, SUSED | BSS | SBSS ); // BSS
+// mksect(M6502, SUSED | TEXT ); // 6502 code section
- switchsect(TEXT); // Switch to TEXT for starters
+ switchsect(TEXT); // Switch to TEXT for starters
}
WORD w;
LONG xloc;
- stopmark(); // Force update to sect[] variables
+ stopmark(); // Force update to sect[] variables
// Hairy, ugly linear search for a mark on our location;
- // the speed doesn't matter, since this is only done when generating a listing, which is SLOW.
+ // the speed doesn't matter, since this is only done when generating a
+ // listing, which is SLOW.
for(ch=sect[sno].sffix; ch!=NULL; ch=ch->chnext)
{
fup.cp = (char *)ch->chptr;
//
int chcheck(LONG amt)
{
- CHUNK * cp;
- SECT * p;
-
+ // If in BSS section, no allocation required
if (scattr & SBSS)
- return 0; // If in BSS section, forget it
+ return 0;
if (!amt)
amt = CH_THRESHOLD;
if (amt < CH_CODE_SIZE)
amt = CH_CODE_SIZE;
- p = §[cursect];
- cp = (CHUNK *)malloc(sizeof(CHUNK) + amt);
+ SECT * p = §[cursect];
+ CHUNK * cp = malloc(sizeof(CHUNK) + amt);
// First chunk in section
if (scode == NULL)
}
+// 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
//
LONG len = 0;
CHUNK * cp;
SECT * p;
+ // Shamus: Expression lengths are voodoo ATM (varibale "i"). Need to fix this.
+ DEBUG printf("FIXUP@$%X: $%X\n", loc, attr);
// Compute length of expression (could be faster); determine if it's the
// single-symbol case; no expression if it's just a mark. This code assumes
// 16 bit WORDs and 32 bit LONGs
if (*fexpr == SYMBOL && fexpr[2] == ENDEXPR)
{
- if ((attr & 0x0F00) == FU_JR) // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN !
+ // Just a single symbol
+ // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN !
+ if ((attr & 0x0F00) == FU_JR)
{
- i = 18; // Just a single symbol
+// i = 18;
+ i = FIXUP_BASE_SIZE + (sizeof(LONG) * 2);
}
else
{
- i = 14;
+// i = 14;
+ i = FIXUP_BASE_SIZE + sizeof(SYM *);
}
}
else
}
len++; // Add 1 for ENDEXPR
- i = (len << 2) + 12;
+// i = (len << 2) + 12;
+ i = FIXUP_BASE_SIZE + sizeof(WORD) + (len * sizeof(TOKEN));
}
// Maybe alloc another fixup chunk for this one to fit in
if ((fchalloc - fchsize) < i)
{
p = §[cursect];
-// cp = (CHUNK *)amem((long)(sizeof(CHUNK) + CH_FIXUP_SIZE));
cp = (CHUNK *)malloc(sizeof(CHUNK) + CH_FIXUP_SIZE);
+ // First fixup chunk in section
if (sfix == NULL)
- { // First fixup chunk in section
+ {
cp->chprev = NULL;
p->sffix = cp;
}
+ // Add to other chunks
else
- { // Add to other chunks
+ {
cp->chprev = sfix;
sfix->chnext = cp;
sfix->ch_size = fchsize;
sfix = p->sfix = cp;
}
- // Record fixup type, fixup location, and the file number and line number the fixup is
- // located at.
+ // Record fixup type, fixup location, and the file number and line number
+ // the fixup is located at.
*fchptr.wp++ = attr;
*fchptr.lp++ = loc;
*fchptr.wp++ = cfileno;
*fchptr.wp++ = (WORD)curlineno;
- // Store postfix expression or pointer to a single symbol, or nothing for a mark.
+ // Store postfix expression or pointer to a single symbol, or nothing for a
+ // mark.
if (attr & FU_EXPR)
{
*fchptr.wp++ = (WORD)len;
}
else
{
- *fchptr.lp++ = (LONG)fexpr[1];
+// *fchptr.lp++ = (LONG)fexpr[1];
+ *fchptr.sy++ = symbolPtr[fexpr[1]];
}
- if ((attr & 0x0F00) == FU_JR) // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN !
+ // SCPCD : correct bit mask for attr (else other FU_xxx will match) NYAN !
+ if ((attr & 0x0F00) == FU_JR)
{
if (orgactive)
*fchptr.lp++ = orgaddr;
//
// Resolve all Fixups
//
-int fixups(void)
+int ResolveAllFixups(void)
{
unsigned i;
char buf[EBUFSIZ];
if (glob_flag)
syg_fix();
- resfix(TEXT);
- resfix(DATA);
+ 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
+ // We need to do a final check of forward 'jump' destination addresses that
+ // are external
for(i=0; i<MAXFWDJUMPS; i++)
{
if (fwdjump[i])
//
// Resolve Fixups in a Section
//
-int resfix(int sno)
+int ResolveFixups(int sno)
{
- SECT * sc; // Section
- CHUNK * ch;
PTR fup; // Current fixup
WORD * fuend; // End of last fixup (in this chunk)
- CHUNK * cch; // Cached chunk for target
WORD w; // Fixup word (type+modes+flags)
char * locp; // Location to fix (in cached chunk)
LONG loc; // Location to fixup
unsigned j;
char buf[EBUFSIZ];
- sc = §[sno];
- ch = sc->sffix;
+ SECT * sc = §[sno];
+ CHUNK * ch = sc->sffix;
if (ch == NULL)
return 0;
- cch = sc->sfcode; // "cache" first chunk
+ CHUNK * cch = sc->sfcode; // "cache" first chunk
- if (cch == NULL) // Can't fixup a sect with nothing in it
+ if (cch == NULL) // Can't fixup a sect with nothing in it
return 0;
do
{
- fup.cp = ch->chptr; // fup -> start of chunk
- fuend = (WORD *)(fup.cp + ch->ch_size); // fuend -> end of chunk
+ fup.cp = ch->chptr; // fup -> start of chunk
+ fuend = (WORD *)(fup.cp + ch->ch_size); // fuend -> end of chunk
while (fup.wp < fuend)
{
esym = NULL;
- // Search for chunk containing location to fix up; compute a pointer to the location
- // (in the chunk). Often we will find the fixup is in the "cached" chunk, so the
- // linear-search is seldom executed.
+ // Search for chunk containing location to fix up; compute a
+ // pointer to the location (in the chunk). Often we will find the
+ // fixup is in the "cached" chunk, so the linear-search is seldom
+ // executed.
if (loc < cch->chloc || loc >= (cch->chloc + cch->ch_size))
{
for(cch=sc->sfcode; cch!=NULL; cch=cch->chnext)
if (cch == NULL)
{
- interror(7); // Fixup (loc) out of range
+ interror(7); // Fixup (loc) out of range
// NOTREACHED
}
}
locp = cch->chptr + (loc - cch->chloc);
-
eattr = 0;
// Compute expression/symbol value and attribs
+ // Complex expression
if (w & FU_EXPR)
- { // Complex expression
+ {
i = *fup.wp++;
if (evexpr(fup.tk, &eval, &eattr, &esym) != OK)
fup.lp += i;
}
+ // Simple symbol
else
- { // Simple symbol
+ {
sy = *fup.sy++;
eattr = sy->sattr;
else
eval = 0;
- if ((eattr & (GLOBAL|DEFINED)) == GLOBAL)
+ if ((eattr & (GLOBAL | DEFINED)) == GLOBAL)
esym = sy;
}
// Do the fixup
//
- // If a PC-relative fixup is undefined, its value is *not* subtracted from the location
- // (that will happen in the linker when the external reference is resolved).
+ // If a PC-relative fixup is undefined, its value is *not*
+ // subtracted from the location (that will happen in the linker
+ // when the external reference is resolved).
//
- // MWC expects PC-relative things to have the LOC subtracted from the value, if the
- // value is external (that is, undefined at this point).
+ // MWC expects PC-relative things to have the LOC subtracted from
+ // the value, if the value is external (that is, undefined at this
+ // point).
//
- // PC-relative fixups must be DEFINED and either in the same section (whereupon the
- // subtraction takes place) or ABS (with no subtract).
+ // PC-relative fixups must be DEFINED and either in the same
+ // section (whereupon the subtraction takes place) or ABS (with no
+ // subtract).
if (w & FU_PCREL)
{
if (eattr & DEFINED)
*locp = (char)eval;
break;
// Fixup WORD forward references;
- // the word could be unaligned in the section buffer, so we have to be careful.
+ // 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 & 0x0F00) == FU_MJR)
{
- // Main code destination alignment checking here for forward declared labels
+ // Main code destination alignment checking here for
+ // forward declared labels
address = (oaddr) ? oaddr : loc;
if (((address >= 0xF03000) && (address < 0xF04000)
if (page_jump)
{
- // This jump is to a page outside of the current 256 byte page
+ // 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);
*locp = (char)eval;
break;
// Fixup LONG forward references;
- // the long could be unaligned in the section buffer, so be careful (again).
+ // the long could be unaligned in the section buffer, so be careful
+ // (again).
case FU_LONG:
if ((w & 0x0F00) == FU_MOVEI)
{
projects / rmac / blobdiff