Removed the -Lp switch, place --dbgfile into help screen

git-svn-id: svn://svn.cc65.org/cc65/trunk@2318 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ld65/global.c b/src/ld65/global.c
index 6ac6f9cce3e3d7016126e80edcb79ff332cfc781..607b7c3edba3be85f3ed6823bd2005009ebf9439 100644 (file)
--- a/src/ld65/global.c
+++ b/src/ld65/global.c
@@ -6,9 +6,9 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
@@ -55,7 +55,6 @@ unsigned char VerboseMap    = 0;      /* Verbose map file */
 const char* MapFileName            = 0;        /* Name of the map file */
 const char* LabelFileName   = 0;       /* Name of the label file */
 const char* DbgFileName     = 0;        /* Name of the debug file */
-unsigned char WProtSegs     = 0;       /* Mark write protected segments */
 
 
 

diff --git a/src/ld65/global.h b/src/ld65/global.h
index a56daf19f8820a59ce2a7d2a2ca4562e9ee15c07..b3cf4502018ce3005d37cc2d5b336981d617cb49 100644 (file)
--- a/src/ld65/global.h
+++ b/src/ld65/global.h
@@ -6,9 +6,9 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
@@ -55,7 +55,6 @@ extern unsigned char  VerboseMap;     /* Verbose map file */
 extern const char*     MapFileName;    /* Name of the map file */
 extern const char*     LabelFileName;  /* Name of the label file */
 extern const char*      DbgFileName;    /* Name of the debug file */
-extern unsigned char           WProtSegs;      /* Mark write protected segments */
 
 
 

diff --git a/src/ld65/main.c b/src/ld65/main.c
index 5385402213ebed8afcf1a3c1ace2c1e94f741294..7e2f4cf7e395f0033ce6706011cd312559b2d889 100644 (file)
--- a/src/ld65/main.c
+++ b/src/ld65/main.c
@@ -94,7 +94,6 @@ static void Usage (void)
                     "  -C name\t\tUse linker config file\n"
              "  -L path\t\tSpecify a library search path\n"
                     "  -Ln name\t\tCreate a VICE label file\n"
-                    "  -Lp\t\t\tMark write protected segments as such (VICE)\n"
                     "  -S addr\t\tSet the default start address\n"
                     "  -V\t\t\tPrint the linker version\n"
                     "  -h\t\t\tHelp (this text)\n"
@@ -107,6 +106,7 @@ static void Usage (void)
             "Long options:\n"
              "  --cfg-path path\tSpecify a config file search path\n"
                     "  --config name\t\tUse linker config file\n"
+            "  --dbgfile name\t\tGenerate debug information\n"
              "  --dump-config name\tDump a builtin configuration\n"
             "  --help\t\tHelp (this text)\n"
              "  --lib file\t\tLink this library\n"
@@ -459,9 +459,8 @@ int main (int argc, char* argv [])
 
                case 'L':
                    switch (Arg [2]) {
-                        /* ## The first two are obsolete and will go */
+                        /* ## The first one is obsolete and will go */
                        case 'n': LabelFileName = GetArg (&I, 3);   break;
-                       case 'p': WProtSegs = 1;                    break;
                        default:  OptLibPath (Arg, GetArg (&I, 2)); break;
                    }
                    break;

diff --git a/src/ld65/mapfile.c b/src/ld65/mapfile.c
index af4ad219182bbc1525150bad8eacc56e471a165e..071b11318ff0f65cb976f957e28d18851f92958e 100644 (file)
--- a/src/ld65/mapfile.c
+++ b/src/ld65/mapfile.c
@@ -147,22 +147,6 @@ void CreateLabelFile (void)
        PrintDbgSymLabels (O, F);
     }
 
-    /* If we should mark write protected areas as such, do it */
-    if (WProtSegs) {
-       SegDesc* S = SegDescList;
-       while (S) {
-           /* Is this segment write protected and contains data? */
-           if (S->Flags & SF_WPROT && S->Seg->Size > 0) {
-               /* Write protect the memory area in VICE */
-               fprintf (F, "wp %04lX %04lX\n",
-                        S->Seg->PC,
-                        S->Seg->PC + S->Seg->Size - 1);
-           }
-           /* Next segment */
-           S = S->Next;
-       }
-    }
-
     /* Close the file */
     if (fclose (F) != 0) {
        Error ("Error closing map file `%s': %s", LabelFileName, strerror (errno));