* as/link/mcs51/aslink.dsp: removed SDK define

* as/link/z80/clean.mk: brought in sync with other ports
* as/link/z80/lklibr.c (SdccLib, fndsym): handle the dflag here too
* as/hc08/Makefile.bcc,
* as/mcs51/Makefile.bcc,
* as/z80/Makefile.bcc: noice.c was moved to as/asxxsrc/
* src/z80/main.c (_setValues): use the now capitalized -Z,
  (z80_port, gbz80_port): generate debug information when asked

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5013 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 3d1b6a461ec63fea5590b59367a2171f194c1672..0e8c34e957d6952cc9b7a6266fbeda0127432839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,19 @@
+2008-02-16 Maarten Brock <sourceforge.brock AT dse.nl>
+
+       * as/link/mcs51/aslink.dsp: removed SDK define
+       * as/link/z80/clean.mk: brought in sync with other ports
+       * as/link/z80/lklibr.c (SdccLib, fndsym): handle the dflag here too
+       * as/hc08/Makefile.bcc,
+       * as/mcs51/Makefile.bcc,
+       * as/z80/Makefile.bcc: noice.c was moved to as/asxxsrc/
+       * src/z80/main.c (_setValues): use the now capitalized -Z,
+         (z80_port, gbz80_port): generate debug information when asked
+
 2008-02-16 Borut Razem <borut.razem AT siol.net>
 
        * as/z80/asmain.c, as/z80/asm.h, as/z80/asdata.c,
          as/link/z80/lkmain.c, as/z80/as_gbz80.dsp, as/z80/as_z80.dsp,
-         as/z80/Makefile.in. as/z80/Makefile.bcc: 
+         as/z80/Makefile.in. as/z80/Makefile.bcc:
          applied patch #1893393: patch for as-z80 and link-z80 to generate
          cdb, thanks to Armin Diehl
        * as/*/asnoice.c, as/hc08/as_hc08.dsp, as/hc08/Makefile.in,

diff --git a/as/hc08/Makefile.bcc b/as/hc08/Makefile.bcc
index 384c518e459134add3f90abb94d3ee84625fc259..0ccc0a942eaf26358390f6b40e4904e0a755e04c 100644 (file)
--- a/as/hc08/Makefile.bcc
+++ b/as/hc08/Makefile.bcc
@@ -4,10 +4,11 @@ PRJDIR          = ../..
 
 !include $(PRJDIR)/Bcc.inc
 
-ASOBJECTS       = asmain.obj aslex.obj assubr.obj asnoice.obj \
+ASOBJECTS       = asmain.obj aslex.obj assubr.obj \
                   asexpr.obj asdata.obj aslist.obj asout.obj \
                   h08ext.obj h08pst.obj h08mch.obj h08adr.obj \
                   ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj \
+                  ../asxxsrc/asnoice.obj \
                   ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
 
 ASX8051         = $(PRJDIR)/bin/asx8051.exe

diff --git a/as/link/mcs51/aslink.dsp b/as/link/mcs51/aslink.dsp
index c185fa6dee33400c98810bad6ce979b0e66bb399..7dd6a6f0239ab5d903c5e11ff6eb2b9634d09f15 100644 (file)
--- a/as/link/mcs51/aslink.dsp
+++ b/as/link/mcs51/aslink.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Debug"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FR /FD /GZ /c\r
 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FR /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FD /c\r
 # ADD CPP /nologo /W3 /GX /O2 /I ".." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r

diff --git a/as/link/z80/clean.mk b/as/link/z80/clean.mk
index b443a6914da2dbe3ade89297978ba2d8bb871cc9..ce8ba5faf638d99b8734b4eb24c11caa48c2d33c 100644 (file)
--- a/as/link/z80/clean.mk
+++ b/as/link/z80/clean.mk
@@ -5,15 +5,14 @@ include $(top_builddir)/Makefile.common
 clean:
        rm -f *core *[%~] *.[oa]
        rm -f .[a-z]*~
-       rm -f $(top_builddir)/bin/link-z80$(EXEEXT) link-z80$(EXEEXT) \
-             $(top_builddir)/bin/link-gbz80$(EXEEXT) link-gbz80$(EXEEXT)
-       rm -f *.dep
+       rm -f $(top_builddir)/bin/link-z80$(EXEEXT) link-z80$(EXEEXT)
+       rm -f $(top_builddir)/bin/link-gbz80$(EXEEXT) link-gbz80$(EXEEXT)
        rm -rf obj
 
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------
 distclean: clean
-       rm -f Makefile
+       rm -f Makefile *.dep
 
 # Like clean but some files may still exist
 # -----------------------------------------

diff --git a/as/link/z80/lklibr.c b/as/link/z80/lklibr.c
index d2dfcb47b3b0eeb4c580bc5f3bb9d9ea65f8b8b4..31d2e897aa472176a5facd25e961d6a9cac5204a 100644 (file)
--- a/as/link/z80/lklibr.c
+++ b/as/link/z80/lklibr.c
@@ -559,6 +559,12 @@ int SdccLib(char * PathLib, FILE * libfp, char * DirLib, char * SymName)
                         fseek(libfp, lbfh->offset, SEEK_SET);
                         LoadRel(PathLib, libfp, ModName);
 
+                        /* if cdb information required & .adb file present */
+                        if (dflag && dfp)
+                        {
+                            if(LoadAdb(libfp))
+                                SaveLinkedFilePath(DirLib);
+                        }
                         return 1; /*Found the symbol, so success!*/
                     }
                 }
@@ -699,6 +705,17 @@ int fndsym( char *name )
                     }
                     else
                     { /*For a stand alone object file*/
+                        /* if cdb information required & adb file present */
+                        if (dflag && dfp)
+                        {
+                            FILE *xfp = afile(lbfh->filspc, "adb",0);
+                            if (xfp)
+                            {
+                                SaveLinkedFilePath(lbfh->filspc);
+                                copyfile(dfp, xfp);
+                                fclose(xfp);
+                            }
+                        }
                         loadfile(lbfh->filspc);
                     }
                     ThisLibr->loaded=1;
@@ -937,7 +954,7 @@ int buildlibraryindex(void)
                 }
                 This->next = NULL;
                 This->loaded=-1;
-                This->offset=-1; /*There should be a rel file*/
+                This->offset=-1; /*We have a stand alone .rel file*/
                 This->libspc = lbnh->libspc;
 
                 This->relfil=(char *)new(strlen(relfil)+1);
@@ -1174,6 +1191,18 @@ fndsym(char *name)
                         strcpy(lbfh->relfil,relfil);
                         fclose(fp);
                         fclose(libfp);
+
+                        /* if cdb information required & adb file present */
+                        if (dflag && dfp)
+                        {
+                            FILE *xfp = afile(str,"adb",0); //JCF: Nov 30, 2002
+                            if (xfp)
+                            {
+                                SaveLinkedFilePath(str);
+                                copyfile(dfp,xfp);
+                                fclose(xfp);
+                            }
+                        }
                         loadfile(str);
                         return (1);
                     }

diff --git a/as/mcs51/Makefile.bcc b/as/mcs51/Makefile.bcc
index a2a2f1c61eb880f68fe5856d69faabb2d196ed4e..cc7d98b0c380ca1eb366836c9a3f6a4fc540b846 100644 (file)
--- a/as/mcs51/Makefile.bcc
+++ b/as/mcs51/Makefile.bcc
@@ -4,10 +4,11 @@ PRJDIR          = ../..
 
 !include $(PRJDIR)/Bcc.inc
 
-ASOBJECTS       = asmain.obj aslex.obj assubr.obj asnoice.obj \
+ASOBJECTS       = asmain.obj aslex.obj assubr.obj \
                   asexpr.obj asdata.obj aslist.obj asout.obj \
                   i51ext.obj i51pst.obj i51mch.obj i51adr.obj \
                   ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj \
+                  ../asxxsrc/asnoice.obj \
                   ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
 
 ASX8051         = $(PRJDIR)/bin/asx8051.exe

diff --git a/as/z80/Makefile.bcc b/as/z80/Makefile.bcc
index 47d093a51a99861a445dc355a09174afc22e2803..149e31365c769292ce52c3c7dc7ed21ddbf500d8 100644 (file)
--- a/as/z80/Makefile.bcc
+++ b/as/z80/Makefile.bcc
@@ -6,13 +6,14 @@ PRJDIR          = ../..
 
 CFLAGS          = $(CFLAGS) -DINDEXLIB -DMLH_MAP -DSDK
 
-OBJECTS       = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \
-                asout.obj assubr.obj z80adr.obj z80ext.obj asnoice.obj \
-                z80mch.obj z80pst.obj \
-                ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj ../asxxsrc/aslex.obj \
-                ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
+OBJECTS         = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \
+                  asout.obj assubr.obj z80adr.obj z80ext.obj \
+                  z80mch.obj z80pst.obj \
+                  ../asxxsrc/strcmpi.obj ../asxxsrc/assym.obj ../asxxsrc/aslex.obj \
+                  ../asxxsrc/asnoice.obj \
+                  ../../support/Util/dbuf.obj ../../support/Util/dbuf_string.obj
 
-TARGET         = $(PRJDIR)/bin/as-z80.exe
+TARGET          = $(PRJDIR)/bin/as-z80.exe
 
 all: $(TARGET)
 

diff --git a/src/z80/main.c b/src/z80/main.c
index dbd02319366655b3caffc1abaf5080ac3e7921e8..6e5e05edcd1f04c73d956a6a026ba3ea2e4db722 100644 (file)
--- a/src/z80/main.c
+++ b/src/z80/main.c
@@ -526,7 +526,7 @@ _setValues(void)
 
   if (IS_GB)
     {
-      setMainValue ("z80outputtypeflag", "-z");
+      setMainValue ("z80outputtypeflag", "-Z");
       setMainValue ("z80outext", ".gb");
     }
   else
@@ -717,7 +717,7 @@ PORT z80_port =
   {
     NULL,
     ASMCMD,
-    "-plosgff",                 /* Options with debug */
+    "-plosgffc",                /* Options with debug */
     "-plosgff",                 /* Options without debug */
     0,
     ".asm"
@@ -838,7 +838,7 @@ PORT gbz80_port =
   {
     NULL,
     ASMCMD,
-    "-plosgff",                 /* Options with debug */
+    "-plosgffc",                /* Options with debug */
     "-plosgff",                 /* Options without debug */
     0,
     ".asm",