disabled the fix for bug #604575

[fw/sdcc] / src / SDCCglobl.h

diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h
index c9ce2630f28d8669aa8d3982f818069d5c18919a..fea1f48ab0293c34fd992d189bfd1e14108deb77 100644 (file)
--- a/src/SDCCglobl.h
+++ b/src/SDCCglobl.h
@@ -1,47 +1,36 @@
 /* SDCCglobl.h - global macros etc required by all files */
+
 #ifndef SDCCGLOBL_H
 #define SDCCGLOBL_H
+
 #include <memory.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <stdio.h>
 
+#include "SDCCset.h"
+
+
 /*
  * Define host port dependant constants etc.
  */
 
-#define DOS_DIR_SEPARATOR_CHAR     '\\'
-#define DOS_DIR_SEPARATOR_STRING   "\\"
 #define UNIX_DIR_SEPARATOR_CHAR    '/'
-#define UNIX_DIR_SEPARATOR_STRING  "/"
-
-#if defined(__BORLANDC__)      /* Borland Turbo C/Win32 Host */
-
-#define NATIVE_WIN32           1
-#define DIR_SEPARATOR_CHAR         DOS_DIR_SEPARATOR_CHAR
-#define DIR_SEPARATOR_STRING       DOS_DIR_SEPARATOR_STRING
-
-#elif defined(_MSC_VER)                /* Miscosoft VC6/Win32 Host */
 
-#define NATIVE_WIN32           1
-#include "sdcc_vc.h"
-#define DIR_SEPARATOR_CHAR         DOS_DIR_SEPARATOR_CHAR
-#define DIR_SEPARATOR_STRING       DOS_DIR_SEPARATOR_STRING
+#ifdef _WIN32       /* WIN32 native */
 
-#elif defined(__MINGW32__)     /* MINGW32 DOS Host */
+#  define NATIVE_WIN32                 1
+#  ifdef __MINGW32__  /* GCC MINGW32 depends on configure */
+#    include "sdccconf.h"
+#  else
+#    include "sdcc_vc.h"
+#    define PATH_MAX  _MAX_PATH
+#  endif
 
-#define NATIVE_WIN32           1
-#define DIR_SEPARATOR_CHAR         DOS_DIR_SEPARATOR_CHAR
-#define DIR_SEPARATOR_STRING       DOS_DIR_SEPARATOR_STRING
-
-#else /* Assume Un*x style system */
-
-#include "sdccconf.h"
-#define DIR_SEPARATOR_CHAR         UNIX_DIR_SEPARATOR_CHAR
-#define DIR_SEPARATOR_STRING       UNIX_DIR_SEPARATOR_STRING
-
-#endif // _MSC_VER
+#else               /* Assume Un*x style system */
+#  include "sdccconf.h"
+#endif
 
 #include "SDCCerr.h"
 
@@ -50,18 +39,18 @@
 
 #include <limits.h>            /* PATH_MAX                  */
 #ifndef PATH_MAX               /* POSIX, but not required   */
-#define PATH_MAX 255           /* define a reasonable value */
+#  define PATH_MAX 255         /* define a reasonable value */
 #endif
 
 #define  MAX_REG_PARMS  1
 typedef int bool;
 
 #ifndef max
-#define max(a,b) (a > b ? a : b)
+#  define max(a,b) (a > b ? a : b)
 #endif
 
 #ifndef min
-#define min(a,b) (a < b ? a : b)
+#  define min(a,b) (a < b ? a : b)
 #endif
 
 #ifndef THROWS
@@ -99,6 +88,8 @@ typedef int bool;
 #define PRAGMA_EXCLUDE     "EXCLUDE"
 #define PRAGMA_NOIV        "NOIV"
 #define PRAGMA_OVERLAY     "OVERLAY"
+#define PRAGMA_LESSPEDANTIC "LESS_PEDANTIC"
+
 #define  SMALL_MODEL 0
 #define  LARGE_MODEL 1
 #define  TRUE 1
@@ -255,6 +246,10 @@ struct options
     int xram_size;             /* external ram size (used only for error checking) */
        bool xram_size_set; /* since xram_size=0 is a possibility */
     int code_size;             /* code size (used only for error checking) */    
+    int verboseExec;            /* show what we are doing */
+    int noXinitOpt;             /* don't optimize initialized xdata */
+    int noCcodeInAsm;           /* hide c-code from asm */
+    int iCodeInAsm;             /* show i-code in asm */
   };
 
 /* forward definition for variables accessed globally */
@@ -279,9 +274,9 @@ extern int NestLevel;               /* NestLevel                 SDCC.y   */
 extern int stackPtr;           /* stack pointer             SDCC.y   */
 extern int xstackPtr;          /* external stack pointer    SDCC.y   */
 extern int reentrant;          /* /X flag has been sent     SDCC.y */
-extern char buffer[];          /* general buffer      SDCCgen.c   */
-extern int currRegBank;                /* register bank being used   SDCCgens.c   */
-extern int RegBankUsed[4];     /* JCF: register banks used       SDCCmain.c   */
+extern char buffer[PATH_MAX * 2];/* general buffer           SDCCmain.c   */
+extern int currRegBank;                /* register bank being used  SDCCgens.c   */
+extern int RegBankUsed[4];     /* JCF: register banks used  SDCCmain.c   */
 extern struct symbol *currFunc;        /* current function    SDCCgens.c */
 extern int cNestLevel;         /* block nest level  SDCCval.c      */
 extern int currBlockno;                /* sequentail block number */
@@ -297,9 +292,7 @@ extern int nlibFiles;
 extern char *libPaths[128];
 extern int nlibPaths;
 
-extern bool verboseExec;
-extern bool noXinitOpt;
-
+void setParseWithComma (set **, char *);
 void parseWithComma (char **, char *);
 
 /** Creates a temporary file a'la tmpfile which avoids the bugs
@@ -312,8 +305,7 @@ FILE *tempfile (void);
     in cygwin wrt c:\tmp.
     Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile().
 */
-char *
-tempfilename (void);
+char *tempfilename (void);
 
 /** An assert() macro that will go out through sdcc's error
     system.