X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmem.h;h=8daf0921b005e4fbede30088dbc0ee3f96b5a147;hb=0c9fb00341a64f6c26cee71602484f559029e7fe;hp=ce734cf58f1f2c6763414b14947ce61292559843;hpb=c819b1e06a731b497ea9e0bfbb6b3b753306a190;p=fw%2Fsdcc

diff --git a/src/SDCCmem.h b/src/SDCCmem.h
index ce734cf5..8daf0921 100644
--- a/src/SDCCmem.h
+++ b/src/SDCCmem.h
@@ -5,28 +5,30 @@
 #ifndef SDCCMEM_H
 #define SDCCMEM_H
 
-struct set ;
-struct value ;
+struct set;
+struct value;
 struct eBBlock;
 
-typedef  struct memmap{
-    unsigned char  pageno;    /* page no for this variable  */
-    const char     *sname;    /*   character prefix for map */
-    char     dbName ;         /* debugger address space name */
-    int      ptrType;         /* pointer Type for this space */
-    int      slbl ;           /* label counter for space    */
-    unsigned sloc    ;        /* starting location          */
-    unsigned fmap : 1;        /* 1 = 16bit addressing reqd  */
-    unsigned paged : 1;       /* this is a paged mem space  */
-    unsigned direct: 1;       /* 1= indirect access only    */
-    unsigned bitsp: 1;        /* 1 = bit addressable space  */
-    unsigned codesp:1;        /* 1 = code space             */
-    unsigned regsp: 1;        /* 1= sfr space               */
-    FILE    *oFile   ;        /* object file associated     */
-    struct  set *syms;        /* symbols defined in this segment */
-} memmap ;
+typedef struct memmap
+  {
+    unsigned char pageno;	/* page no for this variable  */
+    const char *sname;		/*   character prefix for map */
+    char dbName;		/* debugger address space name */
+    int ptrType;		/* pointer Type for this space */
+    int slbl;			/* label counter for space    */
+    unsigned sloc;		/* starting location          */
+    unsigned fmap:1;		/* 1 = 16bit addressing reqd  */
+    unsigned paged:1;		/* this is a paged mem space  */
+    unsigned direct:1;		/* 1= indirect access only    */
+    unsigned bitsp:1;		/* 1 = bit addressable space  */
+    unsigned codesp:1;		/* 1 = code space             */
+    unsigned regsp:1;		/* 1= sfr space               */
+    FILE *oFile;		/* object file associated     */
+    struct set *syms;		/* symbols defined in this segment */
+  }
+memmap;
 
-extern FILE	*junkFile ;	
+extern FILE *junkFile;
 
 /* memory map prefixes  MOF added the DATA,CODE,XDATA,BIT */
 #define  XSTACK_NAME   port->mem.xstack_name
@@ -35,33 +37,36 @@ extern FILE	*junkFile ;
 #define  DATA_NAME     port->mem.data_name
 #define  IDATA_NAME    port->mem.idata_name
 #define  XDATA_NAME    port->mem.xdata_name
+#define  XIDATA_NAME   port->mem.xidata_name
+#define  XINIT_NAME    port->mem.xinit_name
 #define  BIT_NAME      port->mem.bit_name
 #define  REG_NAME      port->mem.reg_name
 #define  STATIC_NAME   port->mem.static_name
 #define	 HOME_NAME     port->mem.home_name
- 
+
 /* forward definition for variables */
-extern   memmap  *xstack;    /* xternal stack data         */
-extern   memmap  *istack;    /* internal stack             */
-extern   memmap  *code  ;    /* code segment               */
-extern   memmap  *data  ;    /* internal data upto 128     */
-extern   memmap  *xdata ;    /* external data		   */
-extern   memmap  *idata ;    /* internal data upto 256     */
-extern   memmap  *bit   ;    /* bit addressable space      */
-extern   memmap  *statsg;    /* static code segment        */
-extern   memmap  *sfr   ;    /* register space             */
-extern   memmap  *sfrbit;    /* sfr bit space              */
-extern   memmap  *reg   ;    /* register space		   */
-extern   memmap  *_const;    /* constant segment           */
-extern   memmap  *generic;   /* unknown                    */
-extern   memmap  *overlay;   /* the overlay segment        */
-extern   memmap  *eeprom;    /* eepromp space              */
-extern   memmap  *eeprom;    /* eepromp space              */
-extern	 memmap	 *home;	     /* Non-banked home space	   */
+extern memmap *xstack;		/* xternal stack data         */
+extern memmap *istack;		/* internal stack             */
+extern memmap *code;		/* code segment               */
+extern memmap *data;		/* internal data upto 128     */
+extern memmap *xdata;		/* external data              */
+extern memmap *xidata;          /* the initialized xdata       */
+extern memmap *xinit;           /* the initializers for xidata */
+extern memmap *idata;		/* internal data upto 256     */
+extern memmap *bit;		/* bit addressable space      */
+extern memmap *statsg;		/* static code segment        */
+extern memmap *sfr;		/* register space             */
+extern memmap *sfrbit;		/* sfr bit space              */
+extern memmap *reg;		/* register space             */
+extern memmap *generic;		/* unknown                    */
+extern memmap *overlay;		/* the overlay segment        */
+extern memmap *eeprom;		/* eepromp space              */
+extern memmap *eeprom;		/* eepromp space              */
+extern memmap *home;		/* Non-banked home space      */
 
 extern int fatalError;
 
-extern   struct  set     *ovrSetSets;
+extern struct set *ovrSetSets;
 
 extern int maxRegBank;
 
@@ -74,20 +79,21 @@ extern int maxRegBank;
 #define IN_CODESPACE(map)       (map && map->codesp)
 #define IN_REGSP(map)		(map && map->regsp)
 #define PTR_TYPE(map)           (map ? (map->ptrType ? map->ptrType : POINTER)\
-                                     : GPOINTER)
+                                     : port->unqualified_pointer)
 
 /* forward decls for functions    */
-memmap     *allocMap       (char,char,char,char,char,char,unsigned, const char *,char,int );
-void        initMem        (                                );
-void        allocGlobal    (struct symbol  *                );
-void        allocLocal     (struct symbol  *                );
-void        allocParms     (struct value   *                );
-void        deallocParms   (struct value   *                );
-void        deallocLocal   (struct symbol  *                );
-int         allocVariables (struct symbol  *                );
-void        overlay2Set    (                                );
-void        overlay2data   (                                );
-void        redoStackOffsets(                               );
-void        printAllocInfo (struct symbol *, FILE *         );
-void        doOverlays     (struct eBBlock **, int count    );
+memmap *allocMap (char, char, char, char, char, char, unsigned, const char *, char, int);
+void initMem ();
+void allocGlobal (struct symbol *);
+void allocLocal (struct symbol *);
+void allocParms (struct value *);
+void deallocParms (struct value *);
+void deallocLocal (struct symbol *);
+int allocVariables (struct symbol *);
+void overlay2Set ();
+void overlay2data ();
+void redoStackOffsets ();
+void printAllocInfo (struct symbol *, FILE *);
+void doOverlays (struct eBBlock **, int count);
+void deleteFromSeg(struct symbol *);
 #endif