/* */
/* */
/* (C) 1998-2003 Ullrich von Bassewitz */
-/* Römerstrasse 52 */
+/* Römerstraße 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
/* common */
#include "check.h"
#include "exprdefs.h"
+#include "fragdefs.h"
#include "hashstr.h"
#include "print.h"
#include "segdefs.h"
#include "global.h"
#include "lineinfo.h"
#include "segments.h"
+#include "spool.h"
/* Hash table */
-#define HASHTAB_SIZE 253
+#define HASHTAB_MASK 0x3FU
+#define HASHTAB_SIZE (HASHTAB_MASK + 1)
static Segment* HashTab [HASHTAB_SIZE];
static unsigned SegCount = 0; /* Segment count */
-static Segment* SegRoot = 0; /* List of all segments */
+static Segment* SegRoot = 0; /* List of all segments */
-static Segment* SegFindInternal (const char* Name, unsigned HashVal)
-/* Try to find the segment with the given name, return a pointer to the
- * segment structure, or 0 if not found.
- */
-{
- Segment* S = HashTab [HashVal];
- while (S) {
- if (strcmp (Name, S->Name) == 0) {
- /* Found */
- break;
- }
- S = S->Next;
- }
- /* Not found */
- return S;
-}
-
-
-
-static Segment* NewSegment (const char* Name, unsigned HashVal, unsigned char Type)
+static Segment* NewSegment (unsigned Name, unsigned char AddrSize)
/* Create a new segment and initialize it */
{
- /* Get the length of the symbol name */
- unsigned Len = strlen (Name);
+ unsigned Hash;
/* Allocate memory */
- Segment* S = xmalloc (sizeof (Segment) + Len);
+ Segment* S = xmalloc (sizeof (Segment));
/* Initialize the fields */
- S->Next = 0;
- S->SecRoot = 0;
- S->SecLast = 0;
- S->PC = 0;
- S->Size = 0;
- S->AlignObj = 0;
- S->Align = 0;
- S->FillVal = 0;
- S->Type = Type;
- S->Dumped = 0;
- memcpy (S->Name, Name, Len);
- S->Name [Len] = '\0';
+ S->Name = Name;
+ S->Next = 0;
+ S->SecRoot = 0;
+ S->SecLast = 0;
+ S->PC = 0;
+ S->Size = 0;
+ S->AlignObj = 0;
+ S->Align = 0;
+ S->FillVal = 0;
+ S->AddrSize = AddrSize;
+ S->ReadOnly = 0;
+ S->Relocatable = 0;
+ S->Dumped = 0;
/* Insert the segment into the segment list */
S->List = SegRoot;
++SegCount;
/* Insert the segment into the segment hash list */
- S->Next = HashTab [HashVal];
- HashTab [HashVal] = S;
+ Hash = (S->Name & HASHTAB_MASK);
+ S->Next = HashTab[Hash];
+ HashTab[Hash] = S;
/* Return the new entry */
return S;
-Segment* GetSegment (const char* Name, unsigned char Type, const char* ObjName)
+Segment* GetSegment (unsigned Name, unsigned char AddrSize, const char* ObjName)
/* Search for a segment and return an existing one. If the segment does not
* exist, create a new one and return that. ObjName is only used for the error
* message and may be NULL if the segment is linker generated.
*/
{
- /* Create a hash over the name and try to locate the segment in the table */
- unsigned HashVal = HashStr (Name) % HASHTAB_SIZE;
- Segment* S = SegFindInternal (Name, HashVal);
+ /* Try to locate the segment in the table */
+ Segment* S = SegFind (Name);
/* If we don't have that segment already, allocate it using the type of
* the first section.
*/
if (S == 0) {
/* Create a new segment */
- S = NewSegment (Name, HashVal, Type);
+ S = NewSegment (Name, AddrSize);
} else {
- /* Check if the existing segment has the requested type */
- if (S->Type != Type) {
+ /* Check if the existing segment has the requested address size */
+ if (S->AddrSize != AddrSize) {
/* Allow an empty object name */
if (ObjName == 0) {
ObjName = "[linker generated]";
}
- Error ("Module `%s': Type mismatch for segment `%s'", ObjName, Name);
+ Error ("Module `%s': Type mismatch for segment `%s'", ObjName,
+ GetString (Name));
}
}
-Section* NewSection (Segment* Seg, unsigned char Align, unsigned char Type)
+Section* NewSection (Segment* Seg, unsigned char Align, unsigned char AddrSize)
/* Create a new section for the given segment */
{
unsigned long V;
/* Allocate memory */
- Section* S = xmalloc (sizeof (Segment));
+ Section* S = xmalloc (sizeof (Section));
/* Initialize the data */
S->Next = 0;
S->FragLast = 0;
S->Size = 0;
S->Align = Align;
- S->Type = Type;
+ S->AddrSize = AddrSize;
/* Calculate the alignment bytes needed for the section */
V = (0x01UL << S->Align) - 1;
Section* ReadSection (FILE* F, ObjData* O)
/* Read a section from a file */
{
- char* Name;
+ unsigned Name;
unsigned Size;
unsigned char Align;
unsigned char Type;
/* Read the segment data */
(void) Read32 (F); /* File size of data */
- Name = ReadStr (F); /* Segment name */
+ Name = MakeGlobalStringId (O, ReadVar (F)); /* Segment name */
Size = Read32 (F); /* Size of data */
Align = Read8 (F); /* Alignment */
Type = Read8 (F); /* Segment type */
/* Print some data */
Print (stdout, 2, "Module `%s': Found segment `%s', size = %u, align = %u, type = %u\n",
- GetObjFileName (O), Name, Size, Align, Type);
+ GetObjFileName (O), GetString (Name), Size, Align, Type);
/* Get the segment for this section */
S = GetSegment (Name, Type, GetObjFileName (O));
- /* We have the segment and don't need the name any longer */
- xfree (Name);
-
/* Allocate the section we will return later */
Sec = NewSection (S, Align, Type);
unsigned char Type = Read8 (F);
/* Extract the check mask from the type */
- unsigned char Check = Type & FRAG_CHECKMASK;
unsigned char Bytes = Type & FRAG_BYTEMASK;
Type &= FRAG_TYPEMASK;
default:
Error ("Unknown fragment type in module `%s', segment `%s': %02X",
- GetObjFileName (O), S->Name, Type);
+ GetObjFileName (O), GetString (S->Name), Type);
/* NOTREACHED */
return 0;
}
- /* A list of check expressions may follow */
- if (Check) {
-
- /* Read the number of expressions that follow */
- unsigned Count = ReadVar (F);
-
- /* Read the expressions */
- CheckExpr* Last = 0;
- while (Count--) {
- /* ### */
- }
- }
-
/* Read the file position of the fragment */
ReadFilePos (F, &Frag->Pos);
-Segment* SegFind (const char* Name)
+Segment* SegFind (unsigned Name)
/* Return the given segment or NULL if not found. */
{
- return SegFindInternal (Name, HashStr (Name) % HASHTAB_SIZE);
+ Segment* S = HashTab[Name & HASHTAB_MASK];
+ while (S) {
+ if (Name == S->Name) {
+ /* Found */
+ break;
+ }
+ S = S->Next;
+ }
+ /* Not found */
+ return S;
}
unsigned long Count = F->Size;
while (Count--) {
if (*Data++ != 0) {
- return 0;
+ return 0;
}
}
} else if (F->Type == FRAG_EXPR || F->Type == FRAG_SEXPR) {
Segment* Seg = SegRoot;
while (Seg) {
Section* S = Seg->SecRoot;
- printf ("Segment: %s (%lu)\n", Seg->Name, Seg->Size);
+ printf ("Segment: %s (%lu)\n", GetString (Seg->Name), Seg->Size);
while (S) {
Fragment* F = S->FragRoot;
printf (" Section:\n");
case FRAG_EXPR:
printf (" Expression (%u bytes):\n", F->Size);
printf (" ");
- DumpExpr (F->Expr);
+ DumpExpr (F->Expr, 0);
break;
case FRAG_SEXPR:
printf (" Signed expression (%u bytes):\n", F->Size);
printf (" ");
- DumpExpr (F->Expr);
+ DumpExpr (F->Expr, 0);
break;
case FRAG_FILL:
printf (" Empty space (%u bytes)\n", F->Size);
break;
-
+
default:
Internal ("Invalid fragment type: %02X", F->Type);
}
/* Call the users function and evaluate the result */
switch (F (Frag->Expr, Sign, Frag->Size, Offs, Data)) {
- case SEG_EXPR_OK:
- break;
+ case SEG_EXPR_OK:
+ break;
- case SEG_EXPR_RANGE_ERROR:
- Error ("Range error in module `%s', line %lu",
- GetSourceFileName (Frag->Obj, Frag->Pos.Name),
- Frag->Pos.Line);
- break;
+ case SEG_EXPR_RANGE_ERROR:
+ Error ("Range error in module `%s', line %lu",
+ GetSourceFileName (Frag->Obj, Frag->Pos.Name),
+ Frag->Pos.Line);
+ break;
- case SEG_EXPR_TOO_COMPLEX:
- Error ("Expression too complex in module `%s', line %lu",
- GetSourceFileName (Frag->Obj, Frag->Pos.Name),
+ case SEG_EXPR_TOO_COMPLEX:
+ Error ("Expression too complex in module `%s', line %lu",
+ GetSourceFileName (Frag->Obj, Frag->Pos.Name),
Frag->Pos.Line);
break;
return -1;
} else {
/* Sort segments with equal starts by name */
- return strcmp (S1->Name, S2->Name);
+ return strcmp (GetString (S1->Name), GetString (S2->Name));
}
}
/* Get a pointer to the segment */
S = SegPool [I];
- /* Print empty segments only if explicitly requested */
- if (VerboseMap || S->Size > 0) {
- /* Print the segment data */
- long End = S->PC + S->Size;
- if (S->Size > 0) {
- /* Point to last element addressed */
- --End;
- }
- fprintf (F, "%-20s %06lX %06lX %06lX\n",
- S->Name, S->PC, End, S->Size);
+ /* Print empty segments only if explicitly requested */
+ if (VerboseMap || S->Size > 0) {
+ /* Print the segment data */
+ long End = S->PC + S->Size;
+ if (S->Size > 0) {
+ /* Point to last element addressed */
+ --End;
+ }
+ fprintf (F, "%-20s %06lX %06lX %06lX\n",
+ GetString (S->Name), S->PC, End, S->Size);
}
}
+void PrintDbgSegments (FILE* F)
+/* Output the segments to the debug file */
+{
+ Segment* S;
+
+ /* Walk over all segments */
+ S = SegRoot;
+ while (S) {
+
+ /* Ignore empty segments */
+ if (S->Size > 0) {
+
+ /* Print the segment data */
+ fprintf (F, "segment\t\"%s\",start=0x%06lX,size=0x%04lX,addrsize=%s,type=%s\n",
+ GetString (S->Name), S->PC, S->Size,
+ AddrSizeToStr (S->AddrSize),
+ S->ReadOnly? "ro" : "rw");
+ }
+
+ /* Follow the linked list */
+ S = S->List;
+ }
+}
+
+
+
void CheckSegments (void)
/* Walk through the segment list and check if there are segments that were
* not written to the output file. Output an error if this is the case.
{
Segment* S = SegRoot;
while (S) {
- if (S->Size > 0 && S->Dumped == 0) {
- Error ("Missing memory area assignment for segment `%s'", S->Name);
+ if (S->Size > 0 && S->Dumped == 0) {
+ Error ("Missing memory area assignment for segment `%s'",
+ GetString (S->Name));
}
S = S->List;
}
projects / cc65 / blobdiff