6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-01-11 11:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Fixed zeropage segment declaration (syntax had changed some time ago).

Browse Source 
Added support for exports.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3370 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2005-01-21 10:35:50 +00:00
parent 2d623f00cc
commit c68a75ceb4
1 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
src/co65/convert.c
View File

@ -101,6 +101,65 @@ static void SetupSegLabels (FILE* F)
static const char* LabelPlusOffs (const char* Label, long Offs)
/* Generate "Label+xxx" in a static buffer and return a pointer to the buffer */
{
static char Buf[256];
xsprintf (Buf, sizeof (Buf), "%s%+ld", Label, Offs);
return Buf;
}
static const char* RelocExpr (const O65Data* D, unsigned char SegID,
unsigned long Val, const O65Reloc* R)
/* Generate the segment relative relocation expression. R is only used if the
* expression contains am import, and may be NULL if this is an error (which
* is then flagged).
*/
{
const O65Import* Import;
switch (SegID) {
case O65_SEGID_UNDEF:
if (R) {
if (R->SymIdx >= CollCount (&D->Imports)) {
Error ("Import index out of range (input file corrupt)");
}
Import = CollConstAt (&D->Imports, R->SymIdx);
return LabelPlusOffs (Import->Name, Val);
} else {
Error ("Relocation references an import which is not allowed here");
return 0;
}
break;
case O65_SEGID_TEXT:
return LabelPlusOffs (CodeLabel, Val - D->Header.tbase);
case O65_SEGID_DATA:
return LabelPlusOffs (DataLabel, Val - D->Header.dbase);
case O65_SEGID_BSS:
return LabelPlusOffs (BssLabel, Val - D->Header.bbase);
case O65_SEGID_ZP:
return LabelPlusOffs (ZeropageLabel, Val - D->Header.zbase);
case O65_SEGID_ABS:
return LabelPlusOffs ("", Val);
default:
Internal ("Cannot handle this segment reference in reloc entry");
}
/* NOTREACHED */
return 0;
}
static void ConvertImports (FILE* F, const O65Data* D) static void ConvertImports (FILE* F, const O65Data* D)
/* Convert the imports */ /* Convert the imports */
{ {
@ -133,7 +192,9 @@ static void ConvertExports (FILE* F, const O65Data* D)
const O65Export* Export = CollConstAt (&D->Exports, I); const O65Export* Export = CollConstAt (&D->Exports, I);
/* First define it */ /* First define it */
fprintf (F, "%s = XXX\n", Export->Name); /* ### */ fprintf (F, "%s = %s\n",
Export->Name,
RelocExpr (D, Export->SegID, Export->Val, 0));
/* Then export it by name */ /* Then export it by name */
fprintf (F, ".export\t%s\n", Export->Name); fprintf (F, ".export\t%s\n", Export->Name);
@ -144,55 +205,6 @@ static void ConvertExports (FILE* F, const O65Data* D)
static const char* LabelPlusOffs (const char* Label, long Offs)
/* Generate "Label+xxx" in a static buffer and return a pointer to the buffer */
{
static char Buf[256];
xsprintf (Buf, sizeof (Buf), "%s%+ld", Label, Offs);
return Buf;
}
static const char* RelocExpr (const O65Data* D, const O65Reloc* R, unsigned long Val)
/* Generate the segment relative relocation expression */
{
const O65Import* Import;
switch (R->SegID) {
case O65_SEGID_UNDEF:
if (R->SymIdx >= CollCount (&D->Imports)) {
Error ("Import index out of range (input file corrupt)");
}
Import = CollConstAt (&D->Imports, R->SymIdx);
return LabelPlusOffs (Import->Name, Val);
case O65_SEGID_TEXT:
return LabelPlusOffs (CodeLabel, Val - D->Header.tbase);
case O65_SEGID_DATA:
return LabelPlusOffs (DataLabel, Val - D->Header.dbase);
case O65_SEGID_BSS:
return LabelPlusOffs (BssLabel, Val - D->Header.bbase);
case O65_SEGID_ZP:
return LabelPlusOffs (ZeropageLabel, Val - D->Header.zbase);
case O65_SEGID_ABS:
return LabelPlusOffs ("", Val);
default:
Internal ("Cannot handle this segment reference in reloc entry");
}
/* NOTREACHED */
return 0;
}
static void ConvertSeg (FILE* F, const O65Data* D, const Collection* Relocs, static void ConvertSeg (FILE* F, const O65Data* D, const Collection* Relocs,
const unsigned char* Data, unsigned long Size) const unsigned char* Data, unsigned long Size)
/* Convert one segment */ /* Convert one segment */
@ -222,18 +234,18 @@ static void ConvertSeg (FILE* F, const O65Data* D, const Collection* Relocs,
} else { } else {
Val = (Data[Byte+1] << 8) + Data[Byte]; Val = (Data[Byte+1] << 8) + Data[Byte];
Byte += 2; Byte += 2;
fprintf (F, "\t.word\t%s\n", RelocExpr (D, R, Val)); fprintf (F, "\t.word\t%s\n", RelocExpr (D, R->SegID, Val, R));
} }
break; break;
case O65_RTYPE_HIGH: case O65_RTYPE_HIGH:
Val = (Data[Byte++] << 8) + R->Val; Val = (Data[Byte++] << 8) + R->Val;
fprintf (F, "\t.byte\t>(%s)\n", RelocExpr (D, R, Val)); fprintf (F, "\t.byte\t>(%s)\n", RelocExpr (D, R->SegID, Val, R));
break; break;
case O65_RTYPE_LOW: case O65_RTYPE_LOW:
Val = Data[Byte++]; Val = Data[Byte++];
fprintf (F, "\t.byte\t<(%s)\n", RelocExpr (D, R, Val)); fprintf (F, "\t.byte\t<(%s)\n", RelocExpr (D, R->SegID, Val, R));
break; break;
case O65_RTYPE_SEGADDR: case O65_RTYPE_SEGADDR:
@ -245,7 +257,7 @@ static void ConvertSeg (FILE* F, const O65Data* D, const Collection* Relocs,
(((unsigned long) Data[Byte+0]) << 0) + (((unsigned long) Data[Byte+0]) << 0) +
R->Val; R->Val;
Byte += 3; Byte += 3;
fprintf (F, "\t.faraddr\t%s\n", RelocExpr (D, R, Val)); fprintf (F, "\t.faraddr\t%s\n", RelocExpr (D, R->SegID, Val, R));
} }
break; break;
@ -342,7 +354,7 @@ static void ConvertZeropageSeg (FILE* F, const O65Data* D)
fprintf (F, "%s = __ZP_START__\n", ZeropageLabel); fprintf (F, "%s = __ZP_START__\n", ZeropageLabel);
} else { } else {
/* Header */ /* Header */
fprintf (F, ".segment\t\"%s\", zeropage\n%s:\n", ZeropageSeg, ZeropageLabel); fprintf (F, ".segment\t\"%s\": zeropage\n%s:\n", ZeropageSeg, ZeropageLabel);
/* Segment data */ /* Segment data */
fprintf (F, "\t.res\t%lu\n", D->Header.zlen); fprintf (F, "\t.res\t%lu\n", D->Header.zlen);