Teach da65 about table units

This commit is contained in:
Lauri Kasanen
2022-11-08 19:04:46 +02:00
parent cce119a9e7
commit 56a414593a
5 changed files with 43 additions and 2 deletions

View File

@@ -528,6 +528,7 @@ static void RangeSection (void)
{ "START", INFOTOK_START },
{ "TYPE", INFOTOK_TYPE },
{ "ADDRMODE", INFOTOK_ADDRMODE },
{ "UNIT", INFOTOK_UNIT },
};
static const IdentTok TypeDefs[] = {
@@ -552,6 +553,7 @@ static void RangeSection (void)
tName = 0x08,
tComment = 0x10,
tAddrMode = 0x20,
tUnit = 0x40,
tNeeded = (tStart | tEnd | tType)
};
unsigned Attributes = tNone;
@@ -564,6 +566,7 @@ static void RangeSection (void)
char* Name = 0;
char* Comment = 0;
unsigned MemberSize = 0;
unsigned Unit = 0;
/* Skip the token */
@@ -682,6 +685,15 @@ static void RangeSection (void)
InfoNextTok ();
break;
case INFOTOK_UNIT:
AddAttr ("UNIT", &Attributes, tUnit);
InfoNextTok ();
InfoAssureInt ();
InfoRangeCheck (0x0002, 0xFFFF);
Unit = InfoIVal;
InfoNextTok ();
break;
default:
Internal ("Unexpected token: %u", InfoTok);
}
@@ -705,6 +717,26 @@ static void RangeSection (void)
}
}
/* Only tables support unit sizes */
if ((Attributes & tUnit) &&
Type != atAddrTab &&
Type != atByteTab &&
Type != atDByteTab &&
Type != atDWordTab &&
Type != atRtsTab &&
Type != atTextTab &&
Type != atWordTab) {
InfoError ("Only table types support unit size");
}
/* Mark each unit separator */
if (Attributes & tUnit) {
unsigned i;
for (i = Start; i < End; i += Unit) {
MarkAddr(i, atTableUnit);
}
}
/* Start must be less than end */
if (Start > End) {
InfoError ("Start value must not be greater than end value");