First finished implementation of the condes feature
git-svn-id: svn://svn.cc65.org/cc65/trunk@456 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -33,20 +33,24 @@
|
||||
|
||||
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/* common */
|
||||
#include "check.h"
|
||||
#include "coll.h"
|
||||
#include "segdefs.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
/* ld65 */
|
||||
#include "exports.h"
|
||||
#include "fragment.h"
|
||||
#include "segments.h"
|
||||
#include "condes.h"
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Data */
|
||||
/* Data */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -55,24 +59,134 @@
|
||||
typedef struct ConDesDesc ConDesDesc;
|
||||
struct ConDesDesc {
|
||||
Collection ExpList; /* List of exported symbols */
|
||||
char* Label; /* Name of table label */
|
||||
char* SegName; /* Name of segment the table is in */
|
||||
unsigned char Enable; /* Table enabled */
|
||||
char* Label; /* Name of table label */
|
||||
char* CountSym; /* Name of symbol for entry count */
|
||||
unsigned char Order; /* Table order (increasing/decreasing) */
|
||||
};
|
||||
|
||||
/* Array for all types */
|
||||
static ConDesDesc ConDes[CD_TYPE_COUNT] = {
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0 },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
{ STATIC_COLLECTION_INITIALIZER, 0, 0, 0, cdIncreasing },
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Internally used function to create the condes tables */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
static int ConDesCompare (void* Data, const void* E1, const void* E2)
|
||||
/* Compare function to sort the exports */
|
||||
{
|
||||
int Cmp;
|
||||
|
||||
/* Data is actually a pointer to a ConDesDesc from the table, E1 and
|
||||
* E2 are exports from the collection. Get the condes type and cast
|
||||
* the void pointers to object pointers.
|
||||
*/
|
||||
ConDesDesc* CD = ((ConDesDesc*) Data);
|
||||
int Type = CD - ConDes;
|
||||
const Export* Exp1 = (const Export*) E1;
|
||||
const Export* Exp2 = (const Export*) E2;
|
||||
|
||||
/* Get the priorities of the two exports */
|
||||
unsigned Prio1 = Exp1->ConDes[Type];
|
||||
unsigned Prio2 = Exp2->ConDes[Type];
|
||||
|
||||
/* Compare the priorities for this condes type */
|
||||
if (Prio1 < Prio2) {
|
||||
Cmp = -1;
|
||||
} else if (Prio1 > Prio2) {
|
||||
Cmp = 1;
|
||||
} else {
|
||||
/* Use the name in this case */
|
||||
Cmp = strcmp (Exp1->Name, Exp2->Name);
|
||||
}
|
||||
|
||||
/* Reverse the result for decreasing order */
|
||||
if (CD->Order == cdIncreasing) {
|
||||
return Cmp;
|
||||
} else {
|
||||
return -Cmp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void ConDesCreateOne (ConDesDesc* CD)
|
||||
/* Create one table if requested */
|
||||
{
|
||||
Segment* Seg; /* Segment for table */
|
||||
Section* Sec; /* Section for table */
|
||||
unsigned Count; /* Number of exports */
|
||||
unsigned I;
|
||||
|
||||
/* Check if this table has a segment and table label defined. If not,
|
||||
* creation was not requested in the config file - ignore it.
|
||||
*/
|
||||
if (CD->SegName == 0 || CD->Label == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check if there is an import for the table label. If not, there is no
|
||||
* reference to the table and we would just waste memory creating the
|
||||
* table.
|
||||
*/
|
||||
if (!IsUnresolved (CD->Label)) {
|
||||
return;
|
||||
}
|
||||
|
||||
/* Sort the collection of exports according to priority */
|
||||
CollSort (&CD->ExpList, ConDesCompare, CD);
|
||||
|
||||
/* Get the segment for the table, create it if needed */
|
||||
Seg = GetSegment (CD->SegName, SEGTYPE_ABS, 0);
|
||||
|
||||
/* Create a new section for the table */
|
||||
Sec = NewSection (Seg, 1, SEGTYPE_ABS);
|
||||
|
||||
/* Walk over the exports and create a fragment for each one. We will use
|
||||
* the exported expression without copying it, since it's cheap and there
|
||||
* is currently no place where it gets changed (hope this will not hunt
|
||||
* me later...).
|
||||
*/
|
||||
Count = CollCount (&CD->ExpList);
|
||||
for (I = 0; I < Count; ++I) {
|
||||
|
||||
/* Get the export */
|
||||
Export* E = CollAt (&CD->ExpList, I);
|
||||
|
||||
/* Create the fragment */
|
||||
Fragment* F = NewFragment (FRAG_EXPR, 2, Sec);
|
||||
|
||||
/* Set the expression pointer */
|
||||
F->Expr = E->Expr;
|
||||
}
|
||||
|
||||
/* Define the table start as an export, offset into section is zero
|
||||
* (the section only contains the table).
|
||||
*/
|
||||
CreateSegExport (CD->Label, Sec, 0);
|
||||
|
||||
/* If we have a CountSym name given AND if it is referenced, define it
|
||||
* with the number of elements in the table.
|
||||
*/
|
||||
if (CD->CountSym) {
|
||||
CreateConstExport (CD->CountSym, Count);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Code */
|
||||
/*****************************************************************************/
|
||||
@@ -86,8 +200,8 @@ void ConDesAddExport (struct Export* E)
|
||||
|
||||
/* Insert the export into all tables for which declarations exist */
|
||||
for (Type = 0; Type < CD_TYPE_COUNT; ++Type) {
|
||||
unsigned Prio = E->ConDes[Type];
|
||||
if (Prio != CD_PRIO_NONE) {
|
||||
unsigned Prio = E->ConDes[Type];
|
||||
if (Prio != CD_PRIO_NONE) {
|
||||
CollAppend (&ConDes[Type].ExpList, E);
|
||||
}
|
||||
}
|
||||
@@ -125,26 +239,29 @@ void ConDesSetLabel (unsigned Type, const char* Name)
|
||||
|
||||
|
||||
|
||||
const char* ConDesGetSegName (unsigned Type)
|
||||
/* Return the segment name for the given ConDes type */
|
||||
void ConDesSetCountSym (unsigned Type, const char* Name)
|
||||
/* Set the name for the given ConDes count symbol */
|
||||
{
|
||||
/* Check the parameters */
|
||||
PRECONDITION (Type >= CD_TYPE_MIN && Type <= CD_TYPE_MAX);
|
||||
PRECONDITION (Type >= CD_TYPE_MIN && Type <= CD_TYPE_MAX && Name != 0);
|
||||
|
||||
/* Return the name */
|
||||
return ConDes[Type].SegName;
|
||||
/* Setting the symbol twice is bad */
|
||||
CHECK (ConDes[Type].CountSym == 0);
|
||||
|
||||
/* Set the name */
|
||||
ConDes[Type].CountSym = xstrdup (Name);
|
||||
}
|
||||
|
||||
|
||||
|
||||
const char* ConDesGetLabel (unsigned Type)
|
||||
/* Return the label for the given ConDes type */
|
||||
void ConDesSetOrder (unsigned Type, ConDesOrder Order)
|
||||
/* Set the sorting oder for the given ConDes table */
|
||||
{
|
||||
/* Check the parameters */
|
||||
PRECONDITION (Type >= CD_TYPE_MIN && Type <= CD_TYPE_MAX);
|
||||
|
||||
/* Return the name */
|
||||
return ConDes[Type].Label;
|
||||
/* Set the order */
|
||||
ConDes[Type].Order = Order;
|
||||
}
|
||||
|
||||
|
||||
@@ -152,7 +269,10 @@ const char* ConDesGetLabel (unsigned Type)
|
||||
int ConDesHasSegName (unsigned Type)
|
||||
/* Return true if a segment name is already defined for this ConDes type */
|
||||
{
|
||||
return (ConDesGetSegName(Type) != 0);
|
||||
/* Check the parameters */
|
||||
PRECONDITION (Type >= CD_TYPE_MIN && Type <= CD_TYPE_MAX);
|
||||
|
||||
return (ConDes[Type].SegName != 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -160,7 +280,10 @@ int ConDesHasSegName (unsigned Type)
|
||||
int ConDesHasLabel (unsigned Type)
|
||||
/* Return true if a label is already defined for this ConDes type */
|
||||
{
|
||||
return (ConDesGetLabel(Type) != 0);
|
||||
/* Check the parameters */
|
||||
PRECONDITION (Type >= CD_TYPE_MIN && Type <= CD_TYPE_MAX);
|
||||
|
||||
return (ConDes[Type].Label != 0);
|
||||
}
|
||||
|
||||
|
||||
@@ -168,6 +291,12 @@ int ConDesHasLabel (unsigned Type)
|
||||
void ConDesCreate (void)
|
||||
/* Create the condes tables if requested */
|
||||
{
|
||||
unsigned Type;
|
||||
|
||||
/* Walk over the descriptor array and create a table for each entry */
|
||||
for (Type = 0; Type < CD_TYPE_COUNT; ++Type) {
|
||||
ConDesCreateOne (ConDes + Type);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user