the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructured some of the code. Attribute handling is still a mess and needs

Browse Source 
another cleanup.
Added unnamed labels.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3700 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2006-01-29 19:00:22 +00:00
parent 7086da868b
commit d31f72d057
15 changed files with 825 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
src/da65/attrtab.c
View File

@@ -6,7 +6,7 @@
/* */
/* */
/* */
/* (C) 2000-2005 Ullrich von Bassewitz */
/* (C) 2000-2006 Ullrich von Bassewitz */
/* R<>merstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
@@ -33,75 +33,20 @@
#include <stdio.h>
#include <string.h>
/* common */
#include "xmalloc.h"
#include "xsprintf.h"
/* da65 */
#include "code.h"
#include "error.h"
#include "global.h"
#include "output.h"
#include "attrtab.h"
/*****************************************************************************/
/* Data */
/* Data */
/*****************************************************************************/
/* Label + comment */
typedef struct {
const char* Name;
const char* Comment;
} Label;
/* A whole lot of Labels, so we don't have to allocate them separately */
static Label* LabelHeap = 0;
static unsigned LabelsLeft = 0;
/* Attribute table */
static unsigned char AttrTab [0x10000];
/* Symbol table */
static const Label* SymTab [0x10000];
/*****************************************************************************/
/* struct Label */
/*****************************************************************************/
Label* NewLabel (const char* Name, const char* Comment)
/* Create a new Label structure, initialize and return it */
{
Label* L;
/* Check if we have some free labels left */
if (LabelsLeft == 0) {
/* Allocate a new block of memory */
LabelsLeft = 200;
LabelHeap = xmalloc (LabelsLeft * sizeof (Label));
}
/* Get a new one from the buffer */
L = LabelHeap++;
--LabelsLeft;
/* Initialize the new label */
L->Name = xstrdup (Name);
L->Comment = Comment? xstrdup (Comment) : 0;
/* Return the new label */
return L;
}
static unsigned short AttrTab[0x10000];
@@ -111,7 +56,7 @@ Label* NewLabel (const char* Name, const char* Comment)
static void AddrCheck (unsigned Addr)
void AddrCheck (unsigned Addr)
/* Check if the given address has a valid range */
{
if (Addr >= 0x10000) {
@@ -175,195 +120,7 @@ void MarkAddr (unsigned Addr, attr_t Attr)
static const char* MakeLabelName (unsigned Addr)
/* Make the default label name from the given address and return it in a
* static buffer.
*/
{
static char LabelBuf [32];
xsprintf (LabelBuf, sizeof (LabelBuf), "L%04X", Addr);
return LabelBuf;
}
void AddLabel (unsigned Addr, attr_t Attr, const char* Name, const char* Comment)
/* Add a label */
{
/* Get an existing label attribute */
attr_t ExistingAttr = GetLabelAttr (Addr);
/* Must not have two symbols for one address */
if (ExistingAttr != atNoLabel) {
/* Allow redefinition if identical */
if (ExistingAttr == Attr && strcmp (SymTab[Addr]->Name, Name) == 0) {
return;
}
Error ("Duplicate label for address $%04X: %s/%s", Addr, SymTab[Addr]->Name, Name);
}
/* Create a new label */
SymTab[Addr] = NewLabel (Name, Comment);
/* Remember the attribute */
AttrTab[Addr] |= Attr;
}
void AddIntLabel (unsigned Addr)
/* Add an internal label using the address to generate the name. */
{
AddLabel (Addr, atIntLabel, MakeLabelName (Addr), 0);
}
void AddExtLabel (unsigned Addr, const char* Name, const char* Comment)
/* Add an external label */
{
AddLabel (Addr, atExtLabel, Name, Comment);
}
void AddDepLabel (unsigned Addr, attr_t Attr, const char* BaseName, unsigned Offs)
/* Add a dependent label at the given address using "base name+Offs" as the new
* name.
*/
{
/* Allocate memory for the dependent label name */
unsigned NameLen = strlen (BaseName);
char* DepName = xmalloc (NameLen + 7); /* "+$ABCD" */
/* Create the new name in the buffer */
if (UseHexOffs) {
sprintf (DepName, "%s+$%02X", BaseName, Offs);
} else {
sprintf (DepName, "%s+%u", BaseName, Offs);
}
/* Define the labels */
AddLabel (Addr, Attr | atDepLabel, DepName, 0);
/* Free the name buffer */
xfree (DepName);
}
static void AddLabelRange (unsigned Addr, attr_t Attr,
const char* Name, const char* Comment,
unsigned Count)
/* Add a label for a range. The first entry gets the label "Name" while the
* others get "Name+offs".
*/
{
/* Define the label */
AddLabel (Addr, Attr, Name, Comment);
/* Define dependent labels if necessary */
if (Count > 1) {
unsigned Offs;
/* Setup the format string */
const char* Format = UseHexOffs? "$%02X" : "%u";
/* Allocate memory for the dependent label names */
unsigned NameLen = strlen (Name);
char* DepName = xmalloc (NameLen + 7); /* "+$ABCD" */
char* DepOffs = DepName + NameLen + 1;
/* Copy the original name into the buffer */
memcpy (DepName, Name, NameLen);
DepName[NameLen] = '+';
/* Define the labels */
for (Offs = 1; Offs < Count; ++Offs) {
sprintf (DepOffs, Format, Offs);
AddLabel (Addr + Offs, Attr | atDepLabel, DepName, 0);
}
/* Free the name buffer */
xfree (DepName);
}
}
void AddIntLabelRange (unsigned Addr, const char* Name, unsigned Count)
/* Add an internal label for a range. The first entry gets the label "Name"
* while the others get "Name+offs".
*/
{
/* Define the label range */
AddLabelRange (Addr, atIntLabel, Name, 0, Count);
}
void AddExtLabelRange (unsigned Addr, const char* Name, const char* Comment, unsigned Count)
/* Add an external label for a range. The first entry gets the label "Name"
* while the others get "Name+offs".
*/
{
/* Define the label range */
AddLabelRange (Addr, atExtLabel, Name, Comment, Count);
}
int HaveLabel (unsigned Addr)
/* Check if there is a label for the given address */
{
/* Check the given address */
AddrCheck (Addr);
/* Check for a label */
return (SymTab[Addr] != 0);
}
int MustDefLabel (unsigned Addr)
/* Return true if we must define a label for this address, that is, if there
* is a label at this address, and it is an external or internal label.
*/
{
/* Get the label attribute */
attr_t A = GetLabelAttr (Addr);
/* Check for an internal or external label */
return (A == atExtLabel || A == atIntLabel);
}
const char* GetLabel (unsigned Addr)
/* Return the label for an address */
{
/* Check the given address */
AddrCheck (Addr);
/* Return the label if any */
return SymTab[Addr]? SymTab[Addr]->Name : 0;
}
const char* GetComment (unsigned Addr)
/* Return the comment for an address */
{
/* Check the given address */
AddrCheck (Addr);
/* Return the label if any */
return SymTab[Addr]? SymTab[Addr]->Comment : 0;
}
unsigned char GetStyleAttr (unsigned Addr)
attr_t GetStyleAttr (unsigned Addr)
/* Return the style attribute for the given address */
{
/* Check the given address */
@@ -375,7 +132,7 @@ unsigned char GetStyleAttr (unsigned Addr)
unsigned char GetLabelAttr (unsigned Addr)
attr_t GetLabelAttr (unsigned Addr)
/* Return the label attribute for the given address */
{
/* Check the given address */
@@ -387,40 +144,3 @@ unsigned char GetLabelAttr (unsigned Addr)
void DefOutOfRangeLabels (void)
/* Output any labels that are out of the loaded code range */
{
unsigned long Addr;
SeparatorLine ();
/* Low range */
Addr = 0;
while (Addr < CodeStart) {
if (MustDefLabel (Addr)) {
DefineConst (SymTab[Addr]->Name, SymTab[Addr]->Comment, Addr);
}
++Addr;
}
/* Skip areas in code range */
while (Addr <= CodeEnd) {
if ((AttrTab[Addr] & atStyleMask) == atSkip && MustDefLabel (Addr)) {
DefineConst (SymTab[Addr]->Name, SymTab[Addr]->Comment, Addr);
}
++Addr;
}
/* High range */
while (Addr < 0x10000) {
if (MustDefLabel (Addr)) {
DefineConst (SymTab[Addr]->Name, SymTab[Addr]->Comment, Addr);
}
++Addr;
}
SeparatorLine ();
}