Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / da65 / attrtab.h

diff --git a/src/da65/attrtab.h b/src/da65/attrtab.h
index 2e64be0678154f630ceeeac12187e5d2e3edac63..c9fb9c35fde0f98a18234914c7ba6e1a761da175 100644 (file)
--- a/src/da65/attrtab.h
+++ b/src/da65/attrtab.h
@@ -1,12 +1,12 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                attrtab.h                                 */
+/*                                 attrtab.h                                 */
 /*                                                                           */
-/*                      Disassembler attribute table                        */
+/*                       Disassembler attribute table                        */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2004 Ullrich von Bassewitz                                       */
+/* (C) 2000-2006 Ullrich von Bassewitz                                       */
 /*               Römerstrasse 52                                             */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
@@ -39,7 +39,7 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                   Data                                    */
 /*****************************************************************************/
 
 
@@ -47,36 +47,52 @@
 typedef enum attr_t {
 
     /* Styles */
-    atDefault  = 0x00,         /* Default style */
-    atCode     = 0x01,
-    atIllegal  = 0x02,
-    atByteTab          = 0x03,         /* Same as illegal */
-    atDByteTab  = 0x04,
-    atWordTab  = 0x05,
-    atDWordTab = 0x06,
-    atAddrTab  = 0x07,
-    atRtsTab   = 0x08,
-    atTextTab   = 0x09,
-    atSkip      = 0x0A,         /* Skip code completely */
+    atDefault       = 0x0000,   /* Default style */
+    atCode          = 0x0001,
+    atIllegal       = 0x0002,
+    atByteTab       = 0x0003,   /* Same as illegal */
+    atDByteTab      = 0x0004,
+    atWordTab       = 0x0005,
+    atDWordTab      = 0x0006,
+    atAddrTab       = 0x0007,
+    atRtsTab        = 0x0008,
+    atTextTab       = 0x0009,
+    atSkip          = 0x000A,   /* Skip code completely */
 
     /* Label flags */
-    atNoLabel  = 0x00,         /* No label for this address */
-    atExtLabel = 0x10,         /* External label */
-    atIntLabel  = 0x20,                /* Internally generated label */
-    atDepLabel         = 0x40,         /* Dependent label */
+    atNoLabel       = 0x0000,   /* No label for this address */
+    atExtLabel      = 0x0010,   /* External label */
+    atIntLabel      = 0x0020,   /* Internally generated label */
+    atDepLabel      = 0x0040,   /* Dependent label */
+    atUnnamedLabel  = 0x0080,   /* Unnamed label */
 
-    atStyleMask = 0x0F,                /* Output style */
-    atLabelMask = 0x70         /* Label information */
+    atLabelDefined  = 0x0100,   /* True if we defined the label */
+
+    atStyleMask     = 0x000F,   /* Output style */
+    atLabelMask     = 0x00F0,   /* Label information */
+
+    /* Segment */
+    atSegment       = 0x0100,   /* Code is in a segment */
+    atSegmentChange = 0x0200,   /* Either segment start or segment end */
 } attr_t;
 
 
 
 /*****************************************************************************/
-/*                                  Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
 
+void AddrCheck (unsigned Addr);
+/* Check if the given address has a valid range */
+
+int SegmentDefined (unsigned Start, unsigned End);
+/* Return true if the atSegment bit is set somewhere in the given range */
+
+int HaveSegmentChange (unsigned Addr);
+/* Return true if the segment change attribute is set for the given address */
+
 unsigned GetGranularity (attr_t Style);
 /* Get the granularity for the given style */
 
@@ -86,53 +102,17 @@ void MarkRange (unsigned Start, unsigned End, attr_t Attr);
 void MarkAddr (unsigned Addr, attr_t Attr);
 /* Mark an address with an attribute */
 
-const char* MakeLabelName (unsigned Addr);
-/* Make the default label name from the given address and return it in a
- * static buffer.
- */
-
-void AddLabel (unsigned Addr, attr_t Attr, const char* Name);
-/* Add a label */
-
-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.
- */
-
-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".
- */
-
-void AddExtLabelRange (unsigned Addr, const char* Name, unsigned Count);
-/* Add an external label for a range. The first entry gets the label "Name"
- * while the others get "Name+offs".
- */
+attr_t GetAttr (unsigned Addr);
+/* Return the attribute for the given address */
 
-int HaveLabel (unsigned Addr);
-/* Check if there is a label for the given address */
-
-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.
- */
-
-const char* GetLabel (unsigned Addr);
-/* Return the label for an address or NULL if there is none */
-
-unsigned char GetStyleAttr (unsigned Addr);
+attr_t GetStyleAttr (unsigned Addr);
 /* Return the style attribute for the given address */
 
-unsigned char GetLabelAttr (unsigned Addr);
+attr_t GetLabelAttr (unsigned Addr);
 /* Return the label attribute for the given address */
 
-void DefOutOfRangeLabels (void);
-/* Output any labels that are out of the loaded code range */
-
 
 
 /* End of attrtab.h */
-#endif
-
-
 
+#endif