X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fld65%2Fsegments.h;h=9810c0f574174a9166b37bffd6265cd22038cfcb;hb=7aefd9b4e7b67908b7b3c38b6003c7f1a8d3ee2d;hp=0df7e8fc366b8466356b3adf734e19ed9cc08e6b;hpb=5537aee2057f62464f4d4e6eaf7381a9542aa356;p=cc65

diff --git a/src/ld65/segments.h b/src/ld65/segments.h
index 0df7e8fc3..9810c0f57 100644
--- a/src/ld65/segments.h
+++ b/src/ld65/segments.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2012, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -41,6 +41,7 @@
 #include <stdio.h>
 
 /* common */
+#include "coll.h"
 #include "exprdefs.h"
 
 
@@ -51,22 +52,26 @@
 
 
 
+/* Forwards */
+struct MemoryArea;
+
 /* Segment structure */
 typedef struct Segment Segment;
 struct Segment {
     unsigned            Name;           /* Name index of the segment */
-    Segment*	      	Next;		/* Hash list */
-    Segment*  	      	List;		/* List of all segments */
-    struct Section*	SecRoot;	/* Section list */
-    struct Section*  	SecLast;	/* Pointer to last section */
+    unsigned            Id;             /* Segment id for debug info */
+    Segment*  	      	Next;		/* Hash list */
+    unsigned            Flags;          /* Segment flags */
+    Collection          Sections;       /* Sections in this segment */
+    struct MemoryArea*  MemArea;        /* Run memory area once placed */
     unsigned long     	PC;    		/* PC were this segment is located */
     unsigned long     	Size;		/* Size of data so far */
-    struct ObjData*	AlignObj;	/* Module that requested the alignment */
-    unsigned char     	Align;		/* Alignment needed */
+    const char*         OutputName;     /* Name of output file or NULL */
+    unsigned long       OutputOffs;     /* Offset in output file */
+    unsigned long       Alignment;      /* Alignment needed */
     unsigned char     	FillVal;	/* Value to use for fill bytes */
-    unsigned char     	Type;		/* Type of segment */
+    unsigned char     	AddrSize;      	/* Address size of segment */
     unsigned char       ReadOnly;       /* True for readonly segments (config) */
-    unsigned char       Relocatable;    /* True if the segment is relocatable */
     unsigned char      	Dumped;		/* Did we dump this segment? */
 };
 
@@ -77,13 +82,14 @@ typedef struct Section Section;
 struct Section {
     Section*  	   	Next;		/* List of sections in a segment */
     Segment*  	    	Seg;		/* Segment that contains the section */
+    struct ObjData*     Obj;            /* Object file this section comes from */
     struct Fragment*	FragRoot;	/* Fragment list */
     struct Fragment*	FragLast;	/* Pointer to last fragment */
     unsigned long   	Offs;		/* Offset into the segment */
     unsigned long   	Size;		/* Size of the section */
-    unsigned char   	Align;		/* Alignment */
-    unsigned char	Fill;		/* Fill bytes for alignment */
-    unsigned char	Type;		/* Type of segment */
+    unsigned long       Fill;           /* Fill bytes for alignment */
+    unsigned long       Alignment;      /* Alignment */
+    unsigned char	AddrSize;       /* Address size of segment */
 };
 
 
@@ -110,13 +116,13 @@ typedef unsigned (*SegWriteFunc) (ExprNode* E, 	      /* The expression to write
 
 
 
-Segment* GetSegment (unsigned 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.
  */
 
-Section* NewSection (Segment* Seg, unsigned char Align, unsigned char Type);
+Section* NewSection (Segment* Seg, unsigned long Alignment, unsigned char AddrSize);
 /* Create a new section for the given segment */
 
 Section* ReadSection (FILE* F, struct ObjData* O);
@@ -138,11 +144,14 @@ unsigned SegWriteConstExpr (FILE* F, ExprNode* E, int Signed, unsigned Size);
  * check and return one of the SEG_EXPR_xxx codes.
  */
 
-void SegWrite (FILE* Tgt, Segment* S, SegWriteFunc F, void* Data);
+void SegWrite (const char* TgtName, FILE* Tgt, Segment* S, SegWriteFunc F, void* Data);
 /* Write the data from the given segment to a file. For expressions, F is
  * called (see description of SegWriteFunc above).
  */
 
+unsigned SegmentCount (void);
+/* Return the total number of segments */
+
 void PrintSegmentMap (FILE* F);
 /* Print a segment map to the given file */